modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java | 3
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java | 63 ++--------
modules/plugins/ant-bundle/src/test/resources/test-build.xml | 34 -----
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 9 -
4 files changed, 23 insertions(+), 86 deletions(-)
New commits:
commit a06d9730ba727c78703e0d994858920e85b9bb4b
Merge: 8262dba... ec5b063...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 27 13:51:14 2010 -0400
Merge branch 'bundle'
Conflicts:
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
modules/plugins/ant-bundle/src/test/resources/test-build.xml
diff --cc modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
index 4a01d15,c4dc63e..bd191be
--- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
+++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
@@@ -99,14 -131,16 +99,15 @@@ public class AntBundlePluginComponentTe
PackageType packageType = new PackageType("testSimpleBundle", resourceType);
Bundle bundle = new Bundle("testSimpleBundle", bundleType, repo, packageType);
BundleVersion bundleVersion = new BundleVersion("testSimpleBundle", "1.0", bundle,
- getRecipeFromFile("test-build.xml"));
+ getRecipeFromFile("test-bundle.xml"));
BundleDestination destination = new BundleDestination(bundle, "testSimpleBundle", new ResourceGroup(
- "testSimpleBundle"), "/jboss");
+ "testSimpleBundle"), "/tmp/rhq-testAntBundle");
Configuration config = new Configuration();
- config.put(new PropertySimple("custom.prop1", "custom property 1"));
- config.put(new PropertySimple("custom.prop2", "custom property 2"));
+ config.put(new PropertySimple("custom.prop1", "ABC123"));
BundleDeployment deployment = new BundleDeployment();
+ deployment.setName("test bundle deployment name");
deployment.setBundleVersion(bundleVersion);
deployment.setConfiguration(config);
deployment.setDestination(destination);
commit 8262dbadeb2514fd482ad8a28cb9071af763008d
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Thu May 27 10:34:12 2010 -0400
throw IllegalArgumentException in setChildSubCategories() if arg is null
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java
index 47f54aa..7714e39 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java
@@ -246,6 +246,9 @@ public class ResourceSubCategory implements Comparable<ResourceSubCategory>, Ser
}
public void setChildSubCategories(List<ResourceSubCategory> childSubCategories) {
+ if (childSubCategories == null) {
+ throw new IllegalArgumentException("childSubCategories is null.");
+ }
this.childSubCategories = childSubCategories;
}
commit 8b50ba816d704ced7668a7fa6aa869416ba0c043
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Thu May 27 10:33:03 2010 -0400
various reworking of rhq:bundle Ant task as discussed; rename rhq:deployment element to rhq:deploymentUnit
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
index 7c4925b..93e0a6a 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
@@ -46,7 +46,7 @@ import org.apache.tools.ant.helper.AntXMLContext;
import org.apache.tools.ant.helper.ProjectHelper2;
import org.rhq.bundle.ant.task.BundleTask;
-import org.rhq.bundle.ant.type.DeploymentType;
+import org.rhq.bundle.ant.type.DeploymentUnitType;
/**
* This object enables you to invoke an Ant script within the running VM. You can fully run the script
@@ -69,14 +69,11 @@ public class AntLauncher {
// TODO (ips, 04/28/10): Figure out a way to avoid assuming the prefix is "rhq".
private static final String BUNDLE_TASK_NAME = "rhq:bundle";
- private static final String INPUT_PROPERTY_TASK_NAME = "rhq:input-property";
- private static final String DEPLOY_TASK_NAME = "rhq:deploy";
/**
* Executes the specified bundle deploy Ant build file (i.e. rhq-deploy.xml).
*
* @param buildFile the path to the build file (i.e. rhq-deploy.xml)
- * @param targetName the target to run, <code>null</code> will run the default target
* @param buildProperties the properties to pass into Ant
* @param buildListeners a list of build listeners (provide callback methods for targetExecuted, taskExecuted, etc.)
*
@@ -84,8 +81,9 @@ public class AntLauncher {
*
* @throws InvalidBuildFileException if the build file is invalid
*/
- public BundleAntProject executeBundleDeployFile(File buildFile, String targetName, Properties buildProperties,
- List<BuildListener> buildListeners) throws InvalidBuildFileException {
+ public BundleAntProject executeBundleDeployFile(File buildFile, Properties buildProperties,
+ List<BuildListener> buildListeners)
+ throws InvalidBuildFileException {
parseBundleDeployFile(buildFile);
BundleAntProject project = new BundleAntProject();
@@ -121,8 +119,8 @@ public class AntLauncher {
// targets.
project.executeTarget("");
- // Now execute the target the user actually specified.
- project.executeTarget((targetName == null) ? project.getDefaultTarget() : targetName);
+ // Now execute the default target?
+ //project.executeTarget(project.getDefaultTarget());
return project;
} catch (Exception e) {
@@ -228,11 +226,11 @@ public class AntLauncher {
}
BundleTask bundleTask = (BundleTask) preconfigureTask(unconfiguredBundleTask);
- Collection<DeploymentType> deployments = bundleTask.getDeployments().values();
+ Collection<DeploymentUnitType> deployments = bundleTask.getDeploymentUnits().values();
if (deployments.isEmpty()) {
- throw new InvalidBuildFileException("The bundle task must contain at least one deployment child element.");
+ throw new InvalidBuildFileException("The bundle task must contain exactly one rhq:deploymentUnit child element.");
}
- DeploymentType deployment = deployments.iterator().next();
+ DeploymentUnitType deployment = deployments.iterator().next();
Map<File, File> files = deployment.getFiles();
for (File file : files.values()) {
project.getBundleFileNames().add(file.getName());
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
index 7d7959a..bd83825 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
@@ -121,14 +121,6 @@ public class BundleAntProject extends Project {
this.deploymentId = deploymentId;
}
- public String getDeploymentName() {
- return deploymentName;
- }
-
- public void setDeploymentName(String deploymentName) {
- this.deploymentName = deploymentName;
- }
-
public DeploymentPhase getDeploymentPhase() {
return deploymentPhase;
}
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
index f943c0d..8e3c066 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
@@ -22,7 +22,7 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.rhq.bundle.ant.DeployPropertyNames;
import org.rhq.bundle.ant.DeploymentPhase;
-import org.rhq.bundle.ant.type.DeploymentType;
+import org.rhq.bundle.ant.type.DeploymentUnitType;
import org.rhq.bundle.ant.type.InputPropertyType;
import java.io.File;
@@ -43,7 +43,7 @@ public class BundleTask extends AbstractBundleTask {
private String name;
private String version;
private String description;
- private Map<String, DeploymentType> deployments = new HashMap<String, DeploymentType>();
+ private Map<String, DeploymentUnitType> deploymentUnits = new HashMap<String, DeploymentUnitType>();
private Set<InputPropertyType> inputProperties = new HashSet<InputPropertyType>();
@Override
@@ -63,8 +63,8 @@ public class BundleTask extends AbstractBundleTask {
* The RHQ Ant launcher will ensure that the following Ant project properties are defined prior to this method being
* invoked:
*
- * rhq.deploy.name - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment} name
- * (e.g. "appserver")
+ * rhq.deploy.id - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment}'s unique id
+ * (e.g. "10001")
* rhq.deploy.dir - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment} install dir
* (e.g. "/opt/jbossas-petstore")
* rhq.deploy.phase - the {@link org.rhq.bundle.ant.DeploymentPhase deployment phase}
@@ -105,15 +105,10 @@ public class BundleTask extends AbstractBundleTask {
getProject().setDeploymentId(deploymentId);
log(DeployPropertyNames.DEPLOY_ID + "=\"" + deploymentId + "\"", Project.MSG_DEBUG);
- String deploymentName = (String) projectProps.get(DeployPropertyNames.DEPLOY_NAME);
- if (deploymentName == null) {
- throw new BuildException("Required property [" + DeployPropertyNames.DEPLOY_NAME + "] was not specified.");
- }
- getProject().setDeploymentName(deploymentName);
- DeploymentType deployment = this.deployments.get(deploymentName);
- if (deployment == null) {
- throw new BuildException("There is no deployment element defined with name '" + deploymentName + "'.");
+ if (this.deploymentUnits.size() != 1) {
+ throw new BuildException("The rhq:bundle task must contain exactly one rhq:deploymentUnit element.");
}
+ DeploymentUnitType deploymentUnit = this.deploymentUnits.values().iterator().next();
String deploymentPhaseName = (String) projectProps.get(DeployPropertyNames.DEPLOY_PHASE);
if (deploymentPhaseName == null) {
@@ -142,28 +137,31 @@ public class BundleTask extends AbstractBundleTask {
String dryRunString = (String) projectProps.get(DeployPropertyNames.DEPLOY_DRY_RUN);
boolean dryRun = Boolean.valueOf(dryRunString);
getProject().setDryRun(dryRun);
-
- log("Executing '" + deploymentPhase + "' phase for deployment '" + deploymentName + "' from bundle '"
- + this.name + "' version " + this.version + " using config " + getProject().getConfiguration() + "...");
+ String revertString = (String) projectProps.get(DeployPropertyNames.DEPLOY_REVERT);
+ boolean revert = Boolean.valueOf(revertString);
+ String cleanString = (String) projectProps.get(DeployPropertyNames.DEPLOY_CLEAN);
+ boolean clean = Boolean.valueOf(cleanString);
+
+ log("Executing '" + deploymentPhase + "' phase for deployment with id [" + deploymentId + "] from bundle '"
+ + this.name + "' version " + this.version + " using config "
+ + getProject().getConfiguration().toString(true) + " [dryRun=" + dryRun + ", revert=" + revert
+ + ", clean=" + clean + "]...");
switch (deploymentPhase) {
case INSTALL:
- String revertString = (String) projectProps.get(DeployPropertyNames.DEPLOY_REVERT);
- boolean revert = Boolean.valueOf(revertString);
- String cleanString = (String) projectProps.get(DeployPropertyNames.DEPLOY_CLEAN);
- boolean clean = Boolean.valueOf(cleanString);
- deployment.install(revert, clean);
+ // TODO: Revert doesn't really make sense for an initial install.
+ deploymentUnit.install(revert, clean);
break;
case START:
- deployment.start();
+ deploymentUnit.start();
break;
case STOP:
- deployment.stop();
+ deploymentUnit.stop();
break;
case UPGRADE:
- deployment.upgrade();
+ deploymentUnit.upgrade(revert, clean);
break;
case UNINSTALL:
- deployment.uninstall();
+ deploymentUnit.uninstall();
break;
}
}
@@ -197,12 +195,12 @@ public class BundleTask extends AbstractBundleTask {
inputProperty.init();
}
- public void addConfigured(DeploymentType deployment) {
- this.deployments.put(deployment.getName(), deployment);
+ public void addConfigured(DeploymentUnitType deployment) {
+ this.deploymentUnits.put(deployment.getName(), deployment);
}
- public Map<String, DeploymentType> getDeployments() {
- return deployments;
+ public Map<String, DeploymentUnitType> getDeploymentUnits() {
+ return deploymentUnits;
}
/**
@@ -233,8 +231,8 @@ public class BundleTask extends AbstractBundleTask {
* @throws BuildException if an error occurs
*/
protected void validateTypes() throws BuildException {
- if (this.deployments.isEmpty()) {
- throw new BuildException("At least one 'deployment' child element must be specified.");
+ if (this.deploymentUnits.isEmpty()) {
+ throw new BuildException("At least one 'rhq:deploymentUnit' child element must be specified.");
}
}
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
index 6874a63..cea5df4 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
@@ -3,6 +3,10 @@ package org.rhq.bundle.ant.type;
import org.apache.tools.ant.types.DataType;
import org.rhq.bundle.ant.BundleAntProject;
+import java.io.File;
+import java.util.List;
+import java.util.regex.Pattern;
+
/**
*
*/
@@ -11,4 +15,60 @@ public abstract class AbstractBundleType extends DataType {
public BundleAntProject getProject() {
return (BundleAntProject)super.getProject();
}
+
+ protected static Pattern getPattern(List<FileSet> fileSets) {
+ if (fileSets == null || fileSets.isEmpty()) {
+ return null;
+ }
+ boolean first = true;
+ StringBuilder regex = new StringBuilder();
+ for (FileSet fileSet : fileSets) {
+ if (!first) {
+ regex.append("|");
+ } else {
+ first = false;
+ }
+ regex.append("(");
+ File dir = fileSet.getDir();
+ if (dir != null) {
+ regex.append(dir);
+ regex.append('/');
+ }
+ if (fileSet.getIncludePatterns().length == 0) {
+ regex.append(".*");
+ } else {
+ boolean firstIncludePattern = true;
+ for (String includePattern : fileSet.getIncludePatterns()) {
+ if (!firstIncludePattern) {
+ regex.append("|");
+ } else {
+ firstIncludePattern = false;
+ }
+ regex.append("(");
+ for (int i = 0; i < includePattern.length(); i++) {
+ char c = includePattern.charAt(i);
+ if (c == '?') {
+ regex.append('.');
+ } else if (c == '*') {
+ if (i + 1 < includePattern.length()) {
+ char c2 = includePattern.charAt(++i);
+ if (c2 == '*') {
+ regex.append(".*");
+ i++;
+ continue;
+ }
+ }
+ regex.append("[^/]*");
+ } else {
+ regex.append(c);
+ }
+ // TODO: Escape backslashes.
+ }
+ regex.append(")");
+ }
+ }
+ regex.append(")");
+ }
+ return Pattern.compile(regex.toString());
+ }
}
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
index 1320630..19aaaf6 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
@@ -22,11 +22,25 @@
*/
package org.rhq.bundle.ant.type;
+import java.util.List;
+import java.util.regex.Pattern;
+
/**
- * An archive file to be exploded during the bundle deployment.
+ * An archive file to be exploded during the bundle deployment. Can optionally contain a rhq:replace child element
+ * that specifies the set of files that contain template variables (e.g. @@http.port@@) which need to be replaced with
+ * the value of the corresponding property.
*
* @author Ian Springer
*/
public class ArchiveType extends AbstractFileType {
+ private Pattern replacePattern;
+
+ public void addConfigured(ReplaceType replace) {
+ List<FileSet> fileSets = replace.getFileSets();
+ this.replacePattern = getPattern(fileSets);
+ }
+ public Pattern getReplacePattern() {
+ return replacePattern;
+ }
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java
deleted file mode 100644
index db33995..0000000
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.bundle.ant.type;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.system.SystemInfoFactory;
-import org.rhq.core.template.TemplateEngine;
-import org.rhq.core.util.updater.DeployDifferences;
-import org.rhq.core.util.updater.Deployer;
-import org.rhq.core.util.updater.DeploymentData;
-import org.rhq.core.util.updater.DeploymentProperties;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * An Ant task for deploying a bundle or previewing the deployment.
- *
- * @author Ian Springer
- */
-public class DeploymentType extends AbstractBundleType {
- private String name;
- private Map<File, File> files = new LinkedHashMap<File, File>();
- private Set<File> archives = new LinkedHashSet<File>();
- private SystemServiceType systemService;
- private Pattern ignorePattern;
- private Pattern replacePattern;
- private boolean preview;
- private String preinstallTarget;
- private String postinstallTarget;
-
- public void install(boolean revert, boolean clean) throws BuildException {
- if (this.preinstallTarget != null) {
- Target target = (Target) getProject().getTargets().get(this.preinstallTarget);
- if (target == null) {
- throw new BuildException("Specified preinstall target (" + this.preinstallTarget + ") does not exist.");
- }
- target.performTasks();
- }
-
- int deploymentId = getProject().getDeploymentId();
- DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
- getProject().getBundleVersion(), getProject().getBundleDescription());
- File deployDir = getProject().getDeployDir();
- TemplateEngine templateEngine = createTemplateEngine();
- if (this.files.isEmpty() && this.archives.isEmpty()) {
- throw new BuildException("You must specify at least one file to deploy via nested rhq:file and/or rhq:archive elements.");
- }
- if (!this.files.isEmpty()) {
- log("Deploying files " + this.files + "...", Project.MSG_VERBOSE);
- }
- if (!this.archives.isEmpty()) {
- log("Deploying archives " + this.archives + "...", Project.MSG_VERBOSE);
- }
-
- // for now, apply the pattern to all files in the deployment
- Map<File, Pattern> archiveReplacePatterns = new HashMap<File, Pattern>();
- for (File file : this.archives) {
- archiveReplacePatterns.put(file, this.replacePattern);
- }
- Set<File> rawFilesToReplace = this.files.keySet(); // TODO: CHANGE ME! only replace those raw files marked as "replace=true"
- DeploymentData dd = new DeploymentData(deploymentProps, this.archives, this.files, deployDir,
- archiveReplacePatterns, rawFilesToReplace, templateEngine, this.ignorePattern);
- Deployer deployer = new Deployer(dd);
- try {
- DeployDifferences diffs = getProject().getDeployDifferences();
- boolean dryRun = getProject().isDryRun();
- if (revert) {
- deployer.redeployAndRestoreBackupFiles(diffs, clean, dryRun);
- } else {
- deployer.deploy(diffs, clean, dryRun);
- }
- deployer.deploy(diffs);
- getProject().log("Results:\n" + diffs + "\n");
- } catch (Exception e) {
- throw new BuildException("Failed to deploy bundle '" + getProject().getBundleName() + "' version "
- + getProject().getBundleVersion() + ": " + e, e);
- }
-
- if (this.systemService != null) {
- this.systemService.install();
- }
-
- if (this.postinstallTarget != null) {
- Target target = (Target) getProject().getTargets().get(this.postinstallTarget);
- if (target == null) {
- throw new BuildException("Specified postinstall target (" + this.postinstallTarget + ") does not exist.");
- }
- target.performTasks();
- }
-
- return;
- }
-
- public void start() throws BuildException {
-
- }
-
- public void stop() throws BuildException {
-
- }
-
- public void upgrade() throws BuildException {
-
- }
-
- public void uninstall() throws BuildException {
- // TODO
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Map<File, File> getFiles() {
- return files;
- }
-
- public Set<File> getArchives() {
- return archives;
- }
-
- public boolean isPreview() {
- return this.preview;
- }
-
- public void setPreview(boolean preview) {
- this.preview = preview;
- }
-
- public String getPreinstallTarget() {
- return preinstallTarget;
- }
-
- public void setPreinstallTarget(String preinstallTarget) {
- this.preinstallTarget = preinstallTarget;
- }
-
- public String getPostinstallTarget() {
- return postinstallTarget;
- }
-
- public void setPostinstallTarget(String postinstallTarget) {
- this.postinstallTarget = postinstallTarget;
- }
-
- public void addConfigured(SystemServiceType systemService) {
- if (this.systemService != null) {
- throw new IllegalStateException("A deployment can only have one system-service child element.");
- }
- this.systemService = systemService;
- }
-
- public void addConfigured(FileType file) {
- File destFile = file.getDestinationFile();
- if (destFile == null) {
- File destDir = file.getDestinationDir();
- destFile = new File(destDir, file.getSource().getName());
- }
- this.files.put(file.getSource(), destFile);
- }
-
- public void addConfigured(ArchiveType archive) {
- this.archives.add(archive.getSource());
- }
-
- public void addConfigured(IgnoreType ignore) {
- List<FileSet> fileSets = ignore.getFileSets();
- this.ignorePattern = getPattern(fileSets);
- }
-
- public void addConfigured(ReplaceType replace) {
- List<FileSet> fileSets = replace.getFileSets();
- this.replacePattern = getPattern(fileSets);
- }
-
- private TemplateEngine createTemplateEngine() {
- TemplateEngine templateEngine = SystemInfoFactory.fetchTemplateEngine();
- // Add the deployment props to the template engine's tokens.
- Configuration config = getProject().getConfiguration();
- for (PropertySimple prop : config.getSimpleProperties().values()) {
- templateEngine.getTokens().put(prop.getName(), prop.getStringValue());
- }
- return templateEngine;
- }
-
- private static Pattern getPattern(List<FileSet> fileSets) {
- boolean first = true;
- StringBuilder regex = new StringBuilder();
- for (FileSet fileSet : fileSets) {
- if (!first) {
- regex.append("|");
- } else {
- first = false;
- }
- regex.append("(");
- File dir = fileSet.getDir();
- if (dir != null) {
- regex.append(dir);
- regex.append('/');
- }
- if (fileSet.getIncludePatterns().length == 0) {
- regex.append(".*");
- } else {
- boolean firstIncludePattern = true;
- for (String includePattern : fileSet.getIncludePatterns()) {
- if (!firstIncludePattern) {
- regex.append("|");
- } else {
- firstIncludePattern = false;
- }
- regex.append("(");
- for (int i = 0; i < includePattern.length(); i++) {
- char c = includePattern.charAt(i);
- if (c == '?') {
- regex.append('.');
- } else if (c == '*') {
- if (i + 1 < includePattern.length()) {
- char c2 = includePattern.charAt(++i);
- if (c2 == '*') {
- regex.append(".*");
- i++;
- continue;
- }
- }
- regex.append("[^/]*");
- } else {
- regex.append(c);
- }
- // TODO: Escape backslashes.
- }
- regex.append(")");
- }
- }
- regex.append(")");
- }
- return Pattern.compile(regex.toString());
- }
-}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
new file mode 100644
index 0000000..df72add
--- /dev/null
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
@@ -0,0 +1,212 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.bundle.ant.type;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Target;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.system.SystemInfoFactory;
+import org.rhq.core.template.TemplateEngine;
+import org.rhq.core.util.updater.DeployDifferences;
+import org.rhq.core.util.updater.Deployer;
+import org.rhq.core.util.updater.DeploymentData;
+import org.rhq.core.util.updater.DeploymentProperties;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * An Ant task for deploying a bundle or previewing the deployment.
+ *
+ * @author Ian Springer
+ */
+public class DeploymentUnitType extends AbstractBundleType {
+ private String name;
+ private Map<File, File> files = new LinkedHashMap<File, File>();
+ private Set<File> rawFilesToReplace = new LinkedHashSet<File>();
+ private Set<File> archives = new LinkedHashSet<File>();
+ private Map<File, Pattern> archiveReplacePatterns = new HashMap<File, Pattern>();
+ private SystemServiceType systemService;
+ private Pattern ignorePattern;
+ private boolean preview;
+ private String preinstallTarget;
+ private String postinstallTarget;
+
+ public void install(boolean revert, boolean clean) throws BuildException {
+ if (this.preinstallTarget != null) {
+ Target target = (Target) getProject().getTargets().get(this.preinstallTarget);
+ if (target == null) {
+ throw new BuildException("Specified preinstall target (" + this.preinstallTarget + ") does not exist.");
+ }
+ target.performTasks();
+ }
+
+ int deploymentId = getProject().getDeploymentId();
+ DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
+ getProject().getBundleVersion(), getProject().getBundleDescription());
+ File deployDir = getProject().getDeployDir();
+ TemplateEngine templateEngine = createTemplateEngine();
+ if (this.files.isEmpty() && this.archives.isEmpty()) {
+ throw new BuildException("You must specify at least one file to deploy via nested rhq:file and/or rhq:archive elements.");
+ }
+ if (!this.files.isEmpty()) {
+ log("Deploying files " + this.files + "...", Project.MSG_VERBOSE);
+ }
+ if (!this.archives.isEmpty()) {
+ log("Deploying archives " + this.archives + "...", Project.MSG_VERBOSE);
+ }
+
+ DeploymentData deploymentData = new DeploymentData(deploymentProps, this.archives, this.files, deployDir,
+ this.archiveReplacePatterns, this.rawFilesToReplace, templateEngine, this.ignorePattern);
+ Deployer deployer = new Deployer(deploymentData);
+ try {
+ DeployDifferences diffs = getProject().getDeployDifferences();
+ boolean dryRun = getProject().isDryRun();
+ if (revert) {
+ deployer.redeployAndRestoreBackupFiles(diffs, clean, dryRun);
+ } else {
+ deployer.deploy(diffs, clean, dryRun);
+ }
+ deployer.deploy(diffs);
+ getProject().log("Results:\n" + diffs + "\n");
+ } catch (Exception e) {
+ throw new BuildException("Failed to deploy bundle '" + getProject().getBundleName() + "' version "
+ + getProject().getBundleVersion() + ": " + e, e);
+ }
+
+ if (this.systemService != null) {
+ this.systemService.install();
+ }
+
+ if (this.postinstallTarget != null) {
+ Target target = (Target) getProject().getTargets().get(this.postinstallTarget);
+ if (target == null) {
+ throw new BuildException("Specified postinstall target (" + this.postinstallTarget + ") does not exist.");
+ }
+ target.performTasks();
+ }
+
+ return;
+ }
+
+ public void start() throws BuildException {
+
+ }
+
+ public void stop() throws BuildException {
+
+ }
+
+ public void upgrade(boolean revert, boolean clean) throws BuildException {
+ install(revert, clean);
+ }
+
+ public void uninstall() throws BuildException {
+ // TODO
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Map<File, File> getFiles() {
+ return files;
+ }
+
+ public Set<File> getArchives() {
+ return archives;
+ }
+
+ public boolean isPreview() {
+ return this.preview;
+ }
+
+ public void setPreview(boolean preview) {
+ this.preview = preview;
+ }
+
+ public String getPreinstallTarget() {
+ return preinstallTarget;
+ }
+
+ public void setPreinstallTarget(String preinstallTarget) {
+ this.preinstallTarget = preinstallTarget;
+ }
+
+ public String getPostinstallTarget() {
+ return postinstallTarget;
+ }
+
+ public void setPostinstallTarget(String postinstallTarget) {
+ this.postinstallTarget = postinstallTarget;
+ }
+
+ public void addConfigured(SystemServiceType systemService) {
+ if (this.systemService != null) {
+ throw new IllegalStateException("A deployment can only have one system-service child element.");
+ }
+ this.systemService = systemService;
+ }
+
+ public void addConfigured(FileType file) {
+ File destFile = file.getDestinationFile();
+ if (destFile == null) {
+ File destDir = file.getDestinationDir();
+ destFile = new File(destDir, file.getSource().getName());
+ }
+ this.files.put(file.getSource(), destFile);
+ if (file.isReplace()) {
+ this.rawFilesToReplace.add(file.getSource());
+ }
+ }
+
+ public void addConfigured(ArchiveType archive) {
+ this.archives.add(archive.getSource());
+ Pattern replacePattern = archive.getReplacePattern();
+ if (replacePattern != null) {
+ this.archiveReplacePatterns.put(archive.getSource(), replacePattern);
+ }
+ }
+
+ public void addConfigured(IgnoreType ignore) {
+ List<FileSet> fileSets = ignore.getFileSets();
+ this.ignorePattern = getPattern(fileSets);
+ }
+
+ private TemplateEngine createTemplateEngine() {
+ TemplateEngine templateEngine = SystemInfoFactory.fetchTemplateEngine();
+ // Add the deployment props to the template engine's tokens.
+ Configuration config = getProject().getConfiguration();
+ for (PropertySimple prop : config.getSimpleProperties().values()) {
+ templateEngine.getTokens().put(prop.getName(), prop.getStringValue());
+ }
+ return templateEngine;
+ }
+}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
index 4e2c296..2e55c0e 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
@@ -27,13 +27,15 @@ import org.apache.tools.ant.BuildException;
import java.io.File;
/**
- * A file to be copied during the bundle deployment.
+ * A file to be copied during the bundle deployment. If the replace attribute is set to true, any template variables
+ * (e.g. @@http.port@@) inside the file will be replaced with the value of the corresponding property.
*
* @author Ian Springer
*/
public class FileType extends AbstractFileType {
private File destinationDir;
private File destinationFile;
+ private boolean replace;
public File getDestinationDir() {
return this.destinationDir;
@@ -57,4 +59,12 @@ public class FileType extends AbstractFileType {
}
this.destinationFile = new File(destinationFile);
}
+
+ public boolean isReplace() {
+ return replace;
+ }
+
+ public void setReplace(boolean replace) {
+ this.replace = replace;
+ }
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
index cdf2b6c..4479d1c 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
@@ -22,8 +22,6 @@
*/
package org.rhq.bundle.ant.type;
-import org.apache.tools.ant.types.DataType;
-
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml b/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
index 9f01c2b..fee46ef 100644
--- a/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
+++ b/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
@@ -8,7 +8,7 @@
<!-- bundle task's child types -->
<typedef name="input-property" classname="org.rhq.bundle.ant.type.InputPropertyType"/>
- <typedef name="deployment" classname="org.rhq.bundle.ant.type.DeploymentType"/>
+ <typedef name="deployment-unit" classname="org.rhq.bundle.ant.type.DeploymentUnitType"/>
<!-- deployment type's child types -->
<typedef name="file" classname="org.rhq.bundle.ant.type.FileType"/>
diff --git a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
index 403bfa2..831bdf9 100644
--- a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
+++ b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
@@ -74,7 +74,7 @@ public class AntLauncherTest {
Properties inputProps = createInputProperties("/test-bundle-v1-input.properties");
List<BuildListener> buildListeners = createBuildListeners();
- BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v1.xml"), null, inputProps,
+ BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v1.xml"), inputProps,
buildListeners);
/*Map<String, String> bundleFiles = project.getBundleFiles();
assert bundleFiles != null;
@@ -94,6 +94,8 @@ public class AntLauncherTest {
String preinstallTargetExecuted = (String) project.getProperties().get("preinstallTargetExecuted");
assert preinstallTargetExecuted.equals("true");
+ String postinstallTargetExecuted = (String) project.getProperties().get("postinstallTargetExecuted");
+ assert postinstallTargetExecuted.equals("true");
}
private List<BuildListener> createBuildListeners() {
@@ -114,7 +116,7 @@ public class AntLauncherTest {
Properties inputProps = createInputProperties("/test-bundle-v2-input.properties");
List<BuildListener> buildListeners = createBuildListeners();
- BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v2.xml"), null, inputProps,
+ BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v2.xml"), inputProps,
buildListeners);
/*Map<String, String> bundleFiles = project.getBundleFiles();
assert bundleFiles != null;
@@ -136,8 +138,7 @@ public class AntLauncherTest {
private Properties createInputProperties(String resourcePath) throws IOException {
Properties inputProps = new Properties();
inputProps.setProperty(DeployPropertyNames.DEPLOY_DIR, DEPLOY_DIR.getPath());
- inputProps.setProperty(DeployPropertyNames.DEPLOY_ID, "100");
- inputProps.setProperty(DeployPropertyNames.DEPLOY_NAME, "appserver");
+ inputProps.setProperty(DeployPropertyNames.DEPLOY_ID, "100");
inputProps.setProperty(DeployPropertyNames.DEPLOY_PHASE, DeploymentPhase.INSTALL.name());
InputStream inputStream = this.getClass().getResourceAsStream(resourcePath);
try {
diff --git a/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml b/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
index 2e63b2c..76820bf 100644
--- a/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
+++ b/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
@@ -12,20 +12,21 @@
defaultValue="8080"
type="integer"/>
- <rhq:deployment name="appserver" preinstallTarget="preinstall">
+ <rhq:deployment-unit name="appserver" preinstallTarget="preinstall" postinstallTarget="postinstall">
<rhq:system-service name="foo" scriptFile="foo-script"
configFile="foo-config" overwriteScript="true"
startLevels="3,4,5" startPriority="80" stopPriority="20" root="root"/>
- <rhq:file name="test-v1.properties" destinationFile="subdir/test.properties"/>
- <rhq:archive name="file.zip"/>
- <rhq:replace>
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
+ <rhq:file name="test-v1.properties" destinationFile="subdir/test.properties" replace="true"/>
+ <rhq:archive name="file.zip">
+ <rhq:replace>
+ <rhq:fileset includes="**/*.properties"/>
+ </rhq:replace>
+ </rhq:archive>
<!-- the files that should be ignored during upgrades -->
<rhq:ignore>
<rhq:fileset includes="*.log"/>
</rhq:ignore>
- </rhq:deployment>
+ </rhq:deployment-unit>
</rhq:bundle>
@@ -36,4 +37,9 @@
<property name="preinstallTargetExecuted" value="true"/>
</target>
+ <target name="postinstall">
+ <echo>Done deploying Test Bundle v1.0 to ${rhq.deploy.dir}.</echo>
+ <property name="postinstallTargetExecuted" value="true"/>
+ </target>
+
</project>
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml b/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
index 501ba3f..6764c13 100644
--- a/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
+++ b/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
@@ -12,28 +12,34 @@
defaultValue="8080"
type="integer"/>
- <rhq:deployment name="appserver" preinstallTarget="preinstall">
+ <rhq:deployment-unit name="appserver" preinstallTarget="preinstall" postinstallTarget="postinstall">
<rhq:system-service name="foo" scriptFile="foo-script"
configFile="foo-config" overwriteScript="true"
startLevels="3,4,5" startPriority="80" stopPriority="20" root="root"/>
- <rhq:file name="test-v2.properties" destinationFile="subdir/test.properties"/>
- <rhq:archive name="file.zip"/>
- <rhq:replace>
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
+ <rhq:file name="test-v2.properties" destinationFile="subdir/test.properties" replace="true"/>
+ <rhq:archive name="file.zip">
+ <rhq:replace>
+ <rhq:fileset includes="**/*.properties"/>
+ </rhq:replace>
+ </rhq:archive>
<!-- the files that should be ignored during upgrades -->
<rhq:ignore>
<rhq:fileset includes="*.log"/>
</rhq:ignore>
- </rhq:deployment>
+ </rhq:deployment-unit>
</rhq:bundle>
<target name="main"/>
<target name="preinstall">
- <echo>Deploying Test Bundle v2.0 to ${rhq.deploy.dir}...</echo>
+ <echo>Deploying Test Bundle v1.0 to ${rhq.deploy.dir}...</echo>
<property name="preinstallTargetExecuted" value="true"/>
</target>
+ <target name="postinstall">
+ <echo>Done deploying Test Bundle v1.0 to ${rhq.deploy.dir}.</echo>
+ <property name="postinstallTargetExecuted" value="true"/>
+ </target>
+
</project>
\ No newline at end of file
diff --git a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
index cd0e4c1..eb45a59 100644
--- a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
+++ b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
@@ -36,6 +36,8 @@ import org.apache.tools.ant.Project;
import org.rhq.bundle.ant.AntLauncher;
import org.rhq.bundle.ant.BundleAntProject;
import org.rhq.bundle.ant.DeployPropertyNames;
+import org.rhq.bundle.ant.DeploymentPhase;
+import org.rhq.bundle.ant.InvalidBuildFileException;
import org.rhq.bundle.ant.LoggerAntBuildListener;
import org.rhq.core.domain.bundle.BundleDeployment;
import org.rhq.core.domain.bundle.BundleResourceDeployment;
@@ -54,6 +56,8 @@ import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.system.SystemInfoFactory;
import org.rhq.core.util.stream.StreamUtil;
import org.rhq.core.util.updater.DeployDifferences;
+import org.rhq.core.util.updater.Deployer;
+import org.rhq.core.util.updater.DeploymentsMetadata;
/**
* @author John Mazzitelli
@@ -121,9 +125,17 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
buildListeners.add(auditor);
// Parse and execute the Ant script.
- AntLauncher antLauncher = new AntLauncher();
- BundleAntProject project = antLauncher.executeBundleDeployFile(recipeFile, null, antProps,
- buildListeners);
+ executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ DeploymentPhase.STOP);
+ String deployDirString = bundleDeployment.getDestination().getDeployDir();
+ File deployDir = new File(deployDirString);
+ DeploymentsMetadata deployMetadata = new DeploymentsMetadata(deployDir);
+ DeploymentPhase installPhase = (deployMetadata.isManaged()) ? DeploymentPhase.UPGRADE :
+ DeploymentPhase.INSTALL;
+ BundleAntProject project = executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ installPhase);
+ executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ DeploymentPhase.START);
// Send the diffs to the Server so it can store them as an entry in the deployment history.
BundleManagerProvider bundleManagerProvider = request.getBundleManagerProvider();
@@ -153,6 +165,12 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
return result;
}
+ private BundleAntProject executeDeploymentPhase(File recipeFile, Properties antProps, List<BuildListener> buildListeners, DeploymentPhase stop) throws InvalidBuildFileException {
+ AntLauncher antLauncher = new AntLauncher();
+ BundleAntProject project = antLauncher.executeBundleDeployFile(recipeFile, antProps, buildListeners);
+ return project;
+ }
+
private Properties createAntProperties(BundleDeployRequest request) {
Properties antProps = new Properties();
diff --git a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
index 6a9d845..4a01d15 100644
--- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
+++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
@@ -23,10 +23,11 @@
package org.rhq.plugins.ant;
import java.io.File;
-import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
+import java.util.Properties;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
@@ -58,9 +59,7 @@ import org.rhq.core.util.file.FileUtil;
import org.rhq.core.util.stream.StreamUtil;
@Test
-public class AntBundlePluginComponentTest {
- private static final String USER_HOME = System.getProperty("user.home");
-
+public class AntBundlePluginComponentTest {
private AntBundlePluginComponent plugin;
private File tmpDir;
@@ -89,42 +88,10 @@ public class AntBundlePluginComponentTest {
FileUtil.purge(this.tmpDir, true);
}
- @Test(enabled = false)
- /**
- * Test a simple Ant script that contains no RHQ tasks other than rhq:bundle.
- */
- public void testSimpleBundle() throws Exception {
- ResourceType resourceType = new ResourceType("testSimpleBundle", "plugin", ResourceCategory.SERVER, null);
- BundleType bundleType = new BundleType("testSimpleBundle", resourceType);
- Repo repo = new Repo("testSimpleBundle");
- PackageType packageType = new PackageType("testSimpleBundle", resourceType);
- Bundle bundle = new Bundle("testSimpleBundle", bundleType, repo, packageType);
- BundleVersion bundleVersion = new BundleVersion("testSimpleBundle", "1.0", bundle,
- getRecipeFromFile("test-bundle-v1.xml"));
-
- BundleDeployment deployment = new BundleDeployment();
- deployment.setBundleVersion(bundleVersion);
- deployment.setConfiguration(null);
-
- BundleDeployRequest request = new BundleDeployRequest();
- request.setBundleFilesLocation(tmpDir);
- request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
-
- BundleDeployResult results = plugin.deployBundle(request);
-
- assertResultsSuccess(results);
-
- // our ant script wrote some output that we should verify to make sure we ran it
- File outputFile = new File(tmpDir, "output.1");
- String output = new String(StreamUtil.slurp(new FileInputStream(outputFile)));
- assert output.equals("Hello World!!") : output;
-
- }
-
/**
- * Test a Ant script that includes all of the RHQ tasks.
+ * Test deployment of an RHQ bundle recipe.
*/
- @Test(enabled = false)
+ @Test
public void testAntBundle() throws Exception {
ResourceType resourceType = new ResourceType("testSimpleBundle", "plugin", ResourceCategory.SERVER, null);
BundleType bundleType = new BundleType("testSimpleBundle", resourceType);
@@ -132,23 +99,25 @@ public class AntBundlePluginComponentTest {
PackageType packageType = new PackageType("testSimpleBundle", resourceType);
Bundle bundle = new Bundle("testSimpleBundle", bundleType, repo, packageType);
BundleVersion bundleVersion = new BundleVersion("testSimpleBundle", "1.0", bundle,
- getRecipeFromFile("test-build.xml"));
+ getRecipeFromFile("test-bundle.xml"));
BundleDestination destination = new BundleDestination(bundle, "testSimpleBundle", new ResourceGroup(
- "testSimpleBundle"), "/jboss");
+ "testSimpleBundle"), "/tmp/rhq-testAntBundle");
Configuration config = new Configuration();
- config.put(new PropertySimple("custom.prop1", "custom property 1"));
- config.put(new PropertySimple("custom.prop2", "custom property 2"));
+ config.put(new PropertySimple("custom.prop1", "ABC123"));
BundleDeployment deployment = new BundleDeployment();
deployment.setBundleVersion(bundleVersion);
deployment.setConfiguration(config);
deployment.setDestination(destination);
- File file1 = new File(tmpDir, "test-v2.properties");
- File file2 = new File(tmpDir, "package.zip");
- assert file1.createNewFile() : "could not create our mock bundle file";
- assert file2.createNewFile() : "could not create our mock bundle file";
+ // create test file
+ File file1 = new File(tmpDir, "test.properties");
+ Properties props = new Properties();
+ props.setProperty("custom.prop1", "@@custom.prop1@@");
+ FileOutputStream outputStream = new FileOutputStream(file1);
+ props.store(outputStream, "blah");
+ outputStream.close();
BundleDeployRequest request = new BundleDeployRequest();
request.setBundleFilesLocation(tmpDir);
@@ -158,6 +127,7 @@ public class AntBundlePluginComponentTest {
BundleDeployResult results = plugin.deployBundle(request);
assertResultsSuccess(results);
+ // TODO: Check that custom.prop1 got replaced.
}
private void assertResultsSuccess(BundleDeployResult results) {
diff --git a/modules/plugins/ant-bundle/src/test/resources/simple-build.xml b/modules/plugins/ant-bundle/src/test/resources/simple-build.xml
deleted file mode 100644
index 88ade87..0000000
--- a/modules/plugins/ant-bundle/src/test/resources/simple-build.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="test" default="init"
- xmlns:rhq="antlib:org.rhq.bundle">
-
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <property name="outfile" value="${basedir}/output.1" />
-
- <target name="init">
- <echo file="${outfile}" message="Hello World!!"/>
- </target>
-
-</project>
-
\ No newline at end of file
diff --git a/modules/plugins/ant-bundle/src/test/resources/test-build.xml b/modules/plugins/ant-bundle/src/test/resources/test-build.xml
deleted file mode 100644
index e4e062b..0000000
--- a/modules/plugins/ant-bundle/src/test/resources/test-build.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="simple-build" default="first-target"
- xmlns:rhq="antlib:org.rhq.bundle">
-
- <echo>basedir=${basedir}</echo>
-
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <rhq:input-property
- name="custom.prop1"
- description="my prop 1"
- required="true"
- defaultValue="default 1"/>
-
- <rhq:input-property
- name="custom.prop2"
- description="my prop 2"
- required="true"
- defaultValue="default 2"/>
-
- <property name="outfile" value="${basedir}/output.2" />
-
- <target name="first-target">
- <!-- TODO -->
- </target>
-
-</project>
\ No newline at end of file
diff --git a/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml b/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml
new file mode 100644
index 0000000..f51fae3
--- /dev/null
+++ b/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<project name="simple-build" default="main"
+ xmlns:rhq="antlib:org.rhq.bundle">
+
+ <echo>basedir=${basedir}</echo>
+
+ <property name="outfile" value="${basedir}/output.2" />
+
+ <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
+ description="example.com corporate website hosted on JBoss EAP 4.3">
+
+ <rhq:input-property
+ name="custom.prop1"
+ description="my prop 1"
+ required="true"
+ defaultValue="default 1"/>
+
+ <rhq:input-property
+ name="custom.prop2"
+ description="my prop 2"
+ required="true"
+ defaultValue="default 2"/>
+
+ <rhq:deployment-unit name="doodibittydoo">
+ <rhq:file name="test.properties" destinationFile="config/test.properties" replace="true"/>
+ </rhq:deployment-unit>
+
+ </rhq:bundle>
+
+ <target name="main"/>
+
+</project>
\ No newline at end of file
commit adaa75d09ecc6fd4b4ca5f3048a531c72fdddc7b
Merge: 03f3780... fddbaae...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Thu May 27 09:43:54 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 03f3780e49a02b0e8d36fa23e4d48a33fac65510
Merge: 8e741f2... 967c372...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed May 26 19:56:47 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 8e741f24a582b0c8f8f2408241bec325b2082415
Merge: c5d2b83... f8f1cc4...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed May 26 16:57:50 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit c5d2b83d4e1260e644697eca55bd8a10e4b9cd15
Merge: bbf58f0... d627f31...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed May 26 14:45:37 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit bbf58f0689d0ccfc361f11c8438e93003c304ed9
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue May 25 17:35:35 2010 -0400
get rid of the JMS Destinations subcategory, which is no longer assigned to any ResourceTypes
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index b6bfdd9..5b376e8 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -947,15 +947,12 @@
<subcategory name="Resources"
description="Different types of Resources">
<subcategory name="Datasources"
- description="Different types of Datasources"/>
+ description="Different types of Datasources"/>
<subcategory name="Connection Factories"
- description="Different types of Connection Factories"/>
- <subcategory name="JMS Destinations"
- description="Different types of JMS Destinations"/>
+ description="Different types of Connection Factories"/>
</subcategory>
<subcategory name="Applications"
- description="Different types of Applications (WARs, EARs, etc.)">
- </subcategory>
+ description="Different types of Applications (WARs, EARs, etc.)"/>
</subcategories>
<plugin-configuration>
1
0
27 May '10
dev/null |binary
modules/cli-tests/src/test/resources/test-ant-bundle-v1.xml | 38 -
modules/cli-tests/src/test/resources/test-ant-bundle-v2.xml | 38 -
modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip |binary
modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip |binary
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_InstallAntBundle.js | 121 -----
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js | 38 +
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js | 38 +
modules/enterprise/gui/coregui/pom.xml | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 168 ++++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 109 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 31 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java | 48 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 29 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java | 27 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 41 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java | 73 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 37 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java | 159 ++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 240 +++++++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 27 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 103 +---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 1
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 50 ++
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 10
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 3
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 4
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java | 3
43 files changed, 1035 insertions(+), 458 deletions(-)
New commits:
commit a06d9730ba727c78703e0d994858920e85b9bb4b
Merge: 8262dba... ec5b063...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 27 13:51:14 2010 -0400
Merge branch 'bundle'
Conflicts:
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
modules/plugins/ant-bundle/src/test/resources/test-build.xml
diff --cc modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
index 4a01d15,c4dc63e..bd191be
--- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
+++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
@@@ -99,14 -131,16 +99,15 @@@ public class AntBundlePluginComponentTe
PackageType packageType = new PackageType("testSimpleBundle", resourceType);
Bundle bundle = new Bundle("testSimpleBundle", bundleType, repo, packageType);
BundleVersion bundleVersion = new BundleVersion("testSimpleBundle", "1.0", bundle,
- getRecipeFromFile("test-build.xml"));
+ getRecipeFromFile("test-bundle.xml"));
BundleDestination destination = new BundleDestination(bundle, "testSimpleBundle", new ResourceGroup(
- "testSimpleBundle"), "/jboss");
+ "testSimpleBundle"), "/tmp/rhq-testAntBundle");
Configuration config = new Configuration();
- config.put(new PropertySimple("custom.prop1", "custom property 1"));
- config.put(new PropertySimple("custom.prop2", "custom property 2"));
+ config.put(new PropertySimple("custom.prop1", "ABC123"));
BundleDeployment deployment = new BundleDeployment();
+ deployment.setName("test bundle deployment name");
deployment.setBundleVersion(bundleVersion);
deployment.setConfiguration(config);
deployment.setDestination(destination);
commit ec5b06356ca5acd1d3a72ad0fa77d8b2e5f96672
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 27 13:37:06 2010 -0400
fix the cli tests to use the latest apis
diff --git a/modules/cli-tests/src/test/resources/test-ant-bundle-v1.xml b/modules/cli-tests/src/test/resources/test-ant-bundle-v1.xml
deleted file mode 100644
index e874c63..0000000
--- a/modules/cli-tests/src/test/resources/test-ant-bundle-v1.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="example.com-website" default="deploy"
- xmlns:rhq="antlib:org.rhq.bundle">
-
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <rhq:input-property
- name="http.port"
- description="the HTTP port the JBoss EAP server should listen on"
- required="true"
- type="integer"/>
-
- <rhq:input-property
- name="https.port"
- description="the HTTPS port the JBoss EAP server should listen on"
- required="true"
- type="integer"/>
-
- <target name="deploy">
- <echo>Deploying example.com website v1.0 to ${rhq.deploy.dir}...</echo>
- <rhq:deploy>
- <rhq:archive name="test-ant-bundle-v1.zip"/>
- <rhq:replace>
- <!-- If no 'dir' attribute is specified, rhq:fileset defaults to ${rhq.deploy.dir}. -->
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
- <rhq:ignore>
- <rhq:fileset>
- <include name="jbossas/server/default/data/**"/>
- <include name="jbossas/server/default/logs/**"/>
- <include name="jbossas/server/default/tmp/**"/>
- <include name="jbossas/server/default/work/**"/>
- </rhq:fileset>
- </rhq:ignore>
- </rhq:deploy>
- </target>
-
-</project>
diff --git a/modules/cli-tests/src/test/resources/test-ant-bundle-v1.zip b/modules/cli-tests/src/test/resources/test-ant-bundle-v1.zip
deleted file mode 100644
index a877718..0000000
Binary files a/modules/cli-tests/src/test/resources/test-ant-bundle-v1.zip and /dev/null differ
diff --git a/modules/cli-tests/src/test/resources/test-ant-bundle-v2.xml b/modules/cli-tests/src/test/resources/test-ant-bundle-v2.xml
deleted file mode 100644
index b825a0f..0000000
--- a/modules/cli-tests/src/test/resources/test-ant-bundle-v2.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="example.com-website" default="deploy"
- xmlns:rhq="antlib:org.rhq.bundle">
-
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="2.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <rhq:input-property
- name="http.port"
- description="the HTTP port the JBoss EAP server should listen on"
- required="true"
- type="integer"/>
-
- <rhq:input-property
- name="https.port"
- description="the HTTPS port the JBoss EAP server should listen on"
- required="true"
- type="integer"/>
-
- <target name="deploy">
- <echo>Deploying example.com website v2.0 to ${rhq.deploy.dir}...</echo>
- <rhq:deploy>
- <rhq:archive name="test-ant-bundle-v2.zip"/>
- <rhq:replace>
- <!-- If no 'dir' attribute is specified, rhq:fileset defaults to ${rhq.deploy.dir}. -->
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
- <rhq:ignore>
- <rhq:fileset>
- <include name="jbossas/server/default/data/**"/>
- <include name="jbossas/server/default/logs/**"/>
- <include name="jbossas/server/default/tmp/**"/>
- <include name="jbossas/server/default/work/**"/>
- </rhq:fileset>
- </rhq:ignore>
- </rhq:deploy>
- </target>
-
-</project>
diff --git a/modules/cli-tests/src/test/resources/test-ant-bundle-v2.zip b/modules/cli-tests/src/test/resources/test-ant-bundle-v2.zip
deleted file mode 100644
index d5cd21c..0000000
Binary files a/modules/cli-tests/src/test/resources/test-ant-bundle-v2.zip and /dev/null differ
diff --git a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip
index 4254981..3f06dac 100644
Binary files a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip and b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip differ
diff --git a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip
index c6963b2..b58a872 100644
Binary files a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip and b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip differ
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_InstallAntBundle.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_InstallAntBundle.js
deleted file mode 100644
index 57b2d86..0000000
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_InstallAntBundle.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/**
- * Thus test script works with a real env including at least one platform resource and a running agent on
- * said platform.
- */
-
-var TestsEnabled = true;
-
-var bundleName = 'Test Ant Bundle';
-
-// note, super-user, will not test any security constraints
-var subject = rhq.login('rhqadmin', 'rhqadmin');
-
-executeAllTests();
-
-rhq.logout();
-
-function testDeployment() {
- if ( !TestsEnabled ) {
- return;
- }
-
- var v1 = "1.0";
- var v2 = "2.0";
-
- // delete the test bundle if it exists
- var bc = new BundleCriteria();
- bc.addFilterName( bundleName );
- var bundles = BundleManager.findBundlesByCriteria( bc );
- if ( null != bundles && bundles.size() > 0 ) {
- print( "\n Deleting existing " + bundleName + " bundle in order to test a fresh deploy...")
- BundleManager.deleteBundle( bundles.get(0).getId() );
- }
-
- // create the test bundle
- var testBundle = BundleManager.createBundle( bundleName, "my fake bundle", getBundleType() );
-
- // define the recipe for bundleVersion 1.0
- var recipe = scriptUtil.getFileString("./src/test/resources/test-ant-bundle-v1.xml");
-
- // create bundleVersion 1.0
- var testBundleVersion = BundleManager.createBundleVersion( testBundle.getId(), bundleName, "my fake bundle version", v1, recipe);
-
- // add the single bundleFile, the test war file
- var fileBytes = scriptUtil.getFileBytes("./src/test/resources/test-ant-bundle-v1.zip");
- var bundleFile = BundleManager.addBundleFileViaByteArray(testBundleVersion.getId(), "test-ant-bundle-v1.zip", v1, null, fileBytes);
-
- // create the config, setting the required properties from the recipe
- var config = new Configuration();
- config.put( new PropertySimple("http.port", "8080") );
- config.put( new PropertySimple("https.port", "8443") );
-
- // create a deployment using the above config
- var testDeployment = BundleManager.createBundleDeployment(testBundleVersion.getId(), "Test Ant Bundle Deployment", "my fake bundle deployment", "/tmp/antbundletest", config);
-
- // Find a target platform
- var rc = new ResourceCriteria();
- rc.addFilterResourceTypeName("in"); // wINdows, lINux
- var platforms = ResourceManager.findResourcesByCriteria(rc);
- var platformId = platforms.get(0).getId();
-
- var bundleScheduleResponse = BundleManager.scheduleBundleResourceDeployment(testDeployment.getId(), platformId);
-
- //
- // UPGRADE IT NOW
- //
-
- // define the recipe for bundleVersion 2.0
- recipe = scriptUtil.getFileString("./src/test/resources/test-ant-bundle-v2.xml");
-
- // create bundleVersion 2.0
- testBundleVersion = BundleManager.createBundleVersion( testBundle.getId(), bundleName, "my fake bundle version", v2, recipe);
-
- // add the second bundleFile using the ViaURL API
- var fileUrl = new java.io.File("./src/test/resources/test-ant-bundle-v2.zip").toURI().toURL();
- bundleFile = BundleManager.addBundleFileViaURL(testBundleVersion.getId(), "test-ant-bundle-v2.zip", v2, null, fileUrl);
-
- // create a deployment using the a different config as before
- // create the config, setting the required properties from the recipe
- var config2 = new Configuration();
- config2.put( new PropertySimple("http.port", "9090") );
- config2.put( new PropertySimple("https.port", "9443") );
- testDeployment = BundleManager.createBundleDeployment(testBundleVersion.getId(), "Test Ant Bundle Deployment 2", "my fake bundle deployment 2", "/tmp/antbundletest", config2);
-
- // deploy to the same platform as before
- var bundleScheduleResponse = BundleManager.scheduleBundleResourceDeployment(testDeployment.getId(), platformId);
-}
-
-function getBundleType() {
-
- var types = BundleManager.getAllBundleTypes();
- for (i=0; ( i < types.size()); ++i ) {
- if ( types.get(i).getName().equals( "Ant Bundle" )) {
- return types.get(i).getId();
- }
- }
-
- print( "\n Could not find Ant bundle type - is the plugin loaded?");
-}
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
index 15d0463..19e6e4d 100644
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
+++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
@@ -100,12 +100,27 @@ function testGroupDeployment() {
}
function getGroupId() {
- // Find a target platform group
- var rgc = new ResourceGroupCriteria();
- rgc.addFilterName("platforms");
- var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc);
- Assert.assertTrue( groups.size() > 0, "need a group called platforms for this test" );
- return groups.get(0).getId();
+ // Find a target platform group
+ var rgc = new ResourceGroupCriteria();
+ rgc.addFilterName("platforms");
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc);
+ var groupId;
+ // create if needed (and possible)
+ if ( groups.isEmpty() ) {
+ var c = new ResourceCriteria();
+ c.addFilterResourceCategory(ResourceCategory.PLATFORM);
+ var platforms = ResourceManager.findResourcesByCriteria(c);
+ Assert.assertTrue( platforms.size() > 0 );
+ var rg = new ResourceGroup("platforms");
+ var platformSet = new java.util.HashSet();
+ platformSet.addAll( platforms );
+ rg.setExplicitResources(platformSet);
+ rg = ResourceGroupManager.createResourceGroup(rg);
+ groupId = rg.getId();
+ } else {
+ groupId = groups.get(0).getId();
+ }
+ return groupId;
}
function getBundleType() {
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js
index 2c4f96d..db33709 100644
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js
+++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js
@@ -86,24 +86,42 @@ function testGroupDeployment() {
var property23 = new PropertySimple("upgrade.test.new", "A NEW REPLACEMENT");
config2.put( property23 );
+ // create a destination to deploy to
+ var testDest = BundleManager.createBundleDestination(testBundleVersion1.getBundle().getId(), "upgrade destination", "upgrade destination", "/tmp/upgrade-bundle-ant-test", groupId);
+
// create a deployment of 1.0 using the 1.0 config
- var testDeployment = BundleManager.createBundleDeployment(testBundleVersion1.getId(), "Upgrade Deployment with Ant Test 1", "Creating initial ant bundle deployment to be upgraded", "/tmp/upgrade-bundle-ant-test", config1);
- var bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(), groupId);
+ var testDeployment = BundleManager.createBundleDeployment(testBundleVersion1.getId(), testDest.getId(), "Upgrade Deployment with Ant Test 1", "Creating initial ant bundle deployment to be upgraded", config1);
+ var bgd = BundleManager.scheduleBundleDeployment(testDeployment.getId(), true);
Assert.assertNotNull( bgd, "Failed to create 1.0 deployment" );
// upgrade the deployment to 2.0 using the 2.0 config
- testDeployment = BundleManager.createBundleDeployment(testBundleVersion2.getId(), "Upgrade Deployment with Ant Test 2", "Testing ant bundle upgrade deployment", "/tmp/upgrade-bundle-ant-test", config2);
- bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(), groupId);
+ testDeployment = BundleManager.createBundleDeployment(testBundleVersion2.getId(), testDest.getId(), "Upgrade Deployment with Ant Test 2", "Testing ant bundle upgrade deployment", config2);
+ bgd = BundleManager.scheduleBundleDeployment(testDeployment.getId(), false);
Assert.assertNotNull( bgd, "Failed to upgrade to 2.0 deployment" );
}
function getGroupId() {
- // Find a target platform group
- var rgc = new ResourceGroupCriteria();
- rgc.addFilterName("platforms");
- var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc);
- Assert.assertTrue( groups.size() > 0, "need a group called platforms for this test" );
- return groups.get(0).getId();
+ // Find a target platform group
+ var rgc = new ResourceGroupCriteria();
+ rgc.addFilterName("platforms");
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc);
+ var groupId;
+ // create if needed (and possible)
+ if ( groups.isEmpty() ) {
+ var c = new ResourceCriteria();
+ c.addFilterResourceCategory(ResourceCategory.PLATFORM);
+ var platforms = ResourceManager.findResourcesByCriteria(c);
+ Assert.assertTrue( platforms.size() > 0 );
+ var rg = new ResourceGroup("platforms");
+ var platformSet = new java.util.HashSet();
+ platformSet.addAll( platforms );
+ rg.setExplicitResources(platformSet);
+ rg = ResourceGroupManager.createResourceGroup(rg);
+ groupId = rg.getId();
+ } else {
+ groupId = groups.get(0).getId();
+ }
+ return groupId;
}
function getBundleType() {
commit 4b3a38bde286be786c1a2bafc607376365293159
Merge: eb8c501... 6e01a49...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 27 12:38:36 2010 -0400
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
commit eb8c50193da8aea86329fbce45e63d07fe0abf4a
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 27 12:20:15 2010 -0400
fix to use the latest API
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
index fb19a06..15d0463 100644
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
+++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
@@ -85,14 +85,17 @@ function testGroupDeployment() {
var property23 = new PropertySimple("upgrade.test.new", "A NEW REPLACEMENT");
config2.put( property23 );
+ // create a destination to deploy to
+ var testDest = BundleManager.createBundleDestination(testBundleVersion1.getBundle().getId(), "upgrade destination", "upgrade destination", "/tmp/upgrade-bundle-test", groupId);
+
// create a deployment of 1.0 using the 1.0 config
- var testDeployment = BundleManager.createBundleDeployment(testBundleVersion1.getId(), "Upgrade Deployment Test 1", "Creating initial deployment to be upgraded", "/tmp/upgrade-bundle-test", config1);
- var bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(), groupId);
+ var testDeployment = BundleManager.createBundleDeployment(testBundleVersion1.getId(), testDest.getId(), "Upgrade Deployment Test 1", "Creating initial deployment to be upgraded", config1);
+ var bgd = BundleManager.scheduleBundleDeployment(testDeployment.getId(), true);
Assert.assertNotNull( bgd, "Failed to create 1.0 deployment" );
// upgrade the deployment to 2.0 using the 2.0 config
- testDeployment = BundleManager.createBundleDeployment(testBundleVersion2.getId(), "Upgrade Deployment Test 2", "Testing upgrade deployment", "/tmp/upgrade-bundle-test", config2);
- bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(), groupId);
+ testDeployment = BundleManager.createBundleDeployment(testBundleVersion2.getId(), testDest.getId(), "Upgrade Deployment Test 2", "Testing upgrade deployment", config2);
+ bgd = BundleManager.scheduleBundleDeployment(testDeployment.getId(), false);
Assert.assertNotNull( bgd, "Failed to upgrade to 2.0 deployment" );
}
commit 6e01a497d59df4735dee428668251d606e35c189
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 11:46:06 2010 -0400
Bundle buttons and images
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
index 80af8fe..4c5ad03 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
@@ -89,6 +89,7 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
+ "\"/> " + destination.getName()));
DynamicForm form = new DynamicForm();
+ form.setWidth100();
form.setNumCols(4);
LinkItem bundleName = new LinkItem("bundle");
@@ -118,6 +119,11 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
tagItem.setCanvas(tagEditor);
tagItem.setRowSpan(4);
+ CanvasItem actionItem = new CanvasItem("actions");
+ actionItem.setShowTitle(false);
+ actionItem.setCanvas(getActionLayout());
+ actionItem.setRowSpan(4);
+
StaticTextItem created = new StaticTextItem("created", "Created");
created.setValue(new Date(destination.getCtime()));
@@ -130,7 +136,7 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
StaticTextItem path = new StaticTextItem("path", "Path");
path.setValue(destination.getDeployDir());
- form.setFields(bundleName, tagItem, created, destinationGroup, path);
+ form.setFields(bundleName, tagItem, actionItem, created, destinationGroup, path);
addMember(form);
@@ -139,26 +145,33 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
deployments.setShowResizeBar(true);
addMember(createDeploymentsTable());
+
+ detail = new Canvas();
+ detail.setHeight("50%");
+ detail.hide();
+ addMember(detail);
+ }
+
+ private Canvas getActionLayout() {
+ VLayout actionLayout = new VLayout();
IButton deployButton = new IButton("Deploy");
+ deployButton.setIcon("subsystems/bundle/BundleAction_Deploy_16.png");
deployButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
new BundleDeployWizard(destination).startBundleWizard();
}
});
- addMember(deployButton);
+ actionLayout.addMember(deployButton);
IButton revertButton = new IButton("Revert");
+ revertButton.setIcon("subsystems/bundle/BundleAction_Revert_16.png");
revertButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
new BundleRevertWizard(destination).startBundleWizard();
}
});
- addMember(revertButton);
-
- detail = new Canvas();
- detail.setHeight("50%");
- detail.hide();
- addMember(detail);
+ actionLayout.addMember(revertButton);
+ return actionLayout;
}
private Table createDeploymentsTable() {
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png
new file mode 100644
index 0000000..1cfd351
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png
new file mode 100644
index 0000000..fa06d44
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png
new file mode 100644
index 0000000..f323445
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png
new file mode 100644
index 0000000..47b8a6e
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png
new file mode 100644
index 0000000..f59537a
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png
new file mode 100644
index 0000000..934800f
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png differ
commit d73773b42b3a1f6ee740cc9a33c31f851cf2283a
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 11:31:44 2010 -0400
refactored new bundle list view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
new file mode 100644
index 0000000..4c83319
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
@@ -0,0 +1,73 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.bundle.version;
+
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.types.SelectionAppearance;
+import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.enterprise.gui.coregui.client.bundle.list.BundleVersionDataSource;
+import org.rhq.enterprise.gui.coregui.client.components.table.Table;
+
+/**
+ * @author Greg Hinkle
+ */
+public class BundleVersionListView extends Table {
+
+
+ public BundleVersionListView() {
+ }
+
+ public BundleVersionListView(Criteria criteria) {
+ super("Bundle Versions", criteria);
+ setHeaderIcon("subsystems/bundle/BundleVersion_24.png");
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setHeight100();
+
+ BundleVersionDataSource bundleVersionsDataSource = new BundleVersionDataSource();
+ setDataSource(bundleVersionsDataSource);
+
+ getListGrid().getField("id").setWidth("60");
+ getListGrid().getField("name").setWidth("25%");
+ getListGrid().getField("name").setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
+ return "<a href=\"#Bundles/Bundle/" + listGridRecord.getAttribute("bundleId") + "/versions/" + listGridRecord.getAttribute("id") + "\">" + o + "</a>";
+ }
+ });
+
+ getListGrid().getField("version").setWidth("10%");
+ getListGrid().getField("fileCount").setWidth("10%");
+ getListGrid().getField("description").setWidth("*");
+
+ getListGrid().setSelectionType(SelectionStyle.NONE);
+ getListGrid().setSelectionAppearance(SelectionAppearance.ROW_STYLE);
+
+ }
+}
commit fcb208d106ecf38f9ae7f3a4842a15885bc55aab
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 11:31:24 2010 -0400
Table cleanups in the bundle section
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java
index 31c506f..9e231bd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java
@@ -70,6 +70,7 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment>
@Override
protected void executeFetch(final DSRequest request, final DSResponse response) {
BundleDeploymentCriteria criteria = new BundleDeploymentCriteria();
+ criteria.fetchBundleVersion(true);
if (request.getCriteria().getValues().containsKey("bundleId")) {
criteria.addFilterBundleId(Integer.parseInt(request.getCriteria().getAttribute("bundleId")));
@@ -79,6 +80,18 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment>
criteria.addFilterBundleVersionId(Integer.parseInt(request.getCriteria().getAttribute("bundleVersionId")));
}
+ if (request.getCriteria().getValues().get("tagNamespace") != null) {
+ criteria.addFilterTagNamespace((String) request.getCriteria().getValues().get("tagNamespace"));
+ }
+
+ if (request.getCriteria().getValues().get("tagSemantic") != null) {
+ criteria.addFilterTagSemantic((String) request.getCriteria().getValues().get("tagSemantic"));
+ }
+
+ if (request.getCriteria().getValues().get("tagName") != null) {
+ criteria.addFilterTagName((String) request.getCriteria().getValues().get("tagName"));
+ }
+
bundleService.findBundleDeploymentsByCriteria(criteria, new AsyncCallback<PageList<BundleDeployment>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError("Failed to load bundle deployments", caught);
@@ -109,9 +122,14 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment>
record.setAttribute("createdTime", new Date(from.getCtime()));
record.setAttribute("configuration", from.getConfiguration());
+
if (from.getBundleVersion() != null) {
record.setAttribute("bundleVersionVersion", from.getBundleVersion().getVersion());
record.setAttribute("bundleVersionId", from.getBundleVersion().getId());
+
+ if (from.getBundleVersion().getBundle() != null) {
+ record.setAttribute("bundleId", from.getBundleVersion().getBundle().getId());
+ }
}
return record;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
index b0413b6..907a2a0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
@@ -47,12 +47,14 @@ public class BundleDeploymentListView extends Table {
public BundleDeploymentListView(Bundle bundle) {
- super("Bundle Versions");
+ super("Bundle Deployments");
this.bundle = bundle;
this.bundleId = bundle.getId();
+ }
-
+ public BundleDeploymentListView(Criteria criteria) {
+ super("Bundle Deployments", criteria);
}
public BundleDeploymentListView(BundleVersion bundleVersion) {
@@ -63,9 +65,12 @@ public class BundleDeploymentListView extends Table {
@Override
protected void onInit() {
super.onInit();
+ setHeaderIcon("subsystems/bundle/BundleDeployment_24.png");
+
- String title = "Bundle Versions";
+
+ String title = "Bundle Deployments";
Criteria criteria = new Criteria();
if (bundle != null) {
title = bundle.getName() + " deployments";
@@ -81,10 +86,11 @@ public class BundleDeploymentListView extends Table {
setDataSource(new BundleDeploymentDataSource());
-
+ getListGrid().getField("id").setWidth("60");
+ getListGrid().getField("name").setWidth("25%");
getListGrid().getField("name").setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord record, int i, int i1) {
- return "<a href=\"#Bundles/Bundle/" + bundleId + "/deployments/" + record.getAttribute("id") + "\">" + String.valueOf(o) + "</a>";
+ return "<a href=\"#Bundles/Bundle/" + record.getAttribute("bundleId") + "/deployments/" + record.getAttribute("id") + "\">" + String.valueOf(o) + "</a>";
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java
index 4787e40..a375981 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java
@@ -88,6 +88,19 @@ public class BundleDestinationDataSource extends RPCDataSource<BundleDestination
criteria.addFilterBundleId(Integer.parseInt(request.getCriteria().getAttributeAsString("bundleId")));
}
+ if (request.getCriteria().getValues().get("tagNamespace") != null) {
+ criteria.addFilterTagNamespace((String) request.getCriteria().getValues().get("tagNamespace"));
+ }
+
+ if (request.getCriteria().getValues().get("tagSemantic") != null) {
+ criteria.addFilterTagSemantic((String) request.getCriteria().getValues().get("tagSemantic"));
+ }
+
+ if (request.getCriteria().getValues().get("tagName") != null) {
+ criteria.addFilterTagName((String) request.getCriteria().getValues().get("tagName"));
+ }
+
+
criteria.fetchBundle(true);
criteria.fetchDeployments(true);
criteria.fetchGroup(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
index cffb484..0cd85a4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
@@ -28,7 +28,6 @@ import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.bundle.BundleDeploymentStatus;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
@@ -36,51 +35,43 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table;
/**
* @author Greg Hinkle
*/
-public class BundleDestinationListView extends VLayout {
+public class BundleDestinationListView extends Table {
- private Integer bundleId;
public BundleDestinationListView() {
- setWidth100();
- setHeight100();
+ super("Bundle Destinations");
+
}
- public BundleDestinationListView(Integer bundleId) {
- this();
- this.bundleId = bundleId;
+ public BundleDestinationListView(Criteria criteria) {
+ super("Bundle Destinations", criteria);
+ setHeaderIcon("subsystems/bundle/BundleDestination_24.png");
}
@Override
- protected void onDraw() {
- super.onDraw();
-
-
- Criteria criteria = new Criteria();
- if (bundleId != null) {
- criteria.setAttribute("bundleId",bundleId.intValue());
- }
+ protected void onInit() {
+ super.onInit();
- Table table = new Table("Bundle Destinations", criteria);
- table.setDataSource(new BundleDestinationDataSource());
+ setDataSource(new BundleDestinationDataSource());
- table.getListGrid().getField("id").setWidth(45);
- table.getListGrid().getField("name").setWidth("20%");
- table.getListGrid().getField("name").setCellFormatter(new CellFormatter() {
+ getListGrid().getField("id").setWidth(45);
+ getListGrid().getField("name").setWidth("20%");
+ getListGrid().getField("name").setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
return "<a href=\"#Bundles/Bundles/" + listGridRecord.getAttribute("bundleId") + "/destinations/" + listGridRecord.getAttribute("id") + "\">" + o + "</a>";
}
});
- table.getListGrid().getField("description").setWidth("15%");
- //table.getListGrid().getField("bundleName").setWidth("20%");
- table.getListGrid().hideField("bundleName");
- table.getListGrid().getField("groupName").setWidth("15%");
- table.getListGrid().getField("deployDir").setWidth("15%");
+ getListGrid().getField("description").setWidth("15%");
+ //getListGrid().getField("bundleName").setWidth("20%");
+ getListGrid().hideField("bundleName");
+ getListGrid().getField("groupName").setWidth("15%");
+ getListGrid().getField("deployDir").setWidth("15%");
- ListGridField status = table.getListGrid().getField("latestDeploymentStatus");
+ ListGridField status = getListGrid().getField("latestDeploymentStatus");
HashMap<String, String> statusIcons = new HashMap<String, String>();
statusIcons.put(BundleDeploymentStatus.IN_PROGRESS.name(), "subsystems/bundle/install-loader.gif");
statusIcons.put(BundleDeploymentStatus.FAILURE.name(), "subsystems/bundle/Warning_11.png");
@@ -91,8 +82,5 @@ public class BundleDestinationListView extends VLayout {
status.setValueIconHeight(11);
status.setWidth(80);
-
-
- addMember(table);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java
index 9a576a6..e8985c7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java
@@ -59,22 +59,30 @@ public class BundleVersionDataSource extends RPCDataSource<BundleVersion> {
addField(deploymentCountField);
}
- public int getBundleId() {
- return bundleId;
- }
-
- public void setBundleId(int bundleId) {
- this.bundleId = bundleId;
- }
-
@Override
protected void executeFetch(final DSRequest request, final DSResponse response) {
BundleVersionCriteria criteria = new BundleVersionCriteria();
- criteria.addFilterBundleId(this.bundleId);
criteria.fetchBundleFiles(true);
+ criteria.fetchBundle(true);
criteria.setPageControl(getPageControl(request));
+ if (request.getCriteria().getValues().get("bundleId") != null) {
+ criteria.addFilterBundleId(Integer.parseInt(String.valueOf(request.getCriteria().getValues().get("bundleId"))));
+ }
+
+ if (request.getCriteria().getValues().get("tagNamespace") != null) {
+ criteria.addFilterTagNamespace((String) request.getCriteria().getValues().get("tagNamespace"));
+ }
+
+ if (request.getCriteria().getValues().get("tagSemantic") != null) {
+ criteria.addFilterTagSemantic((String) request.getCriteria().getValues().get("tagSemantic"));
+ }
+
+ if (request.getCriteria().getValues().get("tagName") != null) {
+ criteria.addFilterTagName((String) request.getCriteria().getValues().get("tagName"));
+ }
+
bundleService.findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError("Failed to load bundle version data", caught);
@@ -112,6 +120,7 @@ public class BundleVersionDataSource extends RPCDataSource<BundleVersion> {
ListGridRecord record = new ListGridRecord();
record.setAttribute("id", from.getId());
+ record.setAttribute("bundleId", from.getBundle().getId());
record.setAttribute("name", from.getName());
record.setAttribute("description", from.getDescription());
record.setAttribute("version", from.getVersion());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
index 091ea7a..a75587f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.bundle.list;
import java.util.HashSet;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.SelectionAppearance;
import com.smartgwt.client.types.SelectionStyle;
@@ -46,8 +47,10 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.bundle.deployment.BundleDeploymentView;
import org.rhq.enterprise.gui.coregui.client.bundle.destination.BundleDestinationListView;
import org.rhq.enterprise.gui.coregui.client.bundle.destination.BundleDestinationView;
+import org.rhq.enterprise.gui.coregui.client.bundle.version.BundleVersionListView;
import org.rhq.enterprise.gui.coregui.client.bundle.version.BundleVersionView;
import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel;
+import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback;
@@ -82,6 +85,9 @@ public class BundleView extends VLayout implements BookmarkableView {
this.bundle = bundle;
+ addMember(new BackButton("Back to All Bundles", "Bundles"));
+
+
headerLabel = new HeaderLabel("subsystems/bundle/Bundle_24.png", bundle.getName());
@@ -112,8 +118,10 @@ public class BundleView extends VLayout implements BookmarkableView {
private Tab createDestinationsTab() {
Tab destinationsTab = new Tab("Destinations");
+ Criteria criteria = new Criteria();
+ criteria.addCriteria("bundleId", bundle.getId());
- destinationsTab.setPane(new BundleDestinationListView(bundle.getId()));
+ destinationsTab.setPane(new BundleDestinationListView(criteria));
return destinationsTab;
}
@@ -121,36 +129,13 @@ public class BundleView extends VLayout implements BookmarkableView {
private Tab createVersionsTab() {
Tab versionsTab = new Tab("Versions");
- bundleVersionsTable = new Table();
- bundleVersionsTable.setHeight100();
-
- BundleVersionDataSource bundleVersionsDataSource = new BundleVersionDataSource();
- bundleVersionsTable.setDataSource(bundleVersionsDataSource);
-
- bundleVersionsTable.getListGrid().getField("id").setWidth("60");
- bundleVersionsTable.getListGrid().getField("name").setWidth("25%");
- bundleVersionsTable.getListGrid().getField("name").setCellFormatter(new CellFormatter() {
- public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
- return "<a href=\"#Bundles/Bundle/" + bundle.getId() + "/versions/" + listGridRecord.getAttribute("id") + "\">" + o + "</a>";
- }
- });
+ Criteria criteria = new Criteria();
+ criteria.addCriteria("bundleId", bundleBeingViewed);
- bundleVersionsTable.getListGrid().getField("version").setWidth("10%");
- bundleVersionsTable.getListGrid().getField("fileCount").setWidth("10%");
- bundleVersionsTable.getListGrid().getField("description").setWidth("*");
-
- bundleVersionsTable.getListGrid().setSelectionType(SelectionStyle.NONE);
- bundleVersionsTable.getListGrid().setSelectionAppearance(SelectionAppearance.ROW_STYLE);
+ bundleVersionsTable = new BundleVersionListView(criteria);
versionsTab.setPane(bundleVersionsTable);
- // versions tab
- BundleVersionDataSource bvDataSource;
- bvDataSource = (BundleVersionDataSource) bundleVersionsTable.getDataSource();
- bvDataSource.setBundleId(bundleBeingViewed);
- bvDataSource.fetchData();
- bundleVersionsTable.getListGrid().invalidateCache(); // TODO: is there a better way to refresh?
-
return versionsTab;
}
@@ -239,7 +224,7 @@ public class BundleView extends VLayout implements BookmarkableView {
Bundle bundle = result.get(0);
viewId.getBreadcrumbs().set(0,new Breadcrumb(String.valueOf(bundle.getId()), bundle.getName()));
viewBundle(bundle, viewPath.getCurrent());
- viewId.getBreadcrumbs().add(new Breadcrumb(String.valueOf(bundle.getId()), bundle.getName()));
+// viewId.getBreadcrumbs().add(new Breadcrumb(String.valueOf(bundle.getId()), bundle.getName()));
CoreGUI.refreshBreadCrumbTrail();
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
index bd2cfe9..e6cfcd6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
@@ -53,6 +53,7 @@ public class BundlesListView extends Table {
public BundlesListView(Criteria criteria) {
super("Bundles", criteria);
+ setHeaderIcon("subsystems/bundle/Bundle_24.png");
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java
index e36289e..037418e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java
@@ -49,7 +49,7 @@ public class BundleTreeView extends TreeGrid {
setWidth100();
setHeight100();
- setShowRoot(true);
+// setShowRoot(true);
setAutoFetchData(true);
setAnimateFolders(false);
setSelectionType(SelectionStyle.SINGLE);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
index c678d6f..c668e84 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
@@ -42,6 +42,7 @@ import org.rhq.core.domain.criteria.BundleVersionCriteria;
import org.rhq.core.domain.tagging.Tag;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
+import org.rhq.enterprise.gui.coregui.client.Breadcrumb;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
@@ -189,6 +190,7 @@ public class BundleVersionView extends VLayout implements BookmarkableView {
public void renderView(final ViewPath viewPath) {
int bundleVersionId = Integer.parseInt(viewPath.getCurrent().getPath());
+ final ViewId viewId = viewPath.getCurrent();
BundleVersionCriteria criteria = new BundleVersionCriteria();
criteria.addFilterId(bundleVersionId);
@@ -205,7 +207,9 @@ public class BundleVersionView extends VLayout implements BookmarkableView {
}
public void onSuccess(PageList<BundleVersion> result) {
- viewBundleVersion(result.get(0), viewPath.getCurrent());
+ BundleVersion version = result.get(0);
+ viewBundleVersion(version, viewPath.getCurrent());
+ viewId.getBreadcrumbs().set(0,new Breadcrumb(String.valueOf(version.getId()), version.getName()));
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index d264d36..592bceb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -29,6 +29,7 @@ import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.IButton;
+import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
@@ -65,6 +66,8 @@ public class Table extends VLayout {
private Label tableInfo;
private String[] excludedFieldNames;
+ private String headerIcon;
+
private boolean showFooter = true;
@@ -170,16 +173,6 @@ public class Table extends VLayout {
}
}
- titleLayout = new HLayout();
- titleLayout.setAutoHeight();
- titleLayout.setAlign(VerticalAlignment.BOTTOM);
- titleLayout.addMember(title);
-
- if (titleComponent != null) {
- titleLayout.addMember(new LayoutSpacer());
- titleLayout.addMember(titleComponent);
- }
-
tableInfo.setWrap(false);
@@ -193,6 +186,22 @@ public class Table extends VLayout {
removeMembers(getMembers());
+
+ titleLayout = new HLayout();
+ titleLayout.setAutoHeight();
+ titleLayout.setAlign(VerticalAlignment.BOTTOM);
+
+ if (headerIcon != null) {
+ titleLayout.addMember(new Img(headerIcon,24, 24));
+ }
+
+ titleLayout.addMember(title);
+
+ if (titleComponent != null) {
+ titleLayout.addMember(new LayoutSpacer());
+ titleLayout.addMember(titleComponent);
+ }
+
addMember(titleLayout);
addMember(listGrid);
if (showFooter) {
@@ -335,6 +344,13 @@ public class Table extends VLayout {
this.extraWidgets.add(canvas);
}
+ public String getHeaderIcon() {
+ return headerIcon;
+ }
+
+ public void setHeaderIcon(String headerIcon) {
+ this.headerIcon = headerIcon;
+ }
private void refreshTableInfo() {
if (showFooter) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index 61cd57f..91627d2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -75,6 +75,8 @@ public class ResourceSearchView extends Table {
public ResourceSearchView(Criteria criteria, String title, SortSpecifier[] sortSpecifier, String[] excludeFields) {
super(title, criteria, sortSpecifier, excludeFields);
+ setHeaderIcon("types/Platform_up_24.png");
+
setWidth100();
setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
index c97936c..a166177 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
@@ -66,6 +66,10 @@ public class TagCloudView extends VLayout {
private void drawTags(PageList<TagReportComposite> tags) {
+ if (tags == null) {
+ return; // Tags still loading
+ }
+
this.tags = tags;
addMember(new HeaderLabel("Tag Cloud"));
@@ -96,6 +100,10 @@ public class TagCloudView extends VLayout {
buf.append("<a href=\"#Tag/" + tag.getTag().toString() + "\" style=\"font-size: " + font + "pt; margin: 8px;\"");
+
+ buf.append(" title=\"Tag used " + tag.getTotal() + " times\"");
+
+
if (tag.getTag().toString().equals(selectedTag)) {
buf.append(" class=\"selectedTag\"");
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
index f837397..b69eb0e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
@@ -22,6 +22,8 @@
*/
package org.rhq.enterprise.gui.coregui.client.report.tag;
+import java.util.ArrayList;
+
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.widgets.Canvas;
@@ -31,7 +33,11 @@ import com.smartgwt.client.widgets.tile.TileLayout;
import org.rhq.core.domain.tagging.Tag;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
+import org.rhq.enterprise.gui.coregui.client.bundle.deployment.BundleDeploymentListView;
+import org.rhq.enterprise.gui.coregui.client.bundle.destination.BundleDestinationListView;
import org.rhq.enterprise.gui.coregui.client.bundle.list.BundlesListView;
+import org.rhq.enterprise.gui.coregui.client.bundle.version.BundleVersionListView;
+import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
/**
@@ -43,9 +49,8 @@ public class TaggedView extends VLayout implements BookmarkableView {
private Criteria criteria;
- private ResourceSearchView resourceView;
- private BundlesListView bundlesView;
+ private ArrayList<Table> tiles = new ArrayList<Table>();
private TileLayout tileLayout;
@@ -88,27 +93,31 @@ public class TaggedView extends VLayout implements BookmarkableView {
tileLayout.setTileWidth(getWidth() / 2 - 20);
addMember(tileLayout);
- tileLayout.addTile(getResourceCanvas(criteria));
- tileLayout.addTile(getBundleCanvas(criteria));
- }
+ ResourceSearchView resourceView = new ResourceSearchView(criteria, "Tagged Resources", new SortSpecifier[]{}, new String[]{"pluginName", "category", "currentAvailability"});
+ tiles.add(resourceView);
- resourceView.refresh(criteria);
- bundlesView.refresh(criteria);
- }
+ BundlesListView bundlesView = new BundlesListView(criteria);
+ tiles.add(bundlesView);
+ BundleVersionListView bundleVersionListView = new BundleVersionListView(criteria);
+ tiles.add(bundleVersionListView);
- private Canvas getResourceCanvas(Criteria criteria) {
- resourceView = new ResourceSearchView(criteria, "Tagged Resources", new SortSpecifier[] {},new String[]{"pluginName", "category", "currentAvailability"});
- resourceView.setShowFooter(false);
- return resourceView;
- }
+ BundleDeploymentListView bundleDeploymentListView = new BundleDeploymentListView(criteria);
+ tiles.add(bundleDeploymentListView);
+ BundleDestinationListView bundleDestinationListView = new BundleDestinationListView(criteria);
+ tiles.add(bundleDestinationListView);
- private Canvas getBundleCanvas(Criteria criteria) {
- bundlesView = new BundlesListView(criteria);
- bundlesView.setShowFooter(false);
- return bundlesView;
+ for (Table t : tiles) {
+ t.setShowFooter(false);
+ tileLayout.addTile(t);
+ }
+ }
+
+ for (Table t : tiles) {
+ t.refresh(criteria);
+ }
}
commit 4f834c8e08c274914f9532bab0e869f2a5d372ec
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 11:28:56 2010 -0400
Links to bundle system in admin->content menu
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
index b493582..9f9995a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
@@ -71,6 +71,9 @@ public class MenuBarView extends VLayout {
protected void onDraw() {
super.onDraw();
+ this.aboutModalWindow = new AboutModalWindow();
+
+
// TODO GH: This is a nasty hack... it injects the css to override the smartgwt skin
String css = ".menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled {\n" +
" border: none;\n" +
@@ -131,7 +134,6 @@ public class MenuBarView extends VLayout {
overviewMenu.addItem(subsystemsSubMenuItem);
overviewMenu.addItem(new EMenuItem("AutoDiscovery Queue",LinkManager.getAutodiscoveryQueueLink()));//,new LinkCommand("#cofng"));
overviewMenu.addItem(new EMenuItem("Dashboard",LinkManager.getDashboardLink()));//,new LinkCommand("#cofng"));
- overviewMenu.addItem(new EMenuItem("Bundles", "#Bundles"));
Menu resourcesMenu = new Menu();
@@ -179,6 +181,7 @@ public class MenuBarView extends VLayout {
Menu contentMenu = new Menu();
contentMenu.setTitle("Content");
+ contentMenu.addItem(new EMenuItem("Bundles","#Bundles"));
contentMenu.addItem(new EMenuItem("Content Providers",LinkManager.getAdminContentProvidersLink()));
contentMenu.addItem(new EMenuItem("Content Repositories",LinkManager.getAdminContentReposLink()));
MenuItem contentSubMenuItem = new MenuItem("Content");
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
index 50efde2..ab5ece0 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
@@ -344,6 +344,9 @@
<ui:remove>***** Administration > CONTENT *****</ui:remove>
<rich:menuGroup value="Content" rendered="#{GlobalPermissionsUIBean.inventory}">
+ <rich:menuItem submitMode="none" onclick="window.location = '/coregui/CoreGUI.html#Bundles'">
+ <h:outputText value="Bundles"/>
+ </rich:menuItem>
<rich:menuItem submitMode="none" onclick="window.location = '/rhq/content/listContentProviders.xhtml'">
<h:outputText value="Content Sources"/>
</rich:menuItem>
commit 68643815c277948c0617bfedb7db73550fabc901
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Thu May 27 10:39:26 2010 -0400
various reworking of rhq:bundle Ant task as discussed; rename rhq:deployment element to rhq:deploymentUnit
(cherry picked from commit 8b50ba816d704ced7668a7fa6aa869416ba0c043)
Conflicts:
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
modules/plugins/ant-bundle/src/test/resources/test-build.xml
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
index 7c4925b..93e0a6a 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
@@ -46,7 +46,7 @@ import org.apache.tools.ant.helper.AntXMLContext;
import org.apache.tools.ant.helper.ProjectHelper2;
import org.rhq.bundle.ant.task.BundleTask;
-import org.rhq.bundle.ant.type.DeploymentType;
+import org.rhq.bundle.ant.type.DeploymentUnitType;
/**
* This object enables you to invoke an Ant script within the running VM. You can fully run the script
@@ -69,14 +69,11 @@ public class AntLauncher {
// TODO (ips, 04/28/10): Figure out a way to avoid assuming the prefix is "rhq".
private static final String BUNDLE_TASK_NAME = "rhq:bundle";
- private static final String INPUT_PROPERTY_TASK_NAME = "rhq:input-property";
- private static final String DEPLOY_TASK_NAME = "rhq:deploy";
/**
* Executes the specified bundle deploy Ant build file (i.e. rhq-deploy.xml).
*
* @param buildFile the path to the build file (i.e. rhq-deploy.xml)
- * @param targetName the target to run, <code>null</code> will run the default target
* @param buildProperties the properties to pass into Ant
* @param buildListeners a list of build listeners (provide callback methods for targetExecuted, taskExecuted, etc.)
*
@@ -84,8 +81,9 @@ public class AntLauncher {
*
* @throws InvalidBuildFileException if the build file is invalid
*/
- public BundleAntProject executeBundleDeployFile(File buildFile, String targetName, Properties buildProperties,
- List<BuildListener> buildListeners) throws InvalidBuildFileException {
+ public BundleAntProject executeBundleDeployFile(File buildFile, Properties buildProperties,
+ List<BuildListener> buildListeners)
+ throws InvalidBuildFileException {
parseBundleDeployFile(buildFile);
BundleAntProject project = new BundleAntProject();
@@ -121,8 +119,8 @@ public class AntLauncher {
// targets.
project.executeTarget("");
- // Now execute the target the user actually specified.
- project.executeTarget((targetName == null) ? project.getDefaultTarget() : targetName);
+ // Now execute the default target?
+ //project.executeTarget(project.getDefaultTarget());
return project;
} catch (Exception e) {
@@ -228,11 +226,11 @@ public class AntLauncher {
}
BundleTask bundleTask = (BundleTask) preconfigureTask(unconfiguredBundleTask);
- Collection<DeploymentType> deployments = bundleTask.getDeployments().values();
+ Collection<DeploymentUnitType> deployments = bundleTask.getDeploymentUnits().values();
if (deployments.isEmpty()) {
- throw new InvalidBuildFileException("The bundle task must contain at least one deployment child element.");
+ throw new InvalidBuildFileException("The bundle task must contain exactly one rhq:deploymentUnit child element.");
}
- DeploymentType deployment = deployments.iterator().next();
+ DeploymentUnitType deployment = deployments.iterator().next();
Map<File, File> files = deployment.getFiles();
for (File file : files.values()) {
project.getBundleFileNames().add(file.getName());
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
index 7d7959a..bd83825 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
@@ -121,14 +121,6 @@ public class BundleAntProject extends Project {
this.deploymentId = deploymentId;
}
- public String getDeploymentName() {
- return deploymentName;
- }
-
- public void setDeploymentName(String deploymentName) {
- this.deploymentName = deploymentName;
- }
-
public DeploymentPhase getDeploymentPhase() {
return deploymentPhase;
}
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
index f943c0d..8e3c066 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
@@ -22,7 +22,7 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.rhq.bundle.ant.DeployPropertyNames;
import org.rhq.bundle.ant.DeploymentPhase;
-import org.rhq.bundle.ant.type.DeploymentType;
+import org.rhq.bundle.ant.type.DeploymentUnitType;
import org.rhq.bundle.ant.type.InputPropertyType;
import java.io.File;
@@ -43,7 +43,7 @@ public class BundleTask extends AbstractBundleTask {
private String name;
private String version;
private String description;
- private Map<String, DeploymentType> deployments = new HashMap<String, DeploymentType>();
+ private Map<String, DeploymentUnitType> deploymentUnits = new HashMap<String, DeploymentUnitType>();
private Set<InputPropertyType> inputProperties = new HashSet<InputPropertyType>();
@Override
@@ -63,8 +63,8 @@ public class BundleTask extends AbstractBundleTask {
* The RHQ Ant launcher will ensure that the following Ant project properties are defined prior to this method being
* invoked:
*
- * rhq.deploy.name - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment} name
- * (e.g. "appserver")
+ * rhq.deploy.id - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment}'s unique id
+ * (e.g. "10001")
* rhq.deploy.dir - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment} install dir
* (e.g. "/opt/jbossas-petstore")
* rhq.deploy.phase - the {@link org.rhq.bundle.ant.DeploymentPhase deployment phase}
@@ -105,15 +105,10 @@ public class BundleTask extends AbstractBundleTask {
getProject().setDeploymentId(deploymentId);
log(DeployPropertyNames.DEPLOY_ID + "=\"" + deploymentId + "\"", Project.MSG_DEBUG);
- String deploymentName = (String) projectProps.get(DeployPropertyNames.DEPLOY_NAME);
- if (deploymentName == null) {
- throw new BuildException("Required property [" + DeployPropertyNames.DEPLOY_NAME + "] was not specified.");
- }
- getProject().setDeploymentName(deploymentName);
- DeploymentType deployment = this.deployments.get(deploymentName);
- if (deployment == null) {
- throw new BuildException("There is no deployment element defined with name '" + deploymentName + "'.");
+ if (this.deploymentUnits.size() != 1) {
+ throw new BuildException("The rhq:bundle task must contain exactly one rhq:deploymentUnit element.");
}
+ DeploymentUnitType deploymentUnit = this.deploymentUnits.values().iterator().next();
String deploymentPhaseName = (String) projectProps.get(DeployPropertyNames.DEPLOY_PHASE);
if (deploymentPhaseName == null) {
@@ -142,28 +137,31 @@ public class BundleTask extends AbstractBundleTask {
String dryRunString = (String) projectProps.get(DeployPropertyNames.DEPLOY_DRY_RUN);
boolean dryRun = Boolean.valueOf(dryRunString);
getProject().setDryRun(dryRun);
-
- log("Executing '" + deploymentPhase + "' phase for deployment '" + deploymentName + "' from bundle '"
- + this.name + "' version " + this.version + " using config " + getProject().getConfiguration() + "...");
+ String revertString = (String) projectProps.get(DeployPropertyNames.DEPLOY_REVERT);
+ boolean revert = Boolean.valueOf(revertString);
+ String cleanString = (String) projectProps.get(DeployPropertyNames.DEPLOY_CLEAN);
+ boolean clean = Boolean.valueOf(cleanString);
+
+ log("Executing '" + deploymentPhase + "' phase for deployment with id [" + deploymentId + "] from bundle '"
+ + this.name + "' version " + this.version + " using config "
+ + getProject().getConfiguration().toString(true) + " [dryRun=" + dryRun + ", revert=" + revert
+ + ", clean=" + clean + "]...");
switch (deploymentPhase) {
case INSTALL:
- String revertString = (String) projectProps.get(DeployPropertyNames.DEPLOY_REVERT);
- boolean revert = Boolean.valueOf(revertString);
- String cleanString = (String) projectProps.get(DeployPropertyNames.DEPLOY_CLEAN);
- boolean clean = Boolean.valueOf(cleanString);
- deployment.install(revert, clean);
+ // TODO: Revert doesn't really make sense for an initial install.
+ deploymentUnit.install(revert, clean);
break;
case START:
- deployment.start();
+ deploymentUnit.start();
break;
case STOP:
- deployment.stop();
+ deploymentUnit.stop();
break;
case UPGRADE:
- deployment.upgrade();
+ deploymentUnit.upgrade(revert, clean);
break;
case UNINSTALL:
- deployment.uninstall();
+ deploymentUnit.uninstall();
break;
}
}
@@ -197,12 +195,12 @@ public class BundleTask extends AbstractBundleTask {
inputProperty.init();
}
- public void addConfigured(DeploymentType deployment) {
- this.deployments.put(deployment.getName(), deployment);
+ public void addConfigured(DeploymentUnitType deployment) {
+ this.deploymentUnits.put(deployment.getName(), deployment);
}
- public Map<String, DeploymentType> getDeployments() {
- return deployments;
+ public Map<String, DeploymentUnitType> getDeploymentUnits() {
+ return deploymentUnits;
}
/**
@@ -233,8 +231,8 @@ public class BundleTask extends AbstractBundleTask {
* @throws BuildException if an error occurs
*/
protected void validateTypes() throws BuildException {
- if (this.deployments.isEmpty()) {
- throw new BuildException("At least one 'deployment' child element must be specified.");
+ if (this.deploymentUnits.isEmpty()) {
+ throw new BuildException("At least one 'rhq:deploymentUnit' child element must be specified.");
}
}
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
index 6874a63..cea5df4 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
@@ -3,6 +3,10 @@ package org.rhq.bundle.ant.type;
import org.apache.tools.ant.types.DataType;
import org.rhq.bundle.ant.BundleAntProject;
+import java.io.File;
+import java.util.List;
+import java.util.regex.Pattern;
+
/**
*
*/
@@ -11,4 +15,60 @@ public abstract class AbstractBundleType extends DataType {
public BundleAntProject getProject() {
return (BundleAntProject)super.getProject();
}
+
+ protected static Pattern getPattern(List<FileSet> fileSets) {
+ if (fileSets == null || fileSets.isEmpty()) {
+ return null;
+ }
+ boolean first = true;
+ StringBuilder regex = new StringBuilder();
+ for (FileSet fileSet : fileSets) {
+ if (!first) {
+ regex.append("|");
+ } else {
+ first = false;
+ }
+ regex.append("(");
+ File dir = fileSet.getDir();
+ if (dir != null) {
+ regex.append(dir);
+ regex.append('/');
+ }
+ if (fileSet.getIncludePatterns().length == 0) {
+ regex.append(".*");
+ } else {
+ boolean firstIncludePattern = true;
+ for (String includePattern : fileSet.getIncludePatterns()) {
+ if (!firstIncludePattern) {
+ regex.append("|");
+ } else {
+ firstIncludePattern = false;
+ }
+ regex.append("(");
+ for (int i = 0; i < includePattern.length(); i++) {
+ char c = includePattern.charAt(i);
+ if (c == '?') {
+ regex.append('.');
+ } else if (c == '*') {
+ if (i + 1 < includePattern.length()) {
+ char c2 = includePattern.charAt(++i);
+ if (c2 == '*') {
+ regex.append(".*");
+ i++;
+ continue;
+ }
+ }
+ regex.append("[^/]*");
+ } else {
+ regex.append(c);
+ }
+ // TODO: Escape backslashes.
+ }
+ regex.append(")");
+ }
+ }
+ regex.append(")");
+ }
+ return Pattern.compile(regex.toString());
+ }
}
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
index 1320630..19aaaf6 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
@@ -22,11 +22,25 @@
*/
package org.rhq.bundle.ant.type;
+import java.util.List;
+import java.util.regex.Pattern;
+
/**
- * An archive file to be exploded during the bundle deployment.
+ * An archive file to be exploded during the bundle deployment. Can optionally contain a rhq:replace child element
+ * that specifies the set of files that contain template variables (e.g. @@http.port@@) which need to be replaced with
+ * the value of the corresponding property.
*
* @author Ian Springer
*/
public class ArchiveType extends AbstractFileType {
+ private Pattern replacePattern;
+
+ public void addConfigured(ReplaceType replace) {
+ List<FileSet> fileSets = replace.getFileSets();
+ this.replacePattern = getPattern(fileSets);
+ }
+ public Pattern getReplacePattern() {
+ return replacePattern;
+ }
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java
deleted file mode 100644
index db33995..0000000
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.bundle.ant.type;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.system.SystemInfoFactory;
-import org.rhq.core.template.TemplateEngine;
-import org.rhq.core.util.updater.DeployDifferences;
-import org.rhq.core.util.updater.Deployer;
-import org.rhq.core.util.updater.DeploymentData;
-import org.rhq.core.util.updater.DeploymentProperties;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * An Ant task for deploying a bundle or previewing the deployment.
- *
- * @author Ian Springer
- */
-public class DeploymentType extends AbstractBundleType {
- private String name;
- private Map<File, File> files = new LinkedHashMap<File, File>();
- private Set<File> archives = new LinkedHashSet<File>();
- private SystemServiceType systemService;
- private Pattern ignorePattern;
- private Pattern replacePattern;
- private boolean preview;
- private String preinstallTarget;
- private String postinstallTarget;
-
- public void install(boolean revert, boolean clean) throws BuildException {
- if (this.preinstallTarget != null) {
- Target target = (Target) getProject().getTargets().get(this.preinstallTarget);
- if (target == null) {
- throw new BuildException("Specified preinstall target (" + this.preinstallTarget + ") does not exist.");
- }
- target.performTasks();
- }
-
- int deploymentId = getProject().getDeploymentId();
- DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
- getProject().getBundleVersion(), getProject().getBundleDescription());
- File deployDir = getProject().getDeployDir();
- TemplateEngine templateEngine = createTemplateEngine();
- if (this.files.isEmpty() && this.archives.isEmpty()) {
- throw new BuildException("You must specify at least one file to deploy via nested rhq:file and/or rhq:archive elements.");
- }
- if (!this.files.isEmpty()) {
- log("Deploying files " + this.files + "...", Project.MSG_VERBOSE);
- }
- if (!this.archives.isEmpty()) {
- log("Deploying archives " + this.archives + "...", Project.MSG_VERBOSE);
- }
-
- // for now, apply the pattern to all files in the deployment
- Map<File, Pattern> archiveReplacePatterns = new HashMap<File, Pattern>();
- for (File file : this.archives) {
- archiveReplacePatterns.put(file, this.replacePattern);
- }
- Set<File> rawFilesToReplace = this.files.keySet(); // TODO: CHANGE ME! only replace those raw files marked as "replace=true"
- DeploymentData dd = new DeploymentData(deploymentProps, this.archives, this.files, deployDir,
- archiveReplacePatterns, rawFilesToReplace, templateEngine, this.ignorePattern);
- Deployer deployer = new Deployer(dd);
- try {
- DeployDifferences diffs = getProject().getDeployDifferences();
- boolean dryRun = getProject().isDryRun();
- if (revert) {
- deployer.redeployAndRestoreBackupFiles(diffs, clean, dryRun);
- } else {
- deployer.deploy(diffs, clean, dryRun);
- }
- deployer.deploy(diffs);
- getProject().log("Results:\n" + diffs + "\n");
- } catch (Exception e) {
- throw new BuildException("Failed to deploy bundle '" + getProject().getBundleName() + "' version "
- + getProject().getBundleVersion() + ": " + e, e);
- }
-
- if (this.systemService != null) {
- this.systemService.install();
- }
-
- if (this.postinstallTarget != null) {
- Target target = (Target) getProject().getTargets().get(this.postinstallTarget);
- if (target == null) {
- throw new BuildException("Specified postinstall target (" + this.postinstallTarget + ") does not exist.");
- }
- target.performTasks();
- }
-
- return;
- }
-
- public void start() throws BuildException {
-
- }
-
- public void stop() throws BuildException {
-
- }
-
- public void upgrade() throws BuildException {
-
- }
-
- public void uninstall() throws BuildException {
- // TODO
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Map<File, File> getFiles() {
- return files;
- }
-
- public Set<File> getArchives() {
- return archives;
- }
-
- public boolean isPreview() {
- return this.preview;
- }
-
- public void setPreview(boolean preview) {
- this.preview = preview;
- }
-
- public String getPreinstallTarget() {
- return preinstallTarget;
- }
-
- public void setPreinstallTarget(String preinstallTarget) {
- this.preinstallTarget = preinstallTarget;
- }
-
- public String getPostinstallTarget() {
- return postinstallTarget;
- }
-
- public void setPostinstallTarget(String postinstallTarget) {
- this.postinstallTarget = postinstallTarget;
- }
-
- public void addConfigured(SystemServiceType systemService) {
- if (this.systemService != null) {
- throw new IllegalStateException("A deployment can only have one system-service child element.");
- }
- this.systemService = systemService;
- }
-
- public void addConfigured(FileType file) {
- File destFile = file.getDestinationFile();
- if (destFile == null) {
- File destDir = file.getDestinationDir();
- destFile = new File(destDir, file.getSource().getName());
- }
- this.files.put(file.getSource(), destFile);
- }
-
- public void addConfigured(ArchiveType archive) {
- this.archives.add(archive.getSource());
- }
-
- public void addConfigured(IgnoreType ignore) {
- List<FileSet> fileSets = ignore.getFileSets();
- this.ignorePattern = getPattern(fileSets);
- }
-
- public void addConfigured(ReplaceType replace) {
- List<FileSet> fileSets = replace.getFileSets();
- this.replacePattern = getPattern(fileSets);
- }
-
- private TemplateEngine createTemplateEngine() {
- TemplateEngine templateEngine = SystemInfoFactory.fetchTemplateEngine();
- // Add the deployment props to the template engine's tokens.
- Configuration config = getProject().getConfiguration();
- for (PropertySimple prop : config.getSimpleProperties().values()) {
- templateEngine.getTokens().put(prop.getName(), prop.getStringValue());
- }
- return templateEngine;
- }
-
- private static Pattern getPattern(List<FileSet> fileSets) {
- boolean first = true;
- StringBuilder regex = new StringBuilder();
- for (FileSet fileSet : fileSets) {
- if (!first) {
- regex.append("|");
- } else {
- first = false;
- }
- regex.append("(");
- File dir = fileSet.getDir();
- if (dir != null) {
- regex.append(dir);
- regex.append('/');
- }
- if (fileSet.getIncludePatterns().length == 0) {
- regex.append(".*");
- } else {
- boolean firstIncludePattern = true;
- for (String includePattern : fileSet.getIncludePatterns()) {
- if (!firstIncludePattern) {
- regex.append("|");
- } else {
- firstIncludePattern = false;
- }
- regex.append("(");
- for (int i = 0; i < includePattern.length(); i++) {
- char c = includePattern.charAt(i);
- if (c == '?') {
- regex.append('.');
- } else if (c == '*') {
- if (i + 1 < includePattern.length()) {
- char c2 = includePattern.charAt(++i);
- if (c2 == '*') {
- regex.append(".*");
- i++;
- continue;
- }
- }
- regex.append("[^/]*");
- } else {
- regex.append(c);
- }
- // TODO: Escape backslashes.
- }
- regex.append(")");
- }
- }
- regex.append(")");
- }
- return Pattern.compile(regex.toString());
- }
-}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
new file mode 100644
index 0000000..df72add
--- /dev/null
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
@@ -0,0 +1,212 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.bundle.ant.type;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Target;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.system.SystemInfoFactory;
+import org.rhq.core.template.TemplateEngine;
+import org.rhq.core.util.updater.DeployDifferences;
+import org.rhq.core.util.updater.Deployer;
+import org.rhq.core.util.updater.DeploymentData;
+import org.rhq.core.util.updater.DeploymentProperties;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * An Ant task for deploying a bundle or previewing the deployment.
+ *
+ * @author Ian Springer
+ */
+public class DeploymentUnitType extends AbstractBundleType {
+ private String name;
+ private Map<File, File> files = new LinkedHashMap<File, File>();
+ private Set<File> rawFilesToReplace = new LinkedHashSet<File>();
+ private Set<File> archives = new LinkedHashSet<File>();
+ private Map<File, Pattern> archiveReplacePatterns = new HashMap<File, Pattern>();
+ private SystemServiceType systemService;
+ private Pattern ignorePattern;
+ private boolean preview;
+ private String preinstallTarget;
+ private String postinstallTarget;
+
+ public void install(boolean revert, boolean clean) throws BuildException {
+ if (this.preinstallTarget != null) {
+ Target target = (Target) getProject().getTargets().get(this.preinstallTarget);
+ if (target == null) {
+ throw new BuildException("Specified preinstall target (" + this.preinstallTarget + ") does not exist.");
+ }
+ target.performTasks();
+ }
+
+ int deploymentId = getProject().getDeploymentId();
+ DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
+ getProject().getBundleVersion(), getProject().getBundleDescription());
+ File deployDir = getProject().getDeployDir();
+ TemplateEngine templateEngine = createTemplateEngine();
+ if (this.files.isEmpty() && this.archives.isEmpty()) {
+ throw new BuildException("You must specify at least one file to deploy via nested rhq:file and/or rhq:archive elements.");
+ }
+ if (!this.files.isEmpty()) {
+ log("Deploying files " + this.files + "...", Project.MSG_VERBOSE);
+ }
+ if (!this.archives.isEmpty()) {
+ log("Deploying archives " + this.archives + "...", Project.MSG_VERBOSE);
+ }
+
+ DeploymentData deploymentData = new DeploymentData(deploymentProps, this.archives, this.files, deployDir,
+ this.archiveReplacePatterns, this.rawFilesToReplace, templateEngine, this.ignorePattern);
+ Deployer deployer = new Deployer(deploymentData);
+ try {
+ DeployDifferences diffs = getProject().getDeployDifferences();
+ boolean dryRun = getProject().isDryRun();
+ if (revert) {
+ deployer.redeployAndRestoreBackupFiles(diffs, clean, dryRun);
+ } else {
+ deployer.deploy(diffs, clean, dryRun);
+ }
+ deployer.deploy(diffs);
+ getProject().log("Results:\n" + diffs + "\n");
+ } catch (Exception e) {
+ throw new BuildException("Failed to deploy bundle '" + getProject().getBundleName() + "' version "
+ + getProject().getBundleVersion() + ": " + e, e);
+ }
+
+ if (this.systemService != null) {
+ this.systemService.install();
+ }
+
+ if (this.postinstallTarget != null) {
+ Target target = (Target) getProject().getTargets().get(this.postinstallTarget);
+ if (target == null) {
+ throw new BuildException("Specified postinstall target (" + this.postinstallTarget + ") does not exist.");
+ }
+ target.performTasks();
+ }
+
+ return;
+ }
+
+ public void start() throws BuildException {
+
+ }
+
+ public void stop() throws BuildException {
+
+ }
+
+ public void upgrade(boolean revert, boolean clean) throws BuildException {
+ install(revert, clean);
+ }
+
+ public void uninstall() throws BuildException {
+ // TODO
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Map<File, File> getFiles() {
+ return files;
+ }
+
+ public Set<File> getArchives() {
+ return archives;
+ }
+
+ public boolean isPreview() {
+ return this.preview;
+ }
+
+ public void setPreview(boolean preview) {
+ this.preview = preview;
+ }
+
+ public String getPreinstallTarget() {
+ return preinstallTarget;
+ }
+
+ public void setPreinstallTarget(String preinstallTarget) {
+ this.preinstallTarget = preinstallTarget;
+ }
+
+ public String getPostinstallTarget() {
+ return postinstallTarget;
+ }
+
+ public void setPostinstallTarget(String postinstallTarget) {
+ this.postinstallTarget = postinstallTarget;
+ }
+
+ public void addConfigured(SystemServiceType systemService) {
+ if (this.systemService != null) {
+ throw new IllegalStateException("A deployment can only have one system-service child element.");
+ }
+ this.systemService = systemService;
+ }
+
+ public void addConfigured(FileType file) {
+ File destFile = file.getDestinationFile();
+ if (destFile == null) {
+ File destDir = file.getDestinationDir();
+ destFile = new File(destDir, file.getSource().getName());
+ }
+ this.files.put(file.getSource(), destFile);
+ if (file.isReplace()) {
+ this.rawFilesToReplace.add(file.getSource());
+ }
+ }
+
+ public void addConfigured(ArchiveType archive) {
+ this.archives.add(archive.getSource());
+ Pattern replacePattern = archive.getReplacePattern();
+ if (replacePattern != null) {
+ this.archiveReplacePatterns.put(archive.getSource(), replacePattern);
+ }
+ }
+
+ public void addConfigured(IgnoreType ignore) {
+ List<FileSet> fileSets = ignore.getFileSets();
+ this.ignorePattern = getPattern(fileSets);
+ }
+
+ private TemplateEngine createTemplateEngine() {
+ TemplateEngine templateEngine = SystemInfoFactory.fetchTemplateEngine();
+ // Add the deployment props to the template engine's tokens.
+ Configuration config = getProject().getConfiguration();
+ for (PropertySimple prop : config.getSimpleProperties().values()) {
+ templateEngine.getTokens().put(prop.getName(), prop.getStringValue());
+ }
+ return templateEngine;
+ }
+}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
index 4e2c296..2e55c0e 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
@@ -27,13 +27,15 @@ import org.apache.tools.ant.BuildException;
import java.io.File;
/**
- * A file to be copied during the bundle deployment.
+ * A file to be copied during the bundle deployment. If the replace attribute is set to true, any template variables
+ * (e.g. @@http.port@@) inside the file will be replaced with the value of the corresponding property.
*
* @author Ian Springer
*/
public class FileType extends AbstractFileType {
private File destinationDir;
private File destinationFile;
+ private boolean replace;
public File getDestinationDir() {
return this.destinationDir;
@@ -57,4 +59,12 @@ public class FileType extends AbstractFileType {
}
this.destinationFile = new File(destinationFile);
}
+
+ public boolean isReplace() {
+ return replace;
+ }
+
+ public void setReplace(boolean replace) {
+ this.replace = replace;
+ }
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
index cdf2b6c..4479d1c 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
@@ -22,8 +22,6 @@
*/
package org.rhq.bundle.ant.type;
-import org.apache.tools.ant.types.DataType;
-
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml b/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
index 9f01c2b..fee46ef 100644
--- a/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
+++ b/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
@@ -8,7 +8,7 @@
<!-- bundle task's child types -->
<typedef name="input-property" classname="org.rhq.bundle.ant.type.InputPropertyType"/>
- <typedef name="deployment" classname="org.rhq.bundle.ant.type.DeploymentType"/>
+ <typedef name="deployment-unit" classname="org.rhq.bundle.ant.type.DeploymentUnitType"/>
<!-- deployment type's child types -->
<typedef name="file" classname="org.rhq.bundle.ant.type.FileType"/>
diff --git a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
index 403bfa2..831bdf9 100644
--- a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
+++ b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
@@ -74,7 +74,7 @@ public class AntLauncherTest {
Properties inputProps = createInputProperties("/test-bundle-v1-input.properties");
List<BuildListener> buildListeners = createBuildListeners();
- BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v1.xml"), null, inputProps,
+ BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v1.xml"), inputProps,
buildListeners);
/*Map<String, String> bundleFiles = project.getBundleFiles();
assert bundleFiles != null;
@@ -94,6 +94,8 @@ public class AntLauncherTest {
String preinstallTargetExecuted = (String) project.getProperties().get("preinstallTargetExecuted");
assert preinstallTargetExecuted.equals("true");
+ String postinstallTargetExecuted = (String) project.getProperties().get("postinstallTargetExecuted");
+ assert postinstallTargetExecuted.equals("true");
}
private List<BuildListener> createBuildListeners() {
@@ -114,7 +116,7 @@ public class AntLauncherTest {
Properties inputProps = createInputProperties("/test-bundle-v2-input.properties");
List<BuildListener> buildListeners = createBuildListeners();
- BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v2.xml"), null, inputProps,
+ BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v2.xml"), inputProps,
buildListeners);
/*Map<String, String> bundleFiles = project.getBundleFiles();
assert bundleFiles != null;
@@ -136,8 +138,7 @@ public class AntLauncherTest {
private Properties createInputProperties(String resourcePath) throws IOException {
Properties inputProps = new Properties();
inputProps.setProperty(DeployPropertyNames.DEPLOY_DIR, DEPLOY_DIR.getPath());
- inputProps.setProperty(DeployPropertyNames.DEPLOY_ID, "100");
- inputProps.setProperty(DeployPropertyNames.DEPLOY_NAME, "appserver");
+ inputProps.setProperty(DeployPropertyNames.DEPLOY_ID, "100");
inputProps.setProperty(DeployPropertyNames.DEPLOY_PHASE, DeploymentPhase.INSTALL.name());
InputStream inputStream = this.getClass().getResourceAsStream(resourcePath);
try {
diff --git a/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml b/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
index 2e63b2c..76820bf 100644
--- a/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
+++ b/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
@@ -12,20 +12,21 @@
defaultValue="8080"
type="integer"/>
- <rhq:deployment name="appserver" preinstallTarget="preinstall">
+ <rhq:deployment-unit name="appserver" preinstallTarget="preinstall" postinstallTarget="postinstall">
<rhq:system-service name="foo" scriptFile="foo-script"
configFile="foo-config" overwriteScript="true"
startLevels="3,4,5" startPriority="80" stopPriority="20" root="root"/>
- <rhq:file name="test-v1.properties" destinationFile="subdir/test.properties"/>
- <rhq:archive name="file.zip"/>
- <rhq:replace>
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
+ <rhq:file name="test-v1.properties" destinationFile="subdir/test.properties" replace="true"/>
+ <rhq:archive name="file.zip">
+ <rhq:replace>
+ <rhq:fileset includes="**/*.properties"/>
+ </rhq:replace>
+ </rhq:archive>
<!-- the files that should be ignored during upgrades -->
<rhq:ignore>
<rhq:fileset includes="*.log"/>
</rhq:ignore>
- </rhq:deployment>
+ </rhq:deployment-unit>
</rhq:bundle>
@@ -36,4 +37,9 @@
<property name="preinstallTargetExecuted" value="true"/>
</target>
+ <target name="postinstall">
+ <echo>Done deploying Test Bundle v1.0 to ${rhq.deploy.dir}.</echo>
+ <property name="postinstallTargetExecuted" value="true"/>
+ </target>
+
</project>
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml b/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
index 501ba3f..6764c13 100644
--- a/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
+++ b/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
@@ -12,28 +12,34 @@
defaultValue="8080"
type="integer"/>
- <rhq:deployment name="appserver" preinstallTarget="preinstall">
+ <rhq:deployment-unit name="appserver" preinstallTarget="preinstall" postinstallTarget="postinstall">
<rhq:system-service name="foo" scriptFile="foo-script"
configFile="foo-config" overwriteScript="true"
startLevels="3,4,5" startPriority="80" stopPriority="20" root="root"/>
- <rhq:file name="test-v2.properties" destinationFile="subdir/test.properties"/>
- <rhq:archive name="file.zip"/>
- <rhq:replace>
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
+ <rhq:file name="test-v2.properties" destinationFile="subdir/test.properties" replace="true"/>
+ <rhq:archive name="file.zip">
+ <rhq:replace>
+ <rhq:fileset includes="**/*.properties"/>
+ </rhq:replace>
+ </rhq:archive>
<!-- the files that should be ignored during upgrades -->
<rhq:ignore>
<rhq:fileset includes="*.log"/>
</rhq:ignore>
- </rhq:deployment>
+ </rhq:deployment-unit>
</rhq:bundle>
<target name="main"/>
<target name="preinstall">
- <echo>Deploying Test Bundle v2.0 to ${rhq.deploy.dir}...</echo>
+ <echo>Deploying Test Bundle v1.0 to ${rhq.deploy.dir}...</echo>
<property name="preinstallTargetExecuted" value="true"/>
</target>
+ <target name="postinstall">
+ <echo>Done deploying Test Bundle v1.0 to ${rhq.deploy.dir}.</echo>
+ <property name="postinstallTargetExecuted" value="true"/>
+ </target>
+
</project>
\ No newline at end of file
diff --git a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
index 2eb1d85..f030cf0 100644
--- a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
+++ b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
@@ -36,6 +36,8 @@ import org.apache.tools.ant.Project;
import org.rhq.bundle.ant.AntLauncher;
import org.rhq.bundle.ant.BundleAntProject;
import org.rhq.bundle.ant.DeployPropertyNames;
+import org.rhq.bundle.ant.DeploymentPhase;
+import org.rhq.bundle.ant.InvalidBuildFileException;
import org.rhq.bundle.ant.LoggerAntBuildListener;
import org.rhq.core.domain.bundle.BundleDeployment;
import org.rhq.core.domain.bundle.BundleResourceDeployment;
@@ -54,6 +56,8 @@ import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.system.SystemInfoFactory;
import org.rhq.core.util.stream.StreamUtil;
import org.rhq.core.util.updater.DeployDifferences;
+import org.rhq.core.util.updater.Deployer;
+import org.rhq.core.util.updater.DeploymentsMetadata;
/**
* @author John Mazzitelli
@@ -121,9 +125,17 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
buildListeners.add(auditor);
// Parse and execute the Ant script.
- AntLauncher antLauncher = new AntLauncher();
- BundleAntProject project = antLauncher.executeBundleDeployFile(recipeFile, null, antProps,
- buildListeners);
+ executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ DeploymentPhase.STOP);
+ String deployDirString = bundleDeployment.getDestination().getDeployDir();
+ File deployDir = new File(deployDirString);
+ DeploymentsMetadata deployMetadata = new DeploymentsMetadata(deployDir);
+ DeploymentPhase installPhase = (deployMetadata.isManaged()) ? DeploymentPhase.UPGRADE :
+ DeploymentPhase.INSTALL;
+ BundleAntProject project = executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ installPhase);
+ executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ DeploymentPhase.START);
// Send the diffs to the Server so it can store them as an entry in the deployment history.
BundleManagerProvider bundleManagerProvider = request.getBundleManagerProvider();
@@ -153,6 +165,12 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
return result;
}
+ private BundleAntProject executeDeploymentPhase(File recipeFile, Properties antProps, List<BuildListener> buildListeners, DeploymentPhase stop) throws InvalidBuildFileException {
+ AntLauncher antLauncher = new AntLauncher();
+ BundleAntProject project = antLauncher.executeBundleDeployFile(recipeFile, antProps, buildListeners);
+ return project;
+ }
+
private Properties createAntProperties(BundleDeployRequest request) {
Properties antProps = new Properties();
diff --git a/modules/plugins/ant-bundle/src/test/resources/simple-build.xml b/modules/plugins/ant-bundle/src/test/resources/simple-build.xml
deleted file mode 100644
index 88ade87..0000000
--- a/modules/plugins/ant-bundle/src/test/resources/simple-build.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="test" default="init"
- xmlns:rhq="antlib:org.rhq.bundle">
-
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <property name="outfile" value="${basedir}/output.1" />
-
- <target name="init">
- <echo file="${outfile}" message="Hello World!!"/>
- </target>
-
-</project>
-
\ No newline at end of file
diff --git a/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml b/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml
new file mode 100644
index 0000000..f51fae3
--- /dev/null
+++ b/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<project name="simple-build" default="main"
+ xmlns:rhq="antlib:org.rhq.bundle">
+
+ <echo>basedir=${basedir}</echo>
+
+ <property name="outfile" value="${basedir}/output.2" />
+
+ <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
+ description="example.com corporate website hosted on JBoss EAP 4.3">
+
+ <rhq:input-property
+ name="custom.prop1"
+ description="my prop 1"
+ required="true"
+ defaultValue="default 1"/>
+
+ <rhq:input-property
+ name="custom.prop2"
+ description="my prop 2"
+ required="true"
+ defaultValue="default 2"/>
+
+ <rhq:deployment-unit name="doodibittydoo">
+ <rhq:file name="test.properties" destinationFile="config/test.properties" replace="true"/>
+ </rhq:deployment-unit>
+
+ </rhq:bundle>
+
+ <target name="main"/>
+
+</project>
\ No newline at end of file
commit 84b4dd24ea3993cdd8aa5bc7b8dd7d6531021f47
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 09:34:39 2010 -0400
Backup version of the menubar
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java
new file mode 100644
index 0000000..b4723e5
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java
@@ -0,0 +1,159 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.menu;
+
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.ui.Hyperlink;
+import com.google.gwt.user.client.ui.MenuBar;
+import com.google.gwt.user.client.ui.MenuItem;
+import com.smartgwt.client.types.ContentsType;
+import com.smartgwt.client.types.VerticalAlignment;
+import com.smartgwt.client.util.SC;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.Img;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.LayoutSpacer;
+import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.toolbar.ToolStrip;
+
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.components.AboutModalWindow;
+
+/**
+ *
+ * This is a backup menu bar that is implemented with the standard gwt component.
+ * It doesn't have many features or look very good.
+ *
+ * @author Greg Hinkle
+ */
+public class GWTMenuBarView extends VLayout {
+
+ private AboutModalWindow aboutModalWindow;
+
+ public static final String[] SECTIONS = {"Dashboard", "Demo", "Inventory", "Bundles", "Administration"};
+
+ private String selected = "Dashboard";
+
+ private HTMLFlow linksPane;
+
+ public GWTMenuBarView() {
+ super(5);
+ setHeight(50);
+ setWidth100();
+
+
+ }
+
+ public static class LinkCommand implements Command {
+ private String href;
+
+ public LinkCommand(String href) {
+ this.href = href;
+ }
+
+ public void execute() {
+ History.newItem(href);
+ }
+ }
+
+
+ protected void onDraw() {
+ super.onDraw();
+
+
+ // Create a command that will execute on menu item selection
+ Command menuCommand = new Command() {
+ public void execute() {
+ SC.say("Clicked");
+ }
+ };
+
+ // Create a menu bar
+ MenuBar menu = new MenuBar();
+ menu.setAutoOpen(true);
+ menu.setWidth("100%");
+ menu.setAnimationEnabled(false);
+ menu.setStylePrimaryName("gwtMenuBar");
+
+
+ MenuBar subsystemsMenu = new MenuBar(true);
+ subsystemsMenu.setStylePrimaryName("gwtMenu");
+ subsystemsMenu.addItem("Configuration Changes", new LinkCommand("#config"));
+ subsystemsMenu.addItem("Suspect Metrics", new LinkCommand("#config"));
+ subsystemsMenu.addItem("Operations", new LinkCommand("#config"));
+ subsystemsMenu.addItem("Alerts", new LinkCommand("#config"));
+ subsystemsMenu.addItem("Alert Definitions", new LinkCommand("#config"));
+
+ MenuBar overviewMenu = new MenuBar(true);
+ overviewMenu.setStylePrimaryName("gwtMenu");
+ overviewMenu.addItem("Subsystem Views", subsystemsMenu);
+ overviewMenu.addItem("AutoDiscovery Queue",new LinkCommand("#cofng"));
+ overviewMenu.addItem("Dashboard",new LinkCommand("#cofng"));
+
+
+ MenuBar resourcesMenu = new MenuBar(true);
+ resourcesMenu.setStylePrimaryName("gwtMenu");
+ resourcesMenu.addItem("All Resources", new LinkCommand("#fsdf"));
+ resourcesMenu.addItem("Platforms", new LinkCommand("#fsdf"));
+ resourcesMenu.addItem("Servers", new LinkCommand("#fsdf"));
+ resourcesMenu.addItem("Services", new LinkCommand("#fsdf"));
+ resourcesMenu.addSeparator();
+// resourcesMenu.addItem("Favorite Resources",)
+
+ MenuBar groupsMenu = new MenuBar(true);
+ groupsMenu.setStylePrimaryName("gwtMenu");
+ groupsMenu.addItem("All Groups", new LinkCommand("#sf"));
+ groupsMenu.addItem("Compatible Groups", new LinkCommand("#sf"));
+ groupsMenu.addItem("Mixed Groups", new LinkCommand("#sf"));
+ groupsMenu.addItem("Group Definitions", new LinkCommand("#sf"));
+ groupsMenu.addSeparator();
+ groupsMenu.addItem("New Group", new LinkCommand("#sf"));
+ groupsMenu.addItem("New Group Definition", new LinkCommand("#sf"));
+ groupsMenu.addSeparator();
+ groupsMenu.addItem("Favorites", new LinkCommand("#sf"));
+
+
+
+
+ MenuBar helpMenu = new MenuBar(true);
+ helpMenu.setStylePrimaryName("gwtMenu");
+ helpMenu.addItem("Online Documentation", new LinkCommand("#sdfs"));
+ helpMenu.addItem("Open a support case", new LinkCommand("#sdfs"));
+ helpMenu.addItem("About", new LinkCommand("#sdfs"));
+
+
+
+ menu.addItem(new MenuItem("<img src=\"images/header/rhq_logo_28px.png\"/>", true, new LinkCommand("#about")));
+ menu.addItem(new MenuItem("Overview", overviewMenu));
+ menu.addItem(new MenuItem("Resources", resourcesMenu));
+ menu.addItem(new MenuItem("Groups", groupsMenu));
+ menu.addItem(new MenuItem("Help", helpMenu));
+
+ // Return the menu
+ menu.ensureDebugId("topMenuBar");
+
+
+ addMember(menu);
+ }
+
+}
\ No newline at end of file
commit 3b1353d13a59ffeb0df4a8bd9ef88da974a14300
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 09:28:25 2010 -0400
New gwt-based menubar
L&F tweaks
Upgrade to SmartGWT 2.2 to fix rendering issue
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index ce94def..690a7b3 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>com.smartgwt</groupId>
<artifactId>smartgwt</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</dependency>
<!--
<dependency>
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index c49908f..9231cbc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -253,7 +253,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
}
public static void setSessionSubject(Subject subject) {
-
// TODO this breaks because of reattach rules, bizarely even in queries. gonna switch out to non-subject include apis
// Create a minimized session object for validation on requests
// Subject s = new Subject(subject.getName(),subject.getFactive(), subject.getFsystem());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
index 6d4a3fd..ab30742 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
@@ -49,5 +49,171 @@ public class LinkManager {
}
}
+ public static String getSubsystemConfigurationLink() {
+ return "/rhq/subsystem/configurationUpdate.xhtml";
+ }
+
+ public static String getSubsystemSuspectMetricsLink() {
+ return "/rhq/subsystem/oobHistory.xhtml";
+ }
+
+ public static String getSubsystemOperationHistoryLink() {
+ return "/rhq/subsystem/operationHistory.xhtml";
+ }
+
+
+ public static String getSubsystemAlertHistoryLink() {
+ return "/rhq/subsystem/alertHistory.xhtml";
+ }
+
+ public static String getSubsystemAlertDefsLink() {
+ return "/rhq/subsystem/alertDefinitions.xhtml";
+ }
+
+
+ public static String getAutodiscoveryQueueLink() {
+ return "/rhq/discovery/queue.xhtml";
+ }
+
+ public static String getDashboardLink() {
+ return "/Dashboard.do";
+ }
+
+
+ public static String getHubAllResourcesLink() {
+ return "/rhq/inventory/browseResources.xhtml?subtab=all";
+ }
+
+ public static String getHubPlatformsLink() {
+ return "/rhq/inventory/browseResources.xhtml?subtab=platform";
+ }
+
+ public static String getHubServerssLink() {
+ return "/rhq/inventory/browseResources.xhtml?subtab=server";
+ }
+
+ public static String getHubServicesLink() {
+ return "/rhq/inventory/browseResources.xhtml?subtab=service";
+ }
+
+
+ public static String getSavedSearchLink(int searchId) {
+ return "/rhq/inventory/browseResources.xhtml?subtab=all&searchId=" + searchId;
+ }
+
+
+ public static String getHubAllGroupsLink() {
+ return "/rhq/inventory/browseGroups.xhtml?subtab=all";
+ }
+
+ public static String getHubCompatibleGroupsLink() {
+ return "/rhq/inventory/browseGroups.xhtml?subtab=compatible";
+ }
+
+ public static String getHubMixedGroupsLink() {
+ return "/rhq/inventory/browseGroups.xhtml?subtab=mixed";
+ }
+
+ public static String getHubGroupDefinitionsLink() {
+ return "/rhq/definition/group/list.xhtml";
+ }
+
+ public static String getHubNewGroupLink() {
+ return "/resource/group/Inventory.do?mode=new";
+ }
+
+
+ public static String getHubNewGroupDefLink() {
+ return "/rhq/definition/group/new.xhtml";
+ }
+
+
+ public static String getAdminUsersLink() {
+ return "/admin/user/UserAdmin.do?mode=list";
+ }
+
+ public static String getAdminRolesLink() {
+ return "/admin/role/RoleAdmin.do?mode=list";
+ }
+
+ public static String getAdminSysConfigLink() {
+ return "/admin/config/Config.do?mode=edit";
+ }
+
+
+ public static String getAdminPluginsLink() {
+ return "/rhq/admin/plugin/plugin-list.xhtml";
+ }
+
+
+ public static String getAdminTemplatesLink() {
+ return "/admin/config/EditDefaults.do?mode=monitor&viewMode=all";
+ }
+
+ public static String getAdminAlertNotifTemplatesLink() {
+ return "/rhq/admin/alert/template/notification/list.xhtml";
+ }
+
+
+ public static String getAdminContentProvidersLink() {
+ return "/rhq/content/listContentProviders.xhtml";
+ }
+
+ public static String getAdminContentReposLink() {
+ return "/rhq/content/listRepos.xhtml";
+ }
+
+
+ public static String getHAServersLink() {
+ return "/rhq/ha/listServers.xhtml";
+ }
+
+ public static String getHAAgentsLink() {
+ return "/rhq/ha/listAgents.xhtml";
+ }
+
+ public static String getHAAffinityGroupsLink() {
+ return "/rhq/ha/listAffinityGroups.xhtml";
+ }
+
+ public static String getHAEventsLink() {
+ return "/rhq/ha/listPartitionEvents.xhtml";
+ }
+
+
+ public static String getReportsInventoryLink() {
+ return "/rhq/admin/report/resourceInstallReport.xhtml";
+ }
+
+ public static String getAdminDownloadsLink() {
+ return "/rhq/admin/downloads.xhtml";
+ }
+
+
+ public static String getAdminLicenseLink() {
+ return "/admin/license/LicenseAdmin.do?mode=view";
+ }
+
+
+ public static String getDebugSqlLink() {
+ return "/admin/test/sql.jsp";
+ }
+
+ public static String getDebugHibernateLink() {
+ return "/admin/test/hibernate.jsp";
+ }
+
+ public static String getDebugBrowserLink() {
+ return "/admin/test/browser.jsp";
+ }
+
+ public static String getUserPrefsLink(int subjectId) {
+ return "/admin/user/UserAdmin.do?mode=edit&u=" + subjectId;
+ }
+
+ public static String getUserPasswordLink(int subjectId) {
+ return "/admin/user/UserAdmin.do?mode=editPass&u=" + subjectId;
+ }
+
-}
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
index 0eafbc6..a529ef9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
@@ -22,8 +22,6 @@
*/
package org.rhq.enterprise.gui.coregui.client;
-import java.util.HashMap;
-
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder;
@@ -31,12 +29,10 @@ import com.google.gwt.http.client.RequestCallback;
import com.google.gwt.http.client.RequestException;
import com.google.gwt.http.client.Response;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.docs.Image;
import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.FormErrorOrientation;
import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
-import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
@@ -46,25 +42,23 @@ import com.smartgwt.client.widgets.form.fields.HeaderItem;
import com.smartgwt.client.widgets.form.fields.PasswordItem;
import com.smartgwt.client.widgets.form.fields.SubmitItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
-import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
-import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
import com.smartgwt.client.widgets.form.fields.events.KeyPressEvent;
import com.smartgwt.client.widgets.form.fields.events.KeyPressHandler;
-import com.smartgwt.client.widgets.layout.VLayout;
-import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.gwt.SubjectGWTServiceAsync;
/**
* @author Greg Hinkle
*/
public class LoginView extends Canvas {
+ private static boolean loginShowing = false;
private Window window;
private DynamicForm form;
+ private SubmitItem loginButton;
+
public LoginView() {
this(false);
@@ -89,67 +83,72 @@ public class LoginView extends Canvas {
public void showLoginDialog() {
- form = new DynamicForm();
- form.setMargin(10);
- form.setShowInlineErrors(false);
+ if (!loginShowing) {
+ loginShowing = true;
+ form = new DynamicForm();
+ form.setMargin(10);
+ form.setShowErrorText(true);
+ form.setErrorOrientation(FormErrorOrientation.BOTTOM);
- CanvasItem logo = new CanvasItem();
- logo.setCanvas(new Img("header/rhq_logo_28px.png", 80, 28));
- logo.setShowTitle(false);
+ CanvasItem logo = new CanvasItem();
+ logo.setCanvas(new Img("header/rhq_logo_28px.png", 80, 28));
+ logo.setShowTitle(false);
- HeaderItem header = new HeaderItem();
- header.setValue("RHQ Login");
+ HeaderItem header = new HeaderItem();
+ header.setValue("RHQ Login");
- TextItem user = new TextItem("user", "User");
- user.setRequired(true);
- user.setAttribute("canAutocomplete", true);
- user.setAttribute("autoComplete", true);
- PasswordItem password = new PasswordItem("password", "Password");
- password.setRequired(true);
- password.setAttribute("autocomplete", true);
+ TextItem user = new TextItem("user", "User");
+ user.setRequired(true);
+ user.setAttribute("canAutocomplete", true);
+ user.setAttribute("autoComplete", true);
+ PasswordItem password = new PasswordItem("password", "Password");
+ password.setRequired(true);
+ password.setAttribute("autocomplete", true);
- final SubmitItem login = new SubmitItem("login", "Login");
- login.setAlign(Alignment.CENTER);
- login.setColSpan(2);
+ loginButton = new SubmitItem("login", "Login");
+ loginButton.setAlign(Alignment.CENTER);
+ loginButton.setColSpan(2);
- password.addKeyPressHandler(new KeyPressHandler() {
- public void onKeyPress(KeyPressEvent event) {
- if ((event.getCharacterValue() != null) && (event.getCharacterValue() == KeyCodes.KEY_ENTER)) {
- form.submit();
+ password.addKeyPressHandler(new KeyPressHandler() {
+ public void onKeyPress(KeyPressEvent event) {
+ if ((event.getCharacterValue() != null) && (event.getCharacterValue() == KeyCodes.KEY_ENTER)) {
+ form.submit();
+ }
}
- }
- });
+ });
- form.setFields(logo, header, user, password, login);
+ form.setFields(logo, header, user, password, loginButton);
- window = new Window();
- window.setTitle("RHQ Login");
- window.setWidth(400);
- window.setHeight(250);
- window.setIsModal(true);
- window.setShowModalMask(true);
- window.setCanDragResize(true);
- window.centerInPage();
- window.addItem(form);
- window.show();
+ window = new Window();
+ window.setTitle("RHQ Login");
+ window.setWidth(400);
+ window.setHeight(250);
+ window.setIsModal(true);
+ window.setShowModalMask(true);
+ window.setCanDragResize(true);
+ window.centerInPage();
+ window.addItem(form);
+ window.show();
- form.focusInItem(user);
+ form.focusInItem(user);
- form.addSubmitValuesHandler(new SubmitValuesHandler() {
- public void onSubmitValues(SubmitValuesEvent submitValuesEvent) {
- if (form.validate()) {
- login(form.getValueAsString("user"), form.getValueAsString("password"));
+ form.addSubmitValuesHandler(new SubmitValuesHandler() {
+ public void onSubmitValues(SubmitValuesEvent submitValuesEvent) {
+ if (form.validate()) {
+ login(form.getValueAsString("user"), form.getValueAsString("password"));
+ }
}
- }
- });
+ });
+ }
}
private void login(String user, String password) {
+ loginButton.setDisabled(true);
RequestBuilder b = new RequestBuilder(RequestBuilder.GET,
"/j_security_check.do?j_username=" + user + "&j_password=" + password);
try {
@@ -158,18 +157,22 @@ public class LoginView extends Canvas {
if (response.getStatusCode() == 200) {
System.out.println("Portal-War logged in");
window.destroy();
+ loginShowing = false;
CoreGUI.checkLoginStatus();
} else {
- form.setFieldErrors("user", "The username or password provided does not match our records.", true);
+ form.setFieldErrors("login", "The username or password provided does not match our records.", true);
+ loginButton.setDisabled(false);
}
}
public void onError(Request request, Throwable exception) {
System.out.println("Portal-War login failed");
+ loginButton.setDisabled(false);
}
});
b.send();
} catch (RequestException e) {
+ loginButton.setDisabled(false);
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
index 3906118..b0413b6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
@@ -39,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table;
/**
* @author Greg Hinkle
*/
-public class BundleDeploymentListView extends VLayout {
+public class BundleDeploymentListView extends Table {
private int bundleId;
private Bundle bundle;
@@ -47,8 +47,12 @@ public class BundleDeploymentListView extends VLayout {
public BundleDeploymentListView(Bundle bundle) {
+ super("Bundle Versions");
+
this.bundle = bundle;
this.bundleId = bundle.getId();
+
+
}
public BundleDeploymentListView(BundleVersion bundleVersion) {
@@ -62,32 +66,27 @@ public class BundleDeploymentListView extends VLayout {
String title = "Bundle Versions";
-
Criteria criteria = new Criteria();
if (bundle != null) {
title = bundle.getName() + " deployments";
- criteria.setAttribute("bundleId",bundle.getId());
+ criteria.setAttribute("bundleId", bundle.getId());
}
if (bundleVersion != null) {
title = bundleVersion.getVersion() + " deployments";
criteria.setAttribute("bundleVersionId", bundleVersion.getId());
}
+ setTableTitle(title);
- Table table = new Table(title, criteria);
+ refresh(criteria);
- table.setDataSource(new BundleDeploymentDataSource());
+ setDataSource(new BundleDeploymentDataSource());
- table.getListGrid().getField("name").setCellFormatter(new CellFormatter() {
+ getListGrid().getField("name").setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord record, int i, int i1) {
return "<a href=\"#Bundles/Bundle/" + bundleId + "/deployments/" + record.getAttribute("id") + "\">" + String.valueOf(o) + "</a>";
}
});
-
-
-
- addMember(table);
-
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
index 176305b..bd2cfe9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
@@ -51,6 +51,10 @@ public class BundlesListView extends Table {
setHeight100();
}
+ public BundlesListView(Criteria criteria) {
+ super("Bundles", criteria);
+ }
+
@Override
protected void onInit() {
super.onInit();
@@ -134,9 +138,6 @@ public class BundlesListView extends Table {
});
}
- public void setCriteria(Criteria criteria) {
- this.getListGrid().fetchData(criteria);
- }
public int getMatches() {
return this.getListGrid().getTotalRows();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java
index c5d432e..f6dbee7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java
@@ -33,7 +33,7 @@ public class HeaderLabel extends HTMLFlow {
public HeaderLabel(String contents) {
super(contents);
- setHeight(60);
+ setHeight(50);
setStylePrimaryName("HeaderLabel");
setStyleName("HeaderLabel");
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index 9167473..d264d36 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -274,6 +274,7 @@ public class Table extends VLayout {
private boolean autoSizing = false;
public void refresh(Criteria criteria) {
+ this.listGrid.invalidateCache();
this.listGrid.setCriteria(criteria);
this.listGrid.markForRedraw();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java
index d640e55..a54d0ac 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java
@@ -42,6 +42,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.RecordDoubleClickEvent;
import com.smartgwt.client.widgets.grid.events.RecordDoubleClickHandler;
import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.menu.IMenuButton;
import com.smartgwt.client.widgets.menu.Menu;
import com.smartgwt.client.widgets.menu.MenuButton;
import com.smartgwt.client.widgets.menu.MenuItem;
@@ -125,7 +126,7 @@ public class OperationHistoryView extends VLayout {
}
});
- MenuButton operationsButton = new MenuButton("Run Operation", operationMenu);
+ IMenuButton operationsButton = new IMenuButton("Run Operation", operationMenu);
operationsButton.setShowMenuBelow(false);
table.addExtraWidget(operationsButton);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
index 0543eac..b493582 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
@@ -18,21 +18,32 @@
*/
package org.rhq.enterprise.gui.coregui.client.menu;
+import com.google.gwt.dom.client.Document;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Hyperlink;
import com.smartgwt.client.types.ContentsType;
import com.smartgwt.client.types.VerticalAlignment;
+import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.events.ClickEvent;
+import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.LayoutSpacer;
import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.menu.Menu;
+import com.smartgwt.client.widgets.menu.MenuBar;
+import com.smartgwt.client.widgets.menu.MenuItem;
+import com.smartgwt.client.widgets.menu.MenuItemSeparator;
+import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.AboutModalWindow;
/**
@@ -42,7 +53,7 @@ public class MenuBarView extends VLayout {
private AboutModalWindow aboutModalWindow;
- public static final String[] SECTIONS = { "Dashboard", "Demo", "Inventory", "Bundles", "Administration" };
+ public static final String[] SECTIONS = {"Dashboard", "Demo", "Inventory", "Bundles", "Administration"};
private String selected = "Dashboard";
@@ -53,19 +64,174 @@ public class MenuBarView extends VLayout {
setHeight(50);
setWidth100();
- History.addValueChangeHandler(new ValueChangeHandler<String>() {
- public void onValueChange(ValueChangeEvent<String> stringValueChangeEvent) {
- String first = stringValueChangeEvent.getValue().split("/")[0];
- if ("Resource".equals(first)) {
- first = "Inventory";
- }
+ }
- selected = first;
- linksPane.setContents(setupLinks());
- linksPane.markForRedraw();
+
+ protected void onDraw() {
+ super.onDraw();
+
+ // TODO GH: This is a nasty hack... it injects the css to override the smartgwt skin
+ String css = ".menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled {\n" +
+ " border: none;\n" +
+ " font-size: 9pt; \n" +
+ " font-weight: bold;\n" +
+ "}\n" +
+ ".menuButtonDown {\n" +
+ " background: url(\"/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images/cssButton/button_Over_stretch.png\") repeat-x scroll 0 0 #DDDDDD";
+
+ com.google.gwt.dom.client.StyleElement style = Document.get().createStyleElement();
+ style.setPropertyString("language", "text/css");
+ style.setInnerText(css);
+ Document.get().getBody().appendChild(style);
+
+
+
+
+
+ HLayout topBar = new HLayout();
+ topBar.setHeight(28);
+ topBar.setStyleName("topMenuBar");
+// url("./images/cssButton/button_stretch.png") repeat-x scroll 0 0 #DDDDDD
+// topBar.setBackgroundImage("[SKIN]/cssButton/button_stretch.png");
+// topBar.setBackgroundRepeat(BkgndRepeat.REPEAT_X);
+
+
+ Img logo = new Img("header/rhq_logo_28px.png", 80, 28);
+ logo.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
+ public void onClick(com.smartgwt.client.widgets.events.ClickEvent event) {
+ MenuBarView.this.aboutModalWindow.show();
}
});
+
+
+ topBar.addMember(logo);
+
+
+ // Create a menu bar
+ final MenuBar menu = new MenuBar();
+ menu.setHeight(28);
+
+ Menu subsystemsMenu = new Menu();
+
+ subsystemsMenu.setTitle("Subsystems");
+ subsystemsMenu.addItem(new EMenuItem("Configuration Changes", LinkManager.getSubsystemConfigurationLink(), "subsystems/configure/Configure_16.png"));//, new LinkCommand("#config"));
+ subsystemsMenu.addItem(new EMenuItem("Suspect Metrics", LinkManager.getSubsystemSuspectMetricsLink(), "subsystems/monitor/Monitor_failed_16.png"));//, new LinkCommand("#config"));
+ subsystemsMenu.addItem(new EMenuItem("Operations", LinkManager.getSubsystemOperationHistoryLink(), "subsystems/control/Operation_16.png"));//, new LinkCommand("#config"));
+ subsystemsMenu.addItem(new EMenuItem("Alerts", LinkManager.getSubsystemAlertHistoryLink(), "subsystems/alert/Alert_HIGH_16.png"));//, new LinkCommand("#config"));
+ subsystemsMenu.addItem(new EMenuItem("Alert Definitions", LinkManager.getSubsystemAlertDefsLink(), "subsystems/alert/Alerts_16.png"));//, new LinkCommand("#config"));
+
+
+ final Menu overviewMenu = new Menu();
+ overviewMenu.setTitle("Overview");
+ overviewMenu.setStyleName("SimpleMenuBarButton");
+ overviewMenu.setBorder("none");
+ com.smartgwt.client.widgets.menu.MenuItem subsystemsSubMenuItem = new com.smartgwt.client.widgets.menu.MenuItem("Subsystems");
+ subsystemsSubMenuItem.setSubmenu(subsystemsMenu);
+ overviewMenu.addItem(subsystemsSubMenuItem);
+ overviewMenu.addItem(new EMenuItem("AutoDiscovery Queue",LinkManager.getAutodiscoveryQueueLink()));//,new LinkCommand("#cofng"));
+ overviewMenu.addItem(new EMenuItem("Dashboard",LinkManager.getDashboardLink()));//,new LinkCommand("#cofng"));
+ overviewMenu.addItem(new EMenuItem("Bundles", "#Bundles"));
+
+
+ Menu resourcesMenu = new Menu();
+ resourcesMenu.setTitle("Resources");
+ resourcesMenu.setStyleName("SimpleMenuBarButton");
+ resourcesMenu.setBorder("none");
+ resourcesMenu.setStyleName("menuBarMenuButton");
+ resourcesMenu.addItem(new EMenuItem("All Resources", LinkManager.getHubAllResourcesLink()));//, new LinkCommand("#fsdf"));
+ resourcesMenu.addItem(new EMenuItem("Platforms", LinkManager.getHubPlatformsLink(),"types/Platform_up_16.png"));//, new LinkCommand("#fsdf"));
+ resourcesMenu.addItem(new EMenuItem("Servers", LinkManager.getHubServerssLink(), "types/Server_up_16.png"));//, new LinkCommand("#fsdf"));
+ resourcesMenu.addItem(new EMenuItem("Services", LinkManager.getHubServicesLink(), "types/Service_up_16.png"));//, new LinkCommand("#fsdf"));
+ resourcesMenu.addItem(new MenuItemSeparator());
+// resourcesMenu.addItem(new MenuItem("Favorite Resources"));//,)
+
+ Menu groupsMenu = new Menu();
+ groupsMenu.setStyleName("menuBarMenuButton");
+ groupsMenu.setTitle("Groups");
+ groupsMenu.addItem(new EMenuItem("All Groups", LinkManager.getHubAllGroupsLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new EMenuItem("Compatible Groups", LinkManager.getHubCompatibleGroupsLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new EMenuItem("Mixed Groups", LinkManager.getHubMixedGroupsLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new EMenuItem("Group Definitions", LinkManager.getHubGroupDefinitionsLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new MenuItemSeparator());
+ groupsMenu.addItem(new EMenuItem("New Group", LinkManager.getHubNewGroupLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new EMenuItem("New Group Definition", LinkManager.getHubNewGroupDefLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new MenuItemSeparator());
+// groupsMenu.addItem(new MenuItem("Favorites")); //, new LinkCommand("#sf"));
+
+
+ Menu securityMenu = new Menu();
+ securityMenu.setTitle("Security");
+ securityMenu.addItem(new EMenuItem("Users",LinkManager.getAdminUsersLink()));
+ securityMenu.addItem(new EMenuItem("Roles",LinkManager.getAdminRolesLink()));
+ MenuItem securitySubMenuItem = new MenuItem("Security");
+ securitySubMenuItem.setSubmenu(securityMenu);
+
+
+ Menu sysConfigMenu = new Menu();
+ sysConfigMenu.setTitle("System Configuration");
+ sysConfigMenu.addItem(new EMenuItem("Settings",LinkManager.getAdminSysConfigLink()));
+ sysConfigMenu.addItem(new EMenuItem("Plugins",LinkManager.getAdminPluginsLink()));
+ sysConfigMenu.addItem(new EMenuItem("Templates",LinkManager.getAdminTemplatesLink()));
+ MenuItem sysConfigSubMenuItem = new MenuItem("System Configuration");
+ sysConfigSubMenuItem.setSubmenu(sysConfigMenu);
+
+
+ Menu contentMenu = new Menu();
+ contentMenu.setTitle("Content");
+ contentMenu.addItem(new EMenuItem("Content Providers",LinkManager.getAdminContentProvidersLink()));
+ contentMenu.addItem(new EMenuItem("Content Repositories",LinkManager.getAdminContentReposLink()));
+ MenuItem contentSubMenuItem = new MenuItem("Content");
+ contentSubMenuItem.setSubmenu(contentMenu);
+
+
+ Menu haMenu = new Menu();
+ haMenu.setTitle("High Availability");
+ haMenu.addItem(new EMenuItem("Servers",LinkManager.getHAServersLink()));
+ haMenu.addItem(new EMenuItem("Agents",LinkManager.getHAAgentsLink()));
+ haMenu.addItem(new EMenuItem("Affinity Groups",LinkManager.getHAAffinityGroupsLink()));
+ haMenu.addItem(new EMenuItem("Partition Events",LinkManager.getHAEventsLink()));
+ MenuItem haSubMentItem = new MenuItem("High Availability");
+ haSubMentItem.setSubmenu(haMenu);
+
+
+ Menu reportsMenu = new Menu();
+ reportsMenu.setTitle("Reports");
+ reportsMenu.addItem(new EMenuItem("Resource Version Inventory Report", LinkManager.getReportsInventoryLink()));
+ MenuItem reportsSubMenuItem = new MenuItem("Reports");
+ reportsSubMenuItem.setSubmenu(reportsMenu);
+
+
+ Menu adminMenu = new Menu();
+ adminMenu.setTitle("Administration");
+ adminMenu.addItem(securitySubMenuItem);
+ adminMenu.addItem(sysConfigSubMenuItem);
+ adminMenu.addItem(contentSubMenuItem);
+ adminMenu.addItem(haSubMentItem);
+ adminMenu.addItem(reportsSubMenuItem);
+ adminMenu.addItem(new EMenuItem("Downloads", LinkManager.getAdminDownloadsLink()));
+ adminMenu.addItem(new EMenuItem("License", LinkManager.getAdminLicenseLink()));
+
+
+
+
+
+ Menu helpMenu = new Menu();
+ helpMenu.setStyleName("menuBarMenuButton");
+ helpMenu.setTitle("Help");
+ helpMenu.addItem(new EMenuItem("Online Documentation", "http://www.rhq-project.org")); //, new LinkCommand("#sdfs"));
+ helpMenu.addItem(new EMenuItem("Open a support case", "http://www.rhq-project.org")); //, new LinkCommand("#sdfs"));
+// helpMenu.addItem(new MenuItem("About")); //, new LinkCommand("#sdfs"));
+
+ menu.setMenus(overviewMenu, resourcesMenu, groupsMenu, adminMenu, helpMenu);
+
+
+ topBar.addMember(menu);
+
+
+ addMember(topBar);
+ addMember(new SearchBarPane());
+
}
protected void onDraw2() {
@@ -79,9 +245,25 @@ public class MenuBarView extends VLayout {
// @Override
- protected void onDraw() {
+
+ protected void onDraw3() {
super.onDraw();
+ History.addValueChangeHandler(new ValueChangeHandler<String>() {
+ public void onValueChange(ValueChangeEvent<String> stringValueChangeEvent) {
+ String first = stringValueChangeEvent.getValue().split("/")[0];
+
+ if ("Resource".equals(first)) {
+ first = "Inventory";
+ }
+
+ selected = first;
+ linksPane.setContents(setupLinks());
+ linksPane.markForRedraw();
+ }
+ });
+
+
ToolStrip topStrip = new ToolStrip();
topStrip.setHeight(34);
topStrip.setWidth100();
@@ -148,7 +330,7 @@ public class MenuBarView extends VLayout {
private String setupLinks() {
StringBuilder headerString = new StringBuilder(
- "<table style=\"height: 34px;\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
+ "<table style=\"height: 34px;\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
boolean first = true;
for (String section : SECTIONS) {
@@ -173,4 +355,35 @@ public class MenuBarView extends VLayout {
return headerString.toString();
}
+
+
+ public static class EMenuItem extends com.smartgwt.client.widgets.menu.MenuItem {
+
+ String link;
+
+ public EMenuItem(String title, String link) {
+ super(title);
+ this.link = link;
+ init();
+ }
+
+ public EMenuItem(String title, String link, String icon) {
+ super(title, icon);
+ this.link = link;
+ init();
+ }
+
+ private void init() {
+ addClickHandler(new com.smartgwt.client.widgets.menu.events.ClickHandler() {
+ public void onClick(MenuItemClickEvent menuItemClickEvent) {
+ if (link.startsWith("#")) {
+ History.newItem(link.substring(1));
+ } else {
+ Window.Location.assign(link);
+ }
+ }
+ });
+ }
+ }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
index 2792255..c97936c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
@@ -41,6 +41,9 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
*/
public class TagCloudView extends VLayout {
+ private PageList<TagReportComposite> tags;
+
+ private String selectedTag;
@Override
protected void onDraw() {
@@ -58,13 +61,13 @@ public class TagCloudView extends VLayout {
drawTags(result);
}
});
-
-
}
private void drawTags(PageList<TagReportComposite> tags) {
+ this.tags = tags;
+
addMember(new HeaderLabel("Tag Cloud"));
long max = 0;
@@ -82,7 +85,6 @@ public class TagCloudView extends VLayout {
}
});
-
StringBuilder buf = new StringBuilder();
int minFont = 8;
@@ -92,16 +94,25 @@ public class TagCloudView extends VLayout {
int font = (int) ((((double) tag.getTotal()) / (double) max) * (maxFont - minFont)) + minFont;
+ buf.append("<a href=\"#Tag/" + tag.getTag().toString() + "\" style=\"font-size: " + font + "pt; margin: 8px;\"");
- buf.append("<a href=\"#Tag/" + tag.getTag().toString() + "\" style=\"font-size: " + font + "pt; margin: 8px;\">" + tag.getTag().toString() + "</a> ");
-
+ if (tag.getTag().toString().equals(selectedTag)) {
+ buf.append(" class=\"selectedTag\"");
+ }
+ buf.append(">" + tag.getTag().toString() + "</a> ");
}
HTMLFlow flow = new HTMLFlow(buf.toString());
addMember(flow);
+ }
+
+ public void setSelectedTag(String selectedTag) {
+ this.selectedTag = selectedTag;
+ removeMembers(getMembers());
+ drawTags(tags);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
index 996c199..f837397 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
@@ -22,24 +22,16 @@
*/
package org.rhq.enterprise.gui.coregui.client.report.tag;
-import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.layout.SectionStack;
-import com.smartgwt.client.widgets.layout.SectionStackSection;
import com.smartgwt.client.widgets.layout.VLayout;
-import com.smartgwt.client.widgets.tile.TileGrid;
import com.smartgwt.client.widgets.tile.TileLayout;
-import org.rhq.core.domain.criteria.TagCriteria;
import org.rhq.core.domain.tagging.Tag;
-import org.rhq.core.domain.tagging.compsite.TagReportComposite;
-import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.bundle.list.BundlesListView;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
/**
@@ -47,17 +39,16 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchVi
*/
public class TaggedView extends VLayout implements BookmarkableView {
-
- private SectionStack sectionStack;
+ private TagCloudView tagCloudView;
private Criteria criteria;
- private SectionStackSection resourceSection;
private ResourceSearchView resourceView;
- private SectionStackSection bundleSection;
private BundlesListView bundlesView;
+ private TileLayout tileLayout;
+
public TaggedView() {
setWidth100();
setHeight100();
@@ -67,32 +58,19 @@ public class TaggedView extends VLayout implements BookmarkableView {
protected void onInit() {
super.onInit();
- TagCloudView tagCloudView = new TagCloudView();
+ tagCloudView = new TagCloudView();
tagCloudView.setAutoHeight();
addMember(tagCloudView);
-//
-// sectionStack = new SectionStack();
-// sectionStack.setHeight("*");
-//
-// sectionStack.addSection(getResourceStack());
-//
-// sectionStack.addSection(getBundleStack());
-//
-// addMember(sectionStack);
-
- TileLayout tileLayout = new TileLayout();
- tileLayout.setWidth100();
- tileLayout.setTileHeight(250);
- tileLayout.setTileWidth(getWidth()/2 - 20);
- addMember(tileLayout);
-
- tileLayout.addTile(getResourceCanvas());
- tileLayout.addTile(getBundleCanvas());
+ }
+ @Override
+ protected void onDraw() {
+ super.onDraw();
}
private void viewTag(String tagString) {
+ tagCloudView.setSelectedTag(tagString);
Tag tag = new Tag(tagString);
@@ -102,40 +80,38 @@ public class TaggedView extends VLayout implements BookmarkableView {
criteria.addCriteria("tagName", tag.getName());
- resourceView.refresh(criteria);
- bundlesView.refresh(criteria);
+ if (tileLayout == null) {
+ tileLayout = new TileLayout();
+ tileLayout.setWidth100();
+ tileLayout.setTileHeight(250);
+ tileLayout.setTileWidth(getWidth() / 2 - 20);
+ addMember(tileLayout);
-/* TagCriteria criteria = new TagCriteria();
- criteria.addFilterNamespace(tag.getNamespace());
- criteria.addFilterSemantic(tag.getSemantic());
- criteria.addFilterName(tag.getName());
+ tileLayout.addTile(getResourceCanvas(criteria));
+ tileLayout.addTile(getBundleCanvas(criteria));
- GWTServiceLookup.getTagService().findTagReportCompositesByCriteria(criteria, new AsyncCallback<PageList<TagReportComposite>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to load tag report",caught);
- }
+ }
- public void onSuccess(PageList<TagReportComposite> result) {
- TagReportComposite tagReport = result.get(0);
- sectionStack.setSectionTitle(0, "Resources: " + tagReport.getResourceCount());
- sectionStack.setSectionTitle(1, "Bundles: " + tagReport.getBundleCount());
- }
- });*/
+ resourceView.refresh(criteria);
+ bundlesView.refresh(criteria);
}
- private Canvas getResourceCanvas() {
- resourceView = new ResourceSearchView("Tagged Resources", new String[]{"pluginName","category","currentAvailability"});
+
+ private Canvas getResourceCanvas(Criteria criteria) {
+ resourceView = new ResourceSearchView(criteria, "Tagged Resources", new SortSpecifier[] {},new String[]{"pluginName", "category", "currentAvailability"});
resourceView.setShowFooter(false);
return resourceView;
}
- private Canvas getBundleCanvas() {
- bundlesView = new BundlesListView();
+
+ private Canvas getBundleCanvas(Criteria criteria) {
+ bundlesView = new BundlesListView(criteria);
bundlesView.setShowFooter(false);
return bundlesView;
}
+
public void renderView(ViewPath viewPath) {
if (!viewPath.isEnd()) {
String tagString = viewPath.getCurrent().getPath();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
index faf5121..b3820a9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
@@ -55,6 +55,7 @@ public class MessageCenterView extends HLayout implements MessageCenter.MessageL
public MessageCenterView() {
super(5);
+ setHeight100();
setAlign(Alignment.LEFT);
setAlign(VerticalAlignment.CENTER);
setOverflow(Overflow.CLIP_H);
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
index 4b8b087..05997e8 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
@@ -301,4 +301,54 @@ a:hover {
font-size: 11px;
padding: 2px;
font-weight: bold;
+}
+
+
+.topMenuBar {
+ background: url('/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images/cssButton/button_stretch.png') repeat-x scroll 0 0 #DDDDDD;
+}
+
+.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled {
+ border: none;
+ font-weight: bold;
+}
+
+
+
+/** Not used right now **/
+.gwtMenuBar {
+ background-image: url('images/header/header_bg.png');
+ /*background-image: url("http://localhost:7080/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/ski…");*/
+ background-repeat: repeat-x;
+ padding: 0px;
+ -moz-box-sizing: border-box;
+ overflow: hidden;
+ cursor: auto;
+ z-index: 9999999;
+}
+
+.gwtMenu, .gwt-MenuBarPopup, .gwt-MenuPopup {
+ z-index: 9999999;
+ background-color: white;
+}
+
+.gwt-MenuItem {
+ padding: 0 10px;
+ font-weight: bold;
+ color: #666666;
+ font-size: 9pt;
+}
+
+.gwt-MenuItemSeparator {
+ background-color: #666666;
+}
+
+.gwt-MenuItem-Selected {
+ background-color: #999999;
+}
+
+.selectedTag {
+ background-color: lightblue;
+ padding: 5px;
+ border: 1px solid darkblue;
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
index 32b1682..fb46e97 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
@@ -1,7 +1,6 @@
<html>
<head>
<title>RHQ Core Application</title>
- <link rel="stylesheet" href="CoreGUI.css">
<link rel="icon" type="image/png" href="/images/favicon.png" />
<link rel="apple-touch-icon" href="/images/favicon.png" />
@@ -10,6 +9,15 @@
</script>
+ <link rel="stylesheet" href="CoreGUI.css">
+
+ <style type="text/css">
+ .menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled {
+ border: none;
+ font-weight: bold;
+ }
+
+ </style>
</head>
<body>
<script type="text/javascript" language="javascript"
commit ffe84cae9d1c490df76047d26fb1fe85d6617f23
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 27 08:56:08 2010 -0400
fiddle with some test code - these still won't pass - still need to wait for the ant stuff to be completed
diff --git a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
index cd0e4c1..2eb1d85 100644
--- a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
+++ b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
@@ -166,9 +166,7 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
int deploymentId = bundleDeployment.getId();
antProps.setProperty(DeployPropertyNames.DEPLOY_ID, Integer.toString(deploymentId));
- if (bundleDeployment.getName() != null) {
- antProps.setProperty(DeployPropertyNames.DEPLOY_NAME, bundleDeployment.getName());
- }
+ antProps.setProperty(DeployPropertyNames.DEPLOY_NAME, bundleDeployment.getName());
antProps.setProperty(DeployPropertyNames.DEPLOY_REVERT, String.valueOf(request.isRevert()));
antProps.setProperty(DeployPropertyNames.DEPLOY_CLEAN, String.valueOf(request.isCleanDeployment()));
diff --git a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
index 6a9d845..c4dc63e 100644
--- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
+++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
@@ -57,7 +57,7 @@ import org.rhq.core.system.SystemInfoFactory;
import org.rhq.core.util.file.FileUtil;
import org.rhq.core.util.stream.StreamUtil;
-@Test
+@Test(enabled = false)
public class AntBundlePluginComponentTest {
private static final String USER_HOME = System.getProperty("user.home");
@@ -84,12 +84,11 @@ public class AntBundlePluginComponentTest {
this.plugin.start(context);
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void cleanTmpDir() {
FileUtil.purge(this.tmpDir, true);
}
- @Test(enabled = false)
/**
* Test a simple Ant script that contains no RHQ tasks other than rhq:bundle.
*/
@@ -103,6 +102,7 @@ public class AntBundlePluginComponentTest {
getRecipeFromFile("test-bundle-v1.xml"));
BundleDeployment deployment = new BundleDeployment();
+ deployment.setName("test bundle deployment name");
deployment.setBundleVersion(bundleVersion);
deployment.setConfiguration(null);
@@ -124,7 +124,6 @@ public class AntBundlePluginComponentTest {
/**
* Test a Ant script that includes all of the RHQ tasks.
*/
- @Test(enabled = false)
public void testAntBundle() throws Exception {
ResourceType resourceType = new ResourceType("testSimpleBundle", "plugin", ResourceCategory.SERVER, null);
BundleType bundleType = new BundleType("testSimpleBundle", resourceType);
@@ -141,6 +140,7 @@ public class AntBundlePluginComponentTest {
config.put(new PropertySimple("custom.prop2", "custom property 2"));
BundleDeployment deployment = new BundleDeployment();
+ deployment.setName("test bundle deployment name");
deployment.setBundleVersion(bundleVersion);
deployment.setConfiguration(config);
deployment.setDestination(destination);
diff --git a/modules/plugins/ant-bundle/src/test/resources/test-build.xml b/modules/plugins/ant-bundle/src/test/resources/test-build.xml
index e4e062b..6ab366a 100644
--- a/modules/plugins/ant-bundle/src/test/resources/test-build.xml
+++ b/modules/plugins/ant-bundle/src/test/resources/test-build.xml
@@ -5,20 +5,25 @@
<echo>basedir=${basedir}</echo>
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <rhq:input-property
- name="custom.prop1"
- description="my prop 1"
- required="true"
- defaultValue="default 1"/>
-
- <rhq:input-property
- name="custom.prop2"
- description="my prop 2"
- required="true"
- defaultValue="default 2"/>
+ <rhq:bundle name="example.com (JBoss EAP 4.3)"
+ version="1.0"
+ description="example.com corporate website hosted on JBoss EAP 4.3" >
+ <rhq:input-property
+ name="custom.prop1"
+ description="my prop 1"
+ required="true"
+ defaultValue="default 1"/>
+
+ <rhq:input-property
+ name="custom.prop2"
+ description="my prop 2"
+ required="true"
+ defaultValue="default 2"/>
+
+ <rhq:deployment name="test-product">
+ <rhq:file name="product.zip"/>
+ </rhq:deployment>
+ </rhq:bundle>
<property name="outfile" value="${basedir}/output.2" />
1
0
dev/null |binary
modules/cli-tests/src/test/resources/test-ant-bundle-v1.xml | 38 ---
modules/cli-tests/src/test/resources/test-ant-bundle-v2.xml | 38 ---
modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip |binary
modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip |binary
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_InstallAntBundle.js | 121 ----------
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js | 27 +-
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js | 38 ++-
8 files changed, 49 insertions(+), 213 deletions(-)
New commits:
commit ec5b06356ca5acd1d3a72ad0fa77d8b2e5f96672
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 27 13:37:06 2010 -0400
fix the cli tests to use the latest apis
diff --git a/modules/cli-tests/src/test/resources/test-ant-bundle-v1.xml b/modules/cli-tests/src/test/resources/test-ant-bundle-v1.xml
deleted file mode 100644
index e874c63..0000000
--- a/modules/cli-tests/src/test/resources/test-ant-bundle-v1.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="example.com-website" default="deploy"
- xmlns:rhq="antlib:org.rhq.bundle">
-
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <rhq:input-property
- name="http.port"
- description="the HTTP port the JBoss EAP server should listen on"
- required="true"
- type="integer"/>
-
- <rhq:input-property
- name="https.port"
- description="the HTTPS port the JBoss EAP server should listen on"
- required="true"
- type="integer"/>
-
- <target name="deploy">
- <echo>Deploying example.com website v1.0 to ${rhq.deploy.dir}...</echo>
- <rhq:deploy>
- <rhq:archive name="test-ant-bundle-v1.zip"/>
- <rhq:replace>
- <!-- If no 'dir' attribute is specified, rhq:fileset defaults to ${rhq.deploy.dir}. -->
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
- <rhq:ignore>
- <rhq:fileset>
- <include name="jbossas/server/default/data/**"/>
- <include name="jbossas/server/default/logs/**"/>
- <include name="jbossas/server/default/tmp/**"/>
- <include name="jbossas/server/default/work/**"/>
- </rhq:fileset>
- </rhq:ignore>
- </rhq:deploy>
- </target>
-
-</project>
diff --git a/modules/cli-tests/src/test/resources/test-ant-bundle-v1.zip b/modules/cli-tests/src/test/resources/test-ant-bundle-v1.zip
deleted file mode 100644
index a877718..0000000
Binary files a/modules/cli-tests/src/test/resources/test-ant-bundle-v1.zip and /dev/null differ
diff --git a/modules/cli-tests/src/test/resources/test-ant-bundle-v2.xml b/modules/cli-tests/src/test/resources/test-ant-bundle-v2.xml
deleted file mode 100644
index b825a0f..0000000
--- a/modules/cli-tests/src/test/resources/test-ant-bundle-v2.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="example.com-website" default="deploy"
- xmlns:rhq="antlib:org.rhq.bundle">
-
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="2.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <rhq:input-property
- name="http.port"
- description="the HTTP port the JBoss EAP server should listen on"
- required="true"
- type="integer"/>
-
- <rhq:input-property
- name="https.port"
- description="the HTTPS port the JBoss EAP server should listen on"
- required="true"
- type="integer"/>
-
- <target name="deploy">
- <echo>Deploying example.com website v2.0 to ${rhq.deploy.dir}...</echo>
- <rhq:deploy>
- <rhq:archive name="test-ant-bundle-v2.zip"/>
- <rhq:replace>
- <!-- If no 'dir' attribute is specified, rhq:fileset defaults to ${rhq.deploy.dir}. -->
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
- <rhq:ignore>
- <rhq:fileset>
- <include name="jbossas/server/default/data/**"/>
- <include name="jbossas/server/default/logs/**"/>
- <include name="jbossas/server/default/tmp/**"/>
- <include name="jbossas/server/default/work/**"/>
- </rhq:fileset>
- </rhq:ignore>
- </rhq:deploy>
- </target>
-
-</project>
diff --git a/modules/cli-tests/src/test/resources/test-ant-bundle-v2.zip b/modules/cli-tests/src/test/resources/test-ant-bundle-v2.zip
deleted file mode 100644
index d5cd21c..0000000
Binary files a/modules/cli-tests/src/test/resources/test-ant-bundle-v2.zip and /dev/null differ
diff --git a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip
index 4254981..3f06dac 100644
Binary files a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip and b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip differ
diff --git a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip
index c6963b2..b58a872 100644
Binary files a/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip and b/modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip differ
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_InstallAntBundle.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_InstallAntBundle.js
deleted file mode 100644
index 57b2d86..0000000
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_InstallAntBundle.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/**
- * Thus test script works with a real env including at least one platform resource and a running agent on
- * said platform.
- */
-
-var TestsEnabled = true;
-
-var bundleName = 'Test Ant Bundle';
-
-// note, super-user, will not test any security constraints
-var subject = rhq.login('rhqadmin', 'rhqadmin');
-
-executeAllTests();
-
-rhq.logout();
-
-function testDeployment() {
- if ( !TestsEnabled ) {
- return;
- }
-
- var v1 = "1.0";
- var v2 = "2.0";
-
- // delete the test bundle if it exists
- var bc = new BundleCriteria();
- bc.addFilterName( bundleName );
- var bundles = BundleManager.findBundlesByCriteria( bc );
- if ( null != bundles && bundles.size() > 0 ) {
- print( "\n Deleting existing " + bundleName + " bundle in order to test a fresh deploy...")
- BundleManager.deleteBundle( bundles.get(0).getId() );
- }
-
- // create the test bundle
- var testBundle = BundleManager.createBundle( bundleName, "my fake bundle", getBundleType() );
-
- // define the recipe for bundleVersion 1.0
- var recipe = scriptUtil.getFileString("./src/test/resources/test-ant-bundle-v1.xml");
-
- // create bundleVersion 1.0
- var testBundleVersion = BundleManager.createBundleVersion( testBundle.getId(), bundleName, "my fake bundle version", v1, recipe);
-
- // add the single bundleFile, the test war file
- var fileBytes = scriptUtil.getFileBytes("./src/test/resources/test-ant-bundle-v1.zip");
- var bundleFile = BundleManager.addBundleFileViaByteArray(testBundleVersion.getId(), "test-ant-bundle-v1.zip", v1, null, fileBytes);
-
- // create the config, setting the required properties from the recipe
- var config = new Configuration();
- config.put( new PropertySimple("http.port", "8080") );
- config.put( new PropertySimple("https.port", "8443") );
-
- // create a deployment using the above config
- var testDeployment = BundleManager.createBundleDeployment(testBundleVersion.getId(), "Test Ant Bundle Deployment", "my fake bundle deployment", "/tmp/antbundletest", config);
-
- // Find a target platform
- var rc = new ResourceCriteria();
- rc.addFilterResourceTypeName("in"); // wINdows, lINux
- var platforms = ResourceManager.findResourcesByCriteria(rc);
- var platformId = platforms.get(0).getId();
-
- var bundleScheduleResponse = BundleManager.scheduleBundleResourceDeployment(testDeployment.getId(), platformId);
-
- //
- // UPGRADE IT NOW
- //
-
- // define the recipe for bundleVersion 2.0
- recipe = scriptUtil.getFileString("./src/test/resources/test-ant-bundle-v2.xml");
-
- // create bundleVersion 2.0
- testBundleVersion = BundleManager.createBundleVersion( testBundle.getId(), bundleName, "my fake bundle version", v2, recipe);
-
- // add the second bundleFile using the ViaURL API
- var fileUrl = new java.io.File("./src/test/resources/test-ant-bundle-v2.zip").toURI().toURL();
- bundleFile = BundleManager.addBundleFileViaURL(testBundleVersion.getId(), "test-ant-bundle-v2.zip", v2, null, fileUrl);
-
- // create a deployment using the a different config as before
- // create the config, setting the required properties from the recipe
- var config2 = new Configuration();
- config2.put( new PropertySimple("http.port", "9090") );
- config2.put( new PropertySimple("https.port", "9443") );
- testDeployment = BundleManager.createBundleDeployment(testBundleVersion.getId(), "Test Ant Bundle Deployment 2", "my fake bundle deployment 2", "/tmp/antbundletest", config2);
-
- // deploy to the same platform as before
- var bundleScheduleResponse = BundleManager.scheduleBundleResourceDeployment(testDeployment.getId(), platformId);
-}
-
-function getBundleType() {
-
- var types = BundleManager.getAllBundleTypes();
- for (i=0; ( i < types.size()); ++i ) {
- if ( types.get(i).getName().equals( "Ant Bundle" )) {
- return types.get(i).getId();
- }
- }
-
- print( "\n Could not find Ant bundle type - is the plugin loaded?");
-}
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
index 15d0463..19e6e4d 100644
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
+++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
@@ -100,12 +100,27 @@ function testGroupDeployment() {
}
function getGroupId() {
- // Find a target platform group
- var rgc = new ResourceGroupCriteria();
- rgc.addFilterName("platforms");
- var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc);
- Assert.assertTrue( groups.size() > 0, "need a group called platforms for this test" );
- return groups.get(0).getId();
+ // Find a target platform group
+ var rgc = new ResourceGroupCriteria();
+ rgc.addFilterName("platforms");
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc);
+ var groupId;
+ // create if needed (and possible)
+ if ( groups.isEmpty() ) {
+ var c = new ResourceCriteria();
+ c.addFilterResourceCategory(ResourceCategory.PLATFORM);
+ var platforms = ResourceManager.findResourcesByCriteria(c);
+ Assert.assertTrue( platforms.size() > 0 );
+ var rg = new ResourceGroup("platforms");
+ var platformSet = new java.util.HashSet();
+ platformSet.addAll( platforms );
+ rg.setExplicitResources(platformSet);
+ rg = ResourceGroupManager.createResourceGroup(rg);
+ groupId = rg.getId();
+ } else {
+ groupId = groups.get(0).getId();
+ }
+ return groupId;
}
function getBundleType() {
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js
index 2c4f96d..db33709 100644
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js
+++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js
@@ -86,24 +86,42 @@ function testGroupDeployment() {
var property23 = new PropertySimple("upgrade.test.new", "A NEW REPLACEMENT");
config2.put( property23 );
+ // create a destination to deploy to
+ var testDest = BundleManager.createBundleDestination(testBundleVersion1.getBundle().getId(), "upgrade destination", "upgrade destination", "/tmp/upgrade-bundle-ant-test", groupId);
+
// create a deployment of 1.0 using the 1.0 config
- var testDeployment = BundleManager.createBundleDeployment(testBundleVersion1.getId(), "Upgrade Deployment with Ant Test 1", "Creating initial ant bundle deployment to be upgraded", "/tmp/upgrade-bundle-ant-test", config1);
- var bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(), groupId);
+ var testDeployment = BundleManager.createBundleDeployment(testBundleVersion1.getId(), testDest.getId(), "Upgrade Deployment with Ant Test 1", "Creating initial ant bundle deployment to be upgraded", config1);
+ var bgd = BundleManager.scheduleBundleDeployment(testDeployment.getId(), true);
Assert.assertNotNull( bgd, "Failed to create 1.0 deployment" );
// upgrade the deployment to 2.0 using the 2.0 config
- testDeployment = BundleManager.createBundleDeployment(testBundleVersion2.getId(), "Upgrade Deployment with Ant Test 2", "Testing ant bundle upgrade deployment", "/tmp/upgrade-bundle-ant-test", config2);
- bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(), groupId);
+ testDeployment = BundleManager.createBundleDeployment(testBundleVersion2.getId(), testDest.getId(), "Upgrade Deployment with Ant Test 2", "Testing ant bundle upgrade deployment", config2);
+ bgd = BundleManager.scheduleBundleDeployment(testDeployment.getId(), false);
Assert.assertNotNull( bgd, "Failed to upgrade to 2.0 deployment" );
}
function getGroupId() {
- // Find a target platform group
- var rgc = new ResourceGroupCriteria();
- rgc.addFilterName("platforms");
- var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc);
- Assert.assertTrue( groups.size() > 0, "need a group called platforms for this test" );
- return groups.get(0).getId();
+ // Find a target platform group
+ var rgc = new ResourceGroupCriteria();
+ rgc.addFilterName("platforms");
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc);
+ var groupId;
+ // create if needed (and possible)
+ if ( groups.isEmpty() ) {
+ var c = new ResourceCriteria();
+ c.addFilterResourceCategory(ResourceCategory.PLATFORM);
+ var platforms = ResourceManager.findResourcesByCriteria(c);
+ Assert.assertTrue( platforms.size() > 0 );
+ var rg = new ResourceGroup("platforms");
+ var platformSet = new java.util.HashSet();
+ platformSet.addAll( platforms );
+ rg.setExplicitResources(platformSet);
+ rg = ResourceGroupManager.createResourceGroup(rg);
+ groupId = rg.getId();
+ } else {
+ groupId = groups.get(0).getId();
+ }
+ return groupId;
}
function getBundleType() {
1
0
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js | 11 ++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 4b3a38bde286be786c1a2bafc607376365293159
Merge: eb8c501... 6e01a49...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 27 12:38:36 2010 -0400
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
commit eb8c50193da8aea86329fbce45e63d07fe0abf4a
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 27 12:20:15 2010 -0400
fix to use the latest API
diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
index fb19a06..15d0463 100644
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
+++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
@@ -85,14 +85,17 @@ function testGroupDeployment() {
var property23 = new PropertySimple("upgrade.test.new", "A NEW REPLACEMENT");
config2.put( property23 );
+ // create a destination to deploy to
+ var testDest = BundleManager.createBundleDestination(testBundleVersion1.getBundle().getId(), "upgrade destination", "upgrade destination", "/tmp/upgrade-bundle-test", groupId);
+
// create a deployment of 1.0 using the 1.0 config
- var testDeployment = BundleManager.createBundleDeployment(testBundleVersion1.getId(), "Upgrade Deployment Test 1", "Creating initial deployment to be upgraded", "/tmp/upgrade-bundle-test", config1);
- var bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(), groupId);
+ var testDeployment = BundleManager.createBundleDeployment(testBundleVersion1.getId(), testDest.getId(), "Upgrade Deployment Test 1", "Creating initial deployment to be upgraded", config1);
+ var bgd = BundleManager.scheduleBundleDeployment(testDeployment.getId(), true);
Assert.assertNotNull( bgd, "Failed to create 1.0 deployment" );
// upgrade the deployment to 2.0 using the 2.0 config
- testDeployment = BundleManager.createBundleDeployment(testBundleVersion2.getId(), "Upgrade Deployment Test 2", "Testing upgrade deployment", "/tmp/upgrade-bundle-test", config2);
- bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(), groupId);
+ testDeployment = BundleManager.createBundleDeployment(testBundleVersion2.getId(), testDest.getId(), "Upgrade Deployment Test 2", "Testing upgrade deployment", config2);
+ bgd = BundleManager.scheduleBundleDeployment(testDeployment.getId(), false);
Assert.assertNotNull( bgd, "Failed to upgrade to 2.0 deployment" );
}
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java | 18 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 16 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java | 13 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java | 48 ++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 29 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java | 27 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 41 +----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java | 73 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 36 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 8 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 43 +++--
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 3
23 files changed, 261 insertions(+), 110 deletions(-)
New commits:
commit 6e01a497d59df4735dee428668251d606e35c189
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 11:46:06 2010 -0400
Bundle buttons and images
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
index 80af8fe..4c5ad03 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
@@ -89,6 +89,7 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
+ "\"/> " + destination.getName()));
DynamicForm form = new DynamicForm();
+ form.setWidth100();
form.setNumCols(4);
LinkItem bundleName = new LinkItem("bundle");
@@ -118,6 +119,11 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
tagItem.setCanvas(tagEditor);
tagItem.setRowSpan(4);
+ CanvasItem actionItem = new CanvasItem("actions");
+ actionItem.setShowTitle(false);
+ actionItem.setCanvas(getActionLayout());
+ actionItem.setRowSpan(4);
+
StaticTextItem created = new StaticTextItem("created", "Created");
created.setValue(new Date(destination.getCtime()));
@@ -130,7 +136,7 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
StaticTextItem path = new StaticTextItem("path", "Path");
path.setValue(destination.getDeployDir());
- form.setFields(bundleName, tagItem, created, destinationGroup, path);
+ form.setFields(bundleName, tagItem, actionItem, created, destinationGroup, path);
addMember(form);
@@ -139,26 +145,33 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
deployments.setShowResizeBar(true);
addMember(createDeploymentsTable());
+
+ detail = new Canvas();
+ detail.setHeight("50%");
+ detail.hide();
+ addMember(detail);
+ }
+
+ private Canvas getActionLayout() {
+ VLayout actionLayout = new VLayout();
IButton deployButton = new IButton("Deploy");
+ deployButton.setIcon("subsystems/bundle/BundleAction_Deploy_16.png");
deployButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
new BundleDeployWizard(destination).startBundleWizard();
}
});
- addMember(deployButton);
+ actionLayout.addMember(deployButton);
IButton revertButton = new IButton("Revert");
+ revertButton.setIcon("subsystems/bundle/BundleAction_Revert_16.png");
revertButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
new BundleRevertWizard(destination).startBundleWizard();
}
});
- addMember(revertButton);
-
- detail = new Canvas();
- detail.setHeight("50%");
- detail.hide();
- addMember(detail);
+ actionLayout.addMember(revertButton);
+ return actionLayout;
}
private Table createDeploymentsTable() {
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png
new file mode 100644
index 0000000..1cfd351
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png
new file mode 100644
index 0000000..fa06d44
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Delete_24.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png
new file mode 100644
index 0000000..f323445
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png
new file mode 100644
index 0000000..47b8a6e
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Deploy_24.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png
new file mode 100644
index 0000000..f59537a
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_16.png differ
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png
new file mode 100644
index 0000000..934800f
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleAction_Revert_24.png differ
commit d73773b42b3a1f6ee740cc9a33c31f851cf2283a
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 11:31:44 2010 -0400
refactored new bundle list view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
new file mode 100644
index 0000000..4c83319
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
@@ -0,0 +1,73 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.bundle.version;
+
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.types.SelectionAppearance;
+import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.enterprise.gui.coregui.client.bundle.list.BundleVersionDataSource;
+import org.rhq.enterprise.gui.coregui.client.components.table.Table;
+
+/**
+ * @author Greg Hinkle
+ */
+public class BundleVersionListView extends Table {
+
+
+ public BundleVersionListView() {
+ }
+
+ public BundleVersionListView(Criteria criteria) {
+ super("Bundle Versions", criteria);
+ setHeaderIcon("subsystems/bundle/BundleVersion_24.png");
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ setHeight100();
+
+ BundleVersionDataSource bundleVersionsDataSource = new BundleVersionDataSource();
+ setDataSource(bundleVersionsDataSource);
+
+ getListGrid().getField("id").setWidth("60");
+ getListGrid().getField("name").setWidth("25%");
+ getListGrid().getField("name").setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
+ return "<a href=\"#Bundles/Bundle/" + listGridRecord.getAttribute("bundleId") + "/versions/" + listGridRecord.getAttribute("id") + "\">" + o + "</a>";
+ }
+ });
+
+ getListGrid().getField("version").setWidth("10%");
+ getListGrid().getField("fileCount").setWidth("10%");
+ getListGrid().getField("description").setWidth("*");
+
+ getListGrid().setSelectionType(SelectionStyle.NONE);
+ getListGrid().setSelectionAppearance(SelectionAppearance.ROW_STYLE);
+
+ }
+}
commit fcb208d106ecf38f9ae7f3a4842a15885bc55aab
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 11:31:24 2010 -0400
Table cleanups in the bundle section
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java
index 31c506f..9e231bd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java
@@ -70,6 +70,7 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment>
@Override
protected void executeFetch(final DSRequest request, final DSResponse response) {
BundleDeploymentCriteria criteria = new BundleDeploymentCriteria();
+ criteria.fetchBundleVersion(true);
if (request.getCriteria().getValues().containsKey("bundleId")) {
criteria.addFilterBundleId(Integer.parseInt(request.getCriteria().getAttribute("bundleId")));
@@ -79,6 +80,18 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment>
criteria.addFilterBundleVersionId(Integer.parseInt(request.getCriteria().getAttribute("bundleVersionId")));
}
+ if (request.getCriteria().getValues().get("tagNamespace") != null) {
+ criteria.addFilterTagNamespace((String) request.getCriteria().getValues().get("tagNamespace"));
+ }
+
+ if (request.getCriteria().getValues().get("tagSemantic") != null) {
+ criteria.addFilterTagSemantic((String) request.getCriteria().getValues().get("tagSemantic"));
+ }
+
+ if (request.getCriteria().getValues().get("tagName") != null) {
+ criteria.addFilterTagName((String) request.getCriteria().getValues().get("tagName"));
+ }
+
bundleService.findBundleDeploymentsByCriteria(criteria, new AsyncCallback<PageList<BundleDeployment>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError("Failed to load bundle deployments", caught);
@@ -109,9 +122,14 @@ public class BundleDeploymentDataSource extends RPCDataSource<BundleDeployment>
record.setAttribute("createdTime", new Date(from.getCtime()));
record.setAttribute("configuration", from.getConfiguration());
+
if (from.getBundleVersion() != null) {
record.setAttribute("bundleVersionVersion", from.getBundleVersion().getVersion());
record.setAttribute("bundleVersionId", from.getBundleVersion().getId());
+
+ if (from.getBundleVersion().getBundle() != null) {
+ record.setAttribute("bundleId", from.getBundleVersion().getBundle().getId());
+ }
}
return record;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
index b0413b6..907a2a0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
@@ -47,12 +47,14 @@ public class BundleDeploymentListView extends Table {
public BundleDeploymentListView(Bundle bundle) {
- super("Bundle Versions");
+ super("Bundle Deployments");
this.bundle = bundle;
this.bundleId = bundle.getId();
+ }
-
+ public BundleDeploymentListView(Criteria criteria) {
+ super("Bundle Deployments", criteria);
}
public BundleDeploymentListView(BundleVersion bundleVersion) {
@@ -63,9 +65,12 @@ public class BundleDeploymentListView extends Table {
@Override
protected void onInit() {
super.onInit();
+ setHeaderIcon("subsystems/bundle/BundleDeployment_24.png");
+
- String title = "Bundle Versions";
+
+ String title = "Bundle Deployments";
Criteria criteria = new Criteria();
if (bundle != null) {
title = bundle.getName() + " deployments";
@@ -81,10 +86,11 @@ public class BundleDeploymentListView extends Table {
setDataSource(new BundleDeploymentDataSource());
-
+ getListGrid().getField("id").setWidth("60");
+ getListGrid().getField("name").setWidth("25%");
getListGrid().getField("name").setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord record, int i, int i1) {
- return "<a href=\"#Bundles/Bundle/" + bundleId + "/deployments/" + record.getAttribute("id") + "\">" + String.valueOf(o) + "</a>";
+ return "<a href=\"#Bundles/Bundle/" + record.getAttribute("bundleId") + "/deployments/" + record.getAttribute("id") + "\">" + String.valueOf(o) + "</a>";
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java
index 4787e40..a375981 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java
@@ -88,6 +88,19 @@ public class BundleDestinationDataSource extends RPCDataSource<BundleDestination
criteria.addFilterBundleId(Integer.parseInt(request.getCriteria().getAttributeAsString("bundleId")));
}
+ if (request.getCriteria().getValues().get("tagNamespace") != null) {
+ criteria.addFilterTagNamespace((String) request.getCriteria().getValues().get("tagNamespace"));
+ }
+
+ if (request.getCriteria().getValues().get("tagSemantic") != null) {
+ criteria.addFilterTagSemantic((String) request.getCriteria().getValues().get("tagSemantic"));
+ }
+
+ if (request.getCriteria().getValues().get("tagName") != null) {
+ criteria.addFilterTagName((String) request.getCriteria().getValues().get("tagName"));
+ }
+
+
criteria.fetchBundle(true);
criteria.fetchDeployments(true);
criteria.fetchGroup(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
index cffb484..0cd85a4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
@@ -28,7 +28,6 @@ import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.bundle.BundleDeploymentStatus;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
@@ -36,51 +35,43 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table;
/**
* @author Greg Hinkle
*/
-public class BundleDestinationListView extends VLayout {
+public class BundleDestinationListView extends Table {
- private Integer bundleId;
public BundleDestinationListView() {
- setWidth100();
- setHeight100();
+ super("Bundle Destinations");
+
}
- public BundleDestinationListView(Integer bundleId) {
- this();
- this.bundleId = bundleId;
+ public BundleDestinationListView(Criteria criteria) {
+ super("Bundle Destinations", criteria);
+ setHeaderIcon("subsystems/bundle/BundleDestination_24.png");
}
@Override
- protected void onDraw() {
- super.onDraw();
-
-
- Criteria criteria = new Criteria();
- if (bundleId != null) {
- criteria.setAttribute("bundleId",bundleId.intValue());
- }
+ protected void onInit() {
+ super.onInit();
- Table table = new Table("Bundle Destinations", criteria);
- table.setDataSource(new BundleDestinationDataSource());
+ setDataSource(new BundleDestinationDataSource());
- table.getListGrid().getField("id").setWidth(45);
- table.getListGrid().getField("name").setWidth("20%");
- table.getListGrid().getField("name").setCellFormatter(new CellFormatter() {
+ getListGrid().getField("id").setWidth(45);
+ getListGrid().getField("name").setWidth("20%");
+ getListGrid().getField("name").setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
return "<a href=\"#Bundles/Bundles/" + listGridRecord.getAttribute("bundleId") + "/destinations/" + listGridRecord.getAttribute("id") + "\">" + o + "</a>";
}
});
- table.getListGrid().getField("description").setWidth("15%");
- //table.getListGrid().getField("bundleName").setWidth("20%");
- table.getListGrid().hideField("bundleName");
- table.getListGrid().getField("groupName").setWidth("15%");
- table.getListGrid().getField("deployDir").setWidth("15%");
+ getListGrid().getField("description").setWidth("15%");
+ //getListGrid().getField("bundleName").setWidth("20%");
+ getListGrid().hideField("bundleName");
+ getListGrid().getField("groupName").setWidth("15%");
+ getListGrid().getField("deployDir").setWidth("15%");
- ListGridField status = table.getListGrid().getField("latestDeploymentStatus");
+ ListGridField status = getListGrid().getField("latestDeploymentStatus");
HashMap<String, String> statusIcons = new HashMap<String, String>();
statusIcons.put(BundleDeploymentStatus.IN_PROGRESS.name(), "subsystems/bundle/install-loader.gif");
statusIcons.put(BundleDeploymentStatus.FAILURE.name(), "subsystems/bundle/Warning_11.png");
@@ -91,8 +82,5 @@ public class BundleDestinationListView extends VLayout {
status.setValueIconHeight(11);
status.setWidth(80);
-
-
- addMember(table);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java
index 9a576a6..e8985c7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java
@@ -59,22 +59,30 @@ public class BundleVersionDataSource extends RPCDataSource<BundleVersion> {
addField(deploymentCountField);
}
- public int getBundleId() {
- return bundleId;
- }
-
- public void setBundleId(int bundleId) {
- this.bundleId = bundleId;
- }
-
@Override
protected void executeFetch(final DSRequest request, final DSResponse response) {
BundleVersionCriteria criteria = new BundleVersionCriteria();
- criteria.addFilterBundleId(this.bundleId);
criteria.fetchBundleFiles(true);
+ criteria.fetchBundle(true);
criteria.setPageControl(getPageControl(request));
+ if (request.getCriteria().getValues().get("bundleId") != null) {
+ criteria.addFilterBundleId(Integer.parseInt(String.valueOf(request.getCriteria().getValues().get("bundleId"))));
+ }
+
+ if (request.getCriteria().getValues().get("tagNamespace") != null) {
+ criteria.addFilterTagNamespace((String) request.getCriteria().getValues().get("tagNamespace"));
+ }
+
+ if (request.getCriteria().getValues().get("tagSemantic") != null) {
+ criteria.addFilterTagSemantic((String) request.getCriteria().getValues().get("tagSemantic"));
+ }
+
+ if (request.getCriteria().getValues().get("tagName") != null) {
+ criteria.addFilterTagName((String) request.getCriteria().getValues().get("tagName"));
+ }
+
bundleService.findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError("Failed to load bundle version data", caught);
@@ -112,6 +120,7 @@ public class BundleVersionDataSource extends RPCDataSource<BundleVersion> {
ListGridRecord record = new ListGridRecord();
record.setAttribute("id", from.getId());
+ record.setAttribute("bundleId", from.getBundle().getId());
record.setAttribute("name", from.getName());
record.setAttribute("description", from.getDescription());
record.setAttribute("version", from.getVersion());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
index 091ea7a..a75587f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.bundle.list;
import java.util.HashSet;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.SelectionAppearance;
import com.smartgwt.client.types.SelectionStyle;
@@ -46,8 +47,10 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.bundle.deployment.BundleDeploymentView;
import org.rhq.enterprise.gui.coregui.client.bundle.destination.BundleDestinationListView;
import org.rhq.enterprise.gui.coregui.client.bundle.destination.BundleDestinationView;
+import org.rhq.enterprise.gui.coregui.client.bundle.version.BundleVersionListView;
import org.rhq.enterprise.gui.coregui.client.bundle.version.BundleVersionView;
import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel;
+import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback;
@@ -82,6 +85,9 @@ public class BundleView extends VLayout implements BookmarkableView {
this.bundle = bundle;
+ addMember(new BackButton("Back to All Bundles", "Bundles"));
+
+
headerLabel = new HeaderLabel("subsystems/bundle/Bundle_24.png", bundle.getName());
@@ -112,8 +118,10 @@ public class BundleView extends VLayout implements BookmarkableView {
private Tab createDestinationsTab() {
Tab destinationsTab = new Tab("Destinations");
+ Criteria criteria = new Criteria();
+ criteria.addCriteria("bundleId", bundle.getId());
- destinationsTab.setPane(new BundleDestinationListView(bundle.getId()));
+ destinationsTab.setPane(new BundleDestinationListView(criteria));
return destinationsTab;
}
@@ -121,36 +129,13 @@ public class BundleView extends VLayout implements BookmarkableView {
private Tab createVersionsTab() {
Tab versionsTab = new Tab("Versions");
- bundleVersionsTable = new Table();
- bundleVersionsTable.setHeight100();
-
- BundleVersionDataSource bundleVersionsDataSource = new BundleVersionDataSource();
- bundleVersionsTable.setDataSource(bundleVersionsDataSource);
-
- bundleVersionsTable.getListGrid().getField("id").setWidth("60");
- bundleVersionsTable.getListGrid().getField("name").setWidth("25%");
- bundleVersionsTable.getListGrid().getField("name").setCellFormatter(new CellFormatter() {
- public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
- return "<a href=\"#Bundles/Bundle/" + bundle.getId() + "/versions/" + listGridRecord.getAttribute("id") + "\">" + o + "</a>";
- }
- });
+ Criteria criteria = new Criteria();
+ criteria.addCriteria("bundleId", bundleBeingViewed);
- bundleVersionsTable.getListGrid().getField("version").setWidth("10%");
- bundleVersionsTable.getListGrid().getField("fileCount").setWidth("10%");
- bundleVersionsTable.getListGrid().getField("description").setWidth("*");
-
- bundleVersionsTable.getListGrid().setSelectionType(SelectionStyle.NONE);
- bundleVersionsTable.getListGrid().setSelectionAppearance(SelectionAppearance.ROW_STYLE);
+ bundleVersionsTable = new BundleVersionListView(criteria);
versionsTab.setPane(bundleVersionsTable);
- // versions tab
- BundleVersionDataSource bvDataSource;
- bvDataSource = (BundleVersionDataSource) bundleVersionsTable.getDataSource();
- bvDataSource.setBundleId(bundleBeingViewed);
- bvDataSource.fetchData();
- bundleVersionsTable.getListGrid().invalidateCache(); // TODO: is there a better way to refresh?
-
return versionsTab;
}
@@ -239,7 +224,7 @@ public class BundleView extends VLayout implements BookmarkableView {
Bundle bundle = result.get(0);
viewId.getBreadcrumbs().set(0,new Breadcrumb(String.valueOf(bundle.getId()), bundle.getName()));
viewBundle(bundle, viewPath.getCurrent());
- viewId.getBreadcrumbs().add(new Breadcrumb(String.valueOf(bundle.getId()), bundle.getName()));
+// viewId.getBreadcrumbs().add(new Breadcrumb(String.valueOf(bundle.getId()), bundle.getName()));
CoreGUI.refreshBreadCrumbTrail();
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
index bd2cfe9..e6cfcd6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
@@ -53,6 +53,7 @@ public class BundlesListView extends Table {
public BundlesListView(Criteria criteria) {
super("Bundles", criteria);
+ setHeaderIcon("subsystems/bundle/Bundle_24.png");
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java
index e36289e..037418e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java
@@ -49,7 +49,7 @@ public class BundleTreeView extends TreeGrid {
setWidth100();
setHeight100();
- setShowRoot(true);
+// setShowRoot(true);
setAutoFetchData(true);
setAnimateFolders(false);
setSelectionType(SelectionStyle.SINGLE);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
index c678d6f..c668e84 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
@@ -42,6 +42,7 @@ import org.rhq.core.domain.criteria.BundleVersionCriteria;
import org.rhq.core.domain.tagging.Tag;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
+import org.rhq.enterprise.gui.coregui.client.Breadcrumb;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
@@ -189,6 +190,7 @@ public class BundleVersionView extends VLayout implements BookmarkableView {
public void renderView(final ViewPath viewPath) {
int bundleVersionId = Integer.parseInt(viewPath.getCurrent().getPath());
+ final ViewId viewId = viewPath.getCurrent();
BundleVersionCriteria criteria = new BundleVersionCriteria();
criteria.addFilterId(bundleVersionId);
@@ -205,7 +207,9 @@ public class BundleVersionView extends VLayout implements BookmarkableView {
}
public void onSuccess(PageList<BundleVersion> result) {
- viewBundleVersion(result.get(0), viewPath.getCurrent());
+ BundleVersion version = result.get(0);
+ viewBundleVersion(version, viewPath.getCurrent());
+ viewId.getBreadcrumbs().set(0,new Breadcrumb(String.valueOf(version.getId()), version.getName()));
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index d264d36..592bceb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -29,6 +29,7 @@ import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.IButton;
+import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
@@ -65,6 +66,8 @@ public class Table extends VLayout {
private Label tableInfo;
private String[] excludedFieldNames;
+ private String headerIcon;
+
private boolean showFooter = true;
@@ -170,16 +173,6 @@ public class Table extends VLayout {
}
}
- titleLayout = new HLayout();
- titleLayout.setAutoHeight();
- titleLayout.setAlign(VerticalAlignment.BOTTOM);
- titleLayout.addMember(title);
-
- if (titleComponent != null) {
- titleLayout.addMember(new LayoutSpacer());
- titleLayout.addMember(titleComponent);
- }
-
tableInfo.setWrap(false);
@@ -193,6 +186,22 @@ public class Table extends VLayout {
removeMembers(getMembers());
+
+ titleLayout = new HLayout();
+ titleLayout.setAutoHeight();
+ titleLayout.setAlign(VerticalAlignment.BOTTOM);
+
+ if (headerIcon != null) {
+ titleLayout.addMember(new Img(headerIcon,24, 24));
+ }
+
+ titleLayout.addMember(title);
+
+ if (titleComponent != null) {
+ titleLayout.addMember(new LayoutSpacer());
+ titleLayout.addMember(titleComponent);
+ }
+
addMember(titleLayout);
addMember(listGrid);
if (showFooter) {
@@ -335,6 +344,13 @@ public class Table extends VLayout {
this.extraWidgets.add(canvas);
}
+ public String getHeaderIcon() {
+ return headerIcon;
+ }
+
+ public void setHeaderIcon(String headerIcon) {
+ this.headerIcon = headerIcon;
+ }
private void refreshTableInfo() {
if (showFooter) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index 61cd57f..91627d2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -75,6 +75,8 @@ public class ResourceSearchView extends Table {
public ResourceSearchView(Criteria criteria, String title, SortSpecifier[] sortSpecifier, String[] excludeFields) {
super(title, criteria, sortSpecifier, excludeFields);
+ setHeaderIcon("types/Platform_up_24.png");
+
setWidth100();
setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
index c97936c..a166177 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
@@ -66,6 +66,10 @@ public class TagCloudView extends VLayout {
private void drawTags(PageList<TagReportComposite> tags) {
+ if (tags == null) {
+ return; // Tags still loading
+ }
+
this.tags = tags;
addMember(new HeaderLabel("Tag Cloud"));
@@ -96,6 +100,10 @@ public class TagCloudView extends VLayout {
buf.append("<a href=\"#Tag/" + tag.getTag().toString() + "\" style=\"font-size: " + font + "pt; margin: 8px;\"");
+
+ buf.append(" title=\"Tag used " + tag.getTotal() + " times\"");
+
+
if (tag.getTag().toString().equals(selectedTag)) {
buf.append(" class=\"selectedTag\"");
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
index f837397..b69eb0e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
@@ -22,6 +22,8 @@
*/
package org.rhq.enterprise.gui.coregui.client.report.tag;
+import java.util.ArrayList;
+
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.widgets.Canvas;
@@ -31,7 +33,11 @@ import com.smartgwt.client.widgets.tile.TileLayout;
import org.rhq.core.domain.tagging.Tag;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
+import org.rhq.enterprise.gui.coregui.client.bundle.deployment.BundleDeploymentListView;
+import org.rhq.enterprise.gui.coregui.client.bundle.destination.BundleDestinationListView;
import org.rhq.enterprise.gui.coregui.client.bundle.list.BundlesListView;
+import org.rhq.enterprise.gui.coregui.client.bundle.version.BundleVersionListView;
+import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
/**
@@ -43,9 +49,8 @@ public class TaggedView extends VLayout implements BookmarkableView {
private Criteria criteria;
- private ResourceSearchView resourceView;
- private BundlesListView bundlesView;
+ private ArrayList<Table> tiles = new ArrayList<Table>();
private TileLayout tileLayout;
@@ -88,27 +93,31 @@ public class TaggedView extends VLayout implements BookmarkableView {
tileLayout.setTileWidth(getWidth() / 2 - 20);
addMember(tileLayout);
- tileLayout.addTile(getResourceCanvas(criteria));
- tileLayout.addTile(getBundleCanvas(criteria));
- }
+ ResourceSearchView resourceView = new ResourceSearchView(criteria, "Tagged Resources", new SortSpecifier[]{}, new String[]{"pluginName", "category", "currentAvailability"});
+ tiles.add(resourceView);
- resourceView.refresh(criteria);
- bundlesView.refresh(criteria);
- }
+ BundlesListView bundlesView = new BundlesListView(criteria);
+ tiles.add(bundlesView);
+ BundleVersionListView bundleVersionListView = new BundleVersionListView(criteria);
+ tiles.add(bundleVersionListView);
- private Canvas getResourceCanvas(Criteria criteria) {
- resourceView = new ResourceSearchView(criteria, "Tagged Resources", new SortSpecifier[] {},new String[]{"pluginName", "category", "currentAvailability"});
- resourceView.setShowFooter(false);
- return resourceView;
- }
+ BundleDeploymentListView bundleDeploymentListView = new BundleDeploymentListView(criteria);
+ tiles.add(bundleDeploymentListView);
+ BundleDestinationListView bundleDestinationListView = new BundleDestinationListView(criteria);
+ tiles.add(bundleDestinationListView);
- private Canvas getBundleCanvas(Criteria criteria) {
- bundlesView = new BundlesListView(criteria);
- bundlesView.setShowFooter(false);
- return bundlesView;
+ for (Table t : tiles) {
+ t.setShowFooter(false);
+ tileLayout.addTile(t);
+ }
+ }
+
+ for (Table t : tiles) {
+ t.refresh(criteria);
+ }
}
commit 4f834c8e08c274914f9532bab0e869f2a5d372ec
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 11:28:56 2010 -0400
Links to bundle system in admin->content menu
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
index b493582..9f9995a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
@@ -71,6 +71,9 @@ public class MenuBarView extends VLayout {
protected void onDraw() {
super.onDraw();
+ this.aboutModalWindow = new AboutModalWindow();
+
+
// TODO GH: This is a nasty hack... it injects the css to override the smartgwt skin
String css = ".menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled {\n" +
" border: none;\n" +
@@ -131,7 +134,6 @@ public class MenuBarView extends VLayout {
overviewMenu.addItem(subsystemsSubMenuItem);
overviewMenu.addItem(new EMenuItem("AutoDiscovery Queue",LinkManager.getAutodiscoveryQueueLink()));//,new LinkCommand("#cofng"));
overviewMenu.addItem(new EMenuItem("Dashboard",LinkManager.getDashboardLink()));//,new LinkCommand("#cofng"));
- overviewMenu.addItem(new EMenuItem("Bundles", "#Bundles"));
Menu resourcesMenu = new Menu();
@@ -179,6 +181,7 @@ public class MenuBarView extends VLayout {
Menu contentMenu = new Menu();
contentMenu.setTitle("Content");
+ contentMenu.addItem(new EMenuItem("Bundles","#Bundles"));
contentMenu.addItem(new EMenuItem("Content Providers",LinkManager.getAdminContentProvidersLink()));
contentMenu.addItem(new EMenuItem("Content Repositories",LinkManager.getAdminContentReposLink()));
MenuItem contentSubMenuItem = new MenuItem("Content");
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
index 50efde2..ab5ece0 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml
@@ -344,6 +344,9 @@
<ui:remove>***** Administration > CONTENT *****</ui:remove>
<rich:menuGroup value="Content" rendered="#{GlobalPermissionsUIBean.inventory}">
+ <rich:menuItem submitMode="none" onclick="window.location = '/coregui/CoreGUI.html#Bundles'">
+ <h:outputText value="Bundles"/>
+ </rich:menuItem>
<rich:menuItem submitMode="none" onclick="window.location = '/rhq/content/listContentProviders.xhtml'">
<h:outputText value="Content Sources"/>
</rich:menuItem>
1
0
Tag 'RHQ_NAGIOS_PLUGIN_V1' created by Heiko W. Rupp <hwr(a)redhat.com> at 2010-05-27 15:34 +0000
First version of the nagios plugin that can be used to connect to nagios
and as-is monitor the default services with some metrics.
Changes since vRHQ_1_3_0_GA:
=Alexander Kiefer (1):
Corrected several errors both in discovery and component classes
Adam Young (178):
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Workaround for hosts files that cannot saved due to duplicate ipv4 and ipv6 entries
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
added a page for editing raw configs with static html, as well as a link to it from the config page
removed the dead source directory causing eclipse to barf on project import
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Workaround for hosts files that cannot saved due to duplicate ipv4 and ipv6 entries
Making the UI start to work. Added a backing component for the RawConfigs and rich faces support
Merged in changes from jsand with working db access
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
functioning read from raw config...with issues
removing code refactored away
Second interim checking for raw config editing
added config file for hudson
merged from master, minus two conflicts
Interim to getting the file upload working. Most likely this will get squashed. Checking in right now to provide a patch for asad
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'raw-config'
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq
Interim for file upload for raw config. This is not a complete solution, but the file upload works, and is worth checkpointing.
functioning upload, albeit an ugly one
restructured upload page to put displayed text below the upload box
checking with upload working, prior to attempting upgrade of rich
Upgraded version of rich edit
moved Rich edit up to SR1 to get bug fixes
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
replaced rich edit with standard textarea
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
turned off embedded mock objects in RawConfigCollection
ability to show raw or structued links from hte view page. Mocked functions for some areas still in effect.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Read only versions of the raw config pages
RawConfigDelegate now hold that changes on a persresource bases. RawConfigCollection is the request scoped facade that contains the touch points for the facelets code
Added session scoped classes
put slightly better mock files in place, to make cleare to the end user what goes where on the page
added pre tags so that the view pages show the underlying format
Replaced the download page with a seam component
upload page returns after upload
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
removed default text for full page
internationalization support and change to using correct method of reading config
Made object more serialization friendly
Revert "Made object more serialization friendly"
Integrated the translation from raw to structured and back. Not yest tested
moved the functionality from this file into the parent class
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Changes made in structured visible in raw
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Made the view pages use a non-edited version of the RawConfigDelegate.
Minor tweak to perform translation
straightening out the raws collection
Merge fixed
Corrected color for file list
Using css class and i18n support for the submit buttons
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Fixes for bugs https://bugzilla.redhat.com/show_bug.cgi?id=537141 and https://bugzilla.redhat.com/show_bug.cgi?id=537086
Added guards around the navigation links between raw and structured
Made links to structured conditional of structred being supported
Made navigation for the edit buttons universal: wroks no matter where clicked. Used for the view-raw.xhtml.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
updated .classpath sources
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merged Raw Config Collection Functionality into the class used for Structured, and dropped the ability to maintain multiple edits going at once.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Removed additional files that break the build
Cleaned up a handful of places that still referred to the rawConfigCollection and related classes
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Fixed download for raw config
Reduced the two round trips to one for updating configs.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Removed extra translation.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Cleaned up navigation, made it so view-raw tracks the link clicked
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Created a unit test for ConfigRenderer and primed the pump with mock objects
Created a unit test for ConfigRenderer and primed the pump with mock objects. This time added the test itself
Increasing the scope of the unit test.
Merging the raw config work into the JSF components, and removing from the facelet code.
Fixed unit test
Extended the unit test to run through additional components such as grid and image.
Cleaned up icons and sidebar navigation, toggles between edit in view
started pushing the decode and encode stuff into the appropriate portion of the jsf lifecycle.
removed temporary file.
Merge of current raw work with remote branch
ability to turn off toolbar. Read only is set from render. replaced some String literals with symbolic constants.
Still broken. Major refactroing of the config renderer so that the structured config is contained inside a panel. Might have broken something not visible from the test. Still working on re-enabling the save.
added toolbar in xhtml, removed it from tests, still broken
removed Overload tags. The functionas are defined in an interface, thus these are not properly overloads, but rather implementations. Eclipse complained.
removed Overload tags. The functionas are defined in an interface, thus these are not properly overloads, but rather implementations. Eclipse complained.
Added a javascript based proof of concept for raw config UI and two test pages to view.
Classpath changes, mostly for sources.
Use of visibility attribute to hide/show asterix
Made necessary changes so the javscript multi-file-edit works inside a webapp.
an intermediate checkin of some half completed custom tag for the raw config work.
added reset on file by file basis. Added Renderer and component for MultiFile, and changed the names in the tag library. The RawConfigRenderer and ConfigUIComponent are still there, but have no component names or tags
Fixed the Undo button colors and made the entire rendered area into a table, including the submit and reset buttons.
minor tweaks for spacing and removing the controls from the xhtml test page.
Validate prior to recording for Update.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config-confirm
Cleaned up exception handling.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config-confirm
Validate prior to recording for Update.
Cleaned up exception handling.
changing the exception handling strategy for the validation code on the agent side.
cleaned up exception handling.
If an excpetion bypassed the catch block of the inner loop, there was no string builder allocated to build the error message.
Cleaned up bad merge.
Update unit test.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config-confirm
Somehow, a bad version of the error messaging generted code has not gotten changed. This attempts to fix it.
Modified error message for collected exceptions to match unit test expected value.
removed amps version, now just check what facet is supported for configuration.
removed @Override annotation incorrectly added to interface implmentations
added a simple template engine and test for it.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config-confirm
Using the more efficient Java Matcher and Pattern classes over the String.replaceAll approach.
Made the member variable private.
Proof of concept for templating
Proof of concept for rhq template engine values.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config-confirm
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config-confirm
Extracted construction of templating engine to pair it with SystemInfo
Modified the key for template replacement.
Now templatizes during translation for structured to raw.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Catch and exception and return an empty template enginer if SystemInfoFactory throws and exception. Reorder operations in ConfigurationManager to not swallow a null exception.
Interim checkin of reporting meesages. This one is fairly invasive, in that it redefines a couple core exceptions.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Fixed unit tests and fixed bug on loading resrouces that support only structured.
removed test-output
making sure we ignore test output .
removing UNSENT as an option for config update status.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
removed option for enum value that no longer exists.
Added test for structured validation.
Fixed typo, removed temp file from test.
Instead of returning a null, the update method always returns a ResourceConfigurationUpdate object.
Isolated Exceptions thrown from Validation to prevent class not found errors on the server. Added correct result handling in the ResourceCOnfiguraitonEditor for the fact that update now always returns an object, never a null.
Edit of contents resets error message.\n Attempt to cycle through all Raw Configs even on unexpected exceptions. \n Marshall Exceptions from Agent to server with WrappedRemotingException.
Makinbg the Plugin Container Exception capable of handling the wrapping of Exceptions for marshalling.
Reordered checks to make code clearer and put most likely case up top.
Removed call to wrap the Exception to test changes to PluginContainerException.
Initiali check in of Name Server Switch COmponent, a simple file based resource that supports both Raw and Structured configuration
REading the file, parsing the file.
shortened the name to nss
Wired up the templating engine to run prior to validation. However, it only has some sample data in it right now, and needs to be populated from the traits.
Added a plugin for nsswitch, might be necessary to show the structured validation errors in the future.
Validation now returns true or false, not an excpetion, to indicate whether validation passed or failed. This should allow marshalling of the error messages back to the server.
Config pages don't die if they can't atlk to the agent. Got rid of unused class. Implemented some simple validation for nss.
Thought I got rid of this long time ago.
Merged with jsanda's changes.
validate API now marshals objects back to the server upon validation failutre.
handle returned configs on the server side.
upgrading rich faces to fix the floating menu bug.
Populating template enginer with values from traits. Currrent values will look like this:
Merged master into raw-config
Merge commit 'origin/raw-config' into raw-config2master
Merge commit 'origin/raw-config' into raw-config2master
Changed unit tests to refelct current approach to validation.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Modified the key for template replacement.
Skeleton of the BundleDeploymnetHistory API
Made jmarques changes, starting to sketch out the criteria object.
Adding persistance to the Session Bean calls, and testing it.
Slowly merging the history work in with the rest of the bundle implementation. First, the test case
minor work on the test, checking in order to rebase.
@Override was inappropriate here, and causing a compilation error in eclipse.
REfactored interfaces and classes into smaller set of code.
Merge of changes from jshaughn.
rebased and merged.
Alexander Kiefer (5):
First plugin version - please give me feedback if you are interested in it
Merge branch 'nagios' of git://git.fedorahosted.org/rhq/rhq into nagios
First update after new clone
Second commit
Deleted old code
Bryan Kearney (43):
Allow clean install to still copy over the license file.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Typo in the db upgrade script
always copy over the license.xml file
BZ535217: Update the JNA version to 3.2.2. In addition, moved the version number up to the main pom file.
Simple discovery of hosts using the libvirt-java jar files
Put virt back into the build process when a clean is done
Basic Guest discovery with up/down status
Some basic metrics for the host, and some basic operations on the guest
Simple metric for total memory usage for the hypervisor
CPU usage measurement is in for the host
Added measurement back into the guest
Add back in the xml lookup for hosts
Add back in the xml lookup for hosts
Put back in the low level disk device stuff
Added basic discovery of networks
Added up/down checks on networks
Basic configuration reading for virtual networks
Logic is in place to update networks, but only autostart works now
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
555545: XML parsing was throwing an error with optional components
Move libvirt to 0.4.1 and try and suppress some of the callbacks
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
556588: Fix the version string
Initial koan discovery, RPM only
Simple Guest Deployment
Downgrade the libvirt-java version to get it to run on RHEL
Hudson has the only lower case display name
First cut at manual add. It works, but guests are not seen
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
556491: Some names in Xen are null, this allows the new guests to be found
Slightly better comments
Missed a comment
Make the name of the kickstart plugin better
Catch koan failures and record them
Can delete and destroy virtual machines now
Modify the AgentMain to use jline Consoles instead of reading from standard in. The big benefit is to be able to use command history in the agent
Fix the native cleanup so that it will not echo password and will use jline
Use stars to blank out the password, not the zeros
Added autocomplete in order to make Greg Happy
Put the new logo in
Attempt to agressively free resources from the libivrt API in order to reduce interaction with SIGAR
553398: Fixed a typo
Charles Crouch (25):
JOPR-32 try to undeploy the .ear/.war before actually deleting it
Add test of using a patch process definition with xml ENTITYs
JOPR-51 fix trimming of wrapping elements around automated install instructions
JOPR-51 trim whitespace from xml string to help with processing by the jbpm xml processor.
JBAS-6472 make updates for the ProfileService api changes
add some timing code and drop the unused getCurrentProfileView(String) method
EMBJOPR-58 stop including config-property in datasource config definitions, all of its included properties should be referenced directly as other properties
JBAS-6188 is done, so shouldnt need the work around any longer
EMBJOPR-88 start turning off some of these refreshCurrentProfileView calls
EMBJOPR-97 add support for connection properties config in Datasources
log info on active profiles and refactor setting of resource details
add TODO to make method less confusing
EMBJOPR-114 don't fail when an operation doesn't return any results, just log if its unexpected.
fix build, since latest PS impl jar isnt in repo yet
EMBJOPR-113 for JMS destinations add names to operation arguments and descriptions to results. Also change to using the operations which have the most arguments from the management view (the others should be callable by just passing null as the appropriate parameter)
JOPR-84 fix JBAS server availability so that we only return UP if the server we're talking to over jnp is the one we expect. Child services don't respect this though.
refresh the profile view when getting the deployment since this makes the availability checks works correctly, i.e. you dont have to wait until the next service scan to see an app go red after its been stopped
EMBJOPR-152 update descriptor to match new managed operation signatures.
re-enable deletes now there is meant to be support in JBAS5 (JBAS-6227)
turn off SAR and MCbean types until we have a better idea of how to organize these resources e.g. right now jms-ds.xml is listed under sars. Also turn off configuration for deployment based resources e.g. ear/war since its not been tested/doc'd
make operations returning HTML have a longString type, should improve rendering
go back to throwing UnsupportedOperationException for deletes until JBAS supports removing components without needing an app server restart JBAS-6227
remove create/destroy ops since start/stop should be the managment operations
JOPR-140 add 'deployExploded' property to ejb2/3 and rar deployments. Also get rid of environment category until we add back JVM support
add back operations to no-tx conn factories
Devan Goodwin (5):
Revert "log4j.xml DTD file (useful for associating log4j doctype to DTD in IntelliJ/Eclipse)"
Revert "updated integration test for samba"
Revert "Made the testResourceConfigUpdate to propertly clean up the mess it creates"
Revert "Added a generic augeas testResourceConfigUpdate method"
Revert "Merge branch 'master' into linux-config"
Fady Matar (27):
Updated ems library version from 1.2.5 to 1.2.6
Added the tomcat plugin test class
Updated the test case / test configurations for the Tomcat plugin
Added the restart Tomcat server operation
Added external build configuration and added target directories of plugins to svn:ignore
Renamed the MainDeployer java class to TomcatApplicationDeployer
Finished with the applications operations
Added Connector operations
Updated the rhq-plugin.xml to support create delete policies for WAR content
Added the FileContentDelegate utility
Updated properties and fixed absolute file passed to plugin container upon discovery of war files
Removed unused TomcatApplicationDeployer
modified eclipse classpath to include jboss-as-5 plugin sources in the ide
Updated Jopr classpath to satisfy jboss-as-5 plugin dependencies
Resolved eclipse classpath
Added a build target to build the JBoss AS 5 plugin from the external tools configuration
JOPR-116 Reloading the management view removes the Managed Deployment from the Management View
JOPR-85: Changing the name and the description of the discovered Jopr server from Rhq Server to Jopr Server
JOPR-85: Propagated the fix to JBoss AS 5 plugin as well
Updated JBoss Managed and JBoss Metatype libraries classpath in eclipse from CR8 to SP1 versions
JOPR-170: Fixed the discovery of EAP 5 instances with the default configuration set
JOPR-173: Committed inital jar libraries discovery, needs further testing and fixes
Resolved JOPR-173: Fixed the deployment path to show up the required jars.
JOPR-215: Added support of parsing log events and parsing them into the events subsystem
JOPR-170: Included missing library in pom.xml to resolved the discovery of EAP 5 instances
Added the jboss-serialization.jar to the plugin lib folder
JOPR-173: Added support for deployment of libraries to the lib folder of the EAP instance
Filip Drabek (78):
JOPR-180 Support detection and running of scripts in AS 5 / EAP 5, as we do now for AS4
Script service added.
Content changed to state from rev. 613. Script components added to devel branch.
JOPR-172 JVM of the JBossAs added.
JOPR-169 start / stop / restart operation added
support of Jboss cache for as5 (JOPR-221) Import
plugin descriptor added
commit f64bfd701f78babdbc024d0fbad3e0918ff9f749
update of cache Discovery
update of discovery process of jbossCache5
update of metrics
update of metrics
JBossCache5 component renamed to JBoss-cache-v3
JBossCache5 component renamed to JBoss-cache-v3
JOPR-264 + Environment Variables returned back to plugin configuration
JOPR-273 + operation results unification
JOPR-298 - components changed to singletons.
JOPR-299 - connection refresh when the bean was not found.
Cache component changed to child service.
Tests for JBoss Cache v3
JBoss Cache Tests
Update of operation tests.
Refresh of Metric values.
JOPR-334
JOPR-353 -JBoss Cache v3 Resources should have friendlier default resource names
augeas support
update
apache 1 version
Include directive update
Include updates
configuration update
rhq-plugin update for augeas based plugin
COnfiguration update
update config
directive Include load
Include update
fix of last commit
new Mapping Augeas to configuration
Merge branch 'linux-config-apacheplugin' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config-apacheplugin
Directive RegEx is now static
mapping returns Configuration
update property name in configuration
regular expressions in code
Include finding update
Merge branch 'linux-config-apacheplugin' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config-apacheplugin
AugeasTree AUGEAS_DATA_PATH fix
update of reading Included files nested in Virtual Host which is nested in another file
Configuration update
Merge branch 'linux-config-apacheplugin' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config-apacheplugin
text formating
ApacheServerComponent import fix
update configuration support
update mapping
update of configuration fix
regex fix
use old lens loading, till LensHelper is finished
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
loading lens from temp file
lens file load from temp
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
IfModule support
Lens loading error fix.
Resource naming AS,AS5,Tomcat,Samba,Postfix
Bug 562236 - fix of bytea problem
Merge branch 'linux-config'
BZ - 535792 JBossCache plugin throws parsing error while checking configuration.
BZ 576148 - [apache] Can't add a Virtual Host Option in the "set"
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
BZ 566235 - Downloading of cumulative patches now works as stream.
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
BZ 576230 - [apache] Saving Apache configuration from RHQ UI destroys all comments
[apache] new format of resource key in Directory,IfModule and IfModuleDirectory components.
BZ 576230 - [apache] Saving Apache configuration from RHQ UI destroys all comments
[apache] new format of resource key in Directory,IfModule and IfModuleDirectory components.
BZ 576617 - [apache] ServerName is now readOnly.
BZ 555098 - new metrics for AS-4 ConnectionFactory.
BZ 566235 - fixed the problem with timeouts on streaming.
Galder Zamarreno (2):
Returns for operations can now be generated.
Operation returns only one result now.
Greg Hinkle (222):
jopr svn setup
initial jopr import
Log detection re-enabled
Fixed retrieval of deployed application content (usable from CLI)
Initial prototype of Samba plugin. Basic network monitoring and configuration management.
Fixing line endings
Fixed line endings
Experimental plugin that can connect to IRC servers and translate messages into events.
Realign jopr modules in preperation for RHQ merge
Merge branch 'master' into jopr-merge
Fixed line endings
Attempt to support builds on platforms without separate JRE directories
First experimentation with GWT module for core domain
First cut at GWT module for core domain
first cut at gwt module for core domain
first cut at gwt module for core domain
A bit too aggresive with moving plugin exposed report objects out of domain... putting them back
a couple other refactoring mistake fixes
Get rid of unsupported field type of Class<?> by implementing an abstract persistence class lookup
First attempt at a GWT UI in the portal-war
Fix compile error
First attempt at a GWT UI in the portal-war
Fix the criteria query stuff and hibernate detach results.
moved the gwt prototype into a new maven module (gui/coregui)
Moved gwt prototype into separate maven module
Fixed equals given new serialization model
More prototyping
more gwt prototyping
Fixed agent comms to serialize detached hibernate objects with HDU
Merge remote branch 'origin' into gwt
Merge remote branch 'origin/gwt' into gwt
fixed merge mistakes
Fixed OrderingField for gwt compatibility
trying to clean up compile
reconnected the gwt compile steps
PageControl adds firstRecord support in addition to pageNumber
cleanup
New gwt prototype features
Fixed problem of the ejb deployment files not deploying
Going to calculate config SHA's on the server before commit
Going to calculate config SHA's on the server before commit
More gwt prototyping
Additional Gwt Prototyping
removed old package
Fixing capitalization of a few files (darn git ignore case)
tab prettyness
Fixing capitalization
refactoring fix
Fixing more of the portal-war dependencies on MeasurementConverter
More measurementConverter refactory for portal-war
New loading page, new "simple" collapsible panel
Now have two separate MeasurementConverters. One for gwt and one for the rest of the server side stuff. May not be a great long term solution, but fixes the issues in the JSF pages
Now have two separate MeasurementConverters. One for gwt and one for the rest of the server side stuff. May not be a great long term solution, but fixes the issues in the JSF pages
Base datasource class can now populate PageControl for pagination and the sort columns and order
Moved the generated files out so they don't intefere with scm
Reworked the sort loading from page control to be gwt compatible
Start to Role permission and group assignment editing
Group Definition criteria query access
Group Definition list view, datasource and server side access
Moving to avoid conflict
Don't destroy root views when reselecting them
New TwoLevelTab component supports the basics of tabs/subtabs (more to add around history navigation for this)
Experimenting with selenium testing
L&F tweaks
RPCDataSource enhancements
some icon migration
Tab/SubTab system further implemented and hooked into history for the ResourceDetailView
Prettier breadcrumb
Config history improvements
Fixing merge issues on criteria api for gwt
Merge fix
NPE fix in resource view
No duplicates in resourceLineageAndSiblings
Base Table Component will handle things like toobar buttons, messages and titles for all table views
Select and open the node in the tree in two other conditions
Resource titlebar cleanup
RPC call tracking and ajax loading icon while requests are in progress
Icons for resource availability display
Move data load to onDraw from onInit. This stops premature data loads (for example when loading all the tabs)
More cleanup
Basic OperationHistory viewing
"Always" enablement for buttons like 'add' that have nothing to do with selection
Avoid ambiguous methods
For mazz
First cut at a wizard framework plus and example for operation execution
Outline for the create bundle wizard
Some tweaks to the scheduling interface
File upload infrastructure including file upload completion listening
Get rid of unnecessary calls to Canvas.draw when we really mean to request a "redraw" with markForRedraw()
CallTime data display for a resource
New Footer bar that includes a message center
Basic wizard validation on moving to next step
Fix JSF pages used by old UI by making -plain versions of pages
Basic operation execution and results viewing
Basic operation execution and results viewing
Start to integrating jsf content tabs
Favorites popup menu
Tree subcategory support
Fixed the resource tree switching to a new resource
Further integration of the error handling strategy
Resource configuration editing and event viewing
AlertDefinitions list view
Viewing of previous configurations in bottom of detail pane
Live charting... yea i know... couldn't help it
Resource create (by configuration)
Create Principal's along with their subjects
layout fixes
Eager load config def templates
exposed rest of authorization service
Fix the dashboard overflow problem
Basics of a metric range editor component
Prettier menubar
L&F improvements
BundleWizard improvements
BundleListView changes
cleanup menu more
Cleanup experiment with embedding gwt in jsf
Support for filtering resource list by resourceTypeId
Autodiscovery queue. tree view. import, ignore, unignore buttons
Autodiscovery queue. tree view. import, ignore, unignore buttons
Dashboard demo work. summary and discovery queue added
Summary traits on overview as per jeremy's updated design
Plugin and Type tree (for type pick list)
avoid npe for mismatched component depths
New resource selection component (left-right boxes, drag-n-drop, search and filter, selection indicator)
Fixed some bugs in but enablement
icons for the new resource and type views
Fixed IE6 form upload replacement
Some UI work... new components, alert investigation work
New tag system for bundle system
gwt plugin config editing (connection settings)
Fix ad queue redraw
data load for graphs outside of the graph list
support resource uninventory
resource factory wizard fixes
ResourceType tree data source and view for either plugin page or type selector popup
support for other components in the table footer (like popup menus)
New hierarchical core history management system
New Dashboard system, storage, portlet factory, loading engine and layout
New admin view for updated history system
Fix resource section menu highlight
Updated resource tree icons
Support resource column for alerts for dasbhoard view
Continued prototyping of new alert def ui
resource column for alerts for dashboard view
Basic Tag infrastructure merged with latest from gwt branch, tables updated, etc.
Tag gwt service exposure
Tag core domain, service, gwt services, editing component
Tag editor component
dashboard tweaks
remote agent install for gwt
Fix bug where manually inventoried servers are not being set to committed on the agent side
Too verbose on dbsetup for builds
merge of schema setup
Resource tag loading fix
Fixed db-upgrade
Can't use String.format in gwt code
Some jaxb binding fixes for webservices
Support the selector having initially selected records (to update a current selection of groups to deploy to or for role assignments)
Add resource icon to the favorites popup
Dashboard prototype tweaks
type in the breadcrumbs
Group member mgmt gwt exposed
Start to login screen, test dashboard tweaks
added missing method for webservices
First version of the bundle tree
icons for the bundle area
Fixed tag unnasignment
Tag editor tweaks, vertical view, loading for bundle versions
Bundle tree preopen
Selector enhancments
Fix group category filter
Fix NPEs in RGWCI
Don't blow up favorites button if there are no favorites
resource links in the recently added portlet
Fixed a couple bugs in the bundle criteria area
Fixed issue with url bookmarks that get encoded
Fixed issue with getting updated role-group assignments on saving them
Allow a ViewId to have no breadcrumbs at all
Fix selector inital selection display
Added lookup by tag for tagged entities
A new back button for in view pane navigation
Tag info exposure
Set file size of uploaded packages
Put tag fetching into abstract tag criteria
new bundle destination criteria
Fix casesensitive setting for overrides with subselects
Expose destination tag updating
File and destination exposure to gwt
Expose destinations into bundle tree instead of deployments
Merging in some additional tag features
Avoid NPE
fix deployment lookup
improve bundle resource deployment list
New separate icon for destinations
Step details are expandable
New destination lists view
destination terminology correction
Add destinations to tag report
single group selector for deployment wizard
Fix fuzzy for subselected in clause
Consistent header sizes
Tag view and start to combined lookup by tag
A basic complete for the resource search box... not integrated to *search*
display installed version
Start to basic tag searching and filtering to match bundles and resources
UI tweaks
First cut of sharing the login session betwee portal war and coregui
More status display in the bundle screens
Relogin when the session has timed out
Improved tag editing and Table component
allow gwt logout
logout typo
Fix null session login detection issue
merging master to bundle
Need the thirdparty repos to find the new augeas dep
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into localbundle
Fix table rendering order problem (buttons missing)
Workaround for certain times when the upload form is not completely destroyed
Cleanup the wizard step canvases when the wizard closes
fix delete for things that have tags related by adding cascading
minor tweaks
Heiko Rupp (82):
Provide dummy implementations for the new method in ConfigurationServerService, as the compile fails for me otherwise.
Initial version of a plugin to monitor and manage JBossCache instances deployed to a JBossAS.
Catch a potential NPE
Fix the filename representation and re-enable returning that property.
Add a javadoc comment that the InputStream 'content' is closed.
Prevent NPE if data is null.
Small code cleanup.
Provide simple creation of caches.
Some code cleanup.
Small property update.
Check for nulls to prevent a NPE.
Implemented loading of the configuration.
Detect child jgroups configs.
Compare against canonical object name, as the key-value pairs might be in different order in the file.
Allow to update a configuration.
Add the cache plugin to the build, as it is already usable for monitoring.
Some code cleanup
If we have a webapp with a multilevel root (e.g. foo/bar) we need to 'escape' the directory separator. JOPR-11
Always call purge() no matter if file or directory.
Get the file path from the main deployer instead of defaulting to '...deploy/'
Extend explanation of the rt file path.
Prevent a NPE later when file is null.
Prevent a NPE.
Only work on the manifest if the jar file actually has one.
Generify
Use the new helper methods.
JOPR-40 Set the product version from the respective Provider.
JOPR-40 Catch exceptions and just return null if we can't read the version.
JOPR-49 Trace operation results at INFO level instead of DEBUG, so that errors are easier to track down.
JOPR-48 use getHomeDir() do determine the home directory.
JOPR-60 Don't throw an invalid plugin config exception when the logfile can not be found.
JOPR-68 : use option -c to pass the configuration and pass flag + argument as individual tokens.
JOPR-69: AS operations return the result, so mark this in the descriptor.
Fix a typo.
Prevent a NPE if the passed file is null
Prevent a possible NPE
JOPR-69 operations on war files also return their outcome.
JOPR-37 Allow to create a backup of a potentially already existing war/ear file.
Allow to revert created war and ear files from an existing backup (file with same base name and ending in .bak)
JOPR-37 Improve wording.
JOPR-39 Implement for .ears too
JOPR-77 Make restart fail fast.
JOPR-77 shutdown() is already waiting for the server to stop. No real need to do it here again.
JOPR-60 make the error more explicit and thus better grep-able for the admin.
Prevent NPEs when the connection to the parent resource is down.
JOPR-83 If the underlying war file is already deleted, don't complain
JOPR-83 Log that the file was missing.
Prevent a NPE if the descriptor can not be loaded.
Small cleanup of stuff I had on disk for some time now.
RHQ-1744 Mark transaction count as trendsup and change the display name to be more clear.
Provide a displayName, as the de-camelcase algorithm makes "Unpack WA Rs" from the property name.
JOPR-104 Use the correct property value to check for XA-resources.
JOPR-39 Correctly handle unzipped archives.
JOPR-104 Write user/pass/url in XA format for XA datasources.
Start of a plugin to monitor JBossOSGi
Update for the event side - not yet done though.
Prevent NPEs
Better resource naming
JOPR-170 Get the jnp server url from the well known file. Also detect if this is an EAP instance.
Add the AS-5-plugin to the standard Jopr build, now that a) the needed libraries are (supposed to be) stable.
Shell version of the start script.
Use CR1 instead of snapshot
JOPR-90 Try to detect war files with distributable tag that may not be listed by the MainDeployer's listDeployedModules() operation.
JOPR-90 Handle the case where the war file is correctly found by the main deployer, but where there is no manager for the vhost
JOPR-90 Handle the case where a distributed war has vhosts.
JOPR-90 Handle the case where a distributed war has vhosts.
JOPR-203 Prepare to discover MDBs and use the PS code for metrics (WIP)
JOPR-203 Follow ALRs naming change and support MDBs
JOPR-203 Show some MDB metrics
JOPR-203 Fix a stupid typo
JOPR-181 Prepare for invocation stats support.
JOPR-181 -instance and -invocation MC will have the same ComponentType
Reword, as there is no such thing as JBoss Cache 5.x
JOPR-250 Support response times for web apps.
Jopr-292 Directly return when the file does not exist instead of calling the Editor and risking a NPE later.
JOPR-293 Prevent a SIOOBE when a short argument is used like in -b 0
JOPR-250 Implement ResponseTime metrics on the level of the individual vhosts below a web app.
JOPR-250 Provide a better identification in the error case.
JOPR-295 If a .ear file is not present when deleting it from the UI, then just log this condition. Users often delete by hand and want to get rid of the inventory entry afterwards.
Add support for the new ManalAddFacet
Add a comment that a plugin can have manual add and autodiscovery.
New module for annotations that will be used to (semi) automatically build plugin artefacts from annotated code.
Heiko W. Rupp (365):
Change default listen port to 11162 so it does not clash with the snmp-agent in jboss-as servers.
Fix a small typo.
RHQ-2470 Postgres message for non-existing table has changeg. Use the SQLState code to determine non-existing table.
Annotations to allow for (semi-)automatic descriptor generation.
Annotations to allow for (semi-)automatic descriptor generation.
More changes to the plugin generator to allow for annotation processing and thus automatic descriptor creation.
Change the group of the helper artifacts to 'org.rhq.helpers' so that they end up in a subgroup
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
More pom work to make users happy that obtain the pugin* stuff from a remote repo.
First cut at AlertSender api. (#1116)
First cut at alert plugin xml schema (#1139)
Start of PluginManager implementation for alerts.
A first implementation of an AlertSender that sends via email
This logger is not needed.
Follow schema conventions to separate words by dash and don't do camelCase
Squashed commit of the following:
Pull up master/master and fix the conflicts that I had.
Support for alert sender plugins and configuring them. WIP
Enable building of the alert-email sender.
List exising notifications and be able to add new ones.
Show the configuration
Use the defined alert sender
Add a comment and remove unneeded code.
Improve display and start on removing notifications.
Mobicents alert sender. Needs to have Mobicents server + alert2voice servlet installed on it.
Mobicents alert sender. Needs to have Mobicents server + alert2voice servlet installed on it.
Fix help text
The Microblog (Twitter,laconi.ca) alert sender.
Fix removal and back to alert definitions link.
Fix twitter api url and mention status.net url
Try to prevent a NPE
Merge branch 'master' into alertPlugin
Follow the changes from master
Implement some "deferred emailing" - senders can create email addresses, that alert info gets sent to.
Re-order, as they are not shared with the remote.
Merge remote branch 'master/master' into alertPlugin
Start supporting custom user UIs for alert properties.
Cleanup and more support for custom-ui
Start implementing a sender that uses a custom-ui
Merge branch 'master' into alertPlugin
Merge branch 'master' into alertPlugin
First cut at an snmp alert sender plugin and removal of the old sender method
Change over to the new plugin preferences and add the remaining config parameters.
Oops, fix constructor call.
Fix return values
Prevent a NPE if a Sender (illegally) returns null in its send() method.
Make this plugin use manual add instead of autodiscovery.
Plugin to run scripts in other languages like Ruby or Python
Merge branch 'master' into alertPlugin
Get rid of the old SNMP gui stuff, as this is now contained in the alert-snmp server plugin.
Always log the result to info level for now.
Some more cleanup and little UI improvements.
Improve wording
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq into plugins
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq into plugins
Script2 plugin is not yet ready
Improve the plugin so that it kind of works. There is still an issue with the engine "forgetting" the script after some time.
Merge branch 'alertPlugin'
Enable irc alert sender
Start working on template bundles of notifications.
Better handling of invalid input
Small improvements in area of logging. Also don't reply to each message in the channel.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'master' into alertPlugin
Copy the needed libs also when not in dev profile
Add required elements
Replace hardcoded version dependencies, as the release plugin screws them up
Merge branch 'master' into alertPlugin
Implement plugin validation for alerts.
More support for custom UI snippets and a custom backing bean of them. Still WIP
Prevent NPE on stop() if Augeas is not present on a system.
Evaluate the script on each call to prevent issues with multi-threading.
Merge branch 'master' into alertPlugin
Don't refresh() as this loses the notification logs
Merge branch 'alertPlugin' of ssh://git.fedorahosted.org/git/rhq/rhq into alertPlugin
Return the status id for a successful status update.
Do some cleanup.
Remove some old SNMP stuff that was still laying around.
Email sender uses now the default smtp host etc. as defined in the rhq-server.properties file.
Remove old struts gui for the old email sender.
Small cleanup
Merge branch 'alertPlugin' of ssh://git.fedorahosted.org/git/rhq/rhq into alertPlugin
Fix SQL-expression for deletion of old SNMP entries
Change wording, as we are adding an alert sender and not an alert :)
List the senders in alphabetical order.
Send emails if result code is DEFERRED_EMAIL
French translations from RHQ-5 from nearly 2 years ago. BZ 536227
Merge branch 'master' into alertPlugin
Snmptrapd port is 162, not 161. BZ 547830
Snmptrapd port is 162, not 161. BZ 547830
If no BackingBean is defined, there is not need to instantiate nothing.
Subject alert sender plugin - only a sekeleton, but I don't want to loose what I had on disk already.
Merge branch 'master' into alertPlugin
Check for null before checking permissions, to prentent a NPE
Define the properties that define subjects and roles, those are needed by the migration process
Code to read in an rhq version 1.3 alert dump in order to migrate to 3.0 format
Merge branch 'master' into alertPlugin
Some cleanup
Add some testing
Add some testing
Export script to export 1.3 style alert definitions.
Some cleanup and added a README on how to proceed.
Add relation from notification templates to notifications.
Start adding Notifications from a template
OOps, forgot the surrounding form tag
Get sequence right.
Catch a NoResult Exception and remove some temporary code
Merge branch 'master' into alertPlugin
Get sequence right.
Remove the default server and disable the irc sender on discovery, so that it does not directly join and spam the freenode network.
Merge branch 'alertPlugin' of ssh://git.fedorahosted.org/git/rhq/rhq into alertPlugin
Merge branch 'master' into alertPlugin
Follow the change in RolesBackingBean
Provide toString()
Rough first cut at creation of notification templates
Fix bugs in "apply from template"
Add NotificationTemplates to admin menu.
Notifications can now be added and their config be modified.
Also need to copy name and sender name over.
Pass the real "clear existing notifications flag", not a dummy
Get rid of the no longer needed SnmpNotification and EmailNotification classes
Fix some re-display issues
Add a note about the need for java 6 to run the cli scripts
Only delete when alertDefinition AND notification is null.
EmailNotifications are gone ...
Merge branch 'alertPlugin' of ssh://git.fedorahosted.org/git/rhq/rhq into alertPlugin
Enable script 2 plugin in build
EmailNotifications are gone ...
Scripting language alert sender that can use Ruby or JavaScript scripts to do the actual alert sending. Not enabled until loading of jruby-complete jar is working.
This option is not honored
Pass preferences and alertParameters to the script engine.
Set context for later use.
Pass the plugin environment to the plugin.
Merge branch 'master' into alertPlugin
Implement deletion of templates.
Fix twitter default URL and provide more information about user and base.
Catch exception when adding a sender to a non-existing template (should not happen)
EmailNotifications are gone ...
Merge branch 'master' into alertPlugin
Add alert id BZ 555091, comment 10
Merge branch 'alertPlugin' of ssh://git.fedorahosted.org/git/rhq/rhq into alertPlugin
Custom backing beans now extend CustomAlertSenderBackingBean and get the alertParameters injected.
Prevent NPE when the bean could not be instantiated.
Implement the sending part
Add a method to just merge changes to a passed Configuration.
Perist config updates.
Get the subject sender to basically work
Now we also show the selected stuff in the custom UI panel.
We can now add and remove subjects succesfully.
Adding an empty list does not remove the existing ones anymore.
Merge branch 'master' into alertPlugin
Merge branch 'master' into alertPlugin
Add scriptlang alert sender plugin and fix its pom to include the domain jar
Model roles sender after subject sender custom ui. Plus some cleanup.
Merge branch 'master' into alertPlugin
Fix tiny error, that prevented showing the available roles
Bring back the Menu entry for alert notification templates, that somehow got lost.
Clean out old stuff that is no longer needed du to alert plugins.
Populate those fields with dummy values - will go away l8er
Alert sender that sendes via German Telekom REST interface.
If a sender fails, log the full stack trace at debug level
Add more dependencies.
README file for this sender.
Small cosmetic changes.
Replace string concatentation in StringBuilder.append() to multiple append()
If the value is -1 return an empty string as "never"
Default ackTime is -1 meaning "never"
Implement acknowledging of fired alerts.
Remove some more outdated stuff
Show acknowledgement data on the fired alerts detail page
Add to the script lang sender for its classloading
Enable SMS sender plugin in build
Return failing email addresses to the caller.
Only append default domain if no domain given.
Allow to provide the default domain in preferenes
Remove unused import
Remove unused import
Merge branch 'alertPlugin' of ssh://git.fedorahosted.org/git/rhq/rhq into alertPlugin
Merge branch 'alertPlugin' of ssh://git.fedorahosted.org/git/rhq/rhq into alertPlugin
Prepare for new version of alert notification logging.
Move ResultState and SenderResult to domain, so we can access it there.
Use new constructors for AlertNotificationLog
Rename column name
If email sending fails, we record the failing ones and set the status accordingly
Merge branch 'master' into alertPlugin
Bring back in the dependency on seam
Merge branch 'master' into alertPlugin
Bring back display of alert notification logs.
Optimize l&f
Those are no longer needed.
Better formatting of the emails lists.
Fix link to alert definitions.
Increase footer width and make acknowledge columns sortable
Provide link to resource overview page in breadcrumbs
Change the way email addresses are set.
Provide a helper to persist individual configuration properties.
First cut at an operations alert sender.
Merge branch 'master' into alertPlugin
This index is no longer unique
Be less verbose
Add acknowledgement info to the subsystem view.
Fix links to the new alert definition pages.
Add a helper to clean out a property.
Merge branch 'alertPlugin' of ssh://git.fedorahosted.org/git/rhq/rhq into alertPlugin
Merge branch 'master' into alertPlugin
Fix link to definitions BZ 566004
Truncate the message at 140 chars, as identi.ca bails out on longer messages; seems to improve stability with Twitter too.
Merge branch 'master' into alertPlugin
Fix potential NPE
Fix link from alert templates list to the view alert page. BZ 566896
Fix link to definitions BZ 566004
Truncate the message at 140 chars, as identi.ca bails out on longer messages; seems to improve stability with Twitter too.
Fix potential NPE
If no emails failed, we can set the state to success
Implement code for token replacement
Display, persist and use operation parameters.
Cleanup of variable names and obtain the right operation name.
Merge branch 'master' into alertPlugin
Add a new cleanup() method and some JavaDoc
Introduce the possibility to ack an alert on the detail page.
Add a link to re-enable the definition on the detail page. Alternate solution to BZ 535889
Provide an internal cleanup method that is called when the notification is deleted. This way, the backing bean can do some housekeeping if needed.
Merge branch 'master' into alertPlugin
Linking fixes for BZ 566896
Merge branch 'master' into alertPlugin
Merge branch 'master' into alertPlugin
Persisting a new resource is no error ...
BZ 568275 - add commons-codec which is needed with commons-httpclient 3
Merge branch 'master' into alertPlugin
BZ 535432 suppress 'null' is the condition has no name, which is the case for availability.
Provide a way to initialize the backing bean after it got created and the alertParameters got injected.
Merge branch 'master' into alertPlugin
Provide token descriptions and a way to get a full list of tokens defined.
Support more tokens
Fix generated xml, provide a list of tokens and a way to translate them to confluence markup.
Optimization of the style sheet
Add an option to specify an output file.
Move to a better place in the file hierarchy
Prevent NPE
Clone the parameters before replacing tokens. Also pass the target resource to the replacer.
Allow for camelCase in tokens. Actually use the provided target resource.
Don't clone, but deepCopy without the ids.
Mvn exec-plugin executions need unique ids across the project.
Inject real Subject of current user and fix congifuration display directly after login.
Provide the operation name at the top of the parameters panel.
Merge branch 'master' into alertPlugin
BZ 570453 max varchar2 len on oracle is 4000 bytes.
Give the customContentForm an explicit name.
Fix some typos.
Provide a resource-picker for users to select the target resource from a list.
Fix tab handling of the picker.
Add findbugs plugin, so findbugs can be started with mvn findbugs:findbugs
Some cosmetics
Merge branch 'master' into alertPlugin
Give the customContentForm an explicit name.
Fix some typos.
Provide a resource-picker for users to select the target resource from a list.
Fix tab handling of the picker.
Add findbugs plugin, so findbugs can be started with mvn findbugs:findbugs
Some cosmetics
Add operations sender plugin to final ear file
Implement acknowledgement of alerts.
CSS fix
Merge branch 'alertPlugin'
Show notification logs for fired alerts.
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Add more properties and fix display when !=1 alert selected.
Finally this looks good.
Show details in tabs.
Display conditions
Provide a better column title
Optimize main table layout and details printing
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
BZ 571968 - refresh list of templates after delete
BZ 571911 - Fix acknowledge on the subsystem page.
BZ 571885 - If no notification templaes are defined, tell the user so and don't bomb out.
BZ 535601 - encrypt the db password by default when installing the server.
BZ 535601 - Optimize the generate password script
Fix comments
First cut of a Windows script to generate the passwords.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Fix an omission and clean up
Fix definition of _JB_DIR variable
Revert navigation to the struts-based alert-configuration
Revert navigation to the struts-based alert-configuration
Revert navigation to the struts-based alert-configuration
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Revert navigation to the struts-based alert-configuration
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Fix a typo that prevents the icon from showing.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Use Arrays.toString() to get at the resource ids.
Use a logger instead of System.out
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Adjust project version.
Merge branch 'master' into nagios
Take Logger version from parent.
Enable building the plugin
BZ 583990 fix nodeFace creation to not overwrite payload data.
BZ 579529: use -eq instead of == to support 'standard' /bin/sh
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Plugin now uses manual add instead of autodiscovery; mk_livestatus host+port can be configured.
BZ 584116 - check for null context root to prevent NPE
Enable manual add.
Re-apply of pom cleanup +
Refactor package
Rename directory NagiosMonitor to 'nagios' to follow the general directory naming scheme.
Small renaming
Prevent NPE if no sshd is running/found.
BZ 548172 pg_relation_size() no longer understands names in postgres 8.4+
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Re-add "supportsManualAdd". Forgot this in the last commit.
Plugin directory got refactored.
Refactor the getValues() loop, so that one bad egg won't spoil the cake.
Filter property got renamed to 'search'
Not all alert senders have cusom backing beans.
BZ 591041 remove extra chars after the resource id
Be more verbose about the used connection parameters.
Parametrize the driver class too to use the -Ddb switch
Don't autodiscover the NagiosMonitor server.
Use service names returned by Nagios
Merge branch 'master' into nagios
Create a common ancestor for Nagios Exceptions
Use nagios host + port from the parent component if applicable.
Move connection open/close out of the loop
Do less hardcoding and get service / metric name from the plugin descriptor.
Rollback last change, as this was swallowing data. We need to enable keepalive, before movig connection open/close out of the loop again.
Merge branch 'master' into nagios
First batch of changes from the jdk15 branch to be merged back.
Revert Ian's commit 804620f9314e4d2b80a980208244b75920b018e7 that
Move plugins that depend on jdk6 into their own profiles.
Actually use 1.6+
Another dependency for jdk1.5
Another dependency for jdk1.5
Another dependency for jdk1.5
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
More jdk15 exclusions
Check for jdk5 in the script2 module and disable its build then.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Fix a typo *sigh*
Disable the jdk6 plugins completely for the moment.
Add missing dependency for jdk15
Use jdk5 api.
Disable the scriptlang sender for now as it requires jdk6
Disable jdk6 needing plugins
BZ 594417 - catch an error in the Pluralizer if the TypeName is all in CAPS
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Provide more logging about what we've discovered.
To split by the pipe symbol we need to escape it.
Provide toString() for easier debugging.
No need to escape backslashes here.
Small variable introduction and get the resource name from the metric row.
Only request columns we need - list needs to be extended again when the parser bug is found.
Add more metrics and fix some regexs
Be less verbose.
Fix language code
Merge branch 'master' into nagios
Add ssh-monitoring - ssh version as trait only at the moment.
In case of I/O error, bail out with an empty reply
Implement pinging the nagios server for availability checking.
Use the property part of the request name like for numerical metrics
Refactor to get rid of code duplication.
Merge branch 'nagios' of ssh://git.fedorahosted.org/git/rhq/rhq into nagios
Ian P. Springer (300):
augeas/hosts plugin stuff - still not quite working, but very close
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
various fixes to augeas and hosts plugins
fix copyright headers and add xml prologs to plugin descriptors
various fixes to augeas and hosts plugins
mtime also needs to be set on Resources when inventoryStatus is updated (this is the rest of the fix for http://jira.rhq-project.org/browse/RHQ-1996)
various augeas + samba plugin fixes
first cut at implementing resource create/delete in augeas plugin
comment out broken test
get hosts plugin working again
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
add abstract base integration test class to augeas plugin and concrete subclass in hosts plugin
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
fix several bugs in augeas and hosts plugins to get hosts+samba+sudoers integration tests passing on Linux; update test log4j.xml in all augeas-based plugins
rename 'hostname' prop to 'hostName' in ServiceBindingManager resource config (https://jira.jboss.org/jira/browse/JOPR-407)
remove all deps on other RHQ classes
set conn props correctly dusring discovery so metrics can be collected successfully (fix for https://jira.jboss.org/jira/browse/JOPR-399)
disable display of baselines on detailed chart page for autogroups (fix for https://bugzilla.redhat.com/show_bug.cgi?id=535828)
add better exception handling
add missing 'javaHome' prop to server's plugin config and improve code that initializes and uses that prop (fix for https://bugzilla.redhat.com/show_bug.cgi?id=553808)
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
upgrade from RF 3.3.0.GA to RF 3.3.2.SR1 (https://bugzilla.redhat.com/535797)
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
a page that demonstrates a paged/sortable data table
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
add a base perspective war that perspective wars can use as a base via the war plugin's overlay feature; update the sample persp war to use the base persp war; add an example of rendering a table with paging, sorting, and selection in the sample persp war (this early example uses only pure RichFaces functionality and will be replaced with an example that uses a number of components to be added to the core-gui module)
update the various core Maven plugins to their latest versions
add missing serialVersionUID field and implement equals() and hashCode()
change a bunch of INFO log messages to DEBUG
when the page size is updated via setPageSize(), also update the page number, so the current page still contains at least a subset of the items on the page with the previous page size
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
upgrade JSF RI version from 1.2_12 to 1.2_14
add new rowSelector JSF component to core-gui, deploy the component in the base perspective war, and demo its usage in the browseResources.xhtml page in the sample perspective war; add copyright headers
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
tld files + README with instructions for configuring IntelliJ to use them for auto-completion when editing xhtml files
tld files + README with instructions for configuring IntelliJ to use them for auto-completion when editing xhtml files
fix minor typo bug
add allRowsSelector component and update browseResources.xhtml page in sample persp war to make use of it
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
oops, this module should not have a dep on the core-gui jar
fix NPE that occurs when sorting table when no rows have been selected
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
hook JavaScript into rowSelector and allRowsSelector components to complete them
add selectedRowsCommandButton component and use it in the browseResources.xhtml page in the sample persp war
put the finishing touches on the selectedRowsCommandButton component; remove pageControls.xhtml from the sample persp war, since its new home is the base persp war
add tld files for f, h, ui, and fn namespaces and update README
reimplement sorting using non-RF data model based on Joseph's original data model (we now have the little numbers in the headers of sorted columns); refactor base persp war base classes; add mainTemplate.xhtml to base persp war and update each of the sample persp apges to use it; pull in CSS files from portal-war; add new UnlimitedPageControl class in domain module; impl toString() in RemoteClient and make a few other minor refactorings
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
upgrade Facelets dep version from 1.1.14 to 1.1.15; re-enable JSP precompilation and upgrade to latest version of Jetty jspc Maven plugin
re-enable JSP precompilation and upgrade to latest version of Jetty jspc Maven plugin; remove unused version properties and commented-out deps
downgrade RichFaces from 3.3.2.SR1 to 3.3.2.GA to fix https://bugzilla.redhat.com/558528
a new utility for obtaining Maven artifact versions of jars in current classloader
finish this up
add a 2nd table on the page to to test out usage of AJAX
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
the About modal now includes versions of some key 3rd party libs (JSF RI, Seam, and RichFaces) if debug mode is enabled
two tables on single page, both using AJAX, now working
implement PageControl.equals() and refactor getRowData() to leverage it; get sorting working using AJAX
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
include Facelets version in About box when debug mode is enabled
downgrade Facelets version from 1.1.15 to 1.1.15.B1 due to nasty NPE caused by regression in 1.1.15 (see https://facelets.dev.java.net/issues/show_bug.cgi?id=364)
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
include current time (as Built-Time attribute) and Git revision (as Build-Number attribute) in all JAR, WAR, and EAR Manifests
use abbreviated 7-character SHA-1 hash, rather than full 40-character SHA-1 hash, for build #
improve descriptions for freeMemory, maxMemory, and totalMemory metrics on JBoss AS Server resourceTypes
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
fix for https://jira.jboss.org/jira/browse/EMBJOPR-280
make Dashboard, rather than Start page, the default page after login (https://bugzilla.redhat.com/562861)
fix for https://jira.jboss.org/jira/browse/EMBJOPR-280
fix for fix for https://jira.jboss.org/jira/browse/JOPR-384
fix for fix for https://jira.jboss.org/jira/browse/JOPR-384
start of SLSB methods and perspective-based GUI for listing bundles
more work on SLSB methods and perspective-based GUI for listing bundles
add ability to exclude subsets of agent plugins from the reactor
change start() so it sets isStarted even if one or more perspectives fail to deploy - that way, the redeploy logic will call start() when a plugin is hot-deployed even if the initial call to start() failed to deploy one or more perspectives
deploy policy perspective by default; misc minor changes
add ability to exclude subsets of agent plugins from the reactor
get rid of calls to t.printStackTrace() - use logging instead
add bundleDetails.xhtml page and associated UIBean to policy perspective
fix bug in fetchPageGuarded()'s check for pageControl that's inconsistent w/ the results
further work on policy persp bundle CRUD pages
add support for optional plugin profiles to ear/pom.xml and remove hudson module from linux-plugins profile in plugins/pom.xml
move base-perspective-war module from etc/modules/ to modules/enterprise/gui/; deploy policy perspective by default
move base-perspective-war module from etc/modules/ to modules/enterprise/gui/; deploy policy perspective by default
add support for optional plugin profiles to ear/pom.xml and remove hudson module from linux-plugins profile in plugins/pom.xml
create a new base-perspective-jar module, rather than using the warpath plugin, in order to pull the base perspective classes and libs into perspective WARs which extend the base perspective WAR
fix incorrect artifact name for dep
fix some errors in the section that copies agent plugins, which appear to be a result of the recent merge from master
fix regression in RSS feed template (https://bugzilla.redhat.com/show_bug.cgi?id=567636)
fix a couple invalid docs URLs
start of GWT impl of Alert>History tab
start of GWT impl of Alert>History tab
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
start of GWT impl of Alert>History tab
add remaining fields to Alert history table; first pass at implementing deletion for Alerts
jmx plugin will no longer log warning if SIGAR is not available; Agent, rather than PC, will log this warning once at startup, and only if the user has not explicitly disabled native support (https://bugzilla.redhat.com/show_bug.cgi?id=568760)
jmx plugin will no longer log warning if SIGAR is not available; Agent, rather than PC, will log this warning once at startup, and only if the user has not explicitly disabled native support (https://bugzilla.redhat.com/show_bug.cgi?id=568760)
finish up v1 of Alert History page
implement Administration>Reports>Inventory Summary page (loads JSF page via IFRAME); revamp history/breadcrumb API
a couple minor tweaks to the history/breadcrumb API
small improvement to getDefaultDisplayName()
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
rename BreadCrumb class to BreadcrumbTrailRenderer; start using FullHTMLPane in AdministrationView; add IFRAME-based Administratio/Settings/Downloads view; fix links on Administration/Reports/InventorySummary view
replace getCanvas() method in View class with getDescendantViewRenderer() and refactor callers; add javadoc to View class
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
fix so #Resource/xxxxx URLs work again; remove parentView param from ViewRenderer.renderView() method; delete Presenter and Place classes
use History.newItem(path) rather than History.newItem(path, true), since, when in prod mode, the latter appears to not call the history even listener as it should; add menu items in portal-war Overview menu that link to the new GWT GUI
add About box
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
upgrade SmartGWT from 2.0 to 2.1; switch to Graphite SmartGWT skin; fix a couple bugs in AdministrationView
fix layout in About box
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
display parent resourcetype name in resource summary header
fix a few compile errors resulting from recent merge from master
fix more compile errors resulting from recent merge from master
optimize imports; fix typo
fix so Resource name is displayed in breadcrumb trail rather than "..."
update history value change listener to only call renderView() for descendant portion of requested path if requested path is a descendant path of the current path; call history value changed listener when a tab is clicked
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
update history value change listener so that if the requested path and the current path have a common base path, renderView() is only called for the part of the requested path after the common base path; implement Alert>History Resource tab
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
update Alerts>History tab to use new Table component; start implementing selected Alert details pane on Alerts>History tab
make sure button enablement state get refreshed after a Delete or other action completes
add support for specifying criteria when creating or refreshing a Table component; add support to AlertDataSource for transposing the SmartGWT criteria object to an RHQ AlertCriteria
a little minor refactoring + some javadoc
fix compile error
fix compile error
upgrade to latest version (2.3.0) of MIT Simile timeline lib
add log4j.xml for tests
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Revert "upgrade to latest version (2.3.0) of MIT Simile timeline lib", because Greg made multiple fixes to the previous version, the deltas for which were not captured anywhere
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
comment out gflot repository, since it has been down for a couple days now, and the gflot jar has been added to the JBoss repo
suffix coregui links w/ #Inventory, rather than #Resources
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
get favorite Resource toggle on Resource details view working
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
add a few more user pref names that were missing
improve default text for "breadcrumbs" ui:define in main.xhtml; override this ui:define in largeenv.xhtml
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
upgrade GWT from 2.0.0 to 2.0.3
reformat XML
tidy up deps a bit
fix bug in nullOutUninitializedFields() - when 'value' parameter was a Collection, HibernateProxy items in the Collection were being converted to detached replacement Objects, but the Collection was not being updated to contain these replacements in place of the HibernateProxy's
include cause.toString() as the details of the message
provide better table title on Inventory>Children view
display Resource names, rather than ids, on Favorites menu
fix bug when trying to toggle favorite flag on current Resource
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
fix bug when trying to toggle favorite flag on current Resource
fix bug when trying to toggle favorite flag on current Resource
add support for discovering and managing JBoss EWP (https://jira.jboss.org/jira/browse/JBPAPP-3673)
add support for discovering and managing JBoss EWP (https://jira.jboss.org/jira/browse/JBPAPP-3673)
fix content source sync so status of successfully completed requests gets flipped from INPROGRESS to SUCCESS; also improve results message for sync requests
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
add id's to executions, so we will be able to override those executions in descendant poms
...
fix file upload hanging by implementing workaround for https://jira.jboss.org/jira/browse/RF-8359; upgrade RichFaces from 3.3.2.GA to 3.3.3.CR1; create fileUpload.xhtml template that is shared by both file upload pages
add id's to executions, so we will be able to override those executions in descendant poms
Merge branch 'bugfixes'
misc minor bugfixes and improvements of content GUI, geared toward making installation of patches from JBoss CSP more intuitive
add unit test and bug fix for HtmlUtility.unescapeHtml()
Merge branch 'master' into bugfixes
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
get rid of createCandidateRepo() SLSB method (createRepo() can be used instead); fix some failing content tests
fix getServerRoot() so that if server root from httpd command line is a relative path, it will be resolved relative to the httpd process's cwd, not the cwd of the Agent process (see https://bugzilla.redhat.com/show_bug.cgi?id=536328)
fix getServerRoot() so that if server root from httpd command line is a relative path, it will be resolved relative to the httpd process's cwd, not the cwd of the Agent process (see https://bugzilla.redhat.com/show_bug.cgi?id=536328)
Merge branch 'master' into bugfixes
fix bug causing RepoSyncingTest.testCancelSync() to fail
fix issue causing ContentSourcePluginHandlingTest.testUpdateContentSourceTypes() to fail; improve some variable names
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
add CascadeType.DELETE_ORPHAN to propertyDefinitions field in ConfigurationDefinition so removals from the propertyDefinitions Map are propogated to the DB when merge is called on the parent ConfigurationDefinition
delete HtmlUtility class and its test, since it is no longer used
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
re-disable testMoveResoureType() until the functionality being tested is fixed
fix test bug
rename "content provider" -> "content source"
add temporary workaround in testListProperty() for constraint min/max not being initialized, along with a TODO to look into the issue (@onLoad method not being called on Constraint entities)
make resourceTypeManager field static
Merge branch 'master' into bugfixes
encrypt default DB password
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
encrypt default DB password
misc minor
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
fix last failing test
Merge branch 'master' into bugfixes
use two different DBs for tests and dev-container
improve description for CSP content source type
fix annoying sporadic test failures in ConfigurationManagerBeanTest
update copyright date in javadoc footer; link JEE5 javadoc in to domain javadoc
fix overlap of dbupgrade version 2.59 between RHQ 1.3.1 and HEAD; fix a few minor typos
add better error handling when calling deleteJob() on Quartz scheduler returns false
add a4j keep-alive annotation to UIBean will survive across AJAX requests
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
change version of sample persp back to 1.0.0-SNAPSHOT
handle case where scheduled Quartz job has an invalid job class by deleting the job; general refactor/cleanup of job scheduling code
some minor javadoc fixes; some cosmetic improvement of log messages
fix typo in log message
improve message in exception thrown by loadResourceconfiguration() when config mgmt is disabled
make sure test Resource is COMMITTED
fix a couple minor typos
upgrade several maven plugins to latest versions
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
only log the sigar not available warning once
configure resources plugin to only replace ${*} template variables, and not also @*@
when a BindException occurs, wrap it in an Exception with a message indicating which port we failed to bind to, and throw that Exception
Merge branch 'master' into gwt
Merge branch 'master' into gwt
initial impl of rhq:bundle and rhq:inputProperty tasks
finish up rhq:bundle and rhq:inputProperty tasks
implement rhq:deploy task
fix unit tests
oops, forgot to check this in
upgrade Ant version from 1.6.5 to 1.8.0
fix groupId of ant dep (should be org.apache.ant, not ant)
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
fix typo
pass in sysprops that determine the ports used by some of the unit tests
remove un-needed dep on ant; update surefire plugin config to use new syntax for passing sysprops; move some compile-scoped deps out of the test deps section and into the compile deps section
add unit test that demonstrates executing an upgrade deploy via the Ant launcher
new CLI bundle test
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
update root pom to use new Nexus JBoss public repo; remove JBoss repo from any sub-poms that declared it, since they should inherit that from the root pom; specify old/deprecated JBoss repo where needed; some misc Maven dep tweaks
update root pom to use new Nexus JBoss public repo; remove JBoss repo from any sub-poms that declared it, since they should inherit that from the root pom; specify old/deprecated JBoss repo where needed; some misc Maven dep tweaks
a sample bundle consisting of AS6 + the Java Petstore app
switch back to old JBoss repo; add some blank lines to improve readability; remove no-longer-needed Wagon extensions
switch back to old JBoss repo; add some blank lines to improve readability; remove no-longer-needed Wagon extensions
RHQ Ant command line wrapper + Maven assembly
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
fix some compile errors; move rhq.deploy.* sysprop name constants to their own class
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Merge branch 'master' into gwt
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'master' into gwt
Ant bundle agent-plugin now reports target-finished and task-finished Ant events back to Server so they can be saved to the deployment history
diffs are now logged to the Ant project log as well as sent back to the Server to be stored in the deployment history
eradicate all snapshot repos and deps from our poms
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
explicitly disable snapshots in all repository pom elements
add a new rhq:install-system-service task for installing Unix init scripts (currently only supports RH Linux); rename rhq:inputProperty task to rhq-input-property to follow our task naming convention
include a system init script for starting JBoss AS in the sample bundle and install that script using the rhq:install-system-service task; still need to actually execute the init script to start the server
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
when dev profile is active, set 'db' prop to 'dev' - this tells dbsetup (in the dbutils module) to use the dev DB conn props
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
when dev profile is active, set 'db' prop to 'dev' - this tells dbsetup (in the dbutils module) to use the dev DB conn props
sample bundle script now installs the jbossas init script and uses it to stop and restart the petstore AS instance
update to depend on RHQ 3.0.0.B05 and to use JBoss Nexus repo
various updates/improvements to the sample settings.xml
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
include remoting/client-api module in reactor by default (previously it was only included when the enterprise profile was active)
as5 plugin's getAvailability() now handles the case then AS5/AS6 instance is listening on an AS4 Server Resource's JNP URL (https://bugzilla.redhat.com/show_bug.cgi?id=588803)
add commented-out enforcer.skip prop to show how enforcer plugin checks can be bypassed
fix mistakes in display name and description of proxyURL content source config property
as5 plugin's getAvailability() now handles the case then AS5/AS6 instance is listening on an AS4 Server Resource's JNP URL (https://bugzilla.redhat.com/show_bug.cgi?id=588803)
add old jboss repo as plugin repo, so jboss-packaging plugin can bo obtained from it
add old jboss repo as plugin repo, so jboss-packaging plugin can bo obtained from it
use /Dashboard.do, rather than /Start.do, as the URL to check to determine if portal-war has been deployed
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
fix name of profile used to enable enforcing of Java 5 API
remove use of nexus deprected repo, which was overriding the original jboss repo in the root pom, which has the same id
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
remove use of nexus deprecated repo, which conflicts with the original jboss repo declared in the root pom
remove use of nexus deprected repo, which was overriding the original jboss repo in the root pom, which has the same id
remove use of nexus deprecated repo, which conflicts with the original jboss repo declared in the root pom
get as5 plugin working w/ AS 6.0.0.M3 (fix for https://bugzilla.redhat.com/show_bug.cgi?id=591177); add comment in JBossAS5ConnectionTypeDescriptor that explains why getConnectionClasspathEntries() returns an empty array
get as5 plugin working w/ AS 6.0.0.M3 (fix for https://bugzilla.redhat.com/show_bug.cgi?id=591177); add comment in JBossAS5ConnectionTypeDescriptor that explains why getConnectionClasspathEntries() returns an empty array
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
upgrade SIGAR from 1.6.3 to 1.6.4 (https://bugzilla.redhat.com/show_bug.cgi?id=591552)
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
improve default Resource descriptions for JBoss AS Server Resources (fixes https://jira.jboss.org/jira/browse/EMBJOPR-292)
fix so plugin jar MD5 and plugin version are calculated by opening streams directly from the plugin jar URLs, rather than trying to convert the URLs to Files and opening the streams from the Files, which won't work when running inside the admin-console because the URLs will be jndi URLs, not file URLs (fix for https://jira.jboss.org/browse/EMBJOPR-274)
fix several minor typos in comments
refactor Ant bundle task to support new Ant bundle recipe format
Merge branch 'gwt' into bundle
fix so plugin jar MD5 and plugin version are calculated by opening streams directly from the plugin jar URLs, rather than trying to convert the URLs to Files and opening the streams from the Files, which won't work when running inside the admin-console because the URLs will be jndi URLs, not file URLs (fix for https://jira.jboss.org/browse/EMBJOPR-274)
add support for revert, clean, and dryRun flags to AntBundlePluginComponent and BundleTask
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
add some TODOs
* add support for moving resourcetypes to new locations in the type hierarchy, as well as moving any existing resources of those types (https://bugzilla.redhat.com/show_bug.cgi?id=577055)
fix conflict
use schema version 2.87, rather than 2.86, for adding unique constraint to rhq_resource_type name+plugin index, since Mazz has already claimed 2.86; fix compile errors in JBossCacheComponent and JBossCacheDetailComponent caused by my previous checkin; turn down logging verbosity in ResourceMetadataManagerBean
oops, forgot to update current schema version in pom to 2.87
improve testMoveResourceType() so that it verifies that when a ResourceType X is moved, that Resources of type X are also moved
upgrade SIGAR from 1.6.4 to 1.6.5 (fixes https://bugzilla.redhat.com/show_bug.cgi?id=591519)
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[maven-release-plugin] prepare release RHQ_3_0_0_B06
Revert "[maven-release-plugin] prepare release RHQ_3_0_0_B06"
[maven-release-plugin] prepare release RHQ_3_0_0_B06
Revert "[maven-release-plugin] prepare release RHQ_3_0_0_B06"
upgrade git scm provider from 1.2 to 1.3 to fix issue where it tries to push updates during release:prepare to all branches, rather than just the current branch
misc cosmetic
fix SCM connection and developConnection URLs
add jboss 3rd party uploads repo for augeas v0.0.2 jar
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Ian Springer (406):
disable printing of option errors to stderr by Getopt while parsing run.sh/bat command line
turn down some logging from INFO to DEBUG (mainly to quiet things down in Embedded)
fix for https://jira.jboss.org/jira/browse/JOPR-3
build jboss-as-5 plugin when dev profile is active
optimize imports, add more logging, and do some minor cleanup
added Path and Exploded traits to WAR and EAR Resource types (https://jira.jboss.org/jira/browse/JOPR-13)
some tweaking of the code for ear/war create and update (see https://jira.jboss.org/jira/browse/EMBJOPR-12)
add support to ApplicationResourceComponent.retrievePackageBits() for sending a directory (in the form of a zipfile)
call MainDeployer.deploy()/redeploy() at the end of EAR/WAR create/update so we can report whether or not the create/update truly succeeded (see https://jira.jboss.org/jira/browse/EMBJOPR-27)
make EAR/WAR update roll back the new file if the call to MainDeployer.deploy() fails (fix for https://jira.jboss.org/jira/browse/JOPR-16); rename FileUtils class to TomcatFileUtils to avoid mixing it up with the 15 other FileUtils classes we have
cleanup Tomcat plugin - move code that is only used by JBossAS plugin to JBossAS plugin or, if it is generic, to plugin-api module (https://jira.jboss.org/jira/browse/JOPR-18)
renamed ApplicationVersions to PackageVersions
changed my mind about building the jbas5 plugin, even in dev mode :-)
set resource name on create ear/war response to fix https://jira.jboss.org/jira/browse/EMBJOPR-30; some misc code cleanup
implement getAvailability(); use non-deprecated version of DeploymentManager.distribute()
get EAR/WAR create working (https://jira.jboss.org/jira/browse/EMBJOPR-10); added code that connects to the profile service and spits out an RHQ deployment descriptor that contains services representing deployed managed component types
replace invalid "@author:" javadoc tags with "@author"
removed no-longer-needed dep on jboss-managed.jar
get config load/update working for Datasources (includes lots of generic config fixes) - https://jira.jboss.org/jira/browse/JOPR-20
implemented delete support for EARs + WARs (https://jira.jboss.org/jira/browse/EMBJOPR-40); added 'path' and 'exploded' traits to EARs + WARs; cleaned up ProfileJBossServerComponent a bit
remove deps on database and jmx plugins from modules-parent pom; move the jmx plugin dep into the poms of the individual plugins that actually depend on it
deleted PropertySimpleToGenericMetaValueAdapter, which has been replaced by PropertyMapToGenericValueAdapter
fix the AS5 deps
use 2.0.0.CR4 rather than 2.0.0-SNAPSHOT version of jboss-man, as per tip from Scott; add xml-apis and jaxb-api deps required by rhq-plugin.xml gen code
include jboss-as-5 module if 'embedded' profile is active
oops, add missing 'profiles' element
add missing props to Local TX Datasource config def and get config load/update working for Datasources (https://jira.jboss.org/jira/browse/JOPR-23)
add missing ems dep
use XML entities to consolidate resource config props that the different types of datasources have in common (https://jira.jboss.org/jira/browse/JOPR-21)
get create working for LocalTx Datasources and load working for NoTX and XA Datasources (https://jira.jboss.org/jira/browse/JOPR-23)
update metric defs and resource config defs for Topics and Qeueues; got config create/load and metrics working for Topics and Queues (https://jira.jboss.org/jira/browse/JOPR-25)
added support for list and map props to plugin descriptor generator; added support for converting ManagedDeployments to ResourceTypes; added support for EAR/WAR update; renamed a bunch of classes; added javadoc to PropertyAdapter
add dep on new jboss-profileservice-spi jar; upgrade jboss-man version from 2.0.0.CR4 to 2.0.0.CR5
updated connection factory defs in plugin descriptor (resource config, metrics, and operations); fixed a few formatting issues in DebugUtils
fix descriptor metadata for datasource / connection factory ops; fix a couple adapter and converter bugs
remove empty package
simplified subcategories (https://jira.jboss.org/jira/browse/JBNADM-3523); removed no-longer-needed dep on tomcat plugin from jboss-as descriptor
upgrade jboss-man from 2.0.0.CR5 to 2.0.0.GA
remove some redundant casts and fix a couple typos
improved descriptions for topic and queue resource config props
fix broken test
fix compile error
Jopr Build 2.1.3.GA (in progress)
[maven-release-plugin] prepare release Jopr_2_1_3_GA
roll back failed release - did i mention i hate the release plugin?
developerConnection SCM URL should use https, not http, so release plugin can use it to create tags and branches
[maven-release-plugin] prepare release Jopr_2_1_3_GA
[maven-release-plugin] prepare for next development iteration
get version discovery working
consider a non-zero exit code from startup.bat or shutdown.bat to be a Start/Shutdown failure; remove some code that was specific to JBAS operations; change Tomcat references to EWS
add "EJB 2.x Stateful Session Bean" Resource type (https://jira.jboss.org/jira/browse/JOPR-102)
upgrade jboss-man from 2.1.0.CR1 to 2.1.0.CR4 (the latest)
cosmetic tweaks of descriptions
make invokeOperation() return null if the returned MetaValue is null and the return MetaType is VOID (part of fix for https://jira.jboss.org/jira/browse/EMBJOPR-67); also cleaned up invokeOperation() a bit
add support for PropertiesMetaValue/PropertiesMetaType in property adapters and plugin descriptor generator (https://jira.jboss.org/jira/browse/JOPR-106)
only generate plugin descriptor if jbmancon.debug sysprop is set to "true"
turn down a bunch of logging from INFO to DEBUG
fix the application update code (https://jira.jboss.org/jira/browse/EMBJOPR-81)
print '*' next to ManagedProperty's that are mandatory
remove an obsolete workaround from convertConfigurationToManagedProperties()
add commented-out dep on jboss-profileservice.jar (handy for debugging Profile Service)
add support for some additional prop types to plugin descriptor generator
component type lookup is now done using the metadata from the plugin descriptor; this is the right way to do it and also gets us back several Resource types that not been getting discovered lately (e.g. No Tx Connection Factories)
add workaround for https://jira.jboss.org/jira/browse/JBAS-6664; add unit tests that test issues with non-mandatory ManagedProperty's; numerous fixes to da and cf restypes in plugin descriptor; add workarounds for errors during plugin descriptor generation
make config-property prop in datasource resource config read-only for now (see https://jira.jboss.org/jira/browse/JBAS-6669)
add more tests that test missing mandatory props in a template passed to applyTemplate()
add testng dep
upgrade jboss-man from 2.1.0.CR4 to 2.1.0.CR5; add support for read-only to plugin descriptor generator now that ManagedProperty has an API for it; fix bug in Resource type names used by plugin descriptor generator; comment out running of profile service unit tests
specify copyContent=true for ear/war create requests, but keep copyContent=false for ear/war update requests for now until ManagedDeploymentComponent.deployPackages() can be reworked
fix simple type mapping in metadata converter; make all Queue/Topic resource config props required to workaround https://jira.jboss.org/jira/browse/JOPR-111; log error if exception occurs in updateResourceConfiguration()
make logged error stand out more and add TODO for possibly supporting incomplete templates
upgrade jboss-profileservice-spi dep from 5.1.0.CR1 to 5.1.0.CR2
make "JNDIName" prop on topics and queues required for now (workaround for https://jira.jboss.org/jira/browse/JBAS-6672)
set clustered, downCacheSize, fullSize, and pageSize props to readOnly="true" as a temporary workaround for https://jira.jboss.org/jira/browse/JOPR-112
fix custom property conversion code; implement custom property adapter for ManagedProperties representing ObjectNames, and add ObjectName properties to Queue and Topic Resource configuration definitions (https://jira.jboss.org/jira/browse/JOPR-113)
remove "config-property" prop from Datasource resource config (see https://jira.jboss.org/jira/browse/JBAS-6669)
add more debug logging in EAR/WAR update code
remove workaround for https://jira.jboss.org/jira/browse/JBAS-6647, since it is now fixed (see https://jira.jboss.org/jira/browse/JOPR-107)
add new 'runState' trait to all ManagedComponent Resource types; use run state to determine availability for ManagedComponent Resource types; add deployExploded option to creation time config for EAR/WAR Resource types (https://jira.jboss.org/jira/browse/EMBJOPR-37); store deployment type names in plugin descriptor, rather than hard-coding them in code; fix EAR/WAR update so it works for both zipped and exploded deployments; turn down some logging during discovery from DEBUG to TRACE
fix for ClassCastException (https://jira.jboss.org/jira/browse/JOPR-117)
fix/workaround for https://jira.jboss.org/jira/browse/JOPR-105
improved error handling / logging
add start/stop/restart operations to EARs/WARs (https://jira.jboss.org/jira/browse/JOPR-120)
fix a couple bugs in EAR/WAR update code (hopefully will resolve https://jira.jboss.org/jira/browse/EMBJOPR-81)
for overloaded ManagedOperations, plugin descriptor generator now generates an operation def for the ManagedOperation with the most parameters (https://jira.jboss.org/jira/browse/JOPR-105)
cosmetic cleanup
fix for NPE (https://jira.jboss.org/jira/browse/EMBJOPR-114) + cleanup refactoring of ManagedComponentComponent.invokeOperation()
expose 'name', 'createdProgrammatically', and 'messageCounterHistoryDayLimit' as traits, rather than resource config props; hopefully we can eventually switch 'name' and 'messageCounterHistoryDayLimit' back if their ViewUse is changed to CONFIGURATION (see https://jira.jboss.org/jira/browse/JBAS-6719, https://jira.jboss.org/jira/browse/JBAS-6721, and https://jira.jboss.org/jira/browse/JOPR-122)
fix for https://jira.jboss.org/jira/browse/JOPR-123
throw an exception if a prop is missing from the Profile Service template, rather than just logging an error; in DebugUtils method that dumps props, sort the props by viewUse and then by name, rather than only by name; turn down some logging from DEBUG to TRACE
fix some datasource props that no longer matched up with the props exposed by the Profile Service
fix typo in Queue 'downCacheSize' prop name
remove 'local-transaction' prop from Tx CF res config and make 'xa-transaction' prop read-only for now (see https://jira.jboss.org/jira/browse/JBAS-6728); add 'Transaction Type' trait to Tx CF res type; DebugUtils: print readOnly and removed flags when dumping props
map PropertySimples with null values to SimpleValues with null values, rather than to null MetaValues
turn down some logging from DEBUG to TRACE
deleteResource() needs to call DeploymentManager.stop() and then DeploymentManager.remove(), rather than only calling DeploymentManager.remove() (see https://jira.jboss.org/jira/browse/JBAS-6701)
upgrade jboss-man dep from 2.1.0.CR5 to 2.1.0.CR6
add "securityConfig" prop to Topic/Queue resource config defs and implement custom Property<->MetaValue adapter for it; set "removed" flag on ManagedProperties that were unset via the Admin Console; make all Topic/Queue props that map to primitive MetaValues required for now (until usage of the "removed" flag is fully implemented by the Profile Service); refactor code in ConversionUtils that deals with props that have custom adapters to reduce redundant code and improve readability; comment out dumping of member items for Collection and Composite MetaValues in DebugUtils (in most cases, it was too verbose)
add better error handling to loadResourceConfiguration() and updateResourceConfiguration() (https://jira.jboss.org/jira/browse/EMBJOPR-104); extract a couple util methods to a new ResourceTypeUtils class
call reload() rather than process() after calling updateComponent() or removeComponent(); don't chop leading slash off deployment URL path unless OS is Windows (fix for https://jira.jboss.org/jira/browse/EMBJOPR-81 and https://jira.jboss.org/jira/browse/JOPR-109)
fix bug in convertToMetaValue()
have deleteResource() throw an UnsupportedOperationException until deletion of ManagedComponents has been implemented by the Profile service
now that activation policy is implemented, flip readOnly flag back to false on topic/queue props that require topic/queue restart to take effect, and not in their descriptions that a restart is required for value changes to take effect; flip required back to false for the topic/queue primitive props (though the removed ManagedProperty flag is still not working correctly)
for non-primitive properties call setValue(null) and setRemoved(true) when the unset box is checked, this should hopefully cause the managed resource to use its default value, which will be return to the PS when we request it (https://jira.jboss.org/jira/browse/JBAS-6672); add descriptions to all Datasource resource config props that were missing them (https://jira.jboss.org/jira/browse/JOPR-128)
upgrade jboss-man dep from 2.1.0.CR6 to 2.1.0.CR7 and jboss-profileservice-spi dep from 5.1.0.CR2 to 5.1.0.CR3
move code for setting default values from ConversionUtils into the property adapters and add support for setting default value to defaultValue attribute from plugin descriptor if it was specified (https://jira.jboss.org/jira/browse/JBAS-6672); set defaultValue attribute on primitive Topic/Queue props
set 'clustered' Topic/Queue resource config prop to readOnly='true', since the corresponding ManagedProperty is read-only
split out a separate resource type for embedded WARs like we have in the as4 plugin (see https://jira.jboss.org/jira/browse/EMBJOPR-81)
add jboss releases repo and comment out jboss snapshots repo
remove testng dep
print metaType.toString(), rather than metaType.getClass().getSimpleName(), for props with null MetaValue
obtain version and server name from Profile Service during Server discovery, rather than hard-coding them; add serverName trait to Server resource type
update serverName/version lookup code to work again after renaming of ServerConfig ManagedComponent type (see https://jira.jboss.org/jira/browse/JBAS-6786)
bump up RHQ version in prep for 2.2.0.EmbJopr_1_2_0-1 release
[maven-release-plugin] prepare release Jopr_2_2_0_EmbJopr_1_2_0-1
[maven-release-plugin] prepare for next development iteration
revert RHQ version back to 1.2.0-SNAPSHOT now that the release is done
add defaultValue attributes to all primitive Datasource and Connection Factory config props (https://jira.jboss.org/jira/browse/JBAS-6672); split out config props that are common to Datasources and Connection Factories into a shared XML entity; a couple improvements to the plugin descriptor generator; move util classes to the util package
add commented-out dep on jboss-system.jar
turn down logging (https://jira.jboss.org/jira/browse/EMBJOPR-143)
uncomment security-domain prop, now that https://jira.jboss.org/jira/browse/JBAS-6796 is at least semi-fixed; improve some prop descriptions
upgrade jboss-man from 2.1.0.CR7 to 2.1.0.CR8
fix bug in SimpleValue prop adapters; work around https://jira.jboss.org/jira/browse/JOPR-132 by adding default value to 'formatClassName' param of 'listFormattedSubPoolStatistics' DS/CF operation
add the various app-server level metric and traits to the JBoss AS Server resource type (https://jira.jboss.org/jira/browse/JOPR-137)
fix a couple bugs in metric def generation code in plugin descriptor generator
add comment that describes metric name syntax
add support for using the new ManagedProperty.getDefaultValue() API when converting RHQ PropertySimples to ManagedProperties
define embedded EJB 2.x EJB-JAR, EJB 3.x EJB-JAR, and RAR Resource types (https://jira.jboss.org/jira/browse/JOPR-139); comment out SAR and MCBean Resource types
add better validation for ObjectName props in Topic/Queue resource config (https://jira.jboss.org/jira/browse/JOPR-153) and improve descriptions for those props
fix cut-and-paste errors - embedded app Resource types should not be creatable or deletable
remove start/stop/restart ops from embedded app Resource types until https://jira.jboss.org/jira/browse/JBAS-6824 is fixed
add 'deployExploded' prop to content creation config for standalone EJB-JAR and RAR Resource types
add call to missing call to DeploymentManager.stop() in StandaloneManagedDeploymentComponent.deployPackages() (fix for https://jira.jboss.org/jira/browse/EMBJOPR-165); remove extra call to run() in DeploymentUtils.deployArchive()
remove unused import
rename ManagedDeploymentComponent -> AbstractManagedDeploymentComponent
update copyright dates from 2008 to 2009
restore changes from r469 and r470, which I accidentally clobbered in r473
Jopr Build 2.2.0.EmbJopr_1_2_0-2 (in progress)
[maven-release-plugin] prepare release Jopr_2_2_0_EmbJopr_1_2_0-2
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.2.0.EmbJopr_1_2_0-2 (done)
fix RAR update, extension validation (https://jira.jboss.org/jira/browse/JOPR-162)
comment out the AS impl deps
start of autodiscovery + remote connection impl
...
temporarily comment out log event code to fix compile errors; add SIGAR dep
got autodiscovery working; manual discovery should work too but hasn't been tested yet; remote connection to profile service is still not working, though I think it's close
fix so local lookup of ProfileService is used when in-process with AS5 instance
use ManagementView.load(), rather than its evil twin ManagementView.reload()
simple project for testing what libs are needed to remotely access the ProfileService
the latest attempt at figuring out the magic combination of client jars to connect to the Profile Service remotely .... not quite working yet, but hopefully it's close ........
got command line Profile Service client working
add a couple more missing deps to RMI client; add new Maven project for testing authenticated access to Profile Service via EJB
fix up deps; add client.bat for EJB client
use javaduke:anotherduke as JNP username/password, rather than admin:admin
all deps should be runtime-scoped except jboss.integration and jboss.man jars; other misc. minor
remove the client jars needed for remote connections; once http://jira.rhq-project.org/browse/RHQ-2059 has been implemented, these will eventually be referenced externally in the managed AS instance's lib dirs, rather than bundled with the plugin
upgrade profile service impl jar dep from 5.1.0.CR1 to 5.1.0.GA
touch up grammar a bit
use the correct Maven artifact for jboss-client.jar
remove some commented out lines from pom; add a few new MBean componentTypes to the plugin descriptor generator's set of known types; re-enable plugin descriptor generation
use 'extension' plugin config prop when checking for valid deployment extension, rather than hard-coding the valid extensions
WAR metrics in da house!
comment out the JBAS impl jars
use new WAR:Context MO in order to determine a WAR deployment's context root, rather than the convoluted hack previously used; fix JBAS discovery issue caused by Heiko's changes from JOPR-170; update MoreKnownComponentTypes to contain all the component types I know of that are missing from KnownComponentTypes
add new "Web Application Context" ResourceType as child of "Web Application (WAR)" ResourceType
add a few more MBean and MCBean component types
added JBoss Web, Connector, and Virtual Host Resource types; did some misc cleanup & refactoring of the descriptor and the code
make sure WARs with no associated contexts (which are most likely stopped WARs) get discovered; don't specify fully-qualified component classnames in the descriptor
reformat all Java files; fix copyright headers on all Java files
upgrade jboss-profileservice-spi dep from 5.1.0.CR3 to 5.1.0.CR4
"resource adaptor" -> "resource adapter" (fix for https://jira.jboss.org/jira/browse/EMBJOPR-175)
stopped queues are now reported as DOWN (workaround for https://jira.jboss.org/jira/browse/JOPR-198)
fix return type on list*Subscriptions operations on Topic resource type (https://jira.jboss.org/jira/browse/JOPR-141)
fix property adapter bug when updating existing Topic/Queue security config prop (https://jira.jboss.org/jira/browse/JOPR-124)
mark a couple metrics as displayType="summary" for the *CF, topic, and queue Resource types; do a cosmetic tidy-up of metric defs
upgrade jboss-profileservice-spi dep from 5.1.0.CR4 to 5.1.0.GA
a 2nd pass at a workaround for https://jira.jboss.org/jira/browse/JOPR-198 that works for topics, as well as queues
if starting app fails during creation of a deployment Resource, the deployment is now rolled back so the invalid app does not get added (fix for https://jira.jboss.org/jira/browse/EMBJOPR-178)
upgrade jboss-man dep from 2.1.0.CR8 to 2.1.0.GA
prep for release needed by EmbJopr
[maven-release-plugin] prepare release Jopr_2_3_0_EmbJopr_1_2_0-1
[maven-release-plugin] prepare for next development iteration
release complete - revert RHQ version back to 1.3.0-SNAPSHOT
shorten names for deployment ResourceTypes
upgrade jboss-man dep from 2.1.0.GA to 2.1.0.SP1
pull in versions for the JBAS client deps by importing the jboss-as-parent pom's managed deps; various fixes to get the plugin working when connecting to the PS remotely (i.e. when the plugin is running inside the Jopr Enterprise Agent)
add jboss snapshot repo and remove jboss release repo since it's already in the rhq-parent pom
add versions for two JBAS deps that are not under depMgmt
switch version of AS5 deps from 5.1.0-SNAPSHOT to 5.1.0.GA, but add a comment describing how those developing or running against EAP5 should switch it back to 5.1.0-SNAPSHOT
import JBAS component-matrix POM's managed deps
leverage new ManagementView.getComponentTypes() API in plugin descriptor generator; have plugin descriptor generator sort the Resource types it generates by component name or deployment name
it's no longer necessary to redefine the context classloader prior to doing our JNDO lookups, since the PC now takes care of setting the context classloader to the plugin classloader prior to making any calls into a plugin
use ALR's new EJB3 PS MOs to discover and manage EJB3 session beans
don't blow up when user tries to delete an EAR/WAR/etc. that has already been undeployed by some other means (fix for https://jira.jboss.org/jira/browse/JOPR-225)
include URL of EAP5 branch in comment
update all JBAS client deps to the JBAS 5.1.0-SNAPSHOT versions; use admin:admin as remote EJB credentials
various minor tweaks
EJB3 resource types are now children of the EJB-JAR resource types, rather than being directly under the JBossAS resource type in the EJBs subcat
add explicit version to jboss-ejb3-ext-api dep
switch back the JBAS version to 5.1.0.GA and comment out the snapshots repo, so the build can succeed in TC
change case
fix errors that were causing component start() to fail
add support for "methodInvocationTime" call-time metric to EJB2 session bean ResourceTypes
remove workaround for https://jira.jboss.org/jira/browse/JBAS-6939 now that that issue has been fixed
leverage new deployExploded option for distribute()
updated EJB3 Resources to work w/ recent changes to EJB3 MOs; added back 'interleaving' prop to datasources even though the underlying MO prop is still broken; improved descriptions on a few props; updated client.bat files to use jbossall-client.jar
add support for call-time metric and operation to EJB3 session bean ResourceTypes; include 'interleaving' prop only in XA Datasources, rather than all Datasources; remove deprecated 'track-connection-by-tx' prop from XA Datasources
add 'partitionName' trait to the JBossAS ResourceType (https://jira.jboss.org/jira/browse/JOPR-137)
part of fix for https://jira.jboss.org/jira/browse/JOPR-204
add "Test Connection" operation on DataSources and Conn Factories (https://jira.jboss.org/jira/browse/JOPR-202)
add 'interleaving' prop to Tx Connection Factories
fix invalid XML
fix XML error in POM; remove no-longer-used Ejb3DiscoveryComponent class
split plugin descriptor generator out into its own Maven module (https://jira.jboss.org/jira/browse/JOPR-232)
don't copy the plugin descriptor generator dep jars into lib/ anymore; change scope of gnu-getopt and sigar deps from provided to compile, since they are no longer provided by the PC
sigar.jar is still provided by the PC, so change the dep back to "provided"
fix so Resource name and description are correct for a discovered EAP instance
it turns out the SIGAR dep wasn't even needed - remove it
prepare for 2.3.0.EmbJopr.1_3_0-1 release
[maven-release-plugin] prepare release Jopr_2_3_0_EmbJopr_1_3_0-1
[maven-release-plugin] prepare for next development iteration
change display names and descriptions to distinguish this plugin from the jboss-cache plugin for AS 4.x
change display names and descriptions to distinguish this plugin from the jboss-cache5 plugin for AS 5.x
fix classnames "Jboss" -> "JBoss"
rename class
rename class
rename class
rename class
fix component class names
make sure metric display names contain spaces and proper capitalization; use spaces in ResourceType names
tidy up metric descriptions a bit more
[maven-release-plugin] prepare release Jopr_2_3_0_EmbJopr_1_3_0-1
[maven-release-plugin] prepare for next development iteration
switch back to snapshot RHQ version now that release is done
fix compile errors caused by wrong case in referenced class names
fix potential NPE in getValues(); improve error reporting when loading resource configs
add back the JBAS client jar deps temporarily until RHQ-2059 is done
add datasource creation code to the client to reproduce https://jira.jboss.org/jira/browse/JBAS-7050
add EJB name trait to the EJB3 ResourceTypes; remove obsolete commented-out lines from plugin descriptor; if an underlying managed component is not in the RUNNING state, log errors during config load or metrics retrieval at DEBUG, rather than ERROR; remove some of the abstract methods from AbstractManagedComponent and move the config facet impl into ManagedComponentComponent
start of integration tests for the as5 plugin
add testOperations() method in AbstractResourceTest
replace usages of Java6+ APIs with Java5-compatible APIs
excludedGroups surefire prop isn't working for some reason, so disable the tests via the TestNG Test annotation's enabled=false attribute for now
remove unused method
disable integration tests so they won't cause the TC build to fail; switch JBAS version to 5.1.0-SNAPSHOT now that EAP5 snapshot jars have been published to the snapshot repo
remove commented-out obsolete lines; neaten up formatting a bit
this was renamed to jboss-cache-v3
various integration test updates; make sure integration tests are disabled via excludedGroups option to surefire plugin, so they will not run in TC
re-disable parallel test execution
add support to EAR/WAR create for deploying to farm dir (https://jira.jboss.org/jira/browse/EMBJOPR-37)
refactor a bit; implement doDisconnect()
component: clean up start() method; disconnect from PS and null out this.connection in stop()
fix resource config updates so they work in Enterprise, as well as Embedded (https://jira.jboss.org/jira/browse/JOPR-259)
add code that reproduces https://jira.jboss.org/jira/browse/JOPR-263
add some more debug output
update AS version to 5.1.0-SNAPSHOT; add dep on new jboss-as-profileservice client jar (see https://jira.jboss.org/jira/browse/JBAS-7052)
add missing dep on jax-impl jar
remove no-longer-needed dep on jboss-profileservice.jar
fix getAvailablity() so it doesn't return UP for a defunct connection
use JAAS to authenticate prior to each remote PS call (part of fix for https://jira.jboss.org/jira/browse/JOPR-263)
switch over to using the new secured-AOP remote interface and non-secured local (java:ProfileService) interface to the Profile Service (https://jira.jboss.org/jira/browse/JOPR-284)
a temporary workaround for https://jira.jboss.org/jira/browse/JOPR-284 to get the admin console working again
lookup the Profile Service from local JNDI when running inside JBAS (https://jira.jboss.org/jira/browse/JOPR-284)
check enum directly, rather than its name
some changes to get the JMX/EMS ResourceTypes working (*NOTE*: additional change necessary is to upgrade to EMS 1.2.11 once it has been released!)
change "Jboss" to "JBoss"; neaten up indentation a bit
remove the comments regarding the jbossas.version prop, which are no longer necessary
remove commented-out client jar deps; remove version from jboss-man/profileservice-spi deps, so the version will be determined via dependency management
rename "resourceName" plugin config prop on datasources, topics, etc. to "componentNameProperty"; use name, rather than JNDIName, as initial Resource name for auto-discovered topics and queues
include stack trace in debug log message that's printed when lookup of ProfileService from local JNDI fails; remove no-longer used UnitTestRunner and associated classes
various minor tweaks
change RHQ version to 1.3.0.EmbJopr.1_3_0-2 to prepare for Jopr 2.3.0.EmbJopr.1.3.0-2 release
get rid of snapshot deps in prep for release
[maven-release-plugin] prepare release Jopr_2_3_0_EmbJopr_1_3_0-2
[maven-release-plugin] prepare for next development iteration
switch back to snapshot deps now that the release is complete
update sigar version to 1.6.3.82
fix https://jira.jboss.org/jira/browse/JOPR-308 and some other bugs in ApplicationServerOperationsDelegate; move constants for plugin config prop names back into ApplicationServerComponent, since this is our standard practice in all other plugins (i.e. the prop name constants live in the ResourceComponent class corresponding to the ResourceType that defines them)
fix so Start operation works in Embedded Jopr
move plugin config prop constants back out of ApplicationServerComponent into a separate class to avoid CNFEs from ApplicationServerDiscoveryComponent when it references ApplicationServerComponent which in turn references JBAS client classes; catch connection error in avail checking (https://jira.jboss.org/jira/browse/JOPR-276); in ApplicationServerComponent.start(), throw an InvalidPluginConfigurationException if authentication fails
remove some obsolete commented-out code
remove test-scoped jboss-remoting dep, since we already have a provided-scoped dep on it
remove MalformedURLException from getDeploymentFile's throws clause, since the method no longer throws that exception
prepare for 2.3.0.EmbJopr.1.3.0-3 release
temporarily remove snapshot deps in prep for release
temporarily comment out the snapshot test deps so we can do a release without the release plugin failing
[maven-release-plugin] prepare release Jopr_2_3_0_EmbJopr_1_3_0-3
[maven-release-plugin] prepare for next development iteration
switch back to snapshot deps now that release for EmbJopr is done
fix for https://jira.jboss.org/jira/browse/EMBJOPR-226
delete obsolete ProfileServiceFactory class, which has been replaced by ProfileServiceConnectionProvider, ProfileServiceConnection, and their impls
include cause in error when app fails to start during create or update (https://jira.jboss.org/jira/browse/JOPR-207)
rename EAR and WAR ResourceTypes so they have the same names as the EAR and WAR ResourceTypes in the AS4 plugin (https://jira.jboss.org/jira/browse/JOPR-320)
add support in AS4 plugin and AS5 plugin for discovering jmx-console security domain credentials (https://jira.jboss.org/jira/browse/JOPR-262)
various minor corrections and improvements to descriptions
reformat XML
remove invalid use of manual-add API from discoveries; use standard simple operation result prop name
friendlier error message when Start op fails because the WAR/EAR is already started
remove unused method isRequestInReport()
Jopr Build 2.3.0.EmbJopr.1.3.0-4 (in progress)
temporarily comment out snapshot test deps in order to make the maven release plugin happy
temporarily comment out snapshot test deps in order to make the maven release plugin happy
[maven-release-plugin] prepare release Jopr_2_3_0_EmbJopr_1_3_0-4
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.3.0.EmbJopr.1.3.0-4 (done)
improve description of 'createdProgrammatically' trait on Topics and Queue restypes
add help text to Topic and Queue resource types that explains how to enable the message counter metrics (https://jira.jboss.org/jira/browse/JOPR-365)
handle the alternate ObjectName format for GlobalRequestProcessor MBeans that occurs when the value of the address element in server.xml is a hostname, rather than an IP address (https://jira.jboss.org/jira/browse/JOPR-208)
re-enable default log event source for Jopr JBoss AS server (http://jira.rhq-project.org/browse/RHQ-2380)
set catalina.base dir correctly during manual add of a Tomcat Server (fix for part of https://jira.jboss.org/jira/browse/JOPR-354); if port can't be determined during a manual add, display the port as "Unknown Port", rather than "null", in the default Resource name
for Start operation, if using script method on Windows (i.e. startup.bat), don't consider an exit code of 1 to be an error (fix for items 7 and 9 from https://jira.jboss.org/jira/browse/JOPR-354)
decrease collection interval for most of the Connector metrics; fix a few typos
at request of ccrouch, change collection intervals for Connector metrics back from 5 min to the defaults (20 min for non-summary and 10 min for summary)
Start op now fails is server is already started, and Shut Down op now fails if server is already shut down (https://jira.jboss.org/jira/browse/JOPR-308)
discovery now filters out SOA-P 4.x servers (https://jira.jboss.org/jira/browse/JOPR-374)
discovery now filters out AS 6.x servers; refer to AS as "JBoss AS", rather than "JBossAS" in log and exception messages
remove illegal usage of client-api StringUtil class (see https://jira.jboss.org/jira/browse/JOPR-381)
implement control action facade in AS5 plugin; improve error handling when plugin is passed a ResourcePackageDetails with a null metadata field (https://jira.jboss.org/jira/browse/JOPR-171)
fix build failure due to missing artifact "sun-jaxb:jaxb-api:jar:2.1.9.patch01" (https://jira.jboss.org/jira/browse/JOPR-380)
change scope of dep on as5 plugin jar to "provided" (https://jira.jboss.org/jira/browse/JOPR-383); remove unused gnu-getopt dep
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.3.0.GA (in progress)
[maven-release-plugin] prepare release Jopr_2_3_0_GA
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.3.0.GA (done)
early draft of a script for performing releases
fix a couple bugs
bug fixes
recompile test class w/ jdk5, rather than jdk6, to avoid test failures when running build w/ java 5
more fixes and improvements
require JAVA5_HOME env var to be set, so we can specify java5.home sysprop when building
pass correct value for java5.home; require development version to be specified as cmd-line arg; pass releaseVersion and developmentVersion sysprops to release:prepare goal
fix usage message
use /home/ispringer as default base dir, rather than /tmp; pass -DdryRun=true to release:prepare goal for the time being
make the connector bind port used by several of the comm tests configurable via a sysprop
change the default connector bind port uses by the tests from 11111 to 33333
move the local Maven repo to a location that can be shared by Jopr and JON release builds
first cut at a script for cutting a Jopr release
some minor changes
fix some bugs - getting close...
add new manual-add API (a discovery facet) and deprecate the old API (discoveryContext.getPluginConfigurations().iterator().next()) (http://jira.rhq-project.org/browse/RHQ-25)
update discovery components for resource types that support manual-add to use the new manual-add API (http://jira.rhq-project.org/browse/RHQ-2439)
convert plugins over to using the new manual-add/discovery API (https://jira.jboss.org/jira/browse/JOPR-388)
update Postgres JDBC driver from 8.3-604.jdbc3 to 8.4-701.jdbc3 (http://jira.rhq-project.org/browse/RHQ-2259)
add validation for new ManualAddFacet; extract several sub methods from validatePlugins()
a new and improved hosts file plugin that does not rely on Augeas
upgrade Oracle JDBC driver jar (ojdbc5.jar) from 11.1.0.7.0 to 11.2.0.1.0 (http://jira.rhq-project.org/browse/RHQ-2441)
Change apache resource key from baseDir of apache install to full path to httpd.conf (http://jira.rhq-project.org/browse/RHQ-690)
improve error handling in initOids()
if java5.home sysprop is defined, echo its value to the console
fix so build of enterprise/remoting/pom.xml will run successfully with either JDK5 or JDK6
2nd rev of the new hosts plugin - it actually works now
fix copyright headers
upgrade jbossas dep from 5.1.0-SNAPSHOT to 5.2.0-SNAPSHOT
minor changes
the Augeas-based /etc/hosts plugin
upgrade to latest versions of Augeas Java binding and JNA
make sure not to restrict to Java5 APIs, even when java5.home sysprop was specified on command line; update parent version to 1.4.0-SNAPSHOT
fix so build date is displayed correctly when default locale in non-US (http://jira.rhq-project.org/browse/RHQ-2447)
explicitly set id attribute even on HtmlOutputText components mean to be rendered as pure text, but preface the id with "j_id" to ensure the TextRenderer does not render the HtmlOutputText as a 'span' element (fix for https://jira.jboss.org/jira/browse/JOPR-343)
implement updateResourceConfiguration() in HostsComponent
rename the classes, so they don't have the exact same names as the classes from the non-Augeas hosts plugin
update SCM URLs to new git URLs
fix so redundant WARs are not discovered when same context is defined in multiple WARs (http://jira.rhq-project.org/browse/RHQ-2404)
use setlocal/endlocal so RHQ_AGENT_MAINCLASS environment variable will not remain set to "org.rhq.core.pc.StandaloneContainer" after exiting the standalone PC
v1 alpha of base augeas plugin + hosts plugin that is based on it
ignore dev-agent dir
update JBossAS version from 5.1.0-SNAPSHOT to 5.2.0-SNAPSHOT to ensure the snapshots can actually be found in the snapshot repo
fix mtime-based inventory sync logic (http://jira.rhq-project.org/browse/RHQ-1996)
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
back out my augeas/hosts plugin changes from last Friday (6dc0d3ff445cb0e5fdd4957577327ccf24a15db6)
do not include virt plugin in ear until errors in it are fixed
do not include virt plugin in ear until errors in it are fixed
upgrade to latest versions of wagon-scm and wagon-webdav extensions
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
always skip tests during test phase in as4 and as5 plugins; disable 'integration-tests' profile in as5 plugin by default to avoid failures in Hudson due to lack of EAP5 instance
log4j.xml DTD file (useful for associating log4j doctype to DTD in IntelliJ/Eclipse)
fix bug in pom that was causing integration tests to fail in Hudson
fix bug in poms that was causing integration tests to fail in Hudson
prototype of custom tab containing page-within-a-page implemented via IFRAME (for perspective service)
always display the Custom tab, rather than requiring the debug=true request param
move augeas base test class in augeas plugin from src/test/ to src/main/ to allow mvn -Dmaven.test.skip=true to be run from project root without failures in samba/sudoers/etc. plugins because mvn cannot find the augeas plugin test jar
change package of AbstractAugeasConfigurationComponentTest class from org.rhq.plugins.augeas to org.rhq.plugins.augeas.test to match its location on the filesystem
refactor so that config tests are skipped if Augeas is not available, so tests will pass on systems without Augeas (e.g. Windows boxes)
Augeas-based ResourceComponents now handle it as gracefully as possible when Augeas is not installed on the Agent system
get hosts plugin integration tests passing on Windows
remove experimental hosts-augeas plugin, which is no longer needed
add some trace logging, so if the Agent JVM crashes during loading of a ProcessInfo, we can see what pid it was trying to load just before the crash
back out usage of iframeSSI.js lib for resizing perseptive iframes, since its license is not compatbile with the GPL
upgrade version of JBossAS deps from 5.2.0-SNAPSHOT to 6.0.0.M1; fix parent of jboss-cache-v3 module
custom settings.xml file for linux-config Hudson builds
change how activators are defined a bit; split out perm type into global perm type and resource perm type; remove subTab type (tab type will be used for both top-level tabs and sub-tabs; start on code for loading Resource tabs
upgrade JBossAS deps from 5.2.0-SNAPSHOT to 6.0.0.M1
fix Wagon settings to get publishing of snapshots working again
get custom menu items and tabs working and loading external pages into iframes
activate dev profile; comment out JBoss snapshots repo
update and refactor perspective descriptor schema and update core and sample perspectives to conform to updated schema; create and implement activator API used for applying activators to extensions
files that got moved or renamed
upgrade maven-dependency-plugin from v2.0 to v2.1
create new remoting-client-api jar (contains only two classes - RemoteClient and RemoteClientProxy), which is the only jar (along with its deps) needed by standalone remote clients; this jar is now a dep of the CLI module and the sample perspective WAR, and it will be a dep of all other perspective WARs
add JSF+Facelets+Seam+RichFaces to the sample perspective WAR and add a demo page that showcases all of them and also uses the RHQ remote API
fix bug in applyActivatorsToMenu()
include the new client-api module in the parent remoting/pom.xml
add new sample page for demonstrating passing resource id
get hot deploy of perspectives working; link Custom resource tab to new currentResource.xhtml; add Seam+RichFaces to wizard.xhtml and link a menu item to it; other misc. fixes and improvements to wizard.xhtml
James Livingston (1):
BZ 560859 - Add mechanism to enable/disable alert definitions for multiple resources
Jason Dobies (206):
test
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Undoing test
Merge branch 'master' into content
Added directories created during build.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'master' into content
Merge branch 'master' into content
First steps towards content provider additions and refactoring to get the hosted plugin devs started.
Changed RepoSource synchronize signature.
Added usage of the PackageSource interface to existing server-side plugins to bring them up to date with the API changes.
Agilo #44 - More refactoring of content sources -> content providers and adding in hooks for retrieving repo information.
Changed repo source API to read as an import to better reflect how we are treating the operation.
Cleaned up invalid javadoc @see references
Updated documentation to reflect the conditions on which an error would occur.
Made getRepoByName accessible through the local interface.
Renamed the package DTOs in the PackageSource APIs to not use the term "content source"
More refactoring/docs cleanup for the content source changes.
Changed repo source interface to allow repo groups to be pushed into the server.
Yanking out the repo manager references until I get the EJB depenencies sorted out.
Reenabling EJB calls. Cyclic dependency was causing issues, so had to mark one side of it as ignoring dependency.
Added try/catch based on method signature changes.
365 - Added CRD operations for RepoGroup instances to the EJBs.
377 - Retrieve operations for RepoGroupType for use when creating RepoGroup instances. Added entry to install SQL to add the "family" group type (still need to get input if this is how we want to do it).
40 - Added description field for group type.
310 - Steps towards repo synccing from content providers (not tested yet)
310/44 - Test cases and changes to support syncing repo and repo group data from external sources.
Fixed test to clean up after itself. General code cleanup. Still flushing out the test to fully test the synchronize method.
310/44 - Fixes to repo imports for repos without groups.
Fixed incorrect list -> array call.
310 - Add ability to create repo groups and associate repos to those groups as part of the sync.
310 - Added EJB methods for creating repo relationships.
310 - Added ability to establish parent/child repo relationships during sync.
Corrected groupID
Fixed incorrect group identifiers
Temporarily disabled while issues on hudson box are resolved
Disabled apt test until it's better flushed out to work on non-apt systems
Disabled test until Spearhead team establishes augeas based testing framework
Added a pause between tests to make sure the ports are closed successfully. Without this, I was seeing non-deterministic failures.
Upping the pause to make sure the ports are released to see if it makes Hudson happy.
It would help if I used the correct annotation. We want this to run between test methods, not after all of the tests in the class.
Added pause between test methods to ensure the ports are released.
Attempts to make this test run more stable. This change worked when running it directly on the Hudson box, so hopefully it will work within Hudson as well.
Attempts to make this test run more stable. This change worked when running it directly on the Hudson box, so hopefully it will work within Hudson as well.
793 - Added flag to repo to differentiate between imported and candidate repos, allowing us to leverage the same model for potential repos introduced by a content provider from those the user has elected to import.
793 - Retrofitted old repo queries to behave the way they did before the candidate flag was introduced. New queries for candidate repos will be added in the future.
Updated javadoc
Missed one
794 - Additons to support create/delete/retrieve for candidate repos
Merge branch 'master' into content
799 - Moved the logic to handle importing candidate repos to the EJB layer. Updated to add them as candidate repos and delete candidates that have previously been returned for a given provider.
801 - Added EJB logic to import a candidate repo into a "real" repo in the system.
Cleaned up inappropriate use of @Overrides
808 - Added repo name to the package sync call out to a content provider.
Removed unnecessary @Overrides
Until this gets yanked out, changing to have it create candidate repos.
Migrated existing calls to add repos directly through EJB calls to use the RepoSource and scheduled sync functionality.
800 - Work towards the ability to import candidate repos. Still need error handling when the import fails.
Fixed query to only attempt to sync packages for imported repos
Updated test to ensure the correct repos are being used in the package sync calls
Small cleanup
Removed incorrect @Overrides declaration
Random cleanup
Updated to be consistent with eclipse
Updated to be consistent with eclipse
Added hook to delete candidate repos when a content provider is deleted.
Fixed broken test.
Removed assertion that's no longer valid with the changes to the content source comparator.
635 - Initial implementation of RepoSyncJob. It's not actually being called yet and the RepoManager synchronizeRepos method needs to be flushed out with all of the pieces to be done in the sync.
Reformatted so I can have it side by side with other code when refactoring the giant synchronizeContentSource method
Work towards refactoring what is done in the content provider sync v. an individual repo sync.
Renamed job to reflect the new terminology (which looks like it's here to stay)
Updated docs
More renaming of source -> provider
Signature cleanup and docs
635 - Rewired hook from RepoManagerBean synchronizeRepos to call the repo sync instead of the content provider sync.
635 - Added lazy load and download mode "never" checks.
Minor code cleanup.
Oops, forgot to update this with the new signature.
Missed another one in the signature change.
Should be the last signature update to build.
Merge branch 'master' into content
1137 - Refactored server-side methods for handling a package sync that's scoped to a particular repo.
Renamed sync job scheduling methods due to different types of sync jobs that can be scheduled.
Renamed sync to reflect which sync its running.
One more renaming.
635 - Ability to trigger a repo sync immediately.
Updated comment
Cleanup
Cleanup
Renamed to make room for a sync packages test. There is too much setup/cleanup to try to keep them in the same class, it would be a mess.
Wrong direction, instead of having it throw the exception I should have removed the invalid docs.
Removed all references to the fact that this test used to test packages as well as repo synccing.
Little more cleanup.
Refactoring to (optionally) support returning multiple different content providers based on content source.
Work towards flushing out this mock to provide packages. Still need to determine if this will be enough for the tests as well as adding distribution support.
This shouldn't be an assertion; that will cause any provider that isn't a DistributionSource to throw an error. Instead, just punch out if it's not a distribution source.
Unit tests for the package portions of the ContentProviderManager synchronizeRepo call.
Added source check
Work towards adding server-side distro method tests, just backing up before I start changing EJB methods.
Fixed method to delete mappings between distros and repos.
Removed stack trace printing outside of the logging framework.
Added distros to the synchronize repo test. Still need to check distro files.
Added distro file checking to test.
Exception checking to make sure the entire repo sync doesn't blow up if one of the potentially many content providers fails.
Upped the logging so we can better see why a repo sync failed.
Updated pom to reflect that this now lives in RHQ.
1106 - Brought these classes in line with recent API changes. These should at least compile now.
Added persistence dependencies as found in other server plugins to get around javac bug.
Fixed dev build to build to the right place.
Updated pom to reflect that this now lives in RHQ.
1106 - Brought these classes in line with recent API changes. These should at least compile now.
Added persistence dependencies as found in other server plugins to get around javac bug.
Fixed dev build to build to the right place.
Updated plugin descriptor to new API.
Updated plugin descriptor to new API.
Enabled the JBoss CSP as part of the default build now that it's been brought up to speed with the current build process and plugin APIs.
Added repo source support. Repos will be determined by directories in the root directory (specified in the plugin configuration). I'll add some docs for this in the wiki soon since this will likely help with QA.
1051 - BZ 538149 - If the provider does not start correctly, we need to make sure it's removed from the cache. Otherwise, future calls to start (which occur when the user attempts to correct the failed start errors) will simply return assuming it's started.
1050 - BZ 538146 - Added request parameter to key off of for new content provider creation. This prevents the form from autopopulating previous values from a failed provider create in the event they navigated away from the page instead of cancelling the second attempt at the provider create.
Merge branch 'master' into content
Moved apt plugin to etc, it's not supported enough to treat as a formal plugin.
1176 - Change call from UI beans to use the job wrapper instead of executing them synchronously.
Corrected infinite loop when repo sync jobs execute.
Added repo source support. Repos will be determined by directories in the root directory (specified in the plugin configuration). I'll add some docs for this in the wiki soon since this will likely help with QA.
Renamed source -> provider.
Renamed source -> provider.
Renamed source -> provider.
Renamed source -> provider.
1054 - Added unit test to try to simulate the updateRepo issues. Test passes correctly, so just leaving it in just in case it catches something.
Fixes to the test to make sure content sources are associated with the repo.
1054 - BZ 537216 - Need to reload the repo to get around HHH-2864.
1054 - BZ 537216 - Need to reload the repo to get around HHH-2864.
1347 - Added mechanism to translate and lookup database configuration property values
Fixed test data files that accidentally got changed.
Fixed unit test. The distribution files were causing package bits loading calls that were not updated in the test assertions.
Backend changes (configuration XML schema, parser, and data model) for supporting dynamic configuration property values.
Deleted invalid use of @Override (not allowed when implementing an interface method). I wasn't seeing issues with this in place but it was causing the build to break for at least one other developer.
1348 - Changes to allow dynamic configuration property values to be retrieved and displayed. Enterprise additions to support database backed values. Additions to disk plugin as an example.
Fixed required indicator not appearing for dynamic configuration properties.
Updated to more fully exercise the options available when defining properties.
Added the database keys to the schema to help the plugin writer.
Removed unnecessary method; was replaced by retrieving the distribution files and getting their bits.
1424 - Work towards content web service APIs -- remove cyclical dependencies
Fixed bug in filtering.
Fixed bug in filtering.
Updated for web service serialization. Fixed bug in setting tag.
Disabled test that requires a lot of setup (and even then I can't get it working). Will revisit once we get a better way to set the initial state of the server.
Fixed javadoc
Steps towards automation of web service tests.
Added comment
Added test group
Removed System.out.println call
Exposed the advisory manager as a web service
Removed invalid tag from interface implementation
Renamed incorrect parameter name (was "name" in remote but "synopsis" in bean)
Accidentally removed the ws excluded group, didn't mean to commit that.
Initial version
Refactored into base class that takes care of the remote connection initialization.
Added method needed for testing.
Missed a place to add the new method.
The import call isn't supposed to be used anymore, so remove from the tests.
Changed to expose the distribution manager over webservices.
Fixed broken call to query.
This should try to reuse the distribution type if it already exists. Prior to this, multiple distribution types with the same label/description were being created.
Initial work on the distribution manager tests. Not all of the test cases are flushed out, but this at least proves it's configured correctly to allow remote calls to be made into it.
Added delete distribution type method so we can clean up properly after the web service tests.
Changes to allow advisory operations over web services
Incorrect mapping of webservice bean to logic bean.
Fixed test to be self-sufficient. Prior to this change, the test relied on the server being started at least once to populate the database with the default plugins' metadata.
Merge branch 'master' into content
Removed invalid import.
Fixed incorrect logger declaration.
This needs to return the bean, not the local interface.
Oops, my IDE accidentally added some testing changes to the index, undoing part of that last commit.
Turns out, when merging master into content there were two EJBs named EntitlementManagerBean. This really, really makes JBoss unhappy. Temporarily moved the prototype one out of the way.
Fixed botched merge.
Refactored dynamic configuration properties to be retrieved with a display/value pair. This way, we are able to display "pretty" values to the user yet use different values programmatically.
Refactored dynamic configuration properties to be retrieved with a display/value pair. This way, we are able to display "pretty" values to the user yet use different values programmatically.
Added "Plugin - Resource Type" as a dynamic config property value. Updated disk source to use this.
Added "Plugin - Resource Type" as a dynamic config property value. Updated disk source to use this.
Added package architectures as dynamic config value and updated disk source to use it.
Added package architectures as dynamic config value and updated disk source to use it.
Disabled plugins not included in the release.
[maven-release-plugin] prepare release release-3.0.0.B02
Revert "Disabled plugins not included in the release."
Revert "Revert "Disabled plugins not included in the release.""
Revert "[maven-release-plugin] prepare release release-3.0.0.B02"
[maven-release-plugin] prepare release release-3.0.0.B02
Revert "[maven-release-plugin] prepare release release-3.0.0.B02"
[maven-release-plugin] prepare release release-3.0.0.B02
Revert "[maven-release-plugin] prepare release release-3.0.0.B02"
[maven-release-plugin] prepare release release-3.0.0.B02
Revert "[maven-release-plugin] prepare release release-3.0.0.B02"
[maven-release-plugin] prepare release release-3.0.0.B02
Revert "[maven-release-plugin] prepare release release-3.0.0.B02"
[maven-release-plugin] prepare release rhq_3_0_0_B02
[maven-release-plugin] prepare for next development iteration
Merge branch 'release-3.0.0.B02'
Updated version from 1.4.0-SNAPSHOT to 3.0.0-SNAPSHOT on files that were missed by maven.
These were only supposed to be disabled in the release-3.0.0.B02 branch. I accidentally merged these into master, so undoing the changes.
Revert "Fix the native cleanup so that it will not echo password and will use jline"
Fixed broken test on recommendation from mazz.
Disabled multicast test until we work out its issues with the hudson server. Filed as BZ 561069 to investigate the hudson configuration issues.
Added the ability for the JBoss CSP sync to introduce a patches repo.
Added alert plugins to release build process.
Jay Shaughnessy (646):
Update of migrated Jopr project structure fro build and RHQ dependency
More changes due to the JON/Jopr/RHQ redistribution of content and builds
Adding dist to Jopr for binary generation
fixing doc links for the installer
profile enterprise-dist changed to dist
[RHQ-1027,1029] Build work associated with agent-update. Moving to a single distribution with the agent included in the server distribution. Removed dist/agent from the build (left the files for now), it's no longer necessary as Jopr uses the RHQ agent verbatim.
Removing existing, unfinished Tomcat plugin, it will be replaced with the new, EWS/Apache compatible standalone Tomcat plugin.
Initial check-in of EWS compatible standalone Tomcat plugin. * UNDER CONSTRUCTION *. This is not a working plugin.
updated due to current state of tomcat plugin
Jopr-55 Improvents to Standalone Tomcat discovery. Fix to version detection, improved config initialization, and addition of Application discovery.
Jopr-55 Improve determination of installationPath to be effective on all target platforms by making use of the fact that standalone tomcat will have a fully resolved path set for the tc home dir.
Jopr-55 Another attempt at cross-product determination of installationPath. This time utilizing Fady's suggestion of using working directory as a base. EWS did not provide any absolute paths in the command line.
Jopr-55 Continuing to improve robustness, discovery and metric gathering.
Jopr-55 After review feedback changed hierarchy layout to include subcategories analogous to AS plugin on the basis of providing as much similarity between standalone and AS tomcat management. Although, updated type names to provide distinction between the two in order to avoid "duplicate type" issues in drop downs and the like. Also, in an effort to properly use a type parameterized class structure updated some classes outside the plugin that had not previously been typed (so, also requires RHQ update).
Jopr-55 Some work on availability. A new EMS connection, or EmsBean is needed to pick up with a restarted TC instance. So, ensure we're working with a new connection/bean after any DOWN availability cycle. This fixes avail and as a byproduct fixes the server Start operation whose success depends on valid UP status.
Jopr-55 Added Security subcategory and associated services. And a bit of random cleanup.
Jopr-66 Added ResponseTime metrics for requests to the web applications hosted in the TC server.
Make sure Temp dir supplied to EMS exists. This solves a problem in the test cases and also adds real runtime protection.
Jopr-55 Some small cleanup remove JON references and unnecessary interface declarations
Jopr-55 Remove maven dependency on a specific version of TC.
Jopr-55 Some more cleanup. Also, remove required properties from advanced conn property group.
Jopr-55 Added CreateChildResource support for Tomcat WARs, merged with Fady's additions for Content and Delete facets.
Jopr-55 Added CreateChildResource support for Tomcat WARs, merged with Fady's additions for Content and Delete facets.
Jopr-55 Delete facet work.
Jopr-55 Added a few more config properties and operations. The config properties may help for smoother deploy/delete logic.
Jopr-55 Intermittent check-in. The plugin is in transition given major structural changes due to the review feedback. This check-in is only to have a working build due to incompatible changes in the underlying RHQ JMX plugin.
Jopr-55 Plugin revised given functional review. Subcategories removed, Hierarchy changed (Threadpool sucked up into connector, VHost parents App, App parents cache, User DB parents users, groups, roles). Several traits/operations/plugin configs migrated to resource config. Create New and Delete added for all security resources. version pulled from Server resource name. probably more.
jopr-55 Improvements to WAR create new, delete and discovery. Supports exploded and .war deploy.
ContentFacet work for Tomcat WARs. Can now hot deploy new package over an existing WAR.
Jopr Build 2.2.0.Beta1 (in progress)
[maven-release-plugin] prepare release Jopr_2_2_0_Beta1
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.2.0.Beta1 (done)
Jopr-55 A bunch of revisions for the Tomcat plugin: Removed some EWS specific code now that CR2 is more Apache oriented. Added StoreConfig op for Server. Fixed issue with discovery of Tomcat processes the plugin can't manipulate (under another user accout e.g.). Fixed issue with AJP port conflicts between multiple TC servers on the same box. Fixed issue with Root web module cache discovery. Fixed issue with bad metric def for ThreadPool. Reduced some logging.
Added a few metric descriptions
jopr-55 Added persistence to config updates. When all config update logic succeeds call either UserDatabase Save or Server storeConfig to then persist the change.
Fix problem with response time metric collection for apps deployed to non-default host.
Jopr-93 Add results declarations to the tomcat server script-based operations.
Jopr-92 Improved results handling logic for both start and shutdown operations.
Jopr-91 Connector state (up/down) can be determined by the presence of a GlobalRequestProcessor for the connector. Added logic to determine availability of a connector in this way.
Jopr-88 Fixed problem determining install dir when started from other than bin dir
Jopr-103 Fixes issue distinguishing EWS TC from Apache TC installs. Makes test for EWS more stringent, better to potentially name an EWS TC as Apache than the reverse. In general it should not be a problem unless the EWS install dir is significantly mucked up.
Jopr-99 For authenticated TC, if the user does not have control perms ensure no part of an app delete succeeds. Previously the physical delete of the war was still succeeding.
Jopr-100 Added missing support for manual add of a TC Server. This includes support for manual add of a remote TC server, although version info will be set to unknown on the resource.
Jopr-94 Added discovery of non-deployed apps to handle scenarios where we want a resource in inventry even if it's down to begin with. In the jira's scenario there was a brief window in manual create where the app was in the deploy directory but discovery completed before TC created the mbean, so the new resource was not created in inventory until the next scan. In another scenario, if the TC vhost did not have autodeploy on, the manually added resource would not be discovered at all. By looking for the physical deployment we ensure a resource is created, even if it is briefly, or indefinitely, down. At least the user will see the results of his manual add.
jopr-118
Fix NPE in RPM-style operation execution
fix JVM discovery type from internal to embedded. Embedded gives us what we want, the JVM from the parent resource (the TC server)
[Jopr-118] ignore executable existence check when executing rpm service command start/stop
[Jopr-118] forgotten check-in applying fix for shutdown/restart.
Add explicit useClasses=True for the JMX dependency.
JBNADM-3637 Remove Tomcat dependency to prevent dependency failures for customers without both EAP and EWS plugin packs.
[Jopr-131] Fixed NPE if script op was executed without any env vars.
Updated year, fixed a typo and expanded title for LICENSE. Fixed bug in dist build LICENSE file placement.
Jopr Build 2.2.0.CR1 (in progress)
[maven-release-plugin] prepare release Jopr_2_2_0_CR1
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.1.0.CR1 (done)
Jopr Build 2.2.0.CR2 (in progress)
[maven-release-plugin] prepare release Jopr_2_2_0_CR2
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.2.0.CR2 (done)
Jopr Build 2.2.0.GA (in progress)
[maven-release-plugin] prepare release Jopr_2_2_0_GA
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.2.0.GA (done)
Update pom versioning that the release plugin missed
Jopr Build 2.2.0 (in progress)
[maven-release-plugin] prepare release Jopr_2_2_0
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.2.0 (done)
Trivial - fixed some operation description text due to a customer's confusion in a case.
Ignore empty JonResourceVersion in RSS feed.
[Jopr-209] Some decent re-working of Connector handling in the Tomcat plugin in order to the use of the <address>element in the connector definition, as well as the various values it supports.
Reworking of connector resource configuration taking into account that different connector protocols have different sets of config properties (some shared, some specific). An issue remains with TC6 config update, unset props (null updates) are not ignored/handled well for some reason. Also, moved 'address' property back to plugin config since it is part of the objectName when specified.
Jopr Build 2.2.1 (in progress)
[maven-release-plugin] prepare release Jopr_2_2_1
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.2.1 (done)
[Jopr-237] Change determination of install dir to never rely on current working dir, instead always use command line parsing and make sure not to resolve symlinks.
A tweak to ensure connection gets set to null.
[JOPR-293] Fixes issue where JNDI service is declared in deploy/naming-service.xml as opposed to conf/jboss-service.xml
Don't run these tests under normal conditions. They require a running AS Server.
[Jopr-352] Be more flexible when identifying an http connector protocol. Was only handling the default value. I think any protocol with 'http' should be ok.
Fix problem with config update of read only properties
[Jopr-254] Attempt to properly support TC configurations utilizing non-default values of $CATALINA_BASE. In this scenario many TC instances can be run against the same installed TC binary. Each instance specifies a different base, but the same $CATALINA_HOME. Tested so far that changes don't break TC Server resources with unset (upgrade scenario) or default CATALINA_BASE. Testing pending for different values.
Some changes to DeployPackages in the ContentFacet to better distinguish an update from a complete delete/deploy. Meaning, take more care to ensure that the mbeans never actually go away when performing an update and that Tomcat behaves in a more expected fashion.
Fix problem in retrievePackageBits. Content can now be pulled via the plugin for a war resource.
Jopr Build 2.3.0 (in progress)
Jopr Build 2.3.0 (remove SNAPSHOT dependencies)
Jopr Build 2.3.0 (remove SNAPSHOT dependencies)
[maven-release-plugin] prepare release Jopr_2_3_0
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.3.0 (Done)
Jopr Build 2.3.0 (Done)
Jopr Build 2.3.0.CR1 (in progress)
[maven-release-plugin] prepare release Jopr_2_3_0_CR1
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.3.0.CR1 (done)
Jopr Build 2.3.0.CR2 (in progress)
[maven-release-plugin] prepare release Jopr_2_3_0_CR2
[maven-release-plugin] prepare for next development iteration
Jopr Build 2.3.0.CR2 (done)
upping jsp precompiler since the previous version seems gone from the central repo. may want to up again when a non RC is available.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
temporarily disabling jsp precomp in the dist build since it's generating errors
Add samba and sudoers plugins to rhq.ear for dist builds
Merging in JON 2.3 patch work. [RHQ-1996,2470,2445,2457,2462,2468]
Merge in JON 2.3 patch work. [RHQ-2445]
Merging in JON 2.3 patch work. [RHQ-1996,2470,2445,2457,2462,2468]
Merge in JON 2.3 patch work. [RHQ-2445]
remove extraneous system.out.println
Merge branch 'jon23cp'
Fix problem with pluginName filter
[Jopr-402] fix issue with milti-part content roots
removed non-existent test dirs from src
[RHQ-2479] avoid hibernate cache for large metric template update
[Jopr-408, Jopr-414] protect against not being able to get procExe from Sigar
Sample Perspective Deployment
Fix phase for adding war to perspective jar
continue to add support for perspective lifecycle mgmt
Merge branch 'pc' of ssh://jshaughn@git.fedorahosted.org/git/rhq/rhq.git into linux-config
Added the first pass at a PerspectiveServerPluginContainer/manager to handle
Fixing merge issues
not changed, maybe resolving a line terminator issue
[RHQ-2467] Performance fix for large metric template updates. Bypass Hibernate cache.
[Jopr 408,414] protect against native layer failing to determine Current Working Directory (CWD).
Obsolete stuff from old perspctives investigation.
Merge branch 'linux-config' into linux-config-dev
fix relative path
Under Construction - Perspective Descriptor
New Core Perspective defining CoreUI extensions
Add Core perspective to build
conforming to schema change
Add core perspective to rhq.ear
more perspective descriptor schema tweaks
Obsolete stuff from old perspctives investigation.
Under Construction - Perspective Descriptor
New Core Perspective defining CoreUI extensions
Add Core perspective to build
conforming to schema change
Add core perspective to rhq.ear
more perspective descriptor schema tweaks
Descriptor processing to make definitions available to the server/gui code.
files removed
Merge branch 'linux-config-dev' into linux-config
Fix problem due to a failed git merge
NullPointer protection
Add more activator elements, reviewed optional/required settings,
Work to expose coreMenu extension point via perspective manager
Add custom menu items to sample perspective
Merge branch 'linux-config' into linux-config-dev
Working to the point of core menu generation from the core perspective.
Added first pass at activation schema elements and added
Added global permission activation for core menu items
Merge branch 'linux-config-dev' into linux-config
Sample perspective additions. Custom images, application declaration.
Remove the sample perspective from default deployment. (If you have it
made this a generated type via the XSD: ExtensionPointType
Added ApplicationType for application declaration and attributes.
Fixed iconUrl.
Added url key support for mapping extension urls to numeric keys for
Added mapping of extension urls to numeric key for cleaner param passing
Merge branch 'linux-config-dev' into linux-config
Files git is forcing me to commit, I think due to line termination issue.
Merge branch 'linux-config' into linux-config-dev
Update sample perspective descriptor with latest schema changes
Fix some imports given new generated schema types
git is intent on making me commit this file, so I will.
merge work
removing obsolete dependency
Working towards url key mapping.
Merge branch 'linux-config' into linux-config-dev
a git forced commit
Merge branch 'linux-config' into linux-config-dev
Fixed log message. Further work coming for BZ-546073
Merge branch 'master-dev' into linux-config-dev
BZ-546073] Do not assume Deployer MBean exists for localhost vhost.
Updated app/descriptor to use different html pages for different regions
moved and renamed the perspective xhtml for (hopefully) better consistency
Implemented url key replacement/mapping for perspective page rendering.
Merge branch 'linux-config' into linux-config-dev
Fix up direct SQL error in 2.61
Merge branch 'master-dev' into linux-config-dev
Multiple changes to try and repair 2.61. Removing unnecessary steps and
Merge branch 'master-dev' into linux-config-dev
Several changes to 2.61 for logic/sql. Also 2.63 and 2.68. Now runs to
Merge branch 'master-dev'
Merge branch 'master' into linux-config-dev
Added getSubjectBySessionId to SubjectManagerRemote and refactored
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
Update WS API with new remote method
Removed duplicate copy
Merge branch 'linux-config' into linux-config-dev
Just a little renaming to make it clear this
Minor or cosmetic changes
Obsolete, merged into AbstractGlobalActivator
Fix issue with applying activators. Added clone logic
Add some initial perspective context as params
Merge branch 'linux-config' into linux-config-dev
Renamed PerspectivesMenuUIBean to PerspectiveUIBean to reflect more
Allow RemoteClient to establish a connection without logging in. This
Merge branch 'linux-config' into linux-config-dev
Perspect8ve InventoryActivator work may add some logic to Criteria searches.
Add client-api src to project
fix UI bean name in JSF decls
completed first impl for supporting requiredPermissions on criteria search.
Work in progress for InventoryActivator
Git forced commit due to LF character issues
Merge branch 'linux-config' into linux-config-dev
Add core perspective for validation
turn off verbose query logging
refactor: Activator.matches -> Activator.isActive
Lock down sample menu items with Global permission and
Implement InventoryActivator support
Git forced commit due to a Line Termination issue.
Jdoc generation using -Djavadoc.outputDirectory
Added javadoc profiles in various places for public API's. To generate
Added javadoc profiles in various places for public API's. To generate
[BZ-545596] Fixed regression in refresh period menu item.
Trivial format change.
Merge branch 'linux-config' into linux-config-dev
[BZ 545596] A further fix to handle, I think, a legacy problem avoiding
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
Merge branch 'linux-config' into linux-config-dev
Refactored to use dash-separated elements and camelCase
Updated with schema refactor.
Added infrastructure for the SupportFacet. Note that detection
finished up support for trait activation for ResourceTypeActivator.
Git forced commit, probably due to line termination issues.
Git LT commit
Merge branch 'linux-config' into linux-config-dev
Conform to display name convention for SS plugins
Add new repo declaration for those folks that have access to an oracle
Fix test given perspective schema change
Trivial - comment additions
Merge branch 'linux-config' into linux-config-dev
Update the linux config m2 settings to hopefully get the linux-confg
Fixed some doco. Added some content activation stuff but it's not at all
Added a bunch of support for linking back from a perspective page to a
Add PerspectiveManagerRemote for use by Remote Clients (i.e. perspectives).
trivial spelling fix
Updated the wizard example to make use of linkback urls in the final
Merge branch 'linux-config' into linux-config-dev
Added what seems to be a dependency on core gui.
Fixed up some build conflicts in eclipse based on cmd line mvn build.
update the richfaces-api jar to 3.3.2.SR1 as the other rf jars are already
Some changes to content activators (under construction)
Merge branch 'linux-config' into linux-config-dev
Remove unnecessary conf files from sample perspective that are now gotten
Add linkbacks for the browse resource table's resources.
Split ExtensionType into ExtensionType and RenderedExtensionType to better
Utilize PageLink extensions in the CreateContentProvider page.
Add page link extensions to RHQ and AS Patch provider types. This should
Merge branch 'linux-config' into linux-config-dev
improve data for sample page re: page links
Merge branch 'linux-config' of ssh://git.fedorahosted.org/git/rhq/rhq into linux-config
Refactored initActivator logic from the extension classes into
Merge branch 'linux-config' into linux-config-dev
BZ 559339
remove formatSearchParameter() as it badly assumed that all db vendors use
Treat percent sign as a literal as well as underscore for search filter
Merge branch 'linux-config' into linux-config-dev
More work for the search value escaping
Add support for the LIKE clause in QueryUtility and utilize as needed in
Merge branch 'linux-config' into linux-config-dev
fix for postgres
Handle the fact that postgres parses the escape character like any other
More BZ 542828. Add support for the escape character when building
Merge branch 'linux-config' into linux-config-dev
Set the rhq-core-domain dependency to provided scope to prevent it from
Git forced this commit. No known changes.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Set the rhq-core-domain dependency to provided scope to prevent it from
reverting change. will have to find another way or add some more changes
The xml-schemas pom needs 'provided' scope on the rhq-domain jar. Otherwise,
Merge branch 'linux-config' into linux-config-dev
minor refactor to avoid redundant guards
make sure fuzzy (strict vs non-strict) and case sensitivity criteria
remove explicit wildcarding. the filter names treat sql wildards as
Change "LIKE :filter" logic in NamedQuery to
Merge branch 'linux-config' into linux-config-dev
Updating tests to expect the new mandatory ESCAPE clause on LIKE
Another try at getting the test to pass in the build env
Git forced commit.
git forced commit (line terminator issue)
git forced commit (line terminator issue)
Revisions to Bundle Schema and due to design tweaks.
trivial - comment change
Merge branch 'bundle' into bundle-jay
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
In the midst of adding criteria search to Bundle entities...
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Git forcing LT fix...
Merge branch 'bundle-jay' into master-jay
git forcing LT fix...
More bundle schema upgrade work - in progress
A better db upgrade...
Change logic in DropTable to just use the default conn and not use
Added obsolete-schema.xml to hold definitions of obsolete tables. It
change the relation between bundleFile and packageVersion to non-nullable.
git forced LT commit
Merge branch 'master' into master-jay
Merge branch 'bundle' into master-jay
Fixing after a bad merge
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
git forced LT commit
Merge branch 'bundle' into bundle-jay
fix a version problem in the sample perspective build
Remove CascadeType.PERSIST on bundleType as the BundleType should already
Change name of action to "recipe". We can change it back but it seems we
Added BundleCriteria and other criteria search. BundleCriteria is tested.
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
Added filters for bundle type
Added access to deploy defs
More work on criteria search for bundle domain
Merge branch 'bundle' into bundle-jay
bundle field is lazy loaded so remove bundle field from hashcode/equals.
Add test for BundleVersionCriteria search.
Fix up BundleTest
Ensure rt log file is closed appropriately on read and truncate.
tweak to improve debug logging in rt log handling. (not bundle related)
- Add 1 to 1 relation between Bundle and its implicit Repo.
update .classpath to reflect the latest change in base perspective war (not
Merge branch 'bundle' into bundle-jay
Add OneToOne Bundle-Repo relation to db upgrade, domain, criteria and test
initial version with some stubbed return values for testing
Add bundleFiles field to BundleVersion and update the criteria object.
local intermittent check-in for merge purposes
Merge branch 'bundle' into bundle-jay
SLSB work for Bundles
Merge branch 'bundle' into bundle-jay
added a few more tests
Merge branch 'bundle-jay' into bundle
Back to steady state - tests passing
checkin of stable code
Merge branch 'bundle-jay' into bundle
git forced LT commit
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
git forced commit
Merge branch 'bundle' into bundle-jay
added:
Merge branch 'bundle' into bundle-jay
added:
Merge branch 'bundle' into master-jay
Add BundleAgentService in appropriate places.
BundleDeployment work
Finish move of most API to the remote and declare as WS endpoints. Minor
git forced LT commin
Merge branch 'bundle' into gwt
Refactor for easier merge into gwt branch
Git forced LT commit
remove generation of mock entries for demo
git forced LT commit
git forced LT commit
still a work in progress
Merge branch 'bundle-jay' into bundle
Merge branch 'bundle' into gwt
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
add getopt dep and jar packaging
Fix a problem executing the test scripts
add missing remote to RemoteClient
Fix problem preventing CLI from loading the remote manager
A bunch of updates to support the bundle provisioning infrastructure.
Make the BundleManagerRemote available via WS
BundleManager CLI test script (note, some hardcoded win platform stuff
Merge branch 'bundle-jay' into bundle
Merge branch 'bundle' into gwt
I'm not entirely sure about this change. mazz, maybe you can verify. But
Merge branch 'bundle-jay' into bundle
git forced LT commit
Merge branch 'bundle' into gwt
Add methods that conform to our standard Criteria class API naming.
protect against NPE in WriteExternalAgent.
Fix problem with Subject-as-first-param logic that was hiding API methods
New test script that generates test users. Can be used to easily generate
Added ability to generate deployment history/audits and added initial
git really is having trouble with these files. I have to keep committing
Git LT commit
Merge branch 'master-jay' into bundle-jay
Get these tests to at least compile. Currently not compiling in master.
Add description fields to Bundle and BundleVersion.
Throw a useful exception if the user has failed to import the necessary
Better test cleanup
Partially revert the fix for
git forced LT commit.
Merge branch 'bundle-jay' into bundle
LF commit
Merge branch 'bundle' into master-jay
LT commit
Merge branch 'master-jay'
bring some domain test back to reality
Merge branch 'bundle-jay' into bundle
Merge branch 'bundle' into master-jay
Merge branch 'master-jay'
Make test aware of new LARGEOBJECT type map
Merge branch 'master-jay'
LT commit
LT
Merge branch 'master' into gwt-jay
remove deprecated criteria methods
add the description params to the necessary methods
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
LT commit
Merge branch 'gwt' into gwt-jay
Add unique indexes to various bundle tables to avoid logical duplicates.
Merge branch 'gwt' into gwt-jay
LT
Add unique indexes to various bundle tables to avoid logical duplicates.
Just added some debug logging confirming successful command handling.
Just added some debug logging confirming successful command handling.
LT
Merge branch 'bundle-jay' into bundle
Merge branch 'bundle'
Basic framework for Deploy wizard
Merge branch 'gwt' into gwt-jay
Initial impl of bundle deploy wizard - still in progress
Merge branch 'gwt' into gwt-jay
Just getting in some initial stuff for deploy wizard. not working yet
Merge branch 'gwt' into gwt-jay
Updates to Bundle Deployment Wizard - work in progress
Merge branch 'gwt' into gwt-jay
make sure the replacement string is escaped such that regex characters are
Make sure display name is set for recipe config items, otherwise the
First version of deploy wizard that actually deploys something!
Merge branch 'gwt' into gwt-jay
Some stuff for group bundle deploy
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Work on infra for bundle group deploy
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Merge branch 'gwt' into gwt-jay
Initial support for bundle group deployment. Needs more work around group
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Merge branch 'gwt' into gwt-jay
Intermittent check-in for deployment status work
Merge branch 'gwt' into gwt-jay
intermittent checkin
Merge branch 'gwt' into gwt-jay
Domain Model Change and Refactor
Merge branch 'gwt' into gwt-jay
re-enable single deployment test
see if setting an initial value fixes the single-value drop down issue.
Incorporate group deployment into bundle deploy wizard. Make initial
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Merge branch 'bundle-jay' into gwt
remove package type creation for the bundle type
More support for deployment status and group deployment status
Merge branch 'gwt' into gwt-jay
LT commit
Merge branch 'master' into gwt-jay
fix import of PersistenceUtility
give the server side bundle plugins their own profile to ensure they
Avoid Exception by ensuring param is passed.
LT commit
Merge branch 'gwt-jay' into gwt
Merge branch 'master' into gwt-jay
Merge branch 'gwt-jay' into gwt
**MAZZ REVIEW** Escape backslashes in properties being sent to Ant. I'm not
A change in the Bundle constructor to include the required Repo and
Merge branch 'gwt-jay' into gwt
LT commit
Merge branch 'master' into gwt-jay
Merge branch 'gwt-jay' into gwt
Set the dev property for ds type to ensure proper copying of the
Add status to deployment audits
Set the dev property for ds type to ensure proper copying of the
Change history to histories to match entity field name. I thnink "history"
added some testing for deployment audits and status.
Merge branch 'master-jay'
Add <support> tag to plugin descriptor to mark that the resource type
Allow leading spaces in recipe command line
Added ability for bundle component to add deployment audits as it performs
Merge branch 'master' into master-jay
Added ability for bundle component to add deployment audits as it performs
Allow leading spaces in recipe command line
Fix some queries - addendum to <support> tag work.
[BZ 580243]
LT commit
Merge branch 'master' into master-jay
[BZ 580243]
lt commit
Merge branch 'gwt-jay' into gwt
see if this makes the build happy. is this an appropriate change?
domain model refactoring - inp progress
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Intermediate Provisioning Domain Model Changes commit:
Merge branch 'gwt-jay' into gwt
Bundle Domain Model Refactor
Merge branch 'gwt' into gwt-jay
These tests look like they need some work to be
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Removed policy fields and relationships as they are not needed for the
fix the container build fix
fix the container build fix
Changes for Oracle compatibility.
Merge branch 'gwt' into gwt-jay
Changes for Oracle compatibility.
fix the container build fix
More oracle compatibility work. This one should make the gui much more
Merge branch 'gwt' into gwt-jay
More oracle compatibility work. This one should make the gui much more
OperationManagerBeanTest test fixes and changes to help oracle run. A
OperationManagerBeanTest test fixes and changes to help oracle run. A
[BZ 562302] Fix operation scheduling calendar display.
change recurring operation interval to possibly better the test success
[BZ 562302] Fix operation scheduling calendar display.
Fix issue with garbage hyperic dir left around in agent lib.
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
LT commit
Merge branch 'gwt' into gwt-jay
Allow bulk delete to better handle the case where the db vendor does
Fix plugin update issue that could cause locking/deadlock issues. Fix up
Merge branch 'gwt' into gwt-jay
LT commit
Merge branch 'gwt' into gwt-jay
Merge branch 'master' into gwt-jay
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'master' into gwt-jay
Merge branch 'master' into master-jay
Merge branch 'gwt' into master-jay
Revert "Fix some queries - addendum to <support> tag work."
Revert "Add <support> tag to plugin descriptor to mark that the resource type"
Merge branch 'master' into master-jay
A lot of DB upgrade fixes. Probably not completely right but getting
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
UpdateConfigurationSubsystemTest updated to deal with new plugin
Merge branch 'master' into master-jay
Fix tests given new plugin registration transactioning.
Merge branch 'master' into master-jay
More work on subsystem test failures
Fixed a couple of too-long constraint names for ora.
Fix the cleanup of this test.
-updated log4j.xml to reduce unit test hibernate verbosity
Test failure showed some bad behavior with respect to the handling
Merge branch 'master' into master-jay
Merge branch 'master' into master-jay
Additional check for proper prop def merging
LT commit
Merge branch 'master' into gwt-jay
LT commit
Merge branch 'gwt-jay' into gwt
Merge branch 'master' into gwt
LT commit
Merge branch 'master' into gwt
LT commit
Merge branch 'gwt' into gwt-jay
Some data model and API changes. (work in progress)
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Merge branch 'master' into gwt
Merge branch 'gwt' into gwt-jay
Refactor for change in audit API
remove straggling reference to scheduleBundleResourceDeployment
Merge branch 'gwt' into gwt-jay
schema:
Merge branch 'gwt' into gwt-jay
add eclipse lib for new ssh dep
add eclipse lib for new ssh dep
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
first pass at supporting distribution file based bundle version creation.
Merge branch 'gwt' into gwt-jay
get rid of obsolete generalPackage criteria
Merge branch 'gwt' into gwt-jay
- Fix a temp file name for the distro
Merge branch 'gwt' into gwt-jay
cli script for deploy - change to dist file approach (not yet working)
Merge branch 'gwt' into gwt-jay
Fix some isues with replacement variable logic.
Merge branch 'gwt' into gwt-jay
update bundle creation scripts to use distros
Merge branch 'gwt' into gwt-jay
Fix vars in recipe to the new format and also make use of the new
Merge branch 'master' into gwt-jay
make sure the bundle-plugins profile is applied to the ear build.
LT commit
Merge branch 'gwt' into gwt-jay
Merge branch 'master' into gwt-jay
LT commit
Merge branch 'master-jay' into gwt-jay
Merge branch 'master-jay'
make the mem settings configurable via property for the maven gwt plugin.
Deplow Wizard Work
Deploy Wizard Work
Merge branch 'gwt' into gwt-jay
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
refactored the use of URL out of the bundle manager API as it caused a
Work on radioGroupWithComponents
CreateWizard
Provisioning CreateWizard Work
Merge branch 'gwt' into gwt-jay
Provisioning CreateWizard Work
Provisioning CreateWizard Work
Merge branch 'gwt' into gwt-jay
Ensure gwt component that declares formHandler can ensure it exeutes
Merge branch 'gwt' into gwt-jay
CriteriaQueryGenerator Work - protect against overrides using an EXISTS
Provisioning Deploy Wizard Work
Merge branch 'gwt' into gwt-jay
Provisioning Work (IN PROGRESS - COMPILING, NOT WORKING)
Provisioning Work (Destinations)
Provisioning (Destinations)
DB Upgrade Work
LT commit
Merge branch 'gwt' into bundle-jay
Changes to resolve incompatibilities
LT commit
Merge branch 'bundle-jay' into bundle
Bundle Deploy Wizard
Merge branch 'bundle-jay' into bundle
Updated test scripts to
BundleManagerBean work
Merge branch 'bundle' into bundle-jay
Bundle Deploy Wizard Work
Merge branch 'bundle' into bundle-jay
Fixing merge problem where we ended up with two decls of
- Updated remote api to enhance scheduleBundleDeploy with "cleanDeploy" option
Merge branch 'bundle' into bundle-jay
Bundle Deployment Work
Merge branch 'bundle' into bundle-jay
Bundle Revert Work
LT commit
Merge branch 'bundle' into bundle-jay
Fix problem in generating the deployment scheduling request
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
Fix an issue with status and message reporting from the async deploy
make it explicit that the ResourceSelector deals with Resource objects
Fix Exception catching and throwing issues for GWT service
cosmetic - remove obsolete code
Merge branch 'bundle' into bundle-jay
[BZ 594706] Remove cleanup of some obsolete prop def in favor of avoiding
Fix NPE issue in Ant Bundle Plugin audit. Also, now throw
LT commit
Merge branch 'bundle' into bundle-jay
LT commit
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 594706] Remove cleanup of some obsolete prop def in favor of avoiding
[BZ 586500] Fixed Regression for Refresh Core menu item.
[BZ 586500] Fixed Regression for Refresh Core menu item.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 596096] Fixed error in upgrade script
LT commit
LT commit
LT commit
Merge branch 'bundle' into bundle-jay
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
return 2.86 to the front lines
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Jeff Ortel (21):
356 - Add channel to repo renaming and add repo group tables
356 - Rename columns associated with channel => repo renaming. Increment DB version to 2.59.
356 - Rename constraints associated with channel => repo renaming. Change version to 2.60.1 per mailing list discussions.
356 - Test/Adjust on Oracle. Add inserts to seed DB for repo group & relation types.
Change content sprint 1 schema upgrade version to 2.59.2.
704 - Fix associate/disassociate repos with content providers
800 - UI changes to import repos from content providers.
800 - Fix ajax part of import page.
800 - Add repo import success/failure messages on import page.
800 - Fix paging and add inital selection on repo import page
800 - Add message detail and rerender repo panel on provider selection instead of table.
537207 - Fix confirmation messages to read content 'provider' and spell out 'repository'.
537207 - updated 'Content Sources' to 'Content Providers' in table titles.
538157 - Fix statement timeout by adding missing index on RHQ_REPO_PKG_VERSION_MAP (PACKAGE_VERSION_ID).
Add API for retrieving subscribed repos by id. Returns truncated Repo.
x509 entitlement prototype.
Refactor x509 entitlement certificates stuff to new EntitlementManager SLSB.
change rhq.server.tomcat.security.client-auth to (want) to support x.509 authorization for content via https.
add (name) to cert.
Allow access to content via http w/o cert. For now, only validate cert when presented.
Look for cert named client for demo instead of by resource id.
John Matthews (64):
Creating layout and test file for location of a plugin for RHQ -> RHN Hosted communication
Refine test so it's simpler and just calls getVersion() to RHN Hosted.
Merge branch 'master' into local_content
241 - adding support for custom request properties and JAXB parsing of data for dump.channels call
241 - added support for dump.packages_short, required changes to xsd to merge data returned by packages_short.
366 - Schema is now generated automatically by running against a sample of xml data from rhn hosted.
366 - added xml parsing for Product Names and Channel Families
366 - add XML parsing for dump.source_packages and dump.kickstartable_trees
366 - extending support for dump.channels() so it can parse more than one channel at a time
241 - work in progress to support fetching an RPM from hosted.
366 - change generated-sources to be under target so they are removed during clean
241 - Figured out how to fetch package from RHN Hosted, documented in unit test.
383 - Added ability to download a rpm from Hosted
remove debug print
241 - Adding wrapper for product names, channel families, and channels
241 - Add support for getPackageShortInfo() and getPackageMetadata()
Merge branch 'master' into local_content
241 - Add get of kickstart tree metadata
241 - added support for fetching kickstart trees from hosted
241 - add error support to jaxb-xmlrpc calls
Fix so RhnComm will use the passed in serverUrl plus minor cleanup
Build fix - Include rhq-enterprise-server as a dependency
Update mock interface to support getPackageMetadata and checkAuth with a bad sysid
cleanup unit test
400 - add to mock interface for getRPM and getKickstart tests
Update for unit test
A constructor for RHNConnector was setting the name of the cert, but not reading it's content
423 - first cut at adding SSL support
684 - add ssl cert validation to https connections
684 - update RHNDownloader to use our custom SSLSocketFactory instance
686 - Fix for: "Extra whitespace when pasting the cert results in validation failure"
690 - Add breadcrumb nav for packageVersion list
555 - adding method to get list of kickstart labels from hosted
555 - work in progress, what I think we'll need to sync kickstarts from hosted.
555 - Add syncing Kickstart trees to rhnhosted plugin
Update test for synchronizePackages method signature
Updated RHNProvider to use passed in repo name for synchronize Packages/Distributions.
560 - partial work to add sync of distributions to ContentProviderManager
560 - changes for distribution sync.
dos2unix on pom.xml for rhnhosted plugin
Fixed package syncs
Adding 'metadata' to package store in RHQ.
Allows RHN plugin to save 'metadata' needed by RHQ Yum operations
Fixes primary.xml/repomd.xml generation for packages.
1034 - fix for pkg install from yum client
Fixing rhnhosted package metadata for dependencies and obsoletes
Remove print of stacktrace
Adding a readme to describe how to setup our basic test to run against RHN Hosted.
Cleanup and remove unused methods.
update how we store returned xmlrpc data for debugging.
fix to allow a file name to be specified for where the debug xml data is written
1157 - bz543031 failure to display info about abuse of service from RHN hosted
1244 - pass in package version to yum install of a package
1357 - first step at creating a placeholder for fetching content through http
1357 - adding war to expose content through http
build fix
Adding eclipse changes for exposing content through http
1357 - added support for 'wget' of a package through http
1357 - added browsing for packages through http
1357 - update to how we render links
1357 - adding support to browse/download distribution files
1358 - generate yum metadata from database entries, expose through http
1361 - add support for 'HEAD' request needed by virt-install & add pkg fetch through distribution url
Fixes kickstarts through http content
John Mazzitelli (711):
add some initial eclipse external tool configurations for eclipse users - these let you clean and build
[RHQ-1035] vm health check thread is configurable now - you can enable/disable it by setting the check interval to 0 or higher. you can configure the mem thresholds.
i don't know why these test directories/files are here - there is no test java code and the test resources are agent configuration files, unsure how these ever could get used. deleting these
remove the now-defunct test path
ocd - fixed indentation and spaces
remove explicit dependency on ems in jopr project
[RHQ-1093] add new <runs-inside> JMX Server so we can now manage/monitor any standard Hibernate application that is running in a standalone J2SE 5+ JVM.
[JOPR-26] add the new purge metrics added by RHQ-1169
unsure why this was deleted, eclipse devs need this file to easily import the jopr project into the IDE
[JOPR-30] use the new comm calltime metrics to expose the data in an operation, in the same way we expose hibernate query stats.
added/changed some setting names
[JOPR-30] operation results show the new, more fine-grained metrics
the RHQ Server typically has the installer undeployed, so look for it, as well as for the installer if it is deployed
[JOPR-41] rhq server plugin can now manage the new MM-at-start property
new resource strings for installer
put the new jopr logo into the dist build - this logo will show in the top left corner of the UI
why is section 15 and 16 missing from the LICENSE_LGPL files? Adding them back in to our copies of the license files.
[JOPR-46] this is now the full LGPL license text, verbatim with no additions/modifications/deletions
don't want eclipse files in here - the top project has the .project file
[JOPR-53] out of box, do not enable log tracking for RHQ Server resources
[JOPR-62] add calltime metrics to EJB2.x SLSBs - basically do the same thing as we do for the EJB3 metrics.
ignore eclipse classes
[RHQ-1601][RHQ-1603] fix the hibernate entity component to survive up/down cycles of the parent VM container. This also provides better public/protected APIs to the MBeanResourceComponent.
new installer msgs
refactored the ContentFileInfo stuff
[JOPR-86] rebrand the files using the included *.unfiltered copies. this is possible due to RHQ-1747
[JOPR-86] rebrand the files using the included *.unfiltered copies. this is possible due to RHQ-1747
point to JON docs - the config properties help is still wrong.. have to fix this still
the config props are documented in another doc root location
[JOPR-34] use the new Jopr logo in Jopr's installer
get the yum and jbosscsp content source plugin in the jopr distro
jopr points to jopr docs
re-enable log/events
if I am forced to use our crappy coding standards, then I curse all others who checkin code with the same crappiness as well. reformatting, taking out tabs (eewww) and reformatting
how did we not see this? its SHA 2*56* not 2*65*
[JOPR-206] compare canonical paths to support the case when you are running JbossAS out of a symlink directory
add jopr license header, remove unused import
[RHQ-2118] allow for optional plugin dependencies to be implicitly specified. runs-inside (Injection) and sourcePlugin (Extension) are now implicitly defining optional plugin dependencies. <depends> now implies required dependencies. you no longer have to define <depends> when you define runs-inside or sourcePlugin - you only need <depends> when you need the classes in that plugin or you want to require a plugin to be deployed with your plugin. still need to refactor this further to support RHQ-2059, but this work had to get done first.
[RHQ-2129] jboss-as plugin now supports the snapshot report facet. you can get a snapshot of all data, conf and log files in a .zip and upload to server.
[RHQ-2129] be able to recurse down into subdirectories so you can take a more full snapshot of the jboss-as server. descriptor and component now allows you to take a snapshot of additional directories (for example, you can snapshot things under deploy/ or anywhere else)
eclipse tool we can use to build jopr plugins
[RHQ-2059] there is now a root plugin classloader to all plugins. they limit what classes the plugins can see. many agent classes are now hidden from plugins. this check is large and moves some files around to ensure plugins are now built correctly (some plugins used clientapi classes, which was a flaw, they should not have been).
put clientapi jar and some other deps required by the plugin descriptor generator testing tool that is embedded in the jboss-as-5 plugin
refactor to use the new support facet (replaces the snapshot report facet)
i'm not sure how this isn't blowing up the build, but without this import, eclipse is giving me a compile error.
should not explicitly depend on ems - will pick it up from the dependent rhq project (and this is now 5 versions out of date from what it should be)
[RHQ-2059] the big kahoona... individual resource classloaders are created to support connections to different managed resource instances
[RHQ-2059] somehow the svn merge screwed this up
we need to tell the PC to create resoruce classloaders so it can pick up the client jars from the managed jboss-as-5 server we are testing against
the tests need to hide classes so they aren't loaded from the maven isolated classloader
this I need this one to be hidden too
don't do this in offline mode - it seems like every day there is a new dependency that needs to be pulled down
if there are no successful executions, show "0" in the results, not Long.MIN/MAX_VALUE
trivial change - remove tabs and EOL whitespace
make this easier to revert back if we can - don't need to comment the entire body of the private method, just don't set the regex in the PC config object
remove the duplicate dep
remove unused import
as part of our performance testing, i'm adding the following metrics to track:
[JOPR-229] provide a new service RHQ Remote API Subsystem to track metrics for the remote APIs
[RHQ-1001] this refactors the code so there is a isEmbeddedInServer method - the place where it can be used is commented out - so the behavior is still the same as before... still trying to figure out how to get embedded agent to fully work
snapshot reporting/support subsystem isn't fully exposed, so just hide the snapshot plugin configurations by default
[JOPR-381] remove ALL illegal usage of clientapi package - including imports
curiously, somehow this test passed regularly on jdk6 but fails regularly on jdk5. the test needs to be more flexible since the set isn't guaranteed an order to return its items
to help detect problems from RHQ-1996 and related issues, dump the mtime when dumping inventory to an xml file
[JOPR-384] to avoid slow-responding jboss-as 4/5 servers from triggering false "downs", allow for plugins to be configurable for async avail checking. the default is the same as its always been - synchronous avail checking. if the 5-second avail timeout gets triggered because the jboss-as servers are slow to reply to the ping, then you turn on async avail checking
[RHQ-2443] default the server endpoint pref to a server called "rhqserver" - if there is none, use localhost as before
change eclipse classpath to use the upgrade libs
change eclipse classpath to use the upgrade libs
pass null if there really are no envvars defined (this will tell the exec to use the agent env vars as a default)
add a utility to load/save .ini formatted files - useful to read config files for things like puppet
only perform the DNS lookup if the address preference value is not yet set. this will avoid doing unnecessary dns lookups when the user has already defined what address to use
we don't want to hide eclipse files - people should be able to git clone and immediately load the project in eclipse and begin working
ignore the eclipse generated classes
remove CRLF
remove CRLF
mass elimination of all CRLF EOL chars from .java, .xml, .properties using dos2unix
remove CRLF
Merge branch 'master' into HEAD
remove CRLF
add to eclipse the things needed to build the jopr stuff
move the jboss software plugin to the place where the other content source server plugins are. do we want to delete this anyway?
remove CRLF
Merge branch 'jopr'
our unit tests need to ensure the default database type is set
no longer use redstone xmlrpc lib
Squashed commit of the following:
cracking a whole bunch of eggs to start to make a plugin container omelet. this branch doesn't come close to successfully building right now. refactored out the server-side xml schemas to a server only mvn module. xml-schemas now contains server side schemas leaving client-api to contain only those schemas needed on both server and agent (as it should be)
removing things that are no longer needed in their original packages
got the xml schemas laid out properly.
comment out the stuff that needs to be in here when perspectives schema
set the package names in the code appropriately to match the new name
add a global "plugin config" to the abstract server plugin schema type
fix the build to be able to reuse the client-api version of config .xsd.
only need schemas that define root elements, config is a child element
stub out the start of the alert plugin schema, with unit test
fixed most of compile errors due to the renaming/moving of classes
get master PC to manage the type PCs
merge master
get the pc ready to be testable
finish the integration into the existing test
fix some compile errors in tests
the rhq server plugin needs to use the new names provided by the new
add the new xml-schemas module to the build
put server jar dep in server plugins pom
use the proper jboss API call to get the true jboss mbean server
fix test descriptors so they follow the new schema
put the apt test in a testng group which will allow us to exclude it via
the plugins need to refer to the old config namespace
provide more fallback in case JAVA_HOME isn't set but java is in path
set the plugin descriptor to be correct
set a default JAVA_HOME via which if not set already.
Merge branch 'content' into pc
missed this in the last merge
Merge branch 'pc'
Squashed commit of the following:
reorganize .classpath to put things in some semblance of order, this
remove eclipse tools that dealt with jopr things since there is no separate project anymore
do not assume java is in /usr/lib/jvm/java and remove the additional
remove eclipse tools that dealt with jopr things since there is no separate project anymore
do not assume java is in /usr/lib/jvm/java and remove the additional
eclipse settings updates - copyright for new files is now up to 2009
fix the build - we should not be creating modules/dev-container,
the start of getting plugin classloading to work
it all compiles now, just have to test content plugins to make sure they didn't break
fix some minor things the tests flushed out
fix test so we don't really deploy any actual jars
add a start lifecycle method to support how the content stuff wants to
more small bug fixes that cause problems at shutdown
add some thread-saftety due to my paranoia
add lifecycle listener to server plugin stuff. change unit tests to explicitly create a server plugin server for content, leaving room for us to add different types later
add a sample server plugin to demo generic plugins and lifecycle
Squashed commit of the following:
refactor the server plugin test code so its easier to install different
move the content server plugin test classes to content test package
write a test that confirms the PC and listener lifecycle is correct
add a new "schedule" element to all plugin descriptors - this can allow us to implement the ability to schedule plugins for periodic work.
Merge branch 'mazz'
why did git not know that I removed these?
Squashed commit of the following:
somehow the db upgrade script got reformatted - things aren't lined up
maven is barfing due to a java.net repo hosting change.
add a "concurrent" attribute to allow for us to use StatefulJob
there are no tests for the cron and postfix plugin, removing from
provide an API to schedule jobs
add plugin context to the job interface
actually schedule the jobs in quartz
Merge branch 'master' into pc
Squashed commit of the following:
Squashed commit of the following:
fix the operation names in the rhq server plugin
get the plugin jobs to be scheduled properly in quartz
Conflicts:
Merge branch 'mazz' into pc
why does git refuse to merge this? I have to manually remove it myself
Squashed commit of the following:
Squashed commit of the following:
Squashed commit of the following:
Conflicts:
out! out! damned tabs!
Squashed commit of the following:
totally revamp the scheduling metadata.
get the new schedule stuff implemented.
rename lifecycle listener to component
finalize the coding to the new way we declare schedules
remove erroneous usage of seam class in javadoc
get test to pass
put boolean in quartz data map as string
rename the agent plugin scanner to indicate it scans for both kinds of plugins, not just agent
Merge branch 'pc' - this is the last of the squishes. I will never squish again, I'm all squooshed out.
fix possible NPE
log when we detect a user plugin and copy it to the internal location
refactor the plugin scanner to make it easier to add server-side plugin scanning
eclipse tool to hide dev-container files when searching for resources
add a help element to the server plugin descriptor schema. we can show this in the plugin UI page
add a query and API to get the number of normal servers in the cloud
do not invoke job if master PC is down. only refire immediately if other HA servers can take it
put the plugin component instance in the job context so stateless jobs can get to the stateful component if they need it.
add new plugin schema changes
fix the queries to join the config properly
test that we can persist plugin config and jobs config for plugins
add queries to filter on deployment type of plugin
some APIs and some GUI work to start being able to display server plugins on the plugins UI page
start doing some server plugin scanning
the scan period scans for both server and agent plugins now, not just agent plugins
initial code that persisted server plugin info to the database
oppps... forgot to define the datasource resource via annotation
get the database check to put cache the plugin info, just like how the filesystem check does it
have master PC and its supporting classes access the DB to get plugin information
API to get configuration def for server plugins
more coding to get info about plugins from the database. this also shows the configs in the server plugin details list as a prototype for how configs could look
be able to enable and disable plugins - start undeploy coding, but it isn't complete.
be able to tell the plugin container to initially disable the plugin when it is first discovered into the system.
have the sample plugin be disabled on discovery
Merge branch 'pc' - this adds server-side plugin container UI and DB changes
update schema catalog for eclipse usrs
out out tabs! fix formatting
add the ability to mark a plugin DELETED. add authz to server plugin SLSB calls. add tests
do not stream plugins to filesystem if the database flagged it as deleted
do not attempt to register plugins that were previously undeployed.
provide API that will allow us to later build a user interface to "resurrect" a deleted plugin - to re-install it if it was undelpoyed before.
actually remove all jobs for the undeployed server plugin
since there is no current way to "revive" a undeployed plugin from the real GUI, at least provide _some_ way to get back to a state that will let you re-register a plugin again using the test control.jsp page
mistakenly deleted the html tag, put it back
convert CRLF to LF
the column should be "enabled" since everywhere else we talk about a plugin being enabled or disabled, not active/inactive
put the proper values in the query params
because we put the byte[] content directly in the plugin entity, we can't entityManager.find() because that would load the full plugin content.
add a test to confirm that snapshot versions are considered older than candidate releases or releases
fix NPE when plugin config or scheduled jobs config is null
Merge branch 'master' into pc
use the new deepCopy()
Merge branch 'master' into pc
Merge branch 'master' into pc
provide an API to get a list of all enabled and disabled plugins grouped by their type
fix the update method so it can handle the config updates
get rid of the update query we don't need anymore
start with plugin key impl
start to adding JPA discriminators to plugin entities
finish JPA discriminator refactoring so there is now ServerPlugin entity (Plugin entity is now only for agent plugins)
fix copyright
Merge branch 'plugin-name-refactor' into pc2
first attempt to see what this looks like if i use plugin key vs. just plugin name in API
plugin configs are now only valid for server plugins. do the check on the UI bean def, since that will be null for agent plugins
use != to check for deployment type inequality
opps... forgot to fix the control.jsp to call the new API
now that we have the type in the data model, we can get all installed plugins grouped by their type
getting some code to help restart individual plugins while the master is still up
refactor the plugin container/manager API so we can load, unload individually
use new API for loading plugins
get the SLSB to unload/reload plugins using new API
make sure to schedule/unschedule jobs appropriately when enabling/disabling plugins
using the wrong dir - need to use the jbossas data dir, not home dir
create tests for new queries
need to reload/enable the plugin first, before rescheduling jobs
now that we have the type in the data model, we can get all installed plugins grouped by their type
getting some code to help restart individual plugins while the master is still up
refactor the plugin container/manager API so we can load, unload individually
use new API for loading plugins
get the SLSB to unload/reload plugins using new API
make sure to schedule/unschedule jobs appropriately when enabling/disabling plugins
using the wrong dir - need to use the jbossas data dir, not home dir
create tests for new queries
need to reload/enable the plugin first, before rescheduling jobs
Merge branch 'master' into pc
add API to get all server plugins, including deleted ones
finish the new UI that lets you completely purge a server plugin. You are free to re-deploy/re-upload a new plugin to replace it.
move the custom jmx plugin example to the /etc/samples/ location since it is a sample so its more appropriate to go here
Merge branch 'master' into pc
provide a way to restart the master PC from the plugin UI
Merge branch 'master' into pc
add eclipse tool to build the xml-schemas module
add build utility that validates server side plugins
add another sample plugin that illustrates how you can dump reports periodically.
add a new simple report that shows live availability
get better reports
rename the method/change log messages to make it clear this is starting the deployer that handles both agent AND server plugins
#545595 - don't send up empty inventory reports and make sure the report has at least the platform plugin
be able to enable and disable plugins successfully. this fixes a few bugs
#545595 - don't send up empty inventory reports and make sure the report has at least the platform plugin
merged pc into master. fixed conflict in ServerPluginsLocal.java
remove apt plugin source from eclise project
fix hot-deployment bugs so we can upload and enable plugisn without recycling the master PC
add sorting to the plugin ui - hide the purge button unless you are viewing undeployed plugins
remove some unused methods ; use type when comparing plugin data
use SLSB to get plugins, not jdbc
only link to the details page if the plugin is installed
if a plugin was undeployed, enabled or disabled on another server
Merge branch 'mazz'
add some error messages to make it clear what's happening
fix log message format
new eclipse tool
fix misspelling in "backinBean"
Merge branch 'master' into alertPlugin
fixing dbsetup - need to set version in pom
indent to match the rest of the file
opps.. show not show the link if plugin is undeployed, but still show if its just disabled
fix the error checking code for scanning dropbox
fix the plugin config ui
when a server plugin is updated, retain the original data.
add method to load plugin class for subclasses to use
add alert server plugin sources and deps to eclipse classpath
trivial - just stub out delegator method for stop
workaround what is probably a bug or poor defensive programming in the irc 3rd party lib
remove the unnecessary delegate methods - don't think we need them right now
loadPlugin now throws exception if there is something wrong with the plugin
fix eclipse classpath so master can compile in eclipse
first code for byteman plugin and skeleton lsof plugin
add operations to the byteman plugin
add new op to get added classpath jars
continuing byteman plugin
rename bytemancomponent to bytemanAGENTcomponent
rename discovery component to make it clear its discovering the agent
fix NPE if a content doesn't have config defined for it
more byteman plugin additions
fix deleting script. now support reloading managed script if it doesn't exist anymore in the agent
fix delete and add
add new JDBC trace plugin - doesn't have a real rule def yet
add res config to byteman agent, add op to jdbc tracer
some test rules
preliminary fix for bz551056
companion to earlier bz551056 fix - allow inventory manager to get you a container from a canonical resource key. have agent plugin operation give more information of the plugin container classloader stuff
add the ability for the jdbc trace plugin to deploy a helper jar to the byteman agent. refactor out some util methods for jdbc trace.
make sure the sys jar is added to the byteman agent
extract the byteman helper jar if refresh is requested
some test jdbc rules
POC to get lsof network connection info as an rhq operation
need to use longString type so the output can be shown in a multi-line gui component
add the ability of our systeminfo native API to get network connection data
build out the lsof plugin some more - add the ability to use either lsof external app or internal sigar API
remove tabs and get everything to format nicely (my tab spaces aren't the same as your tab spaces :)
put in missing end tag , this is invalid xml otherwise
get this file to finally be formatted properly
byteman 1.2.1 has been released, we need this as a dep
Merge commit 'origin/master' into byteman-lsof-plugins
need to add a few more paths/deps to eclipse classpath to build antlr-config plugin
change some javadoc to correct some info that are directed to plugin devs
cobbler server side plugin skeleton
move the test log file out of the root module directory into the target directory. now a mvn clean will delete it and git won't tell me I need to commit it
add cobbler4j as a dep
add the "clustered" job property
need to configure the scheduler thread pool in order for it to initialize successfully
Merge branch 'master' into cobbler-serverside
set cobbler4j.version property, reformat pom.xml
add "deploy-jar-meta-inf" antrun execution so the jar manifests are properly updated when building in dev profile.
remove the optional version attributes - we let our manifests define the versions of the plugins
add server plugin description, display name and help text
Merge branch 'cobbler-serverside'
noticed that the keystore generated needs to be rhq branded
make sure the nonclustered scheduler is started properly
Merge branch 'cobbler-serverside'
add cobbler4j to the eclipse classpath
need to put the xmlrpc jar in the plugin jar /lib dir
do not pause the scheduler - just get the list and delete the jobs
make sure we unload a plugin if a new one has been detected and needs to be deployed
add cobbler4j to the eclipse classpath
need to put the xmlrpc jar in the plugin jar /lib dir
do not pause the scheduler - just get the list and delete the jobs
make sure we unload a plugin if a new one has been detected and needs to be deployed
Merge branch 'master' into cobbler-serverside
provide the ability to run control operations on server plugins.
provide SLSB API to get the server plugin controls
Merge branch 'alertPlugin' of ssh://git.fedorahosted.org/git/rhq/rhq into cobbler-serverside
antlr-config plugin has been deleted, removing from eclipse classpath
remove this generated test artifact
prototype ui to invoke controls on server plugins - this isn't close to working
Merge branch 'master' into cobbler-serverside
stub out a getCobblerDistros control
add test controls to test plugin; remove unused prototype xhtml
finish the ui to allow control operations to be invoked on server plugins
get the cobbler server plugin to show some info on distros and profiles
complete the get distros/get profiles operations for the cobbler server
fix NPE, which happens during unit testing
don't render the link if plugin is not installed
get distros populated into cobbler from the rhq content subsystem
Merge branch 'master' into content
create distros using the proper distro tree ks metadata entry
create distros using the proper distro tree ks metadata entry
merge changes if a cobbler distro needs to be changed
merge changes if a cobbler distro needs to be changed
add new entitlement server plugin type
add bundle schema to db setup/upgrade scripts
start of the bundle domain objects along with unit tests
BundleVersionRepo entity and unit tests
new bundle config/file/deployment entities
change the blob column to clob since this really is text of the action script/receipt and not raw binary data
trivial fix to a javadoc comment
the start of the bundle SLSB and its unit test
fixes BZ#548526 and obsoletes BZ#559160 - when changing config of server plugin, plugin is hot-redeployed and other HA servers will pick up the chanage within a few minutes at most
fixes BZ#548526 and obsoletes BZ#559160 - when changing config of server plugin, plugin is hot-redeployed and other HA servers will pick up the chanage within a few minutes at most
add new relationships to have bundle type associated with a resource type and a config def associated with a bundle version
initial start of the agent-side bundle subsystem. includes server side service impl/interface
BZ 561083 - output warnings if server or agent endpoints use loopback
BZ 561083 - output warnings if server or agent endpoints use loopback
create sample bundle plugin (to be used for my inital work on impl)
Merge branch 'master' into bundle
why does antlr-config keep showing up in .classpath?
why does antlr-config keep showing up in .classpath?
fixing .classpath (again)
fixing .classpath (again)
put this back, but don't integrate it yet
opps. this should not be here
put this back in the agent
start abstracting out the input reader
refactor the jline integration to fix problems and enhance it.
Merge branch 'master' into bundle
a solution to the infamous RHQ-2 (now BZ 535894)
fix cut-n-paste error
rename "audit" to match the new name of "history"
add remote interface to the server side bundle API
stub out the bundle update API
create the new server-side "bundle" plugin type and stub out the "file template" bundle
opps.. this sample plugin has been deleted, remove from eclipse classpath
opps.. this sample plugin has been deleted, remove from eclipse classpath
should use rhq-project as the org name
the installer should create a keystore with the server's public endpoint in the CN
the installer should create a keystore with the server's public endpoint in the CN
log the obsolete msg at debug level; don't create a prepared statement unless we know we need it
there is no longer etc/modules
part of BZ 560803 - use distinct in having clause to speed up query
add new base-perspective-jar to eclipse classpath
remove extra parens from delete query
create a peer package type for all bundle types during metadata updates
BZ 566724 - if classloader fails to be created, master PC will skip the plugin
BZ 537396 - to not block indefinitely if a lock cannot be acquired before attempting to invoke the initialize callback
should not worry about the lock failure if the init callback doesn't need to be invoked anyway
i think this should report an error always on lock acq failure. we'll leave the flag alone - don't set it to true - let the next call take care of whether or not the init callback should be invoked or not
BZ 537396 - to not block indefinitely if a lock cannot be acquired before attempting to invoke the initialize callback
should not worry about the lock failure if the init callback doesn't need to be invoked anyway
i think this should report an error always on lock acq failure. we'll leave the flag alone - don't set it to true - let the next call take care of whether or not the init callback should be invoked or not
BZ 566724 - if classloader fails to be created, master PC will skip the plugin
BZ 537396 - to not block indefinitely if a lock cannot be acquired before attempting to invoke the initialize callback
should not worry about the lock failure if the init callback doesn't need to be invoked anyway
i think this should report an error always on lock acq failure. we'll leave the flag alone - don't set it to true - let the next call take care of whether or not the init callback should be invoked or not
given a bundle type name, you can now get a plugin component from the bundle plugin that supports that type.
don't bother looping/logging if debug not enabled.
don't bother looping/logging if debug not enabled.
starting agent side bundle deployment stuff - not even close to useful yet
API for agent plugin to ask for bundle file content
opps.. typo
file template bundle can download bundle files and verify them
remove circular dep - plugin api should never dep on pc module
first stubbed version of the commons filetemplate bundle commons lib
stub the useage of parse results
get configdef and deploy to parse - create unit test - support blank/comment lines
start parsing replacement variables
cherry picking two commits b10d6026bba36c90530077dec3f22475c34ac69c and
be defensive when building the template engine replacement variables - get as many variables as we can, ignoring native errors if we hit them
more bundle processing stuff - this attempts to process the deploy command
opps.. forgot to use the new constructor
fix bundle test so the mock PC is started properly
add script recipe command
support the file recipe command
add realize recipe command
remove this broken link
add agent bundle plugin unit tests
get the script recipe command to work
add shell command recipe support
Merge branch 'bundle' into master-copy
plugin validator caught this error - the service resource had createDeletePolicy set to both but the resource component's parent did not have create-child facet implemented and its delete facet method was empty (so it wasn't really implemented either). removing createDeletePolicy
fixed this test so it isn't so brittle - not sure how master has been passing since we moved to 3.0.0
Merge branch 'master' into bundle-copy
Merge branch 'bundle-copy' into bundle
Merge branch 'master' into gwt - this also pulls in the bundle stuff
Merge branch 'master' into gwt
remove JDK6 dep
Merge branch 'master' into gwt
update eclipse classpath
base64 encode the token
get eclipse classpath up to date
add some eclipse external tool defs
stub out the rpc service for the bundle endpoint
forgot to add the bundle service to the gwt.xml
add the lookup of the bundle service
use -o in eclipse external tool def when starting gwt:run/debug
add getWindowTitle to the wizard API
starting bundle wizard. not even half baked
more bundle wizard stuff
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
fix some dsl processing stuff and add tests
fix some dsl processing stuff and add tests
add SLSB method that lets you create a bundle and bundle version at the same time
add util method that auto-increments a version string
some minor fixes in file template commons
slowly filling out bundle wizard
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
more control over next/previous buttons
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
total brain freeze - correcting obvious logic problems
verified msgs
add api that lets you know what bundle files are needed and which are already uploaded
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
use HashMap in gwt service interface
bz 572535 - make sure security interceptor checks subject ID as well as subject NAME when confirming the session is valid.
bz 572535 - make sure security interceptor checks subject ID as well as subject NAME when confirming the session is valid.
add authentication to the file upload plus prepare to upload files that won't be retrieved back
refactor so this is more easily subclass-able
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
add TODO warning to remember that we need JDBC streaming here
make sure to load in the architecture so we know its ID if its not yet known
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
add a prototype of bundle file upload from gwt wizard - not pretty but at least the file upload works which is what I wanted to confirm
get rid of the sys.err.println
starting the file uploads for the bundle files
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
get the exception message output properly with cause strings and the html br element
do better error handling on upload failure
refactor bundle wizard with abstract superclass to support both an upgrade and create wizard and have them reuse as much as possible
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
make gwt interface use ArrayList rather than List interface
opps, forgot to check this in
wrap data in brackets in log messages just to make them easier to pick out the paths
fixing some bundle wizard things - makes sure description is saved
try-catch all gwt service impl methods, add delete bv method
make sure the cancel button undos what the the wizard did
the file dsl command also refers to a bundle file so it needs to be returned as a needed file by the plugin
getting the first couple steps to work better
add version order column
fix test - need to explicitly set uuid now
more bundle wizard stuff
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
use the new versionOrder column so we can create bundle versions in the proper ordering. this way we can determine which is the latest version of a bundle
fix this so the test passes again, this was a legit test failure
all domain tests now pass and all but 3 server/jar tests pass.
fix the package version criteria so it uses the proper alias.
dont use getSimpleName - GWT can't handle it
make sure uuid is the proper length for the column type CHAR - mainly for tests
can't rely on the toString to format the value - explicitly have the util method format the value
joe says this is broke - rg. should be resourcegroup. now
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
start of the bundle-with-latest-version composite query and SLSB finder
allow bundle criteria to sort by name or description
add bundle id to the bundle-last-ver composite query
get gwt to use the new criteria and show things like the latest version
all for recipe replacement variables to represent Java system properties
add new configdef recipe command so we can specify a replacement variable that may exist in bundle files that are to be realized
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
test the different gnu getop ways to specify the args
never mind, don't support sysprop fallback
explicitly support some standard java sysprops
get the wizard to cancel when you click the X
fix bundle file criteria - name of field should be "general"Package
delete the bundle if, when deleting a BV it turns out there are no more bundle versions for that bundle
remove the obsolete/unused isNext/PreviousEnabled methods from the steps classes
get the wizard framework to know when the wizard is finished and to close the dialog when it is
get end-to-end bundle create wizard to work. still need to pretty up the upload file step, but this commit has end-to-end working with the ability to cancel at any point in the wizard
don't refresh title if the view hasn't been rendered yet
was seeing erroneous behavior when deleting bundles - changing impl and added unit test
finishing up create bundle wizard. the summary page is almost done - can't get the vlayout of the file list to look right, need to fix that
get the finish button to close the wizard; remove isNext/Previous methods - they are obsolete/no longer needed
better button labels
add start of the "bundle" view at the bottom of bundle list
forgot to pass in the name in the log message
get the summary page's list of files to look right
i think i finally got the summary page to look like its supposed to now
fix summary tab view
bundle file upload step in wizard works and looks nicer now
get the 'logged in as' message area formatted a bit better
need to use the return obj from merge
simplify the upload step, the icon still isn't redrawing when it should though
this new test breaks - it illustrates our problem with packages ignoring classification
i can't figure out how to redraw this icon without hiding then showing it again. prior to doing this, the new icon would not show up
put the summary data in the same location as the other steps (via margin)
allow for a non-titled table
be able to go to next step when no files need to be uploaded
show bundle versions at the bottom right of the bundle view
make the parse call directly in the bundle PC so we can set context CL
allow public API to obtain tokens from the template engine
force the filetemplate plugin to use its own gnu getopt just to isolate it from the servers's version (this probably isn't that important to do)
introduce a new bundle type - ANT
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
provide ant contrib tasks out of box for user
Merge branch 'gwt'
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
a bundle type no longer has a corresponding package type, so have the plugin validator not check that special case
have eclipse pass the proper -Ddb=X sysprop when doing dbsetup
BZ 579886 - startup servlet should init scheduler earlier on so when resource type deletions from plugin metadata changes are allowed to unschedule jobs
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
move tasks classes to their own package
add javadocs
add the RHQ custom tasks
fix container build error
change our replacement templates to use @@ var @@ as opposed to the <% var %> notation
fix container build error
add the start to metadata handling of bundles.
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
more building blocks for the bundle provisioning utility - be able to walk a zip file and calculate hashcodes in memory, and realize files in memory; also do the same but write zip entries to a root directory
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
make sure parent directories are created during zip extraction
make hashcode generation more efficient by reusing the generator object
add description to deployment props object
change API around to better support zips/raw files
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
add bundle metadata to server side parse results object
have the eclipse tools explicitly use -Ddb=dev
remove description from properties if its null
remove unused field
test initial deployment
test deploying multiple zips and raw files, with and without realizing files
support getting passed in absolute paths in File
cannot assume mkdirs always returns true - if the directory already exists, it returns false. we need to check to see if the directory exists after the call the mkdirs as verification - this will return true in both cases (where the directory was created OR where the directory already existed)
add native system module as "provided" dependency so it can compile
test deploying raw file to absolute path
rescan functionality
first stab at updating a deployment, need to write unit tests to see if it works
add the start of a good update unit test, still need to finish it
finish the big update unit test - it all passes
finishes the initial tests for upgrade - looks like the first attempt at upgrade is working
put backup files in backup directory under metadata location
put the new ant 1.8.0 libs in the plugin jar, not the old 1.6.5 ones
have eclipse use the new 1.8.0 ant jars in its classpath
add logger
add test log4j.xml so we can see our log msgs
backup files that are to be deleted
so I can read the test logs easier, make the tmp dir that represents an external location for absolute paths easier to see
don't invoke the implicit target if we are just supposed to parse the script
don't validate the file here
need to squirrel away the deployment ID in the project so when we are running on the agent it can be set
provide an API to allow a remove client to specify a URL (as opposed to the full byte content) of a bundle file - the server will stream the URL content down and use that
bz535436 - removed all usages of collection.toArray in InventoryManager to avoid concurrency bug.
BZ 577875 - when in daemon mode, jline seems to want to gobble up console input, do not use native console libs when in daemon mode, there is no need for us to do so anyway
BZ 577875 - when in daemon mode, jline seems to want to gobble up console input, do not use native console libs when in daemon mode, there is no need for us to do so anyway
add DeployDifferences so you can obtain what happened on the filesystem after a deployment (files added, deleted, backed up, ignored,etc)
the ?/?/none case has a special sub-case - when the current file has been changed from the original, even though it will be deleted since there is no new file, we should back it up since it was modified by the user for some reason
a set of simpler unit tests that individually test the different original/current/new use cases
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
test the different bundle deploy scenarios with raw, absolute path, files
set of tests that test deploying raw files that have relative paths, that is, files that need to get deployed inside the bundle install dir
don't log "deleting files" message if we have nothign to delete
just some javadoc additions
changed the way the external, absolute path files are backed up. Rather than storing the backup copy next to the real copy, we back them up in ext-backup directory in the dest dir metadata directory.
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
make sure we store paths in platform specific way
store the paths in the differences object in the platform specific form
add more APIs to diff object to help avoid adding/removing/checking for wrong paths
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
change of plans - all internally stored paths should be normalized using /
fix test to look for the normalize path in the map
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
test for normalized paths
test normalized path
conver the raw file path so its normalized since currentFilesToLeaveAlone is a simple map thus it won't normalize for us unlike our own map's impl of containsKey
normalize raw path in test
normalize path when testing
the values in the backed-up-files map also are normalized so we have to test normalized paths
initial try at the "dry-run" preview mode. added some unit tests that show it working.
final set of tests for the dry run stuff
forgot to normalize this path for testing on windows
bz535436 - removed all usages of collection.toArray in InventoryManager to avoid concurrency bug.
stub out some server side bundle API that allows a user to provide a "uber bundle file" and have it be processed such that from it we can create a bundle, bundle version and associated bundle files
start of test
make sure streams are always closed, even in error conditions
couple fixes
unit test coding is done - need to make sure it actually works. this is a wip
add ant-nodeps to eclipse
don't assume all plugins will only throw illegal-arg-exception on bad recipe/distro file. catch all exceptions and assume we need to keep going asking other plugins
no need to keep walking the zip file when we found the recipe file we wanted
eclipse tool to clean test db
set up proper tx boundaries. abort/delete bundle version creation on error. try to fetch data that is returned to the caller after creation using new distro
get tests to run - this doesn't pass yet - need the API to return full data on the bundle version taht was created
fix test, get create call to return proper domain object with everything it can filled in
change the name of the temp dir to avoid bad filename chars
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
support the new distro file stuff
allow bundle files to be null, meaning the distro did not have any
support a raw recipe file as a "distro"
test more parsing rules, particular around blank names/versions
go thru the local interface
give the script the properties we should always have available
add some more tests to template engine/recipe parser; make sure we better support windows paths
if bundle file to be uploaded didn't say what its version is, use the bundleVersion itself
add javadoc
tell eclipse to pass -o (offline mode) when starting mvn builds
BZ 588383 - make sure the server sleeps enough time to ensure the agent knows the server was down
BZ 588383 - make sure the server sleeps enough time to ensure the agent knows the server was down
start of the new bundle create wizard impl - not close to being done
be able to support realize regex on a per-zip file, per-raw-file basis
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
use a new DeploymentData API and specify raw files that need to be replaced, rather than using a map that maps raw files to regex (which doesn't makes sense to do and hence why I change the map of raw file regexs to a set of raw files
a component that provides a drop down for bundle type - if only 1 type is deployed, this drop down is hidden from the user; only if more than 1 bundle type exists will this drop down be visible.
no need for this "New Version" button - the "New" button allows one to create a new one
minor refactoring to remove unused code and rearrange existing code
only add the handler once, at create time. nextPage() may be called more than one time which would add multiple handlers
fix things so the previous button works properly. move the distro upload form callbacks inside nextPage because it seems like they have to be added then
no need for uploadDistroFormHandlersInstalled since the handlers are only ever installed immediately after the form is newly instantiated (i.e. we never add handlers to a single form instance more than once)
introduce UnknownRecipeException so bundle plugins can tell us if the recipe it was given was not of the proper type (vs. it was the proper type, it just had a syntax error in it)
this provides two simple bundle distros with simple file template recipes. to test,
keep going even if we can't load in the thirdparty ant tasks, that just means they can't use those third party tasks but if they don't we should still work
some simple ant bundle distros we can use to test upgrades via ant bundle system
in case the server plugin didn't define a display name of recipe config props, set them as the same as the property name.
put the file downloads in a specific agent tmp directory
add more auditing to file template bundle plugin
add status to toString output
fix the test recipe so it has proper config defs
crlf -> lf
based on conversations with ghinkle and jshaughn, its been decided to backup files to the new deployment metadata directory, as opposed to the old existing metadata directory
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
generate the version properties file without leading spaces on each line
whenever the deployer installs a new current deployment, have it remember what the previous deployment was
provide api to support the restoration of backup files
missing this from the web services remote API
add the "estimateDiskUsage" method so before you deploy, you can examine if the disk has enought space. this is only an estimate and doesn't take into account copying external files to a different partition or disk than that of the destination directory. this assumes all content is being stored on the partition where the destination dir is
remove override annotation so it builds on jdk5
Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle
correct the javadoc
fail fast if there is not enough disk space
provide an option to clean the destination directory before laying down the new files
just some javadocs
pass through the clean/revert flags to the agent bundle plugins.
BZ 587026 - fix concurrent mod exception by synchronizing access to the static cache
BZ 587026 - fix concurrent mod exception by synchronizing access to the static cache
BZ 587026: use Iterator.remove API to avoid concurrent modification exceptions during the loop over the keyset of the cache
BZ 587026: use Iterator.remove API to avoid concurrent modification exceptions during the loop over the keyset of the cache
don't worry about doing db schema checks when just building agent from eclipse
fix minor format problem in tostring
add single-threaded thread pool to bundle manager so the agent runs the deployment asynchronously from the server request.
add a new MANAGE_BUNDLE global permission - confirmed the JSF and GWT role/permission editors work
changed all MANAGE_INVENTORY required perms to MANAGE_BUNDLE - this is probalby not 100% what we want - we probably want some to use this global perm but others we might want to restrict to the resource perm CONTENT. But for now, everywhere we had MANAGE_INVENTORY is now MANAGE_BUNDLE
provide the agenet with a new command line option: --purgeplugins
provide the agenet with a new command line option: --purgeplugins
add rhq.deploy.name as a out-of-box built-in property name for file template recipes (the ant recipes have this, too , just trying to keep up with the jones')
send an audit message when file template plugin is cleaning a deployment
test boolean string using Boolean.valueOf to ensure a case-insentitive test
update these to the new ant recipe syntax
BZ 536173 - there is now a backdoor system property you can set to override the 5s availability timeout - rhq.agent.plugins.availability-scan.timeout
BZ 536173 - there is now a backdoor system property you can set to override the 5s availability timeout - rhq.agent.plugins.availability-scan.timeout
if failed to load in inventory.dat, clear out any inventory that might have been partially loaded, remove the inventory.dat (we rename it actually, in case we want to perform some post-failure analysis on it) and return as if there was no inventory.dat (thus making the agent start up as if it has no known inventory to start with)
if failed to load in inventory.dat, clear out any inventory that might have been partially loaded, remove the inventory.dat (we rename it actually, in case we want to perform some post-failure analysis on it) and return as if there was no inventory.dat (thus making the agent start up as if it has no known inventory to start with)
fix some typos in the test ant scripts
need to make sure we are getting non-zero back from the disk usage API
Merge branch 'bundle'
Merge branch 'bundle'
John Sanda (481):
Initial commit for RawConfiguration.java and corresponding test class.
Implementing equals(), hashCode(), and toString().
Fixing mapping typos in RawConfiguration and adding JPA associatin in Configuration.
Adding comments and renaming field in RawConfiguration from content to contents.
Updating war plugin configuration to support the war:exploded goal.
Updating war plugin configuration to support the war:exploded goal.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Adding dbupgrade script for new raw config table.
Fixing syntax errors in dbupgrade script.
Adding config_id to rhq_raw_config table in upgrade script.
Fixing syntax in setup and in upgrade scripts for RHQ_CONFIG foreign key.
Bumping up schema version in pom.xml
Reverting war plugin change made in previous commit that changed the value of the webappDirectory.
Merge branch 'master' of ssh://jsanda@git.fedorahosted.org/git/rhq/rhq
Fixing typo that deleted top-level <project> tag
Adding back column to RHQ_CONFIG_TEMPLATE that I accidentally deleted.
Fixing column definition and deleting swap file that shouldn't have been committed.
Initial commit for RawConfiguration.java and corresponding test class.
Fixing mapping typos in RawConfiguration and adding JPA associatin in Configuration.
Adding comments and renaming field in RawConfiguration from content to contents.
Adding dbupgrade script for new raw config table.
Fixing syntax errors in dbupgrade script.
Adding config_id to rhq_raw_config table in upgrade script.
Fixing syntax in setup and in upgrade scripts for RHQ_CONFIG foreign key.
Bumping up schema version in pom.xml
Fixing column definition and deleting swap file that shouldn't have been committed.
Merge branch 'raw-config' of ssh://jsanda@git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'master' into raw-config
Reverting to previous working version to resolve compilation errors.
Adding methods for retrieving raw configurations.
Adding automated test for new method, findRawConfigurationsByConfigurationId()
Adding test for findRawConfigurationById()
Updating test to clean up after itself
Renaming MD5Generator to MessageDigestGenerator and refactoring to support SHA-256.
Refactoring equals/hashCode. Adding corresponding unit tests and javadocs.
Merge branch 'master' into raw-config
Fixing compilation error in test that happened as a result of removing RawConfiguration.setSha256().
Adding @Transient to messageDigestGenerator field since it is not a persistent field.
Refactoring equals(), hashCode(), toString() to account for RawConfigurations
Refactoring Configuration.equals() and Configuration.hashCode() to include the rawConfigurations field.
Updating deepCopyWithoutProxies() to copy rawConfigurations collection.
Fixing typo/comiler error in unit test
[US 403] Adding support for ampsVersion in data model and in schema.
Merge branch 'raw-config' of ssh://jsanda@git.fedorahosted.org/git/rhq/rhq into raw-config
Fixing failing tests, disabling one, debugging another.
Disabling test that is failing on build server.
[US 403] Modifying dbsetup script to add AMPS_VERSION column to RHQ_PLUGIN table
[US 403] Initial commit for PluginTransformer, PluginTransformerTest, and PluginTransformerException
[US 403] Modifying plugin container to load Plugin objects in their entirety.
[US 403] Adding ampsVersion to UI in plugin details page and updating logic for setting ampsVersion for exisitng plugins
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Fixing group id of parent pom.
Merge branch 'master' into raw-config
Adding a couple profiles to allow plugins to be built in a separate job on hudson
[US 2] Adding configurationFormat attribute to domain model.
[US 2] Adding configurationFormat attribute to plugin descriptor schema.
Fixing versions of modules that had been set to 1.3.0-SNAPSHOT. Needs to be 1.4.0-SNAPSHOT.
[US 2] Adding more unit tests
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
[US 2] Updating ConfigurationMetadataParser to set configuratFormat on ConfigurationDefinition
[US 403] Initial commit for PluginManagerTest.
[US 403] This commit contains the initial implementation of PluginManagerTest
[US 403] Refactoring PluginManager to better support integration tests.
[US 2] Initial commit for PluginManager.getAmpsVersion(String pluginName) and unit tests.
[US 2] Initial commit for new ResourceConfigurationFacet interface
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
[US 2] Updating parser to make configurationFormat default to structured if it not declared in plugin descriptor
Adding additional configuration to agent and comm tests to allow multiple builds run simultaneously on hudson.
Merge branch 'master' of ssh://jsanda@git.fedorahosted.org/git/rhq/rhq
Adding build properties that are used to filter the agent config files to ensure unique ports are used across builds
Merge branch 'master' into raw-config-clean
Fixing schemSpec numbers for dbupgrade
Making another port that was previously hard-coded configurable
Replacing another hard-coded port with configured property
Modifying @AfterMethod method to always run to ensure shut down of comm services happens
Merge branch 'master' into raw-config
Merge branch 'master' into content
Fixing typo in property names
Merge branch 'master' into content
[US 2] Adding methods for merging/translating back and forth between structured and raw
Trying to make the tests more robust since there were failures on hudson.
Adding dependency for jmock and initial commit for ConfigurationManagerUnitTest.java
[US 2] Initial commit to support raw config in ConfigurationManager
[US 2] Updating ResourceConfigurationStrategyFactoryImpl to initialize strategy object with its dependencies
[US 2] Implementing StructuredResourceConfigurationStrategy and adding unit tests for it.
Adding implementation and unit tests for StructuredAndRawResourceConfigurationStrategy
[US 2] Refactoring loadConfiguration() method to use new strategy and factory interfaces.
[US] Renaming classes to be a bit more concise.
[US 2] Initial commit for ComponentServiceImpl
[US 2] Initial commit for ConfiugrationManagerInitializer.java
[US 2] Updating ConfigurationManagerBean to call new version of loadResource().
Updating PluginTransformer to set a default ampsVersion when the descriptor does not declare one.
[US 2] Updating ConfigurationManagerBean to call new ConfigurationAgentService api
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Commenting out failing test for now as the functionality may be removed.
Updating fake agent service to fix failing tests
[US 4] Adding initial support for translating bewteen structured and raw during an edit.
Increasing length of config_format column to 32.
[US 2] Initial commit for raw config test plugin.
[US 2] Implementing more of the ResourceConfigurationFacet API
Merge branch 'raw-config' of ssh://jsanda@git.fedorahosted.org/git/rhq/rhq into raw-config
[US 2] Updating logic in getLatestResourceConfigurationUpdate() to persist raw configs
[US 2] Updating agent serialization to include the rawConfigurations collection in the (de)serialization.
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
[US 2] Modifying deserialization behavorior for RawConfiguration.
Modifying PropertyList and PropertyMap to initialize collections to avoid NPEs during deep copy operations.
Debugging the agent serialization code
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
[US 2] Cleaning up serialization code.
Updating AbstractResourceConfiguration to call Configuration.deepCopyWithoutProxies()
Fixing a bug in EntitySerializer in which the id field is not serialized unless it specifies @Column.
[US 2] Updating serialization code to include rawConfigurations field.
[US 2] Implementing merge operations in raw-config-test plugin
[US 2] Adding dependency for commons-configuration
Updating RawConfigServer to use commons-configuration for the merge operations
Updating pom to include dependencies in the packaged plugin
[US 2] Refactoring strategy class and tests for loading structured and raw.
[US 2] Fixing signature of loadRawConfigurations() to return Set<RawConfiguration>.
[US 2] Refactor LoadRaw and LoadRawTest
[US 2] Finishing the refactoring (for now) of the classes and tests involved with loading resources.
Updating plugin with facet API changes for the load methods
Updating .gitignore for IntelliJ 9
Updating plugin descriptor parsing code to not require child elements of the config when the format is raw.
Adding a resource type to test plugin that supports only structured config
Updating Structured and Raw Server to handle 3 config files and fixing the confiurationFormat attribute of Structured Server so that it is 'structured' instead of 'both'
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Adding unit tests for serialization code.
[US 4] Updating plugin container code for translating from structured to raw.
[US 4] Updating ConfigurationManager to better support translating raw to structured
[US 4] Fixing bugs in the merge() method that resulted in returning the configuration unmodified.
[US 4] Adding javadocs
[US 6] Adding unit tests for existing resource configuration update code
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
[US 6] Adding unit tests for embedded mode
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
[US 6] Refactoring common test classes into test-utils module.
[US 6] Adding Javadocs
[US 6] Starting to refactor UpdateResourceConfigurationRunner for raw config support and lots of refactoring.
[US 6] Renaming LoadResourceConfigurationFactory to ConfigManagementFactory
[US 6] Changing return type of ConfigManagement.executeUpdate() to void.
[US 6] Refactoring Configuration.deepCopy() to properly handle hibernate proxies.
[US 6] Refactoring Configuration.deepCopy() to properly handle hibernate proxies.
Deleting directory that accidentally included in a previous commit
[US 6] Refactoring UpdateResourceConfigurationRunner to handle ConfigurationUpdateException
Fixing compilation error that happened as a result of my refactoring RawConfiguration.deepCopy()
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[US 6] Updating call to RawConfig.deepCopy() to pass a boolean argument
Eagerly initializing underlying list and map in PropertyList and PropertyMap to avoid NPEs
[US 6] Refactoring ConfigurationManager.updateResourceConfiguration() to support raw config.
[US 6] Updating raw config test plugin to support update operation for Raw Server
Updating runtime dependencies
[BZ 541486] Fixing serialization bug for configuration update objects
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Refactoring tests to use common TestUtil class that now contains the serializeAndDeserialize() method that was formerly a private helper method.
Merge branch 'master' into raw-config
Fixing ordering of updates
Merge branch 'raw-config' of ssh://jsanda@git.fedorahosted.org/git/rhq/rhq into raw-config
[US 910]
[US 910] Refactoring testGetAndUpdateRawConfiguration() to eliminate some duplicate code
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
[US 6] Adding support for updates of structured config with new ResourceConfigurationFacet
[US 910] Adding CLI script test for structured config update using the new API
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
[US 6] Implementing update functionality for structured and raw
Fixing version of dependency. It was referencing jopr version but it should have been the rhq version
Merge branch 'master' into raw-config
[US 6] Initial commit for new updateResourceConfiguration() method that handles raw config.
[US 6] Adding implementation and tests for updating configs that support structured and raw
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
[US 6] Adding support for updating a resource config that supports structured and raw.
Fixing copy/paste error
[US 6] Adding CLI script test to verify that updates for a config that supports structured and raw works
Fixing parent reference in to point to rhq-plugins-parent instead of old jopr module
Merge branch 'master' of ssh://jsanda@git.fedorahosted.org/git/rhq/rhq
Fixing versions and groupIds on dependencies that got busted when I changed the parent module
Fixing serialization bug that I introduced during some previous refactoring.
[US 910, 914] Exposing the configuration translation operation to the remote APIs
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'master' into raw-config
Adding raw-config-test plugin to aggregrate build
Fixing build failures in webservices module
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Fixing broken build...again. Updating test method to call correct version of generated API.
[US 6] Fixing logic of legacy update config
Fixing test so that it retrieves the "live" config after applying the update instead of just retrieving it from the database. This way, we verify that the update has been applied on the reosurce.
Changing name of new udpate method to updateStructuredOrRawConfiguration.
Adding unit tests for LegacyConfigManagemnt
Updating unit tests and adding logic to throw an exception when wrong update method is called.
Adding a script to the dbutils build for "resetting" the database
Adding error handling and unit tests for translation operation.
Adding a test script for applying structured updates
Adding support for raw update
Rewrite of script to make it more modular and to support for scenarios.
Adding functions to translate from structured to raw and vice versa
[BZ 541486] Fixing serialization bug for configuration update objects
Porting a fix for a serialization bug introduced in the raw-config branch
[BZ 545175] Updating resouce config rollback to support structured and raw.
[US 1025] Fixing raw config plugin redeployment error
Merge branch 'master' into raw-config
Renaming script to something more logical
[BZ 544136] Fixing bug that prevented see history for raw config updates
[BZ 538088] Reverting back to using the view ui bean which only has a request scope.
[BZ 537891] Fixing bug in which required query parameter was not getted appended to url
Removing check for config property definitions in findResourceConfigurationUpdates()
Revert "added toolbar in xhtml, removed it from tests, still broken"
Revert "Still broken. Major refactroing of the config renderer so that the structured config is contained inside a panel. Might have broken something not visible from the test. Still working on re-enabling the save."
Revert " ability to turn off toolbar. Read only is set from render. replaced some String literals with symbolic constants."
Revert "Merge of current raw work with remote branch"
Revert "removed temporary file."
Revert "Removing check for config property definitions in findResourceConfigurationUpdates()"
Revert "[BZ 537891] Fixing bug in which required query parameter was not getted appended to url"
Revert "[BZ 538088] Reverting back to using the view ui bean which only has a request scope."
Revert "[BZ 544136] Fixing bug that prevented see history for raw config updates"
Revert "started pushing the decode and encode stuff into the appropriate portion of the jsf lifecycle."
Revert "Cleaned up icons and sidebar navigation, toggles between edit in view"
Revert "Renaming script to something more logical"
Renaming script to something more logical
[BZ 538088] Reverting back to using the view ui bean which only has a request scope.
[BZ 537891] Fixing bug in which required query parameter was not getted appended to url
Removing check for config property definitions in findResourceConfigurationUpdates()
Reverting back to previous functionality (for now)
Refactoring facelets code so that the appropriate ui is rendered for the config type
Merge branch 'master' into raw-config
Removing files from merge that were committed by accident
[BZ 537891] Adding fix for edge case in which id parameter was not passed when leaving raw edit page.
[US 7] Adding initial support for validation of raw config in plugin container
[US 7] Adding initial support in test plugin for validation
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Updating/adding validation support for configs that support structured and raw
Removing unused classes and cleaning up imports
Adding groups for plugin configuration properties
Merge branch 'master' into raw-config
Fixing typo
Initial commit for raw config ui changes
Initial commit for raw config ui changes. This is just a protoype.
More refactoring to combine the structured and raw ui into edit.xhtml
Adding support to switch between structured and raw in view mode
Updating controls so that there is only a single 'Edit' button
Adding status msg to show which file is loading.
Seam-ifying backing bean in order to work around request scope issue with JSF
Adding tabs to switch back and forth between structured and raw on view.xhtml
Adding tabs to switch between structured and raw on edit.xhtml.
Adding logic to group files by directory in the file menu
Deleting unused file that was accidentally included in a previous commit
Add javascript to change cursor to a wait cursor when changing tabs or when selecting a new file
Adding javascript and file grouping on the raw view and on the edit pages
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Adding initial support for full screen, modal raw config editor
Using tabs on the view/edit pages regardless of the supported config format to be consistent
Adding javascript on edit page to change cursor to wait icon when switching between tabs
Fixing regression that broke translation and changing files from the raw file menu
Fixing another translation/file selection issue in which modifications were getting overwritten
Adding logic to properly initialize the rawConfigDirectories property in the UI backing bean.
Updating modal dialog editor to display the correct header and contents after a file selection
Updating file menu to display icon next to file that has been modified in the file menu.
Adding logic to display an 'undo' button next to files in the file menu that have modifications
Fixing a bug that breaks translating from structured to raw
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Updating logic so that when you click on the edit button, you go to the edit page but remain on the same tab
Adding another config file for StructuredAndRawServer that is managed only via the raw and not structured
Refactoring to put config files into multiple directories
Adding commit button and msg above text area and moving them to the right side of the screen.
Adding save/cancel buttons to modal editor
Checking in some debug code for trying to get file upload working on edit.xhtml
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
A first pass of file upload working directly on edit.xhtml without going to a different page
Fixing icon for unmodified files to be a blank image
Fixing edit button for structured view so that it sends you to the edit page.
Adding logic to display file upload panel only when on a raw edit page
Adding support in file upload to rerender the current file with the uploaded contents.
Making edit button on view.xhtml consistent with placement of commit button on edit.xhtml
Fixing navigation rules so that you are redirected to the history page after making a config update.
Adding file upload to list of components to rerender after an upload has completed.
Adding logic to display status/progress bar of file upload
Modifying upload functionality so that the upload component is now rendered in a modal window
Adding new upload behavior for raw-only edit
Fixing upload for raw-only
Adding initial support for marking a file modified based on keyboard events
Updating logic for key events to indicate whether or not a file has been modified
Removing dead code
Fixing download behavior so that the file name matches the file name listed on the page
Updating resource tree navigation logic for configuration UI
Removing resource name that was directly above the tabs
Adding logic to generate the number of files changed label that appears next to the commit button
Adding logic for generating the number of files changes message
Moving the toolbar links one row above the file name label that appears before the text area
Adding back call to update modified cache on tranlsation to raw
Updating logic for displaying the number of files changed
Fixing <h:outputlink> tags for view full screen and upload links so that do not post back to server
Disabling usage of flash for upload. It was set to auto but looked like it was still trying to use flash when it was not available.
Refactoring RawConfiguration entity to store file contents as a string instead of as an array of bytes
Merge branch 'raw-config' of ssh://jsanda@git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'master' into raw-config
Fixing rerendering logic to display updated path name label
Merge branch 'master' into raw-config
Merge branch 'raw-config' of ssh://jsanda@git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'master' into raw-config
Fixing merge error
Merge branch 'master' of ssh://jsanda@git.fedorahosted.org/git/rhq/rhq
Initial refactoring to replace usage of ExistingResourceConfigurationViewUIBean with configurationViewer.
Starting seam refactoring for edit pages
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Updating lower edit button on view.xhtml so that you are sent to the same tab on edit.xhtml.
Removing raw-config-test module from plugins build as it is just for testing
Refactoring methods for translating between structured and raw and for tracking changes
Adding update method to ResourceConfigurationEditor.
Updating page nav rules and ResourceConfigurationEditor to support adding/editing complex properties
Adding ResourceConfigurationEditor.undoEdit() and corresponding method in RawConfigUIBean
Adding and updating support for undo operation in ResourceConfigurationEditor and in edit.xhtml
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Updating edit.xhtml to support undo operation for raw-only configs
Removing numberOfFilesModified variable as it is not needed.
Refactoring undoEdit methd to just call setContents with the original contents
Adding a param to view-raw-modal.xhtml so that it supports a read-only mode for use in view.xhtml
Updating modal editor to use new seam components
Moving lower edit button outside of tab panel which eliminates some duplication
Moving common structured code into view-structured.xhtml
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Refactoring some duplicate code in xhtml files and changing event to use for file menu selection
Updating logic for modal editor so that its contents do not overwrite the contents of the main text area on partial page updates
Replacing xhtml code inside raw tab for structured and raw with an include of view-raw.xhtml
Refactoring common code in edit.xhtml into shared templates
First cut at CSS changes for raw config
Adding css for modal editor
Updating css, formatting and adding back keypress event code for text area
Updating StructuredServer to support complex properties
Refactoring some common code into new base class ConfigurationTestServer.groovy
Adding support for simulating long running update operations
Updating StructuredServer and RawServer to support delays for update operations
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Updating plugin code to properly handle omitted plugin configuration properties
Adding a navigation rule and rendering logic to handle a request for a configurtion that already has an update in progress
Upgrading groovy to latest version
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Fixing file upload
Changing file path status lable to a regular JSF label and updating some of the file menu rerendering
Doing away with the bright, fancy star used to inidicate file changes
Updating page navigation rules for when there is no change on an update request
Updating page navigation rules for validation failures
Refactoring ResourceConfigurationViewer to handle a null resource config def and/or null config
Modifying logic for determining whether or not to render the upload window
Adding cancel button that takes you back to view.xhtml and does away with any uncommitted edits
Adding file display name property in RawConfigUIBean so file name is not lost in download
Adding logic to gray out the upload link on view.xhtml since upload is only available on edit.xhtml
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Adding support for displaying validation errors associated with individual raw config files
Storing validation error message in RawConfigUIBean so that they are not lost during translations
Removing call to ExistingResourceConfigurationUIBean as it is longer used.
Modifying update method to call the correct update method in ConfigurationManagerBean
Merge branch 'raw-config' of ssh://git.fedorahosted.org/git/rhq/rhq into raw-config
Fixing unit test that needed to be updated to support new validation logic
Merge branch 'raw-config'
Fixing brittle tests in PluginManagerTest so that it no longer relies on plugin jars in the local maven repo
First cut at summary counts portlet for the dashboard.
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Moving class InventorySummary from server/jar module to core/domain module so it can be serialized by gwt
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Refactoring to use a smartgwt DynamicForm
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Adding initial support for handling click events
Initial attempt at building table for recently added resources portlet
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Adding support to filter by itime
Updating recently add resource portlet to use RecentlyAddedResourceComposite at least for now
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Fixing logic to check whether or not a field is a primitive
Adding hooks for supplying ClickHandlers for the settings and help buttons
Initial commit for a prototype of the portal admin settings window
Merge branch 'gwt' of ssh://git.fedorahosted.org/git/rhq/rhq into gwt
Changing the masked property value since the unicode chars were getting stripped off
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
Removing old, commented out code
Adding profile for bugfixes branch to use in hudson build
Merge branch 'master' into ldap
[BZ 573034] Adding test to reproduce the bug
Adding assertions to handle null inputs for assertPropertiesMatch().
Fixing type for resourceTypeId filter. It was a string and should be an int.
Initial commit for ConfigurationMetadataManagerBeanTest.
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
[BZ 573034] Removing unncessary call to EntityManager.remove() and EntityManager.flush()
Adding another test and cleaning up persistence logic
Updating assertPropertyMatches() to allow you to specify properties to exclude from comparison
[BZ 573034] Updating ConfigurationMetadataManagerBean to generate a report of property defs added
Disabling tests due to a transaction problem which causes entity removal to fail
merge fix
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
[BZ 573982] Adding inital impl and test for AuthorizationManagerBean.canViewResources
[BZ 573982] Adding JPA query for canViewResources
[BZ 573982] Adding performance monitoring interceptor temporarily for this bug
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
[BZ 573982] Adding test for when user does not have perms to view resources
[BZ 573983] Adding javadocs and another test for a scenario in which resources span multiple groups
[BZ 573982] Moving the authorization check into MeasurementChartsManagerBean
Fixing test failures and trying to make transaction a bit more robust
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
Fixing compile error after merge
Disabling failing test for now as it needs to be refactored
Fixing test failure
Changing assertion back to check for 5 elements.
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
[BZ 535640] Modifying the column sizing algorithm to limit when columns will be truncated.
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
Merge branch 'master' into bugfixes
Updating DISTINCT to select clause in canViewResources query
Merge branch 'bugfixes'
[BZ 580175] Adding logic to cancel the job if the resource has an uninventoried status or has been deleted from the db
[BZ 580175] Updating logic to actually cancel the job if the resource is not in inventory
[BZ 580175] Modifying exception handling code for canceling a job
[BZ 580175] Moving the deletion of scheduled jobs to the async job.
Merge branch 'bugfixes'
Updating scripts build to set rhq server name as a system property
Updating tests to give resource a committed inventory status
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 577047] Moving project files from scripts module to new cli-tests module
[BZ 581539] Fixing seam page navigation rule for viewing map property in resource configuration
Merge branch 'bugfixes'
[BZ 569563] supportsManualAdd attribute was missing from server compomnent
Merge branch 'bugfixes'
Merge branch 'cli-test'
[BZ 5770547] Adding profile for cli-tests module
[BZ 5770547] Enabling snapshot repos for cli-tests profile
[BZ 5770547] Correcting url for snapshot repos
Correcting url for snapshot repos...take 2
[BZ 5770547] Moving repo declarations into cli-tests module
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 546397] The property name for log event sources needs to match the name in the plugin descriptor
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'master' into bugfixes
[BZ 580931] Updating discovery so that we detect the tomcat5.exe and tomcat6.exe executables
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
[BZ 544353] Fixing UI bean code so stale values are not used when creating a new group def
[BZ 575987] Removing rhq-register functionality from web services api
Merge branch 'master' into bugfixes
[BZ 575987] Removing reference to method for rhq-register functionality that has been removed
Merge branch 'bugfixes'
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Merge branch 'bugfixes' of ssh://git.fedorahosted.org/git/rhq/rhq into bugfixes
[BZ 544353] Modifying ui backing bean for edit page so stale values are not used
[JOPR-419] Updating plugin to use correct defaults for bind address and server profile
[BZ 582991] Fixing dbupgrade script so that values for context column match enum value
[BZ 582991] undoing deletion of operation_def_id from rhq_alert_definition since it is still referenced
[BZ 582991] Adding missing id sequence
[BZ 582991] Fixing property name references
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 582991] Changing type of Alert.ackTime from long to Long to handle nulls in the database
Refactoring dbutils build to support building databases for earlier releases
Changing dbreset script to run in compile phase to guarentee that it runs before the dbsetup/upgrade tasks
Setting release property to be passed to ant script
Changing version of plugin while debugging hudson issues
Changing activation policy so that the latest and release profiles are mutually exclusive and so that one is always activated.
Changing property name from release to jon.release to be more descriptive
Updating property name from release to jon.release. This property is passed to the ant script
Adding back data source build properties in root pom and restoring property resolution code in dbutils/pom.xml
Replacing hard-coded database name with property substitution to reduce places it needs to be changed
Adding temporary work around for https://cvs.codehaus.org/browse/GMAVEN-46
Cleaning up some debug code
Merge branch 'master' into test-dbupgrade
Fixing new ant target to run dbupgrade after runnin the older release dbsetup.
Merge branch 'test-dbupgrade'
BZ 586943 - Adding work around for hibernate exception
[BZ 588467] Adding null check to prevent NPE
[BZ 593000] Adding logic to check for different client jars based on JBoss AS version
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 591485] Removing calls to delete alert templates when they are enabled/disabled
[BZ 581818] Adding option to select oracle 11g as database type
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 581818] Changing oracle label to 10/11 since we don't have implementation differences for the versions
Removing oracle version numbers from database type dropdown to be consistent with other dbs in list
[BZ 581818] Updating javascript so that db connection properties are updated for oracle selection
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 586068] Removing GWT dependency
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 586068] Moving formatting code out of core/domain to avoid problems with gwt
Removing scratch work that was accidentally committed
Fixing compilation errors
[BZ 586068] Moving formatting logic to ui bean where it is used.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
[BZ 591490] Reverting alert links back to struts links since that UI code was reverted back to struts
[BZ 588700] Fixing alert dbupgrade so that rhq_config.version has a default value instead of null
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
Joseph Marques (187):
RHQ-342 - add the ability to alert on changes to the resource configuration;
JOPR-7 - be more forgiving during the processing of the scriptPrefix property;
JOPR-42 - change the password for the content source proxy settings from "string" type to "password" type;
RHQ-1299 - performance metrics for work done by recalculation thread for group defs / dyna groups;
prepare for next development iteration (undo of manual work done in 129, which release plugin did not automate)
convenience methods that enforce arbitrary naming convention on plugin developers should not reside in the plugin API classes;
JOPR-47 - when a script returns a non-zero error code, mark that as a failed operation;
an external tool which downloads the maven dependencies; this allows users to execute this once when dependencies in pom's change (usually infrequently) and allows us to run the rest of the external tools (clean / dev profile) in offline mode for performance;
[RHQ-1421] - add operation to alert cache that unloads and then immediately reloads the cache;
expose new AlertConditionCache operation;
[RHQ-1464] [RHQ-1214] [RHQ-825] - update the resource component to match the fixes made for the noted jiras
update all eclipse tools to be execute from root instead of relative to "modules"
[RHQ-1599] - this is the only plugin we ship that seems to be missing a description
[RHQ-1599] - add descriptions to all metrics missing them;
remove accidentally checked in plugin
test commit emails (change some whitespace)
JOPR-114 - it's possible that we could have put a null element responses, which manifests as an NPE later in the flow instead of completing as FAILURE;
better logging for patch installations
change format of <help> tag inside rhq-plugin.xml from confluence format to html;
fix for proper generation of help text for hibernate plugin
fix eclipse classpath for next development iteration;
remove empty directory from webdav module as well as corresponding element in the pom;
fix .classpath so eclipse builds
export GWT user library
since git can't version empty directories, remove "webapp-filtered" directory from maven-war-plugin configuration until content actually exists in it
add eclipse dash/monkey scripts to ignore target dirs and (default location for) dev-container
update .classpath to point to new generated WS classes
eliminate references to old ojdbc14 library (ojdbc5 is used exclusively everywhere now)
fix eclipse settings so that code gets auto-reformatted on save
Merge branch 'master' into gwt
Bugzilla 535773 (RHQ-2434) - fix for sorting on plugin column for compatible groups;
initial commit for new JSF-based resource/group browsers
Merge branch 'master' into search
various enhancements for new inventory browser:
set the parent object on the resource composite, so that callers can use <composite>.getParent() if the parent is loaded
fix long-standing off-by-one pagination bug:
force mulit-word sub-tabs onto a single line
JSF managed bean for exposing summary counts on new inventory browser
finish up new inventory browser - point all existing links to it:
Merge branch 'master' into search
fix group browser breadcrumb
javadoc fix
fix dashboard search portlet to show results in the new inventory browser
fix typo for UNINVENTORY button
re-enable ResourceHubPortalActions until search backend is complete;
Merge branch 'master' into search
refresh the parenthetical counts in the new inventory browser, once every minute
fix pagination for resource disambigation results:
add resource disambiguation for parent column to resource tabs for new inventory browser;
support displaying empty groups in the new inventory browser properly:
fix broken links after an AJAX-refresh:
Merge branch 'master' into search
fix copy/paste error which made the groupName link on the new inventory browser invalid
Merge branch 'master' into search
normalize resource group descriptions:
up the db.schema.version
Merge branch 'master' into search
add sorting to the resource/group description field
Merge branch 'master' into search
update hibernate.jsp to provide translations for DML-style operations;
BZ-534284 (RHQ-1095) - make hibernate.jsp work for non-string bind parameters:
saved searches dbsetup scripts
saved search dbupgrade scripts
saved search hibernate entities
initial SLSB support basic CRUD, with security restrictions, for saved search patterns
enhance the CriteriaQueryGenerator to allow more flexible authorization:
add criteria-based retrieval for the saved search manager
add LookupUtil method to retrieve the saved search manager from the UI layer
add auto-completion capability for saved search manager to the CLI
fix copy/paste error for saved search entity annotation
add some default, global saved searches for the resource context
fix some whitespace issues
add anltr support to server/jar maven module, update eclipse classpath accordingly;
antlr should compile the grammar files before the standard maven compile phase
abstract RHQL grammar support:
add missing @WebMethod annotation to saved search manager remote interface
modify RHQL test case file to adhere to simpler syntax for IN-clause:
construct AST from parse tree for RHQL grammar
Merge branch 'master' into search
change order of dbsetup so that saved search table gets created after the rhq_subject table
fix typo for column name in saved search table
insert some default global searches into the system during dbsetup
simplify dbupgrade by merge saved search-related entries into a single schemaSpec
update .classpath to reflect latest maven dependencies
add byteman plugin to the 'misc-plugins' group
BZ-571590: enhance dynagroup expression builder to support resource categories
preliminary search assist and execution support for resource subsystem
fix monkey script
Merge branch 'master' into search
remove unused files
fix inventory browser
fix PersistenceUtility import for hibernate.jsp
temporary workaround for compilation error when building the web services module
search assist has not been written for resource groups yet, disable for now
BZ 577109 - fix for partial-page requests not properly recovering from view exceptions
improve logging to capture some simple rules and thresholds to indicate performance issues
various fixes to alerts-related user interface pieces
bring back application of notification from the alert template notification level
tidy up interaction model for alert notification CRUD, use partial-page updates everywhere
fix width
remove calls to the prototype library in favor of pure JSF-based solution;
some files used for testing dynamic redisplay of included facelets
remove "subjectNotifications" from the SubjectCriteria object since it no longer exists as a first-class construct
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
only add an email address if it's not null
rework the custom alert sender for roles to use the new navigation
tidy up custom alert sender for direct emails
tidy up custom alert sender UI for SNMP traps
quick tidy up of formatting for the operation-based custom alert sender UI
tidy up operation-based custom alert sender UI
example of conditional form rendering that goes 3 conditional-levels deep
add error handling and debugging for conditional form rendering
there is a bug using the inplaceselect rich component, so fall back to classic h:selectOneMenu for conditional forms
improve debugging
example of how to write a dynamic form using the load/save paradigm
update operation-based custom alert sender UI from UXD feedback
more tweaking on operations-based custom alert sender UI:
suppress NPE when there is no associated display type
BZ-582698: fix criteria-based finder method for ResourceGroup to match the alias used by the CriteriaQueryGenerator
BZ-582799: fix DynaSearch so that it uses the same alias generation scheme as CriteriaQueryGenerator
finish up work for operations-based custom alert sender UI
show more contextual information when previewing an operation-based alert sender
implement back-end for operation-based custom alert sender
trivial change - don't use abbreviation
BZ-583090 - if the descendant type drop-down is active, use that type to determine which operations to show
support '!=' operator for expressions that map to string types
add the ability to do starts-with, ends-with, and exact string matches
BZ-546399: bring back the old static menu bar, fixes AJAX-enable favorite resource/group badging (all speeds up the UI rendering considerably)
BZ-582614 - possible fix for the intermittent NPE caused by the resource/group tree advisors;
BZ-582614 - fix for intermittent NPE originating from the left nav trees:
fix bug where operation arguments for custom alert senders were not property being rehydrated
fix whitespace:
remove alert sender ordering, that feature has been removed from the release
add support for launching JavaTasks which can execute arbitrary SQL against the connection used by the DBUpgrader
add database upgrade support for customer alert senders
fix dbupgrade logic for subject/role/email notifications
add necessary dbupgrade pieces for RHQ_SUBJECT_ROLE_LDAP_MAP table
change name of primary key constraint on RHQ_SUBJECT_ROLE_LDAP_MAP to be less than 30 chars, to match dbupgrade task 2.83
fix/simplified dbupgrade for RHQ_SAVED_SEARCH table
move the upgrade procedures for postgreaming blob streaming out into its own schemaSpec
remove OrderBy attribute, since alert notification order column was removed
alert notifications are now db-upgraded using the standard mechanism, this project is no longer needed
remove mention of the alert-migration maven module, since it is no longer needed
BZ-585255 - fix resource search from the menu bar to properly show disambiguated results
BZ-567297 add deletion/removal functionality to the inventory browser group tab
continuing development on search subsystem:
BZ-562816: fix regression in custom alert sender UI
fix failure unit tests for saved searches subsystem
only print statistics for saved search result count recalculation if updates were non-zero
BZ-562816: fix for stack trace when trying to edit general properties or conditions for an alert definition
remove name field from alert notifications
small fix to dbsetup script data
removal of alert notification templates
fix NPE seen during very first recalculation of saved search result counts
if possible, use the resource-specific ancestry to populate relative resource drop-down
suppress debugging statement
fix sorting bug on the group definitions list page
BZ-584149 fix for broken sorting on the inventory browser (resources and groups)
do now swallow the error message when their appears to be an error handling PageControl data
improve debug logging for pagination/sorting issues, so that root cause can more readily be determined in the future
oops, referring to a table that no longer exists
move logging message to DEBUG level
BZ-586676: fix for alert>history sub-tab as a result of changes to dbsetup
BA-586918 - fix for ClassCastException when using AlertDefinitionCriteria when filtering by either alertTemplateParentId or alertTemplateResourceTypeId
fix the "Reload Caches" method on the "Alert Subsystem" MBean component under the RHQ Server
BZ-535788: BZ-545062: fix for newly created event/measurement-based alerts not firing
fix gwt-compile errors:
fix build errors:
BA-587754: remove references to deprecated job 'org.rhq.enterprise.server.scheduler.jobs.ClusterManagerJob' upon server startup
update resource install report to pass a specific type filter
fix performance when creating/updating alert definitions en masse
BZ-588700 - fix issue when trying to upgrade alert notifications
BZ-591271: fix broken ConfigurationManagerBean.deleteConfigurations(List<Integer> configIds) method:
BZ-590724 - alert notifications C/U/D is now properly cascaded from template and group levels
BZ-535576: change error-handling for template/group alert definition create/update workflows
fix Hibernate LazyInitException during creating of group-wise alert definition
BZ-577853 - add first cut of GWT-based search bar functionality:
BZ-577853 - second cut of GWT-based search bar functionality:
bring back the feature to auto-fresh resource/group counts in the inventory browser tab headers
BZ-562434 - finish up the translation routine for simple text searches
BZ-562434 - finish up the translation routine for simple text searches
add missing interface
BZ-577853 - refactor SearchBar component so it can be reused for other SearchSubsystems
BZ-577853 - initial implementation for GWT-based group search
cosmetic fix to the display items on the menubar's subitems
BZ-586068: fix error preventing GWT-compilation from succeeding
fix ArrayIndexOutOfBoundsException when there are search terms but the user repositions the cursor at the beginning of the SearchBar
Justin Harris (55):
Adding save button to plugin details page.
Updating update plugin call to new naming scheme.
Moving in some seam functionality to allow for page scoped beans in form submission.
Adding in first cut at the server plugin config UI.
Adding the ability to edit server plugin configs and tweaking the display in the plugin tree.
Adding in server plugins page link from the server settings page.
Cleaning out editing of server plugins on details page.
Pulling out old admin navigation rules.
Adding in autoselection of plugin given a request param, and linking in from plugin details page.
Adding in first cut at the server plugin config UI.
Adding the ability to edit server plugin configs and tweaking the display in the plugin tree.
Adding in server plugins page link from the server settings page.
Cleaning out editing of server plugins on details page.
Pulling out old admin navigation rules.
Adding in autoselection of plugin given a request param, and linking in from plugin details page.
* Modifying server plugin config page to be read-only
Adding in 'user defined jobs' functionality.
Making add/update lists work for both scheduled jobs and plugin configs.
Adding a 'no config' message if a server plugin has no configurations defined.
* Changing plugin list to optionally show 'Server Plugins' tab initially.
Moving tab selection into session bean.
Fixing typo in db-upgrade.
Adding IRC Alert Plugin.
Disabling and re-enabling a plugin when configuration settings are saved.
Fixing scoping bug that affected editing the incorrect plugin.
Merge branch 'alertPlugin'
Rough first pass at the new alert sender config page. The only glaring omission is the ability to save the list ordering...
Introducing custom UI into Alert Sender Definitions page.
Adding in ordering to alert notifications, as well as the ability to name each new notification when it is created.
Making lots of changes to alert sender plugin requirements.
Making <backing-bean-name> optional in alert plugin descriptor -- defaults to <backing-bean-class>
Reapplying commit 7c2df82f31fe398e103e0910fe0a3cc71fb24f1c
Adding in missing alert-migration dependency.
Merge remote branch 'origin/master'
Adding in missing alert-migration dependency.
Adding in rough cut of new alert definition page.
Not specifying IRC server by default.
Using date formatter in facelet markup instead of in the UI bean.
Tweaking the struts redirects and fixing a few breadcrumb issues.
Altering navigation rules for notification templates.
Making lots of small cosmetic changes to the alert definition page.
Merge remote branch 'origin/master' into alertPlugin
* Refactoring a good portion of the new alerting UI code.
Taking out alert-sms until we can resolve maven issue.
Pulling out alert templating into a different modal dialog.
Adding in a rough pass at the new Alert Conditions page.
Adding in create alert page.
Adding in validation rules and messaging for the alert conditions page.
Fix for BZ 567375
Fix for BZ 561900
Merge remote branch 'origin/alertPlugin' into bugz
Changing ui:composition to ui:decorate to get page title working properly.
BZ 562816 - Fixed lazy init excepion by going through entity manager directly instead of using the alert definition manager.
BZ 568796 - Changing input length on metric baseline % field.
BZ 570575 - Adding in a4j:regions to prevent page-level validation on ajax requests
Lukas Krejci (301):
[JOPR-142] Adding the ability to expose and configure the type of config-property elements of connection factories.
[JOPR-171] - adding support for patch download and install for as5 plugin
Fixing eclipse classpath
code formatting for rev671
[JOPR-171] Made the version check in the RSS feed parser more lenient;
MERGE: merged DEV_AS_5_TMP branch into trunk
[JOPR-213] JMX connections to JBoss now go through JNP to achieve feature parity with AS4 plugin.
[JOPR-179] Added support for hibernate statistics in JBoss AS 5 plugin.
[JOPR-210] support for EJB2 beans, some metrics is still to be implemented
Eclipse classpath fix.
[JOPR-210] added newly implemented metrics for EJB2 beans.
[JOPR-210] MDBs are correctly identified across server restarts.
Removed unused constant.
added the client/jboss-serialization.jar to EMS classpath when connecting to the AS5 instance.
[JOPR-233] Added the ability to deploy jars/wars/ears via then agent as well as the embedded console.
[JOPR-234] - The autodetection of JNP URL by reading $SERVER_HOME/data/jnp-service.url now works.
added svn:ignore to jboss-cache5/target
[JOPR-183] We've got full read/write support for Service Binding Manager.
[JOPR-183] Updated readOnly and required attrs on SBM properties to reflect what's required.
Updated the comment on why we copy the file into jboss AS $SERVER_HOME before we deploy.
Don't run the JBoss AS5 tests in parallel.
Only run the tests defined in AbstractResourceTest if the current resource type supports appropriate facets.
Adding the ability to deploy/undeploy stuff to/from the AS during the tests.
[JOPR-230] added a note about the necessity of server restart for the active service binding to take effect in the property description.
Logging success or failure when reading data/jnp-service.url
Updating ejb-client test app to reproduce JBPAPP-2245
[JOPR-279] We need to reload the management view everytime we access an EJB2 MDB because the management view doesn't get refreshed automatically when the MDB name changes (which happens quite often).
Prevent a debug method throw an exception.
Added missing group definition to @BeforeTest methods
Integration tests for EJB2 stateful and stateless session beans and message driven beans.
Updated the ejb-client to be able to connect unsecured; added the ability to specify how to connect and what tests to execute as command-line args.
EJB2 MDB test now only checks the appropriate MDB for metrics values, but the test itself is still failing.
Added EJB2 entity bean test.
Updated ejb client to support JAAS authentication.
Outputting a little bit more information in AS5 resource configuration during the integration tests startup; fixed a typo in comments.
Updated as5 plugin's pom.xml to use jboss-as-profileservice-client and to provide security credentials for server connection to integration tests.
Moving stuff around so that invokeMethod() is reusable in other tests and not only in EJB2 tests.
Forgot to uncomment skipping of the as5 integration tests
Getting the Jopr eclipse project classpath in line with pom.xml
The @BeforeSuite and @AfterSuite methods of the as5 tests now only execute if the as5-plugin group is included in the tests.
Improved descriptions on service binding manager/sets properties, made Service Binding Manager a singleton and made its resource name contain spaces.
Updated the binding set component to give the user an overview of what the port bindings would look if the binding set was active.
[JOPR-290] - The deployers now properly use ProfileServiceConnection to use the authenticated proxy objects when connected securely.
made the integration tests compile again.
Added some deps and reworked the AppServerUtils to take the classloading changes into account. Now the integration tests execute properly again.
[JOPR-282] Fixed a bug with binding set changes not persisted and made the "Resulting Bindings" an operation so that we don't have duplicate configuration history entries due to "Resulting Bindings" being dynamically recomputed.
Added metric traits to SBM and binding sets; removed the obsolete bindingAddress property from the binding sets.
Modified the classloading to include all the deps in the maven classloader. This prevents hickups when we need the same classes across the classloader boundaries.
Added EJB3 SLSB test.
Added, EJB3 SFSB tests, updated the EJB3 session bean tests to check for non-zero createCount.
Removed an obsolete EJB3 entity bean service from the plugin descriptor. AS5 doesn't expose those.
[JOPR-337] adding support for invocation stats on EJB3 MDBs.
Added EJB3 MDB integration test.
Trying out new way of specifying test scope deps.
[JOPR-281] Added a delay between MDB tests setup and the tests themselves to give some time for the messages to arrive.
Adding a test app to support JBAS-7141.
[JOPR-341] removing CreateCount and RemoveCount metrics from EJB2 MDBs because they don't make sense for MDBs.
Reverting previous commit. I commited the wrong file.. ;)
[JOPR-341] removing CreateCount and RemoveCount metrics from EJB2 MDBs because they don't make sense for MDBs. This time, committing the correct file.
EJB2 session bean tests finally all passing. A stupid mistake of mine in the test logic.. :(
This one should have been in the previous commit.
[JOPR-347] - The active binding set name metric is reported only once.
SBM Active Binding Set Name integration test. More to come soon.
Finished the basic SBM tests.
[JOPR-261] - the properties passed to the JBoss AS startup script using -P option are properly read in by the discovery code even if the start up script was executed from a different directory. This is fixed for both as4 and as5 plugin...
Stop the deployment before removing it from the AS to prevent problems.
Updated EJB3 tests to test the embedded and local interface scenarios. I.e. an EJB jar deployed inside an EAR and an EJB called through a reference from another EJB.
Prevent an NPE when wrapping a null property into a meta value.
[JOPR-358] remove caching of the SBM managed component and reload the management view during the discovery so that we properly detect changes to the configuration made outside JOPR.
[JOPR-348] Availability reporting now consistent with as4 plugin.
[JOPR-361] The results of "Display Bindings" operation now display the override's description instead of the standard one, if one is provided. Overrides are displayed with the default host name if they don't provide their own host name definition. I.e. the results now look as they should ;)
Both availability and service scans are executed after the server restart in the integration tests to get the current picture of the server straight away.
Added some support static methods to the abstract resource test to be reused by the actual tests.
Added SBM binding set integration tests.
[JOPR-352] Resolve port and address in Tomcat's server.xml if they are set using environment variables; Be able to set the environment variables for the start and shutdown scripts in the plugin configuration.
Renamed confusingly named methods for applying system properties to the tomcat configuration values.
Adding range constraints on SBM ports and port offsets.
[JOPR-372] Disallow binding sets with invalid default hostname to "enter" Profile Service on binding set creation and update.
[JOPR-167] xa datasources should now be created properly.
Reverting rev1157. The fix will go into its separate branch to wait until we can test it throughly.
rename testOperations() method on ServiceBindingSetResourceTest so that it isn't confused with the protected method of the same name in the parent class.
Initial dump of the work done against the defunct svn repo. Still loads to do in the antlr-config plugin.
emitting more information about a tree path element
How come this wasn't commited before?
finished property definition matching against a tree path during the reading of a config file.
Removed unused variable.
Reworked the the configuration reading methods to correctly handle "gaps" in the mapping to the AST, bugfixes, hosts-anltr plugin integration tests to test this beast.
Sanity checking
Updating the eclipse .classpath
forgot to put hosts-antlr into the eclipse project
Adding to .gitignore to exclude stuff supporting Antlr IDE for Eclipse.
Adding the <Skip> token for future use.
Moved away from using the Tree interface to requiring the AST to be a CommonTree (which is a default in antlr) (or a subclass). We will need that to support the custom token classes.
Deferring all the AST traversal to an appropriately configured AntlrTreeStructure instance to support the traversal modified by the <Skip> and <Transparent> tokens.
Fixed an NPE.
Simplified the config updates. The only thing left is implementing <Unordered>.
Removing unused imports.
testing updates and additions to the configuration
Removed unused imports.
Implemented <Unordered>. Now we should be functionally on par with Augeas.
Added a test for robustness against reordering of properties on update.
modified the pom to be able to use test grammars in the unit tests
Preparing for antlr-config tests.
gave things more appropriate names, refactored out the property comparison out of the config mapper.
reformatting the pom a bit to conform with the rest.
Refining the abilities of the config mapper.
First test
fixed an NPE
another test
added a create test
Updated to work with the proper way of getting the configuration definition.
Merging antlr-config plugin from 'linux-config' into master.
added the simple delete test.
Added support for <Ordered> list so that we can support config files where order of statements is significant.
Extracted an abstract class for the tests.
Added a test for <Unordered> token type in grammars.
Fixing the delete behavior.
Renamed the "SimpleTest" to "OrderedTest" to reflect what it's actually testing.
added tests for <Skip> and <Transparent>
Modified Augeas plugin to support configuring multiple files at once.
changed the way the resourceKey is determined.
Make it possible for the discovery subclasses to override the inclusion and exclusion patterns. Made it all compile again..
The (in|ex)clusion patterns are now specified as simple properties so that they can be defaulted.
fixing small bugfixes uncovered during basic functional tests.
Made Augeas*Component inheritable by correctly specifying the type parameter, made the propery loading/saving methods protected so that they can be overriden in the subclasses.
default root node is "/files//" instead of "/" which could theoretically match stuff in /augeas as well.
small fixes...
Removing unused imports.
initial commit for cron plugin. nothing to see here.
some basic stuff in the rhq-plugin.xml
basic mappings of cron components.
Because of the possible length of mappings, we need to increase the length of the property name in rhq-plugin.xml and in database. Setting it to 255 chars hoping it's going to be enough.
Can read the crontab name now.
Further implementing cron plugin.
pushing cron plugin impl further...
Updating standalone container to support showing plugin and resource configuration.
fixing hosts plugin to work with the latest augeas base.
user is a mandatory in the cron entry
throwing more descriptive errors, attempt at making the augeas paths well formed with the default "/files//" root.
Adding the ability for the subclasses to override how is an augeas node called based on the current property definition.
Making the workaround for whitespace escaping in the node names a little bit more robust (now can handle a node name with an [] expression with embedded spaces).
Finishing up cron plugin.
added the descriptions to the cron plugin descriptor.
Removing newNodeExpression concept from sudoers.
Adding the cron plugin to the default server build.
Making CronComponent implicitly fail on config update because it is designed as readonly.
Correctly handling the augeas root path.
unit tests for cron plugin
Fixed the resource key generation regression introduced in the last update of this class.
Make sure the start() and stop() methods are run only once in the whole suite.
first draft of the apache resource config. not connected to any code or anything.
More work on apache res conf, future components stubs...
Merge branch 'linux-config' into linux-config-apacheplugin
Options directive is ignored in <Location>. Leave it out from the mapping.
Adding the working version of httpd.aug to the source control.
make augparse happy with the lens syntax. still augparse hangs on the test for some strange reason.
another update of the httpd lens.
minor modifications to the httpd lens. With this we can parse the default httpd.conf of apache (barring the nested <IfModule>s)
how come there were windows line endings when we only develop this on linux machines?
getting the rhq res conf and the lens more in line, some minor fixes in the lens
adding the directiveIndex to <Directory>-like resources. That is the only way we can identify them.
modifications of the lens after more testing...
reformatting the source files...
Changing all exceptions to be runtime exceptions.
Added a prototype of VirtualHost discovery.
Loading of server component config using augeas, some minor modifications...
apache plugin now even compiles and validates against plugin validator.
Make server component not cache the augeas config so that updates out of RHQ are correctly detected.
updating server configuration to read the ping-url from configuration using augeas.
Fixes to vhost discovery.
This belonged to the previous 2 commits.
Make this dependent on the augeas base plugin so that stuff actually works... ;)
prevent silly letter-case bugs (at least here)...
Loading vhost configuration using augeas.
Directory discovery works, mapping mostly doesn't.
This should have been in the previous commit...
The specialized lens is way too slow and computationally intensive. A generic, less convenient lens is much more performant.
removed the testing rule from the lens, rewritten the tests to reflect the new lens.
updates to the configuration definition
changing simple property mapping to conform to the new lens
renaming wrongly named class.
mappings for new-style lens.
modified the discovery code to work with new lens.
small update of resource config.
Server config can be read now... VirtualHost and Directory not...
VirtualHost and Directory configuration can be read, not all props have correct values though.
Making the Directory properties all read correctly.
moving augeas settings into a group in plugin config.
Adding line end escaping support into the lens.
Adding lots of documentation, serverRoot is initialized from configuration when starting to read the configuration files.
Finishing up the documentation.
Unit tests for GlobFilter along with a basic set of unit tests.
Merge branch 'linux-config' into linux-config-apacheplugin
Consolidating the two implementations of Glob and GlobFilter that appeared after the merge of old and new augeas base.
Fixing cron plugin and its unit tests.
Coding standards compliance.
adding getters for configuration and tree builder in the augeas proxy.
Removing the hardcoded "Httpd" lens name from the code, always reading it from plugin descriptor.
code formatting
more on coding standards
Readding the support for Apache 1.3 for non-configuration tasks...
Re-enabling SNMP monitoring for virtual hosts.
Removing configuration entries from the server config that are also present on the "Main Server" virtual host.
preliminary support for vhost and directory resource deletion.
Leaving out the yet unsupported Files and Location resource types from plugin config.
Support for directory creation in apache
Making NameVirtualHost a list because it may be specified multiple times in httpd.conf
vhost creation support + a bunch of small fixes and enhancements here and there...
graceful degradation of discovery and resource features when augeas or correct lens is missing.
vhost resource doesn't get confused if there is no URL to do the availability check.
Don't fail the vhost discovery when augeas is missing. Just return the "MainServer" default vhost and give up.
including the missing dependency on augeas plugin during the integration tests setup.
Correctly determine the URL of vhosts defined as _default_.
Using the default plugin configuration instead of empty configuration as we should.
Conditionally restart the apache instance after a config update and child resource create or delete.
removing the duplicate properties from server config and leaving them only in the vhost config.
Making cron a server and changing its resource key to a reasonable "Cron" instead of the insanity before.
Support for deleting empty configuration files from disk.
!= != .equals() ! (so to speak)
Update the metrics collection for vhosts to work without augeas.
Get RT log autodiscovery back to the vhost discovery component, change the vhost resource name from "VirtualHost blah" to "Virtual Host blah", the server ping URL uses ServerName or the localhost's domain name (if server name not configured in httpd.conf) instead of just localhost IP.
Discovery of vhosts falls back to SNMP when Augeas not installed. Nicer error messages when configuration not supported.
Some fixes + discovery working for Apache 1.3.x
Handling the "Listen port" case in Apache 1.3. address detection.
removing now obsolete antlr-based configuration parser plugin.
First implementation of resource names disambiguation algorithm.
Disambiguation in quick search in resource menu.
configuration updates subsystem converted to use disambiguation.
Abstracting out the disambiguation into a new abstract ResourceNameDisambiguatingPagedListDataModel that the UI beans can use instead of the former PagedListDataModel.
OOB History subsystem page converted to use resource names disambiguation.
Remove unnecessary @Override
Operation history subsystem page converted to use disambiguation.
Short-circuit the disambiguation if there are no results to disambiguate.
alert subsystem page converted to use disambiguation.
alert definitions subsystem page uses resource names disambiguation.
Finished the seemingly unfinished javadoc...
Disambiguate the package names by prepending them with plugin and resource type name for display purposes.
the /rhq/content/repo.xhtml and repoSubscriptions.xhtml converted to use resource names disambiguation.
converted group member list and group member selection page to use resource name disambiguation.
Merge branch 'master' into linux-config
BZ 565910 - Resource group summary pane uses resource names disambiguation.
Fixing an NPE on alert definitions subsystem page caused by alert defs without an attached resource.
BZ 567925 - a follow up to my previous commit should finally fix the issue.
BZ 567925 - Restructured the ResourceManagerBean.disambiguate() method to handle (hopefully) all the corner cases resulting from the fact that not all of the provided results have to be mappable to a resource.
BZ 566749 - fixing the NPE when adding platforms (that don't have a parent) to a resource group.
BZ 565626 - fixing the URL query string for groups used in menu search.
BZ 568544 - disambiguation doesn't get confused if more than one item in the provided results corresponds to a signle resource.
apache renaming
Slight updates to the apache resource names.
Grub plugin resources renamed.
Jira plugin resources renamed.
Oracle plugin resources renamed.
Platforms plugin resources renamed.
RHQ agent plugin resources renamed.
RHQ Server plugin resources renamed.
Script2 plugin resources renamed.
Snmptrapd plugin resources renamed.
Virt plugin resources renamed.
IIS plugin resources renamed.
Postgres plugin resources renamed.
Resources in JMX plugin renamed.
Changing the return type of findResourcesByAgent and findResourcesByCompatibleGroup to return List<ResourceFlyweight>.
Making the nav tree using the flyweights actually work.
making the group tree work with the flyweights
Cleanup of the imports
Removing now obsolete LockedResource
Don't I hate instanceof checks? Especially when there's so many that one is easily overlooked? ;)
Adding the viewsInSession limits to web.xml to prevent storing multiple versions of the resource tree in memory.
making the constructors private so that the construct() methods are the only way to instantiate a flyweight that needs to be put in a cache...
changing the package of the flyweight classes from ...domain.resource.hierarchy to ...domain.resource.flyweight
Not sure if it ever happens that a group tree node directly contains a resource, but the UI is suggesting that so add that possibility to the nodeType property.
removing stale imports... it now even compiles! :)
Refactoring out the construct() methods from the *Flyweight types into the cache and making th flyweights publicly constructible. This enables reuse of the flyweights but still encourages the use of the proper methods to put the data into the cache.
Increasing the max number of views in session to 2.
BZ 577294 - fixing the nav tree high memory usage by limiting the number of views stored in users' sessions as well as minimizing the size of the tree stored in the session.
Autogrouping even if there is one resource of given type in the nav tree.
Nodes can be opened/closed freely, auto-changing focus to parent if a parent for the current node is collapsed in the tree.
Removing unused (and accidentally included) imports.
Adding tooltips for tree items with context menus.
Updating the group tree to behave the same as the resource tree.
Nodes are no longer auto-expanded on selection, group resource tree auto-expands the root node.
BZ 580994 - Adding the open/expand tree arrows accidentally removed in commit ffb448ebbb371ec9e03e06032af3c3add1dc0799
Merge branch 'master' into bugfixes
BZ 582195 - context menu hint not to be displayed for sub categories that actually don't have a context menu.
Merge branch 'master' into bugfixes
BZ 582201, BZ 583836 -
BZ 582201, BZ 583836 -
Merge branch 'master' into bugfixes
BZ 582193 - left nav context menu working again. New version of RF requires parameters passed to the show() method for the contextMenu that weren't necessary before.
Merge branch 'nav-tree-flyweights' into bugfixes
BZ 580928, BZ 587250 - RHQ server is identified as such in the resource name, jboss as (4 and 5) are called hostname:jnpPort instead of bindingAddress:jnpPort
BZ 587317 - revert to using different icons for different resource types.
BZ 587325 - Singletons are no longer autogrouped in the resource and group left navigation trees.
Merge branch 'master' into bugfixes
Merge branch 'master' into bugfixes
Merge branch 'master' into bugfixes
BZ 591645 - making a couple of resource types singletons, some minor changes to naming of others
BZ 591645 - reverting back the resource type changes. changing a resource type name is a very dangerous thing to do.
BZ 591645 - renamed the JBossAS(5) and RHQAgent JVM resources to just "JVM". This had to be done without actually renaming the resource types to avoid problems in existing inventories.
BZ 585292 - Fixing inconsistent node collapsing across redirects by actually moving the node state tracking to the advisor itself.
Merge branch 'master' into bugfixes
Mike McCune (106):
testing commit and push
122 - first attempt at a renaming of Content Source -> Content Provider
122 - comments for rename
122 - fixing typo
122 - more wording changes and fixing nav so you can create a CP
122 - fixing javascript buttons so you can sync and delete
Merge branch 'master' into content2
Merge branch 'master' into content2
122 - more renaming
adding rhn hosted src and libs to .classpath
122 - adding repo query unit test and fixing nav
classpath cleanup for content branch
Merge branch 'master' into content2
fixing unit test that still referred to Channel
more contentsource -> contentprovider
more git merge testing
adding generated source for antlr plugin
adding generated source for antlr plugin
removing uneeded src dir
400 - reworking RhnComm to pull out xmlrpc client creation
400 - forgot to checkin a few files plus using 2 urls
400 - moving downloader methods into their own class
400 - first cut at a mock interace to RHN
400 - mock rhn interface
400 - adding profile to allow pointing test runs at alt db
400 - switching to settings file
Merge branch 'master' into content2
adding helpers src dir
adding helpers src dir
431 - inlining systemids so it works in both eclipse and mvn
Merge branch 'master' into content2
Merge branch 'master' into content2
400 - switching to simpleCreate because we cant start the adapter
resolving path/compile errors
Merge branch 'master' into content2
changing classpath to match new path
400 - fixing rhnactivator test to not actually touch rhnhosted
fixing typo in bean name
693 - check the local FS to make sure files are still there
more unit test cleanup.
Merge branch 'master' into content
fixing xml from previous merge
Merge branch 'master' into content
more unit test cleanup.
disabling these 2 tests in master so we have a clean build
Merge branch 'master' into content
Merge branch 'master' into content2
Merge branch 'content' of ssh://git.fedorahosted.org/git/rhq/rhq into content2
adding src reference
582 - sync status per repository.
582 - removing commented out code
Merge branch 'master' into content
removing uneeded path
fixing jar building phase so we get the deps every time
800 - missing nav for the import button
807 - removing uneeded configs
807 - adding sync methods to repo beans
Merge branch 'master' into content
method rename to fix a mispelling identified by jdob
582 - fixing bug in status reporting where we showed failed
800 - now we sync immediately upon creation
810 - switching out package list with repo list on provider page
fixing NPE for unfinished syncs
Merge branch 'master' into content
1102 - adding RepoSyncResults
1102 - test refactoring to unify TestContentProvider
1103 - fixing NPE when syncing content. still broken thou
forgot to reset this flag
adding some src repos
1102 - unit test cleanup. should help fix some of the bustication
1102 - initiate status tracking when we sync
1150 - adding most recent sync results to details page.
removing system.out
1102 - adding more status steps and trackign
1102 - unit test fixage
1102 - fixing status display on details page
1103 - first stab ad tracking percent complete.
fixing compile error
1103 - stupid bug fixed. wasnt setting var
1103, 1107, 1108 - big checkin to support progress tracking
1103 - bugfixes for status reporting.
1103 - bugfixing status reporting
Merge branch 'master' into content
1105 - hide progress bar and add ajaxy update for status on details page
quieting some log spew
1104 - cleanup and TX change to fix the timeouts we are seeing
removing duplicate unit test
Merge branch 'master' into content
Merge branch 'master' into content
Merge branch 'master' into content
making tests less fragile to failure if existing data is in db
making test a bit more isolated
Cleaning up unit tests and removing immediate sync of ContentProvider
1382 - sync schedule
Merge branch 'master' into content
1383, 1385, 1387 - can now edit/save the sync schedule.
1384 - validate format of cron input
Fixing unit test and adding hacked ejb exception class to help testing
1376,1374,1377 - big amount of work to support cancelling syncs
1370 - cancel is now functional. feel free to test
Merge branch 'master' into content
1374 - bugfixes, cleanup
0000 - various bugfixes
removing system.out
0000 - temp fix to alleviate timeouts during long syncs
0000 - switching to previous method for refreshing status bar
Noam Malki (5):
A workaround for JOPR-309.
[JOPR-335] - after manually deleting ear file form the file system, getManagedDeployment() may return UndeclaredThrowableException instead of NoSuchDeploymentException.
changed log.error to log.warn in start method
[JOPR-246] - added integration tests for Topic and Queue. Also, updated AbstractResourceTest to support more general operation test.
[JOPR-370] - adding testMetricRefreshing method for testing the updating of the metrics
Partha Aji (134):
Removing a non existent directory from .classpath
Added a new utility to print augeas config tree given a config file ..
Fixed eclipse classpath and bunch of other issues..
Added the samba project to eclipse and fixed it to use the correct augeas plugin
Taking an initial stab at the sudoers plugin - doesn't do updates but does everything else
Fixed the Sudoers Component to use the AugeasConfiguration extensions.
Updated the rhq sudoer's plugin in to correctly map to the updated Augeas plugin
Revert "back out my augeas/hosts plugin changes from last Friday (6dc0d3ff445cb0e5fdd4957577327ccf24a15db6)"
Merge branch 'master' into linux-config
Merge branch 'master' into linux-config
Updated the rhq sudoer's plugin in to correctly map to the updated Augeas plugin
Merge branch 'master' into linux-config
Commiting a bare bones limited edition sudoers plugin
Got the add functionality working with sudoers
Merge branch 'master' into linux-config
fixed a bunch of merge conflicts
Fixed merge conflicts
Updated spec file to point to latest db
Added a way to specify custom augeas root directories by adding the 'AUGEAS_ROOT' property
Fixed an accidental bug that occured because of choosing the wrong variable name...
Fixed a broken sudoers add configuration thanks to changes in Base component
Fixing a compile error that occured due to a refactor..
Updating eclipse classpath to include augeas tests
Merge branch 'master' into linux-config
Added Sudoers loadConfiguration unit test
Merge branch 'master' into linux-config
Added a generic augeas testResourceConfigUpdate method
Made the testResourceConfigUpdate to propertly clean up the mess it creates
Merge branch 'master' into linux-config
Important bug fixes on various issues with the /etc/hosts plugin and augeas plugin in general
Fixed Merge conflicts
Fixed more conflicts from the linux-config branch
Merge branch 'linux-config' into master-merge
Mixed merged conflicts resulting from revert of d9f656b50586750124a3d3bbecee95ade22c3885
Fixed a couple of unit tests
Merge branch 'master' into master-merge
Merge branch 'linux-config' into master-merge
Merge branch 'master' into linux-config
Added a couple of checks to make sure augeas base paths are generated before unit tests are run
Fixed test cases related to samba and sudoer plugins
Merge branch 'master' into hope
Revert "Fixed test cases related to samba and sudoer plugins"
Merge branch 'master' into linux-config
added aliaseses to .classpath
Added Load and Update tests for the alias component
Removed the augeas test jar dep from aliases pom since its going to be built as part of core
Merge branch 'master' into linux-config
Added Postfix unit tests + got the update for the postfix plugin working
Commiting base functionality of an post access file. Unit tests and custom lens to come.
Merge branch 'master' into linux-config
Fixed a bunch of conflicts
Added code to setup recycle bin for Samba
Fixed samba unit tests
Fixed merge conflicts
More samba fixes
Revert "More samba fixes"
Fixed merge conflicts
Merge branch 'master' into dumb
Unit tests Postfix Access
Merge branch 'linux-config' into apache
Added SambaShare unit tests.
Remote apt dependencies from maven pom's since apt got moved to /etc
Merge branch 'master' into linux-config
Merge branch 'master' into linux-config
Merge branch 'master' into linux-config
Fixed unit tests related to samba ads commit
Merge branch 'master' into linux-config
Fixed a unit test goofup..
Merge branch 'master' into linux-config
Fixed a post fix component unit test..
Fixed a post fix component unit test..
Merge branch 'master' into linux-config
Merge branch 'master' into linux-config
Initial Cobbler plugin skeleton
Merge branch 'master' into linux-config
Small updates on cobbler-plugin .
Added code enable AugeasConfigComponent to load multiple lenses..
Added a prototype to deal with system config services over dbus
Merge branch 'master' into linux-config
Added raw config elements to cobbler component
Added Raw Config support to display modules.conf and settings
Added update operations for saving raw config file.
Added code to merge between raw and structured ..
Fixed merge conflicts
Got the Merge Raw-Structured working..for Cobbler Component
Fixed merge conflicts
Added entries from modules.conf... more to come on settings
Added a nice comprehensive list of cobbler structured options
Merge branch 'master' into linux-config
Fixed a compile error
Created Raw Config helper to facilitate merge between structured to raw
Added code to handle boolean properties in the cobbler plugin
Added a nicer service name.
Fixed merge conflicts
Fixed merge conflicts
Merge branch 'master' into linux-config
Added the cobbler plugin to the dist ear pom file
Merge branch 'master' into linux-config
Fix for Jira RF-8359
Merge branch 'master' into linux-config
Merge branch 'master' into linux-config
Fixed merge conflicts
Fixed merge conflicts
Intial config setup for LDAP stuff..
Merge branch 'linux-config' into ldap
Adding initial mapping change needed for ldap
Merge branch 'master' into linux-config
Merge branch 'linux-config' into ldap
More clean up work on Subjects and SubjectRoleEntity
Updated the addSubject/removeSubject stuff from Role to use SubjectRoleEntity bean
Added a more accurate mapping for SubjectRoleEntity
Merge branch 'master' into linux-config
Merge branch 'linux-config' into ldap
More updates on the Mapping
Added back the Many To Many roles magic to preserve roles variable
Initial commit for solution 2
Mapping For Solution 2 Done
Removed the unused is_ldap column from RHQ_SUBJECT_ROLE_MAP since we are using RHQ_SUBJECT_ROLE_LDAP_MAP for that information
Merge branch 'master' into linux-config
Merge branch 'linux-config' into ldap
Merge branch 'master' into linux-config
Merge branch 'linux-config' into ldap
whateve
Merge branch 'master' into linux-config
Merge branch 'linux-config' into ldap
Merge branch 'master' into linux-config
Merge branch 'linux-config' into ldap
Added functionality to deal with roles
Merge branch 'master' into linux-config
Merge branch 'linux-config' into ldap
Added methods to get 2 kinds of ldap groups
Added the logic to sync roles to ldap users on login
Added code to handle ldap group queries
Merge branch 'linux-config' into ldap
Pradeep Kilambi (69):
test
Merge branch 'content' of ssh://git.fedorahosted.org/git/rhq/rhq into content
test undo
Activation Support for RHQ:
This commit Includes:
Support to transmit the Error handling from plugin to the UIBean layer. Exceptions should not propagate over and show the right error message if invalid data is entered during rhnhosted content source creation.
consume the exception and only show the message
renaming and cleanup
renaming RHNSource to RHNProvider
renaming the other plugin *Source -> *Provider
adding some url validation checks
moving cert validation logic to its own package
This commit includes:
moving the activation logic to use apache xmlrpc instead of redstone
get list of syncable channels
Adding a static list of syncable channels to the content provider page.
bug fix on typos
renaming and tests for helper
Task:#553,#558 new Database tables and upgrade scripts to support initial kickstart tree representation.
Task#554 Adding the domain layer representation for kickstart tree schema
if one of the packages is busted dont quit. Instead try to fetch as many package objects as we can
if one of the packages is busted dont quit. Instead try to fetch as many package objects as we can
Task#787 renaming kickstart to distribution and added new table to reference the distribution type
missed spots on renaming
more changes pertaining to new distro tables
Tasks#556,561 bean layer support for the distribution trees representation.
Adding a distribution facet for the plugin to implement and process distro syncs
some fixes based on unit test failures
create delete distro tests
adding calls to initialize repos for availabel syncable channels
Task#822 Adding new database tables and domain logic to handle kickstart files associated to each distribution tree
tests for new distrofiles support
test to check delete query
UI representation for the distribution tree logic. This is a read only widget displaying the list of available distros per repo
implementing dist tree lookups in webservicesManager
wrap up of UIBean layer and jsf for listing associated kickstart trees by repo
fixing the query to return repodistro as intended instaed of distro
helper calls to access distribution files by distro
Adding a separate identifier to please hibernate from assuming two distribution objects have same identifier
Initial schema changes to support
db upgrade supporting the Advisory schema changes
clean up of db changes for 2.71 spec
bumping url field size to 256
Adding errata metadata representation support to xmlrpc layer once the errata is fetched from hosted.
domain layer changes for advisory representation
fixing domain object column issues
Merge branch 'content' of ssh://git.fedorahosted.org/git/rhq/rhq into content
task:#1068,1069 bean layer for supporting calls to query advisory info, create/delete advisory, cve, advisorycve and advisorypackage realtionships
fixing the seq
fixing the seq
forgot to git add this, fixing the seq
Tasks:1070,1073
more changes for previous commit
clean up standard out from testing
Tasks: Advisory syncs fully functional with associations to packages and other optimizations to cves and buglists associated
Task#1074 UI Widget to show list of synced advisory list for a given repo
Task#1075: A new page to display advisory details information per advisory. This is a link from the advisory list in repo page. Currently shows Advisory, type, synopsis, topic, description, solution for viewed advisory. packages,cve and buglist info is on the way.
Task#1075(Contd): Adding support to show package info, cve, bugids, issue date, update date to advisory details page
adding css whitespace line wrap for advisory description
Fixing the rpm display name to follow right format and separate it from downloadname which has a epoch :
Fix for syncs halting intermittently due to overlapping advisories between repos
fixing db error
Supporting bean layer calls for bootstrap process to leverage to register a rhel client, import it as a managed resource, subscribe the resource to compatible base channel if available based on release,version and arch information sent from the clients. The resource created is associated to a dummy agent which will have the same host and port as the resource but does nothing. More work left to sync the agents once they are installed on the clients. These basic calls should siffice the goal of bootstrapping.
fix unittest failure
some optimizations to not check hibernate twice
fixing the last modified on distribution trees to show right time stamp
Merge branch 'content' of ssh://git.fedorahosted.org/git/rhq/rhq into content
Adding logic to populate the default plugin configuration at the registration time. If not, the inventory -> connection tab will show up as empty as it sets to null
fixing unittests for registration bean
Sayli Karmarkar (48):
test commit to content branch
renaming Channel class to Repo.
Revert "test commit to content branch"
renaming classes under content module to replace Channel by Repo
renaming classes under content module to replace Channel by Repo - continued
renaming classes under content module to replace Channel by Repo - continued
rename from channel to repo
fixing some xhtml link errors due to renaming
DB schema and queries renaming
37 - removing error when creating a repo
fixing typo in listContenProvider
43 - addition of RepoGroup and RepoGroupType classes
Reverting some changes because of error
43 - adding content domain classes to support RepoGroups
Merge branch 'content' of git+ssh://git.fedorahosted.org/git/rhq/rhq into mycontent
43 - domain model changes continued
43 - dbsetup changes for added entities
43 - dbsetup changes for added entities
reverting db-upgrade schema specs previous to channel -> repo renaming back to using channel instead of repo
adding addRepoGroup and removeRepoGroup functions
43 - committing RepoRelationship related classes
43 - committing RepoRelationship related classes
43 - RepoRelationship related dbsetup additions
fixing bugs in dbsetup additions
renaming gui components of repo to Repository
dbsetup data for types of repo relationships
some remaining gui changes for Repo to Repository
db-upgrade typo corrections
Unit tests for RepoGroup
552 - Adding generic tag object, taggable interface and implementation
Merge branch 'content' of git+ssh://git.fedorahosted.org/git/rhq/rhq into mycontent
552 - Adding generic tag object, taggable interface and implementation
temporarily fixing domain objects to make sure the content branch build successfully until I figure out the problem
552 - Adding db changes for generic tag object
552 - Uncommenting tag related functions after fixing db issues
552 - adding db upgrade script for new table for tagging
552 - updating db.schema.version in dbutil pom.xml for db changes
removing @overrides - not required
bug 536811 - fixed db errors when deleting repo
Merge branch 'content' of git+ssh://git.fedorahosted.org/git/rhq/rhq into mycontent
bug 536811 - content source and package associations not needed for this sprint - once we have tagging feature and repo - resource tag model approved, we can just replicate it with other domain objects
bug 536811 - fixed db errors when deleting repo
800 - Filtering out expired channels from repos that can be imported
1368,1369 - Adding webUI and manager layer changes for tracking resource deployment
1368,1369 - Adding webUI and manager layer changes for tracking resource deployment
Fixing issues with rendering of Content Update page for a resource
1364 - Update list should show only the most recent packageversion and not all versions > installed package
Adding sorting for install and update lists
Shannon Hughes (49):
initial scrubbing of samba plugin
more changes to the Samba agent plugin
initial samba plugin using augeas plugin as dependency
adding support for samba share discovery
updates to samba service property descriptions
typo in plugin descriptor
fixing schema validation on samba rhq-plugin
adding support for samba share creation
modifying support for resource creating using augeas set vs insert nodes
fixes to samba share create using augeas plugin. added report prop logic
initial integration test for samba load resource config
updated integration test for samba
initial stubs (discovery/load) for postfix server
added security options for main postfix configuration
intial stubs for Aliases service (platform)
logic for aliases platform service discovery and load resources
minor updates to aliases service
modifying aliases agueas paths
adding postfix and aliases plugins to the packaging ear
plugin and resource config vars for Active Server Integration
initial code to start authconfig call
logic to modify samba file for active server directory
join ads logic for samba domain controllers
changes based off 12/23 demo of samba ads
moving join/disconnect to operations tab
join/leave logic for ads operation facet
metric support for samba
adding cobbler to plugin pom
removing vi artifact from partha checkin
fixing descriptor syntax issue in partha code
changing cobbler from service to server
minor syntax fix on plugin name
quick update
update structured config for cobbler
removing child numbers in parens from left tree nav
remove tree node imagery (connector lines)
updates left hand tree expanders graphics
new tree visuals for resource types. suitcase->closed folder up/down
quick change to closed icon collapse
css/xhtml changes for resource links in left hand nav
use gears for leaf icons
more css ui work on left nav
using 3.3.2.sr1 for richfaces conflict.
fixing augeas and cobber due to RawConfig refactoring
updating richfaces to use GA not SR1
fixed merge conflicts with rich faces
initial schema for ldap group feature
added ldap group member txt field for ldap configs
initial ldap group block
Simeon Pinder (44):
perspectives dynamic menus changes for MenuUIBean.
Modified menu.xhtml to pull most content dynamically
Merge branch 'linux-config' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into linux-config
sample perspective page flow. Single page.
sample perspectives page flow supporting content
Merge branch 'linux-config' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into linux-config
Page flow/wizard updates: added cancel and cleaner display.
Bug 537480 - added a check for null reference.
Merge branch 'linux-config' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into linux-config
fix unit test file with upated node name to match schema.
Bug 535794 - modified code to conditionally handle PropertyMap as it is not instance of Map as assumed. Added code to order listings as UI does.
Merge branch 'linux-config' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into linux-config
BZ 557815 : commenting out AJP on default installs. Not supported at same levels as other connectors.
added single and double quote removal code to *JSON jsps to guard against creating invalid runtime javascript
added null ptr check before retrieval for JSON population.
BZ 580042 : updated dbsetup and dbupgrade to use valid identifiers for oracle.
BZ 580042 : increment db spec version.
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
formatting changes.
- commenting WS* unit test as they are causing unnecessary compilation errors. Automated WS tests need to piggback on CLI automated test efforts.
-i)revert pom ws test changes ii)remove call from ws test due to refactoring.
BZ-580127: modified ldap group auth i)to throw more specific exceptions ii)only do group auth check when group auth components configured iii)gui to gracefully fail when exceptions thrown.
BZ 577800 : added ldap synch check for ldap logins. Added named query to assist authz.
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq
BZ 582471: AD server fix i)disable referral follow ii)change enumeration->next method iii)added npe check for ldap bug.
BZ 584994:i)pagination fix ii)added ldapgroupform iii)cache ldap group list
BZ 584355: i)refactored ldap auth classes to be more consitently defined.ii)modified exception handling.
BZ 586435:conditionally check for case insensitive ldap usernames and reload accordingly.
BZ-537236, BZ-584994: i)repo pagination control error. ii)ldap pagination control issues for pending and sorting columns.
BZ-588568, BZ-589268: i)Fixed order of hibernate query to eliminate wierd sql syntax issuues ii)modified content repo named query to include resource type name in search.
BZ 589199: modified contentProvider to exclude modalElement in updates.
BZ-590718: added missing dbupgrade sql.
BZ-589231, BZ-586079: i)modified package flow to allow no repo to be defined ii)re-enabled associate/dissociate.
BZ 586079: spelling changes.
BZ-589193: numerous changes for details of content uploaded. UI + mergeDiscovery + agent side.
BZ-583104: populate install date details for content.
BZ:589173: modified agent side and server side to update pkg version using Sha.
content: reapply ce0d8ab, sp changes, noResultException handling.
Merge branch 'master' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq
content synch up issue.
fixing config property regression.
take two on regression fix.
moving incorrect em.persist and put NPE check in.
npe check and disabling testAntBundle.
Todd B Sanders (1):
Removed incorrect @Override annotations. These annotations will cause compiler errors with the OpenJDK (v1.6.0 in F12).
alex (1):
File Upload of first version of Nagios plugin
alexander.kiefer79(a)googlemail.com (8):
Finally merged:-)
Final changes for today
Merge branch 'nagios' of ssh://git.fedorahosted.org/git/rhq/rhq into nagios
Merge branch 'nagios' of ssh://git.fedorahosted.org/git/rhq/rhq into nagios
Put RegEx in plugin descriptor, modified ComponentClass to handle them
Merge branch 'nagios' of ssh://git.fedorahosted.org/git/rhq/rhq into nagios
Created a TODO textdoc that includes important information of things that will have to be done soon
Enlarged TODO.txt
jmatthews (2):
Update how we translate the 'obsolete' portion of package metadata to primary xml format.
1156 - Fix excessive login's to RHN when downloading packages/files
jshaughnessy (1):
Support building the former Jopr plugins
unknown (7):
update project organization
add dependency on platform plugin jar to resolve build issue.
Merge branch 'nagios' of ssh://git.fedorahosted.org/git/rhq/rhq into nagios
Latest changes!!
Changes on plugin descriptor
Corrected several errors both in discovery and component classes
Merge branch 'nagios' of ssh://git.fedorahosted.org/git/rhq/rhq into nagios
---
.classpath | 156
.gitignore | 13
.settings/org.eclipse.core.resources.prefs | 20
.settings/org.eclipse.core.runtime.prefs | 6
.settings/org.eclipse.jdt.core.prefs | 535
.settings/org.eclipse.jdt.ui.prefs | 228
.settings/org.maven.ide.eclipse.prefs | 8
dev/null |binary
etc/apt/pom.xml | 199
etc/apt/src/main/java/org/rhq/plugins/apt/AptSourcesComponent.java | 144
etc/apt/src/main/java/org/rhq/plugins/apt/AptSourcesDiscoveryComponent.java | 50
etc/apt/src/main/resources/META-INF/rhq-plugin.xml | 48
etc/apt/src/test/java/org/rhq/plugins/apt/AptSourcesComponentTest.java | 93
etc/apt/src/test/resources/log4j.xml | 32
etc/augeas-utils/README.txt | 48
etc/augeas-utils/augtree.sh | 3
etc/augeas-utils/pom.xml | 40
etc/augeas-utils/src/AugeasTree.java | 116
etc/augeas-utils/src/Node.java | 69
etc/classloaders-test/plugin1/pom.xml | 4
etc/classloaders-test/plugin2/pom.xml | 4
etc/custom-jmx-plugin/pom.xml | 17
etc/custom-jmx-plugin/src/main/resources/META-INF/rhq-plugin.xml | 62
etc/custom-serverplugin/pom.xml | 165
etc/custom-serverplugin/src/main/java/org/custom/serverplugin/MyCustomContentSource.java | 49
etc/custom-serverplugin/src/main/resources/META-INF/rhq-serverplugin-content.xml | 20
etc/dev-utils/test-file.txt | 3
etc/eclipse-tools/RHQ | 138
etc/eclipse-tools/RHQ_Ignore_Target.js | 21
etc/eclipse-tools/hibernate.cfg.xml | 223
etc/eclipse-tools/maven/RHQ | 275
etc/eclipse-tools/templates/cleanup-profile.xml | 102
etc/eclipse-tools/templates/code-templates.xml | 74
etc/eclipse-tools/templates/formatter-profile.xml | 528
etc/eclipse-tools/templates/schema.xmlcatalog | 18
etc/intellij-tools/rhq-style.xml | 136
etc/m2/settings-bugfixes.xml | 54
etc/m2/settings-content.xml | 58
etc/m2/settings-linux-config.xml | 73
etc/m2/settings-rawconfig.xml | 54
etc/m2/settings.xml | 181
etc/modules/sample-bundle/pom.xml | 92
etc/modules/sample-bundle/src/main/jbossas-init-config | 69
etc/modules/sample-bundle/src/main/jbossas-init-script | 327
etc/modules/sample-bundle/src/main/petstore/petstore-db.changelog.xml | 187
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore-ds.xml | 42
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/META-INF/application.xml | 19
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/META-INF/persistence.xml | 21
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Address.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Category.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Item.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Product.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/SellerContactInfo.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/Tag.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore-ejb.jar/com/sun/javaee/blueprints/petstore/model/ZipLocation.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/META-INF/MANIFEST.MF | 4
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/BlueFilter.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/CaptchaSingleton.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/RandomString.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/captcha/SimpleCaptcha.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AddressBean.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/AutocompleteBean.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/CaptchaValidateFilter.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerAction.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/ControllerServlet.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/EntryFilter.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/FileUploadBean.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CaptchaAction.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/CatalogXmlAction.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/DefaultControllerAction.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/ImageAction.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/controller/actions/TagXmlAction.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/mapviewer/MapBean.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/CatalogFacade.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/FileUploadResponse.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/PayPalBean.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/model/RatingBean.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoCoder.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/proxy/GeoPoint.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser$CallbackHandler.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/HTMLParser.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/IndexDocument.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/Indexer.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SQLParser.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchBean.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/SearchIndex.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/search/UpdateIndex.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/ImageScaler.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/LogStrings.properties | 10
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/MessageStrings.properties | 10
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreConstants.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/classes/com/sun/javaee/blueprints/petstore/util/PetstoreUtil.class |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/faces-config.xml | 94
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/jboss-web.xml | 10
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/bp-ui-5.jar |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-fileupload-1.1.1.jar |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-io-1.2.jar |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/commons-logging-1.1.jar |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/jdom.jar |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/lucene-core-2.0.0.jar |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-0.8.jar |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/rome-fetcher-0.7.jar |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/lib/shale-remoting.jar |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/sun-web.xml | 14
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/WEB-INF/web.xml | 126
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.css | 1
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/accordion.js | 249
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/banner.jsp | 80
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.css | 48
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist.js | 269
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_dom.js | 136
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/bp_petstorelist_one_div.js | 159
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/captchaerror.jsp | 23
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.js | 329
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp | 95
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/catalog.jsp-old | 95
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/common.js | 77
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/download.jsp | 22
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.js | 54
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.json | 7
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/downloadAd.txt | 1
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/engine.js | 241
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileupload.jsp | 266
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/fileuploadstatus.jsp | 134
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/footer.jsp | 15
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9081.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9083.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9084.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9086.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9088.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9099.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9100.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9101.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9102.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9103.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9104.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9107.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9109.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9113.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9115.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9117.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9118.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9122.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9123.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9125.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9127.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9129.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9134.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9138.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9142.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9149.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9154.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9155.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9156.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9157.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9158.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9159.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9162.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/CIMG9165.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-jre.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-netbeans.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ad-sdk.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/african-spurred-tortoise2.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/anthony.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bailey.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/banner_logo.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird1.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird2.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird3.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird4.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird5.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bird6.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/birds_icon.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/biscuit.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/bob.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle2.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/box-turtle3.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/california-desert-tortoise.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/carp-car-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat1.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat10.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat11.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat12.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat2.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat3.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat4.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat5.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat6.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat7.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat8.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cat9.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb-g.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/catalog-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cats_icon.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cbutton.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/chantelle.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/charlie.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/check_all.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/cuttlefish-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog1.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog2.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog3.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog4.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog5.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dog6.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dogs_icon.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/dragon-iron-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eagle-stone-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/eclectus-female-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/elkie.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/faith.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish2.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish3.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish4.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/fish_icon.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/florida-king-snake.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/frog1.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/gaetano.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/galah-parrot-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/glassfish-colored-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/guinea-pig.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harmony.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/harrison.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hawaiian-lizard-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/honey.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/hunter.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb-g.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/index-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/indicator-black.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/ja_flag.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/jack.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/katzen.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/koi-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/kookaburra-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lady.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/left_2.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko-thumb2.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/leopard-gecko2.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard1.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard2.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lizard3.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/lovebird-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/macaw.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maggie.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/marianna.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mario.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/maximize.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mexican-redkneed-tarantula.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/mimi.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/minimize.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/monique.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/moon-jelly-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-red-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/octopus-white-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/olie.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/paris.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/parrot-popcorn.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-blue-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peacock-white-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/peakcock-white-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/prehensile-tailed-skink2.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/princess.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/puppup.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/purple-jellyfish-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rainbow-lorikeet-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/reptiles_icon.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/right.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rita.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/rockfish-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sabrina.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-anemone-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/sea-nettle-jellyfish-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb-g.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/seller-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/simba.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/splash.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-med.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/spotted-jellyfish-thumb.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaicat.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog-s.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/thaidog.jpg |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/uncheck_all.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/us_flag.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/images/zh_flag.gif |binary
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index-ajax.jsp | 239
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.html | 117
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index.jsp | 164
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/index_a.jsp | 194
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/jsonTest.jsp | 53
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/lookup.jsp | 36
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.htmf | 36
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/main.js | 21
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/map.jsp | 143
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/mapAll.jsp | 65
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.js | 190
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/news.jsp | 51
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/petstoreListTest.jsp | 21
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.js | 110
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rss.jsp | 33
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rssbar.jsp | 20
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/rteToolBar.html | 60
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.css | 1
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/scroller.js | 643
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/search.jsp | 290
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/styles.css | 130
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/systemerror.jsp | 28
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.css | 47
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tag.jsp | 158
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/tagItemLookup.jsp | 45
etc/modules/sample-bundle/src/main/petstore/server/default/deploy/petstore.ear/petstore.war/testis.jsp | 36
etc/modules/sample-bundle/src/main/rhq-bundle.xml | 52
etc/modules/sample-bundle/src/main/scripts/assembly.xml | 41
etc/modules/sample-bundle/src/main/scripts/build.xml | 64
etc/rhq-plugin-archetype/src/main/resources/archetype-resources/pom.xml | 6
etc/samples/custom-jmx-plugin/pom.xml | 18
etc/samples/custom-jmx-plugin/src/main/resources/META-INF/rhq-plugin.xml | 62
etc/samples/custom-serverplugin/pom.xml | 148
etc/samples/custom-serverplugin/src/main/java/org/custom/MyLifecycleListener.java | 110
etc/samples/custom-serverplugin/src/main/java/org/custom/MyScheduledJob.java | 41
etc/samples/custom-serverplugin/src/main/resources/META-INF/rhq-serverplugin.xml | 97
etc/samples/perspectives/sample-perspective/app/pom.xml | 94
etc/samples/perspectives/sample-perspective/app/src/main/java/org/rhq/sample/perspective/BrowseResources2UIBean.java | 13
etc/samples/perspectives/sample-perspective/app/src/main/java/org/rhq/sample/perspective/BrowseResourcesUIBean.java | 201
etc/samples/perspectives/sample-perspective/app/src/main/java/org/rhq/sample/perspective/CurrentResourceUIBean.java | 43
etc/samples/perspectives/sample-perspective/app/src/main/java/org/rhq/sample/perspective/RandomResourceUIBean.java | 65
etc/samples/perspectives/sample-perspective/app/src/main/java/org/rhq/sample/perspective/WizardBean.java | 677
etc/samples/perspectives/sample-perspective/app/src/main/resources/seam.properties | 3
etc/samples/perspectives/sample-perspective/app/src/main/webapp/WEB-INF/components.xml | 16
etc/samples/perspectives/sample-perspective/app/src/main/webapp/browseResources.xhtml | 160
etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderJBossASPatch.xhtml | 77
etc/samples/perspectives/sample-perspective/app/src/main/webapp/createContentProviderRHN.xhtml | 77
etc/samples/perspectives/sample-perspective/app/src/main/webapp/currentResource.xhtml | 53
etc/samples/perspectives/sample-perspective/app/src/main/webapp/images/create.png |binary
etc/samples/perspectives/sample-perspective/app/src/main/webapp/images/jboss.png |binary
etc/samples/perspectives/sample-perspective/app/src/main/webapp/index.html | 14
etc/samples/perspectives/sample-perspective/app/src/main/webapp/mainpage.html | 17
etc/samples/perspectives/sample-perspective/app/src/main/webapp/randomResource.xhtml | 37
etc/samples/perspectives/sample-perspective/app/src/main/webapp/subtabpage.html | 17
etc/samples/perspectives/sample-perspective/app/src/main/webapp/tabpage.html | 26
etc/samples/perspectives/sample-perspective/app/src/main/webapp/wizard.xhtml | 543
etc/samples/perspectives/sample-perspective/perspective/pom.xml | 161
etc/samples/perspectives/sample-perspective/perspective/src/main/resources/META-INF/rhq-serverplugin.xml | 277
etc/samples/perspectives/sample-perspective/pom.xml | 46
etc/samples/simplereport-serverplugin/pom.xml | 148
etc/samples/simplereport-serverplugin/src/main/java/org/custom/SimpleReportsPluginComponent.java | 277
etc/samples/simplereport-serverplugin/src/main/resources/META-INF/rhq-serverplugin.xml | 81
etc/samples/skeleton-plugin/pom.xml | 35
etc/standalone-pc/standalone.bat | 16
etc/tlds/README.txt | 29
etc/tlds/a4j.tld | 3882
etc/tlds/c.tld | 572
etc/tlds/f.tld | 1973
etc/tlds/fn.tld | 207
etc/tlds/h.tld |14417 +
etc/tlds/rich.tld |19301 ++
etc/tlds/s.tld | 2644
etc/tlds/ui.tld | 292
modules/cli-tests/README.txt | 31
modules/cli-tests/pom.xml | 146
modules/cli-tests/src/main/java/org/rhq/enterprise/remoting/cli/ScriptTest.java | 66
modules/cli-tests/src/main/java/org/rhq/enterprise/remoting/cli/ScriptTestRunner.java | 200
modules/cli-tests/src/main/script/configuration/config_util.js | 287
modules/cli-tests/src/test/resources/cli-test-bundle-zip.zip |binary
modules/cli-tests/src/test/resources/cli-test-bundle.zip |binary
modules/cli-tests/src/test/resources/test-ant-bundle-v1.xml | 38
modules/cli-tests/src/test/resources/test-ant-bundle-v1.zip |binary
modules/cli-tests/src/test/resources/test-ant-bundle-v2.xml | 38
modules/cli-tests/src/test/resources/test-ant-bundle-v2.zip |binary
modules/cli-tests/src/test/resources/test-repo-war-2.0.war |binary
modules/cli-tests/src/test/resources/test-repo-war.war |binary
modules/cli-tests/src/test/resources/test-upgrade-bundle-ant1.zip |binary
modules/cli-tests/src/test/resources/test-upgrade-bundle-ant2.zip |binary
modules/cli-tests/src/test/resources/test-upgrade-bundle1.zip |binary
modules/cli-tests/src/test/resources/test-upgrade-bundle2.zip |binary
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_ConfigurationManager.js | 390
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_DataAccessManager.js | 62
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_EventManager.js | 144
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_InstallAntBundle.js | 121
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_MeasurementDefinitionManager.js | 77
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_MeasurementScheduleManager.js | 150
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_OperationManager.js | 211
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js | 508
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_ResourceGroupManager.js | 163
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_ResourceManager.js | 199
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_ResourceTypeManager.js | 80
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RoleManager.js | 84
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_SubjectManager.js | 121
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_SystemManager.js | 44
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_alerts.js | 235
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManager.js | 115
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js | 116
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgradeAnt.js | 117
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js | 133
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_subjectManagerUserCreate.js | 116
modules/common/ant-bundle/pom.xml | 126
modules/common/ant-bundle/src/main/assembly/bin/antenv.cmd | 98
modules/common/ant-bundle/src/main/assembly/bin/envset.cmd | 131
modules/common/ant-bundle/src/main/assembly/bin/lcp.bat | 31
modules/common/ant-bundle/src/main/assembly/bin/rhq-ant | 333
modules/common/ant-bundle/src/main/assembly/bin/rhq-ant.cmd | 93
modules/common/ant-bundle/src/main/assembly/bin/runrc.cmd | 60
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java | 277
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntMain.java | 1085
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java | 151
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/DeployPropertyNames.java | 39
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/DeploymentPhase.java | 24
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/InvalidBuildFileException.java | 39
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/LoggerAntBuildListener.java | 114
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/AbstractBundleTask.java | 47
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java | 240
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java | 14
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractFileType.java | 60
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java | 32
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java | 268
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileSet.java | 182
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java | 60
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/IgnoreType.java | 53
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/InputPropertyType.java | 140
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java | 46
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/SystemServiceType.java | 375
modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml | 21
modules/common/ant-bundle/src/main/scripts/assembly.xml | 46
modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java | 156
modules/common/ant-bundle/src/test/resources/file.zip |binary
modules/common/ant-bundle/src/test/resources/foo-config | 3
modules/common/ant-bundle/src/test/resources/foo-script | 24
modules/common/ant-bundle/src/test/resources/log4j.xml | 33
modules/common/ant-bundle/src/test/resources/test-bundle-v1-input.properties | 1
modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml | 39
modules/common/ant-bundle/src/test/resources/test-bundle-v2-input.properties | 1
modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml | 39
modules/common/ant-bundle/src/test/resources/test-v1.properties | 3
modules/common/ant-bundle/src/test/resources/test-v2.properties | 4
modules/common/filetemplate-bundle/pom.xml | 53
modules/common/filetemplate-bundle/src/main/java/org/rhq/bundle/filetemplate/recipe/BundleRecipeCommand.java | 105
modules/common/filetemplate-bundle/src/main/java/org/rhq/bundle/filetemplate/recipe/CommandRecipeCommand.java | 56
modules/common/filetemplate-bundle/src/main/java/org/rhq/bundle/filetemplate/recipe/ConfigDefRecipeCommand.java | 81
modules/common/filetemplate-bundle/src/main/java/org/rhq/bundle/filetemplate/recipe/DeployRecipeCommand.java | 85
modules/common/filetemplate-bundle/src/main/java/org/rhq/bundle/filetemplate/recipe/FileRecipeCommand.java | 85
modules/common/filetemplate-bundle/src/main/java/org/rhq/bundle/filetemplate/recipe/RealizeRecipeCommand.java | 74
modules/common/filetemplate-bundle/src/main/java/org/rhq/bundle/filetemplate/recipe/RecipeCommand.java | 43
modules/common/filetemplate-bundle/src/main/java/org/rhq/bundle/filetemplate/recipe/RecipeContext.java | 304
modules/common/filetemplate-bundle/src/main/java/org/rhq/bundle/filetemplate/recipe/RecipeParser.java | 267
modules/common/filetemplate-bundle/src/main/java/org/rhq/bundle/filetemplate/recipe/ScriptRecipeCommand.java | 51
modules/common/filetemplate-bundle/src/test/java/org/rhq/bundle/filetemplate/recipe/RecipeParserTest.java | 388
modules/common/jboss-as/pom.xml | 95
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/ActionHandlerException.java | 45
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/ActionHandlerMessageLog.java | 48
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/BackupAndReplaceFileActionHandler.java | 261
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/BaseHandler.java | 296
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/CompareDigestActionHandler.java | 143
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/ContextVariables.java | 55
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/ControlActionFacade.java | 56
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/ControlActionHandler.java | 141
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/HandlerUtils.java | 148
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/JONServerDownloadActionHandler.java | 124
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/NotificationActionHandler.java | 61
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/PluginContainerControlActionFacade.java | 71
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/SetProcessStatusActionHandler.java | 50
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/SoftwareValue.java | 230
modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/UnzipActionHandler.java | 115
modules/common/jboss-as/src/main/java/org/jboss/on/common/jbossas/AbstractJBossASContentFacetDelegate.java | 193
modules/common/jboss-as/src/main/java/org/jboss/on/common/jbossas/JBPMWorkflowManager.java | 385
modules/common/jboss-as/src/main/java/org/jboss/on/common/jbossas/JBossASDiscoveryUtils.java | 117
modules/common/jboss-as/src/main/java/org/jboss/on/common/jbossas/JBossASPaths.java | 61
modules/common/jboss-as/src/main/java/org/jboss/on/common/jbossas/JmxInvokerServiceConfiguration.java | 117
modules/common/jboss-as/src/main/java/org/jboss/on/common/jbossas/SecurityDomainInfo.java | 143
modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/BackupAndReplaceFileActionHandlerTest.java | 129
modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/CompareDigestActionHandlerTest.java | 239
modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/ControlActionHandlerTest.java | 178
modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/HandlerTestUtils.java | 75
modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/JONServerDownloadActionHandlerTest.java | 66
modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/MockContentContext.java | 40
modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/MockContentServices.java | 105
modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/MockControlActionFacade.java | 97
modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/NotificationActionHandlerTest.java | 69
modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/UnzipActionHandlerTest.java | 275
modules/common/jboss-as/src/test/java/org/jboss/on/common/jbossas/test/JBPMWorkflowManagerTest.java | 230
modules/common/jboss-as/src/test/java/org/jboss/on/common/jbossas/test/JmxInvokerServiceConfigurationTest.java | 71
modules/common/jboss-as/src/test/resources/configFiles/jmx-invoker-service-eap4-securityDisabled.xml | 132
modules/common/jboss-as/src/test/resources/configFiles/jmx-invoker-service-eap4-securityEnabled.xml | 130
modules/common/jboss-as/src/test/resources/configFiles/jmx-invoker-service-eap5-securityDisabled.xml | 132
modules/common/jboss-as/src/test/resources/configFiles/jmx-invoker-service-eap5-securityEnabled.xml | 130
modules/common/jboss-as/src/test/resources/handlers/BackupAndReplaceFileActionHandlerTest-one-file-replace-with-entities.xml | 32
modules/common/jboss-as/src/test/resources/handlers/BackupAndReplaceFileActionHandlerTest-one-file-replace.xml | 25
modules/common/jboss-as/src/test/resources/handlers/CompareDigestActionHandlerTest-md5.xml | 25
modules/common/jboss-as/src/test/resources/handlers/CompareDigestActionHandlerTest-no-algorithm.xml | 24
modules/common/jboss-as/src/test/resources/handlers/CompareDigestActionHandlerTest-no-expected-digest.xml | 24
modules/common/jboss-as/src/test/resources/handlers/ControlActionHandlerTest-1.xml | 23
modules/common/jboss-as/src/test/resources/handlers/JBPMWorkflowManagerTest-1.xml | 91
modules/common/jboss-as/src/test/resources/handlers/JONServerDownloadActionHandlerTest-input-1.txt | 2
modules/common/jboss-as/src/test/resources/handlers/NotificationActionHandlerTest-one-notification.xml | 23
modules/common/jboss-as/src/test/resources/handlers/UnzipActionHandlerTest-1.zip |binary
modules/common/jboss-as/src/test/resources/handlers/UnzipActionHandlerTest-no-destination.xml | 22
modules/common/jboss-as/src/test/resources/handlers/UnzipActionHandlerTest-no-zip-file.xml | 22
modules/common/jboss-as/src/test/resources/handlers/UnzipActionHandlerTest-valid.xml | 23
modules/common/jboss-as/src/test/resources/jboss-server.zip |binary
modules/common/jboss-as/src/test/resources/log4j.xml | 51
modules/common/jboss-as/src/test/resources/test-patch.zip |binary
modules/common/pom.xml | 66
modules/core/client-api/pom.xml | 370
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/PluginContainerException.java | 88
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/bundle/BundleAgentService.java | 39
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/bundle/BundleScheduleRequest.java | 101
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/bundle/BundleScheduleResponse.java | 66
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/configuration/ConfigurationAgentService.java | 43
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/configuration/ConfigurationUtility.java | 4
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/configuration/ConfigurationValidationException.java | 47
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/content/ContentAgentService.java | 10
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java | 2
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/inventory/CreateResourceRequest.java | 308
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/ConfigurationMetadataParser.java | 43
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginDependencyGraph.java | 51
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java | 11
modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java | 1510
modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/DescriptorPackages.java | 3
modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformException.java | 48
modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/PluginTransformer.java | 124
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/bundle/BundleServerService.java | 73
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentDiscoveryReport.java | 83
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServerService.java | 426
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/ContentServiceResponse.java | 274
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/DeletePackagesRequest.java | 69
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/DeployPackagesRequest.java | 78
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/content/RetrievePackageBitsRequest.java | 70
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/discovery/AutoDiscoveryRequest.java | 86
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/discovery/DiscoveryServerService.java | 2
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/discovery/InvalidInventoryReportException.java | 2
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/discovery/InventoryReport.java | 143
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/plugin/content/ContentSourceAdapter.java | 90
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/plugin/content/ContentSourcePackageDetails.java | 75
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/plugin/content/ContentSourcePackageDetailsKey.java | 119
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/plugin/content/PackageSyncReport.java | 117
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/plugin/content/metadata/ContentSourcePluginMetadataManager.java | 201
modules/core/client-api/src/main/resources/rhq-configuration.xsd | 60
modules/core/client-api/src/main/resources/rhq-contentsource-packagedetails.xsd | 381
modules/core/client-api/src/main/resources/rhq-perspective.xsd | 163
modules/core/client-api/src/main/resources/rhq-plugin.xsd | 1900
modules/core/client-api/src/main/resources/rhq-serverplugin-content.xsd | 180
modules/core/client-api/src/test/groovy/org/rhq/core/clientapi/agent/metadata/PluginMetadataParserTest.groovy | 392
modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java | 54
modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/PluginDependencyGraphTest.java | 60
modules/core/client-api/src/test/java/org/rhq/core/clientapi/descriptor/PluginTransformerTest.java | 318
modules/core/client-api/src/test/java/org/rhq/core/clientapi/server/plugin/content/ContentSourcePackageDetailsKeyTest.java | 69
modules/core/client-api/src/test/resources/metadata-manager-test-1.xml | 196
modules/core/client-api/src/test/resources/metadata-manager-test-2.xml | 36
modules/core/client-api/src/test/resources/metadata-manager-test-3.xml | 44
modules/core/client-api/src/test/resources/test-custom-jmx.xml | 118
modules/core/client-api/src/test/resources/test-hibernate.xml | 40
modules/core/client-api/src/test/resources/test-jbossas.xml | 82
modules/core/client-api/src/test/resources/test-jmx.xml | 38
modules/core/client-api/src/test/resources/test-subcategories.xml | 44
modules/core/client-api/src/test/resources/test-tomcat.xml | 42
modules/core/comm-api/pom.xml | 176
modules/core/dbutils/pom.xml | 744
modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java | 61
modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java | 26
modules/core/dbutils/src/main/java/org/rhq/core/db/DbUtilsI18NResourceKeys.java | 662
modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java | 22
modules/core/dbutils/src/main/java/org/rhq/core/db/SQLServerDatabaseType.java | 9
modules/core/dbutils/src/main/java/org/rhq/core/db/ant/DbAntI18NResourceKeys.java | 10
modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/SST_DropTable.java | 14
modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/SST_JavaTask.java | 102
modules/core/dbutils/src/main/java/org/rhq/core/db/setup/DBSetup.java | 2
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java | 219
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DatabaseUpgradeTask.java | 34
modules/core/dbutils/src/main/resources/db-ant-tasks.properties | 1
modules/core/dbutils/src/main/resources/db-typemaps.xml | 7
modules/core/dbutils/src/main/scripts/dbsetup-build.xml | 689
modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-data-combined-2.3.1.xml | 663
modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-schema-combined-2.3.1.xml | 1916
modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml | 21
modules/core/dbutils/src/main/scripts/dbsetup/amps-schema.xml | 10
modules/core/dbutils/src/main/scripts/dbsetup/authz-data.xml | 68
modules/core/dbutils/src/main/scripts/dbsetup/authz-schema.xml | 22
modules/core/dbutils/src/main/scripts/dbsetup/config-schema.xml | 239
modules/core/dbutils/src/main/scripts/dbsetup/content-data.xml | 15
modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 901
modules/core/dbutils/src/main/scripts/dbsetup/dbsetup-schema.xsd | 1
modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml | 32
modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml | 883
modules/core/dbutils/src/main/scripts/dbsetup/obsolete-schema.xml | 67
modules/core/dbutils/src/main/scripts/dbsetup/search-data.xml | 25
modules/core/dbutils/src/main/scripts/dbsetup/search-schema.xml | 22
modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 276
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 4508
modules/core/dbutils/src/test/java/org/rhq/core/db/DatabaseTest.java | 2
modules/core/dbutils/src/test/java/org/rhq/core/db/TypeMapTest.java | 3
modules/core/dbutils/src/test/resources/log4j.xml | 44
modules/core/dbutils/src/test/resources/preupgrade-dbsetup.xml | 20
modules/core/dbutils/src/test/resources/small-dbsetup.xml | 80
modules/core/dbutils/src/test/resources/test-db-typemaps.xml | 20
modules/core/dbutils/src/test/resources/test-upgrade.xml | 128
modules/core/domain/pom.xml | 738
modules/core/domain/src/main/java/META-INF/MANIFEST.MF | 16
modules/core/domain/src/main/java/org/rhq/core/RHQDomain.gwt.xml | 18
modules/core/domain/src/main/java/org/rhq/core/client/RHQDomain.java | 31
modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 95
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java | 5
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionCategory.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java | 3
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDampeningEvent.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 44
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java | 113
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 196
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/EmailNotification.java | 110
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/ResultState.java | 35
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/RoleNotification.java | 128
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SenderResult.java | 114
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SnmpNotification.java | 144
modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/SubjectNotification.java | 128
modules/core/domain/src/main/java/org/rhq/core/domain/auth/Principal.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 1056
modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java | 50
modules/core/domain/src/main/java/org/rhq/core/domain/authz/Role.java | 616
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java | 262
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeployment.java | 404
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDeploymentStatus.java | 50
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleDestination.java | 278
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleFile.java | 147
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeployment.java | 210
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeploymentHistory.java | 240
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleType.java | 151
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java | 305
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersionRepo.java | 132
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersionRepoPK.java | 122
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/composite/BundleWithLatestVersionComposite.java | 101
modules/core/domain/src/main/java/org/rhq/core/domain/cloud/PartitionEvent.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/cloud/Server.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/cloud/composite/FailoverListComposite.java | 77
modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/OptionItem.java | 170
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/AbstractConfigurationUpdate.java | 25
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/AbstractResourceConfigurationUpdate.java | 3
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java | 336
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationUpdateStatus.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/DeepCopyable.java | 30
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/DynamicConfigurationPropertyValue.java | 70
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PluginConfigurationUpdate.java | 9
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java | 141
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyDefinitionDynamic.java | 82
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyDynamicType.java | 33
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyList.java | 41
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyMap.java | 41
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertySimple.java | 47
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/RawConfiguration.java | 270
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdate.java | 24
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationDefinition.java | 32
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationFormat.java | 49
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinition.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionEnumeration.java | 16
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionSimple.java | 20
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertySimpleType.java | 46
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/constraint/Constraint.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/group/GroupPluginConfigurationUpdate.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/content/Advisory.java | 291
modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryBuglist.java | 158
modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java | 168
modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryPackage.java | 168
modules/core/domain/src/main/java/org/rhq/core/domain/content/Architecture.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/content/CVE.java | 126
modules/core/domain/src/main/java/org/rhq/core/domain/content/Channel.java | 477
modules/core/domain/src/main/java/org/rhq/core/domain/content/ChannelContentSource.java | 149
modules/core/domain/src/main/java/org/rhq/core/domain/content/ChannelContentSourcePK.java | 119
modules/core/domain/src/main/java/org/rhq/core/domain/content/ChannelPackageVersion.java | 146
modules/core/domain/src/main/java/org/rhq/core/domain/content/ChannelPackageVersionPK.java | 119
modules/core/domain/src/main/java/org/rhq/core/domain/content/ContentServiceRequest.java | 614
modules/core/domain/src/main/java/org/rhq/core/domain/content/ContentSource.java | 890
modules/core/domain/src/main/java/org/rhq/core/domain/content/ContentSourceSyncResults.java | 10
modules/core/domain/src/main/java/org/rhq/core/domain/content/ContentSourceSyncStatus.java | 27
modules/core/domain/src/main/java/org/rhq/core/domain/content/ContentSourceType.java | 620
modules/core/domain/src/main/java/org/rhq/core/domain/content/ContentSyncResults.java | 18
modules/core/domain/src/main/java/org/rhq/core/domain/content/ContentSyncStatus.java | 27
modules/core/domain/src/main/java/org/rhq/core/domain/content/Distribution.java | 209
modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFile.java | 186
modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionFilePK.java | 90
modules/core/domain/src/main/java/org/rhq/core/domain/content/DistributionType.java | 142
modules/core/domain/src/main/java/org/rhq/core/domain/content/InstalledPackage.java | 430
modules/core/domain/src/main/java/org/rhq/core/domain/content/InstalledPackageHistory.java | 455
modules/core/domain/src/main/java/org/rhq/core/domain/content/InstalledPackageHistoryStatus.java | 208
modules/core/domain/src/main/java/org/rhq/core/domain/content/Package.java | 431
modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java | 8
modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageCategory.java | 51
modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageInstallationStep.java | 348
modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageType.java | 13
modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java | 1567
modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java | 46
modules/core/domain/src/main/java/org/rhq/core/domain/content/ProductVersionPackageVersion.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/content/Repo.java | 796
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisory.java | 167
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoAdvisoryPK.java | 121
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSource.java | 150
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoContentSourcePK.java | 120
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistribution.java | 162
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoDistributionPK.java | 121
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoGroup.java | 249
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoGroupType.java | 172
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java | 158
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersionPK.java | 120
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRelationship.java | 244
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRelationshipType.java | 173
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroup.java | 147
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoGroupPK.java | 120
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationship.java | 154
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoRepoRelationshipPK.java | 120
modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoSyncResults.java | 191
modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceChannel.java | 157
modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceChannelPK.java | 119
modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepo.java | 157
modules/core/domain/src/main/java/org/rhq/core/domain/content/ResourceRepoPK.java | 121
modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/AdvisoryDetailsComposite.java | 143
modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/ChannelComposite.java | 49
modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/PackageVersionComposite.java | 222
modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/RepoComposite.java | 49
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/ContentDiscoveryReport.java | 82
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/ContentResponseResult.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/DeletePackagesRequest.java | 67
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/DeployIndividualPackageResponse.java | 235
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/DeployPackageStep.java | 236
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/DeployPackagesRequest.java | 76
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/DeployPackagesResponse.java | 22
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/EntitlementCertificate.java | 68
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/RemoveIndividualPackageResponse.java | 24
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/RemovePackagesResponse.java | 23
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/ResourcePackageDetails.java | 46
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/RetrievePackageBitsRequest.java | 68
modules/core/domain/src/main/java/org/rhq/core/domain/content/transfer/SubscribedRepo.java | 47
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java | 45
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 17
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleCriteria.java | 153
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDeploymentCriteria.java | 127
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDestinationCriteria.java | 108
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleFileCriteria.java | 75
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java | 108
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleVersionCriteria.java | 99
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ChannelCriteria.java | 91
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java | 164
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java | 25
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupOperationHistoryCriteria.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageCriteria.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDefinitionCriteria.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementScheduleCriteria.java | 13
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationDefinitionCriteria.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/OperationHistoryCriteria.java | 14
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageVersionCriteria.java | 32
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RepoCriteria.java | 118
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java | 50
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java | 73
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupDefinitionCriteria.java | 108
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceOperationHistoryCriteria.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java | 28
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RoleCriteria.java | 106
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SavedSearchCriteria.java | 145
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/SubjectCriteria.java | 13
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/TagCriteria.java | 86
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/TaggedCriteria.java | 84
modules/core/domain/src/main/java/org/rhq/core/domain/dialect/H2CustomDialect.java | 45
modules/core/domain/src/main/java/org/rhq/core/domain/discovery/AvailabilityReport.java | 11
modules/core/domain/src/main/java/org/rhq/core/domain/discovery/InventoryReport.java | 143
modules/core/domain/src/main/java/org/rhq/core/domain/discovery/ResourceSyncInfo.java | 13
modules/core/domain/src/main/java/org/rhq/core/domain/event/Event.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/event/EventDefinition.java | 26
modules/core/domain/src/main/java/org/rhq/core/domain/event/EventSource.java | 16
modules/core/domain/src/main/java/org/rhq/core/domain/event/transfer/EventReport.java | 8
modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallInfo.java | 120
modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallStep.java | 63
modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/RemoteAccessInfo.java | 93
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementBaseline.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java | 11
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java | 3
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java | 3
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java | 16
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataPK.java | 9
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java | 1032
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementOOB.java | 12
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementReport.java | 390
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/calltime/CallTimeData.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/calltime/CallTimeDataComposite.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/calltime/CallTimeDataValue.java | 22
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementNumericValueAndUnits.java | 5
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java | 23
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementStringValueAndUnits.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/util/MeasurementConverter.java | 426
modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationHistory.java | 32
modules/core/domain/src/main/java/org/rhq/core/domain/operation/OperationRequestStatus.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/operation/ResourceOperationHistory.java | 13
modules/core/domain/src/main/java/org/rhq/core/domain/plugin/AbstractPlugin.java | 391
modules/core/domain/src/main/java/org/rhq/core/domain/plugin/Plugin.java | 455
modules/core/domain/src/main/java/org/rhq/core/domain/plugin/PluginDeploymentType.java | 31
modules/core/domain/src/main/java/org/rhq/core/domain/plugin/PluginKey.java | 153
modules/core/domain/src/main/java/org/rhq/core/domain/plugin/PluginStatusType.java | 29
modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPlugin.java | 372
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java | 55
modules/core/domain/src/main/java/org/rhq/core/domain/resource/CreateResourceHistory.java | 8
modules/core/domain/src/main/java/org/rhq/core/domain/resource/DeleteResourceHistory.java | 17
modules/core/domain/src/main/java/org/rhq/core/domain/resource/InventorySummary.java | 114
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 3762
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceError.java | 3
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java | 1757
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceTypeFacet.java | 28
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/DisambiguationReport.java | 69
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/LockedResource.java | 50
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/RecentlyAddedResourceComposite.java | 11
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceComposite.java | 270
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceFacets.java | 57
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceNamesDisambiguationResult.java | 90
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceParentFlyweight.java | 59
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourcePermission.java | 248
modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/AutoGroupCompositeFlyweight.java | 206
modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java | 256
modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceAvailabilityFlyweight.java | 111
modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceFlyweight.java | 148
modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceSubCategoryFlyweight.java | 95
modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/ResourceTypeFlyweight.java | 123
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/LdapGroup.java | 130
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java | 1346
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/AutoGroupComposite.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java | 427
modules/core/domain/src/main/java/org/rhq/core/domain/search/SavedSearch.java | 264
modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSubsystem.java | 76
modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java | 101
modules/core/domain/src/main/java/org/rhq/core/domain/state/discovery/AutoDiscoveryRequest.java | 84
modules/core/domain/src/main/java/org/rhq/core/domain/tagging/Tag.java | 347
modules/core/domain/src/main/java/org/rhq/core/domain/tagging/compsite/TagReportComposite.java | 83
modules/core/domain/src/main/java/org/rhq/core/domain/util/CriteriaQueryGenerator.java | 433
modules/core/domain/src/main/java/org/rhq/core/domain/util/CriteriaQueryRunner.java | 84
modules/core/domain/src/main/java/org/rhq/core/domain/util/EntitySerializer.java | 279
modules/core/domain/src/main/java/org/rhq/core/domain/util/OrderingField.java | 34
modules/core/domain/src/main/java/org/rhq/core/domain/util/PageControl.java | 49
modules/core/domain/src/main/java/org/rhq/core/domain/util/PageList.java | 242
modules/core/domain/src/main/java/org/rhq/core/domain/util/PersistenceUtility.java | 507
modules/core/domain/src/main/java/org/rhq/core/domain/util/Recordizable.java | 28
modules/core/domain/src/main/java/org/rhq/core/domain/util/ReportUtils.java | 50
modules/core/domain/src/main/java/org/rhq/core/domain/util/UnlimitedPageControl.java | 34
modules/core/domain/src/main/java/org/rhq/core/domain/util/serial/ExternalizableStrategy.java | 65
modules/core/domain/src/main/java/org/rhq/core/public/RHQDomain.css | 7
modules/core/domain/src/main/java/org/rhq/core/public/RHQDomain.html | 10
modules/core/domain/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java | 172
modules/core/domain/src/main/java/org/rhq/core/server/EntitySerializer.java | 281
modules/core/domain/src/main/java/org/rhq/core/server/ExternalizableStrategy.java | 65
modules/core/domain/src/main/java/org/rhq/core/server/H2CustomDialect.java | 45
modules/core/domain/src/main/java/org/rhq/core/server/PersistenceUtility.java | 602
modules/core/domain/src/test/java/org/rhq/core/domain/bundle/test/BundleTest.java | 480
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/AbstractConfigurationUpdateTest.java | 114
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java | 608
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/PluginConfigurationUpdateTest.java | 67
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/PropertyListTest.java | 59
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/PropertyMapTest.java | 53
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/PropertySimpleTest.java | 16
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationIntegrationTest.java | 69
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/RawConfigurationTest.java | 238
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateIntegrationTest.java | 74
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdateTest.java | 67
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/TestUtil.java | 45
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/group/GroupPluginConfigurationUpdateTest.java | 51
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/group/GroupResourceConfigurationUpdateTest.java | 51
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationDefinitionTest.java | 2
modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationTest.java | 67
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java | 78
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java | 373
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/PackageVersionContentSourceTest.java | 79
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoGroupTest.java | 191
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/RepoTest.java | 54
modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/CompositeLoadingTest.java | 48
modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/MeasurementTest.java | 3
modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java | 47
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/PluginTest.java | 170
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ProblemResourceTest.java | 739
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java | 46
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceGroupTest.java | 49
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ServerPluginTest.java | 693
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/TokenGenerationTest.java | 6
modules/core/domain/src/test/java/org/rhq/core/domain/search/SavedSearchTest.java | 54
modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java | 350
modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java | 811
modules/core/domain/src/test/java/org/rhq/core/domain/test/SerializableTest.java | 5
modules/core/domain/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java | 385
modules/core/domain/src/test/resources/META-INF/persistence.xml | 37
modules/core/domain/src/test/resources/ejb3-interceptors-aop.xml | 718
modules/core/domain/src/test/resources/embedded-jboss-beans.xml | 444
modules/core/domain/src/test/resources/jboss-jms-beans.xml | 406
modules/core/domain/src/test/resources/jndi.properties | 2
modules/core/domain/src/test/resources/log4j.xml | 104
modules/core/domain/src/test/resources/login-config.xml | 126
modules/core/domain/src/test/resources/security-beans.xml | 26
modules/core/domain/src/test/resources/testng.xml | 24
modules/core/gui/pom.xml | 447
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractConfigurationComponent.java | 12
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractPropertyBagUIComponentTreeFactory.java | 74
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java | 3
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigUIComponent.java | 72
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigurationMaskingUtility.java | 2
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/MultiFileRenderer.java | 70
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/MultiFileUIComponent.java | 38
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/RawConfigRenderer.java | 58
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/RawConfigUIComponent.java | 143
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/helper/DynamicPropertyRetriever.java | 53
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/helper/PropertyRenderingUtility.java | 117
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/propset/ConfigurationSetComponent.java | 7
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/propset/PropertySetRenderer.java | 17
modules/core/gui/src/main/java/org/rhq/core/gui/converter/PropertySimpleValueConverter.java | 73
modules/core/gui/src/main/java/org/rhq/core/gui/model/AbstractPagedDataModel2.java | 315
modules/core/gui/src/main/java/org/rhq/core/gui/model/DefaultPageControlSettingsUIBean.java | 65
modules/core/gui/src/main/java/org/rhq/core/gui/model/PagedDataModel.java | 396
modules/core/gui/src/main/java/org/rhq/core/gui/model/PagedDataProvider.java | 37
modules/core/gui/src/main/java/org/rhq/core/gui/table/bean/AbstractPagedDataUIBean.java | 182
modules/core/gui/src/main/java/org/rhq/core/gui/table/component/AllRowsSelectorComponent.java | 85
modules/core/gui/src/main/java/org/rhq/core/gui/table/component/RowSelectorComponent.java | 153
modules/core/gui/src/main/java/org/rhq/core/gui/table/component/SelectedRowsCommandButtonComponent.java | 124
modules/core/gui/src/main/java/org/rhq/core/gui/table/component/SortableColumnHeaderComponent.java | 135
modules/core/gui/src/main/java/org/rhq/core/gui/table/model/PagedListDataModel.java | 299
modules/core/gui/src/main/java/org/rhq/core/gui/table/renderer/AbstractButtonRenderer.java | 235
modules/core/gui/src/main/java/org/rhq/core/gui/table/renderer/AbstractRenderer.java | 140
modules/core/gui/src/main/java/org/rhq/core/gui/table/renderer/AllRowsSelectorRenderer.java | 131
modules/core/gui/src/main/java/org/rhq/core/gui/table/renderer/RowSelectorRenderer.java | 238
modules/core/gui/src/main/java/org/rhq/core/gui/table/renderer/SelectedRowsCommandButtonRenderer.java | 106
modules/core/gui/src/main/java/org/rhq/core/gui/table/renderer/SortableColumnHeaderRenderer.java | 110
modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesComponentUtility.java | 13
modules/core/gui/src/main/java/org/rhq/core/gui/util/FacesContextUtility.java | 4
modules/core/gui/src/main/java/org/rhq/core/gui/validator/PropertySimpleValueValidator.java | 2
modules/core/gui/src/main/resources/META-INF/faces-config.xml | 78
modules/core/gui/src/main/resources/META-INF/rhq.taglib.xml | 43
modules/core/gui/src/main/resources/org/rhq/core/gui/table/renderer/js/table.js | 57
modules/core/gui/src/main/resources/seam.properties | 3
modules/core/native-system/ant-run.xml | 260
modules/core/native-system/pom.xml | 233
modules/core/native-system/src/main/java/org/rhq/core/system/FileSystemInfo.java | 186
modules/core/native-system/src/main/java/org/rhq/core/system/JavaSystemInfo.java | 7
modules/core/native-system/src/main/java/org/rhq/core/system/NativeSystemInfo.java | 28
modules/core/native-system/src/main/java/org/rhq/core/system/NetworkStats.java | 320
modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java | 107
modules/core/native-system/src/main/java/org/rhq/core/system/SystemInfo.java | 26
modules/core/native-system/src/main/java/org/rhq/core/system/SystemInfoFactory.java | 109
modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java | 4
modules/core/native-system/src/test/java/org/rhq/core/system/NativeSystemInfoTest.java | 1276
modules/core/native-system/src/test/java/org/rhq/core/system/SigarTest.java | 128
modules/core/plugin-api/pom.xml | 196
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/bundle/BundleDeployRequest.java | 125
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/bundle/BundleDeployResult.java | 64
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/bundle/BundleFacet.java | 32
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/bundle/BundleManagerProvider.java | 73
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ConfigurationFacet.java | 2
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ConfigurationFacetSupport.java | 27
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ResourceConfigurationFacet.java | 48
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ResourceConfigurationUpdateException.java | 49
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/content/ContentFacet.java | 202
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/content/ContentServices.java | 262
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessor.java | 72
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/CreateResourceReport.java | 300
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ManualAddFacet.java | 58
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryContext.java | 31
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/operation/OperationFacet.java | 134
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/FileUtils.java | 386
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ResponseTimeLogParser.java | 154
modules/core/plugin-container/pom.xml | 389
modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java | 1102
modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java | 1546
modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerMBeanImpl.java | 36
modules/core/plugin-container/src/main/java/org/rhq/core/pc/ServerServices.java | 241
modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java | 40
modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java | 377
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigManagement.java | 48
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigManagementFactory.java | 32
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigManagementFactoryImpl.java | 85
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigManagementSupport.java | 82
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java | 227
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManagerInitializer.java | 41
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationUpdateException.java | 55
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationUtilityService.java | 37
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationUtilityServiceImpl.java | 42
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/LegacyConfigManagement.java | 102
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/RawConfigManagement.java | 83
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/StructuredAndRawConfigManagement.java | 114
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/StructuredConfigManagement.java | 80
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/UpdateInProgressException.java | 43
modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/UpdateResourceConfigurationRunner.java | 100
modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentDiscoveryRunner.java | 5
modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java | 1473
modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/CreateContentRunner.java | 332
modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/DeleteContentRunner.java | 225
modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/RetrieveContentBitsRunner.java | 76
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AutoDiscoveryExecutor.java | 13
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java | 20
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/CreateResourceRunner.java | 27
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/DeleteResourceRunner.java | 26
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryFile.java | 65
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 4742
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceFactoryManager.java | 536
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/RuntimeDiscoveryExecutor.java | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/CanonicalResourceKey.java | 182
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/ClassLoaderManager.java | 25
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginEnvironment.java | 126
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginLifecycleListenerManager.java | 73
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginLifecycleListenerManagerImpl.java | 115
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java | 131
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginValidator.java | 245
modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentService.java | 43
modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentServiceImpl.java | 57
modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/ComponentUtil.java | 6
modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java | 180
modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/ConfigManagementFactoryImplTest.java | 378
modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/ConfigManagementTest.java | 130
modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/ConfigurationManagerTest.java | 484
modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/LegacyConfigManagementTest.java | 212
modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/RawConfigManagementTest.java | 265
modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/StructuredAndRawConfigManagementTest.java | 285
modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/StructuredConfigManagementTest.java | 174
modules/core/plugin-container/src/test/java/org/rhq/core/pc/configuration/UpdateResourceConfigurationRunnerTest.java | 308
modules/core/plugin-container/src/test/java/org/rhq/core/pc/operation/OperationManagerTest.java | 1214
modules/core/plugin-container/src/test/java/org/rhq/core/pc/plugin/PluginManagerTest.java | 282
modules/core/plugin-container/src/test/java/org/rhq/core/pc/plugin/descriptor/test/DescriptorTest.java | 150
modules/core/plugin-container/src/test/resources/classloader-test.jar |binary
modules/core/plugin-container/src/test/resources/log4j.xml | 70
modules/core/plugin-container/src/test/resources/org/rhq/core/pc/plugin/plugin-A.jar |binary
modules/core/plugin-container/src/test/resources/org/rhq/core/pc/plugin/plugin-B-depends-on-A.jar |binary
modules/core/plugin-container/src/test/resources/org/rhq/core/pc/plugin/plugin-C-depends-on-B.jar |binary
modules/core/plugin-container/src/test/xml/rhq-plugin-jmx-server-test.xml | 188
modules/core/plugin-validator/pom.xml | 112
modules/core/plugindoc/pom.xml | 243
modules/core/pom.xml | 185
modules/core/util/pom.xml | 254
modules/core/util/src/main/java/org/rhq/core/template/TemplateEngine.java | 59
modules/core/util/src/main/java/org/rhq/core/util/IniEditor.java | 1165
modules/core/util/src/main/java/org/rhq/core/util/IntExtractor.java | 44
modules/core/util/src/main/java/org/rhq/core/util/MD5Generator.java | 245
modules/core/util/src/main/java/org/rhq/core/util/MessageDigestGenerator.java | 346
modules/core/util/src/main/java/org/rhq/core/util/NumberUtil.java | 65
modules/core/util/src/main/java/org/rhq/core/util/ZipUtil.java | 181
modules/core/util/src/main/java/org/rhq/core/util/exception/ThrowableUtil.java | 9
modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java | 134
modules/core/util/src/main/java/org/rhq/core/util/file/GenericContentFileInfo.java | 4
modules/core/util/src/main/java/org/rhq/core/util/jdbc/JDBCUtil.java | 458
modules/core/util/src/main/java/org/rhq/core/util/maven/MavenArtifactNotFoundException.java | 32
modules/core/util/src/main/java/org/rhq/core/util/maven/MavenArtifactProperties.java | 146
modules/core/util/src/main/java/org/rhq/core/util/progresswatch/ProgressWatcher.java | 115
modules/core/util/src/main/java/org/rhq/core/util/stream/StreamCopyDigest.java | 82
modules/core/util/src/main/java/org/rhq/core/util/updater/ChangesFileHashcodeMap.java | 90
modules/core/util/src/main/java/org/rhq/core/util/updater/DeployDifferences.java | 277
modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java | 902
modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentData.java | 146
modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentDiskUsage.java | 83
modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentProperties.java | 193
modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentsMetadata.java | 410
modules/core/util/src/main/java/org/rhq/core/util/updater/ExtractorZipFileVisitor.java | 168
modules/core/util/src/main/java/org/rhq/core/util/updater/FileHashcodeMap.java | 386
modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipEntryRealizer.java | 84
modules/core/util/src/main/java/org/rhq/core/util/updater/InMemoryZipFileVisitor.java | 103
modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java | 9
modules/core/util/src/test/java/org/rhq/core/template/TemplateEngineTest.java | 70
modules/core/util/src/test/java/org/rhq/core/util/IniEditorTest.java | 81
modules/core/util/src/test/java/org/rhq/core/util/MD5GeneratorTest.java | 6
modules/core/util/src/test/java/org/rhq/core/util/NumberUtilTest.java | 44
modules/core/util/src/test/java/org/rhq/core/util/ZipUtilTest.java | 104
modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java | 112
modules/core/util/src/test/java/org/rhq/core/util/progresswatch/ProgressWatcherTest.java | 64
modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerTest.java | 729
modules/core/util/src/test/java/org/rhq/core/util/updater/DeploymentPropertiesTest.java | 131
modules/core/util/src/test/java/org/rhq/core/util/updater/DeploymentsMetadataTest.java | 74
modules/core/util/src/test/java/org/rhq/core/util/updater/FileHashcodeMapTest.java | 418
modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerRawFileTest.java | 874
modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerRawRelativeFileTest.java | 876
modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java | 999
modules/core/util/src/test/java/org/rhq/core/util/updater/UpdaterZipTest.java | 278
modules/core/util/src/test/resources/ini-editor-test.ini | 36
modules/core/util/src/test/resources/log4j.xml | 20
modules/core/util/src/test/resources/updater-test1.zip |binary
modules/core/util/src/test/resources/updater-test2.zip |binary
modules/core/util/src/test/resources/updater-test3.zip |binary
modules/core/util/src/test/resources/updater-testA.txt | 4
modules/core/util/src/test/resources/updater-testB.txt | 4
modules/enterprise/agent/ant-run.xml | 12
modules/enterprise/agent/pom.xml | 487
modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf | 2
modules/enterprise/agent/src/etc/rhq-agent-env.sh | 2
modules/enterprise/agent/src/etc/rhq-agent.sh | 35
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java | 2818
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java | 1411
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReader.java | 62
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentInputReaderFactory.java | 115
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 6707
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagement.java | 6
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentNativePromptInfo.java | 91
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentPromptInfo.java | 59
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateDownload.java | 4
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentUpdateThread.java | 2
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/ExternalizableStrategyCommandPreprocessor.java | 2
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JLineAgentInputReader.java | 103
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/JavaAgentInputReader.java | 60
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/PluginUpdate.java | 69
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/SigarAgentInputReader.java | 73
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/Version.java | 7
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 73
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentSetupInstructions.java | 1950
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/DiscoveryPromptCommand.java | 2
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/FailoverPromptCommand.java | 2
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/PluginsPromptCommand.java | 30
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java | 1984
modules/enterprise/agent/src/main/resources/agent-configuration.xml | 1994
modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentBasicTest.java | 458
modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java | 8
modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentCommTestBase.java | 6
modules/enterprise/agent/src/test/resources/log4j.xml | 82
modules/enterprise/agent/src/test/resources/test-agent-configuration.xml | 208
modules/enterprise/agent/src/test/resources/test-agent1-cfg-mvn.xml | 105
modules/enterprise/agent/src/test/resources/test-agent2-cfg-mvn.xml | 124
modules/enterprise/agent/src/test/resources/test-agent2-configuration.xml | 186
modules/enterprise/agentupdate/pom.xml | 6
modules/enterprise/comm/pom.xml | 445
modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/ServiceContainer.java | 2
modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/JBossRemotingRemoteCommunicator.java | 82
modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/CommTestConstants.java | 37
modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/command/client/LimitedConcurrencyTest.java | 26
modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/command/client/MaxRetriesTest.java | 5
modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/command/client/RemotingTest.java | 3
modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/command/stream/CommStreamTest.java | 23
modules/enterprise/comm/src/test/resources/log4j.xml | 64
modules/enterprise/comm/src/test/resources/org/rhq/enterprise/communications/command/param/ParametersTest.properties | 4
modules/enterprise/gui/base-perspective-jar/pom.xml | 210
modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectivePagedDataUIBean.java | 41
modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java | 49
modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveUIBean.java | 41
modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java | 161
modules/enterprise/gui/base-perspective-jar/src/main/resources/seam.properties | 3
modules/enterprise/gui/base-perspective-war/pom.xml | 67
modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/components.xml | 16
modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/faces-config.xml | 28
modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/includes/pageControls.xhtml | 103
modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/jboss-web.xml | 20
modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/templates/mainTemplate.xhtml | 70
modules/enterprise/gui/base-perspective-war/src/main/webapp/WEB-INF/web.xml | 108
modules/enterprise/gui/base-perspective-war/src/main/webapp/index.xhtml | 36
modules/enterprise/gui/content_http-war/pom.xml | 292
modules/enterprise/gui/content_http-war/src/main/java/org/rhq/gui/content/ContentFilter.java | 42
modules/enterprise/gui/content_http-war/src/main/java/org/rhq/gui/content/ContentHTTPServlet.java | 680
modules/enterprise/gui/content_http-war/src/main/java/org/rhq/gui/content/EntitlementException.java | 62
modules/enterprise/gui/content_http-war/src/main/java/org/rhq/gui/content/HtmlRenderer.java | 122
modules/enterprise/gui/content_http-war/src/main/java/org/rhq/gui/content/YumMetadata.java | 167
modules/enterprise/gui/content_http-war/src/main/webapp/WEB-INF/jboss-web.xml | 5
modules/enterprise/gui/content_http-war/src/main/webapp/WEB-INF/web.xml | 33
modules/enterprise/gui/content_http-war/src/main/webapp/icons/back.gif |binary
modules/enterprise/gui/content_http-war/src/main/webapp/icons/blank.gif |binary
modules/enterprise/gui/content_http-war/src/main/webapp/icons/bomb.gif |binary
modules/enterprise/gui/content_http-war/src/main/webapp/icons/folder.gif |binary
modules/enterprise/gui/content_http-war/src/main/webapp/icons/text.gif |binary
modules/enterprise/gui/content_http-war/src/main/webapp/icons/unknown.gif |binary
modules/enterprise/gui/content_http-war/src/main/webapp/testfile | 2
modules/enterprise/gui/content_http-war/src/main/webapp/testfile2 | 2
modules/enterprise/gui/coregui/pom.xml | 429
modules/enterprise/gui/coregui/src/main/java/org/rhq/core/domain/measurement/MeasurementConverterClient.java | 360
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 70
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BookmarkableView.java | 31
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Breadcrumb.java | 115
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BreadcrumbTrailPane.java | 108
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 317
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/DemoCanvas.java | 120
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java | 73
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 53
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 204
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java | 85
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/View.java | 120
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewId.java | 77
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java | 83
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 318
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java | 303
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionEditorView.java | 131
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 220
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleGroupsEditorItem.java | 100
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleResourceGroupSelector.java | 45
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java | 227
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 120
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRolesEditorItem.java | 126
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java | 166
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java | 290
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 128
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 316
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java | 186
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertsView.java | 313
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/SubsystemResourceAlertDataSource.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AlertDefinitionsDataSource.java | 194
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AlertDefinitionsView.java | 69
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/AbstractBundleWizard.java | 87
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java | 103
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java | 114
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreateWizard.java | 86
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleCreateWizard.java | 37
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleSummaryStep.java | 94
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleTypeDropDownSelectItem.java | 103
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java | 195
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java | 267
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java | 168
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/AbstractBundleDeployWizard.java | 144
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/BundleDeployWizard.java | 160
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java | 123
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java | 79
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentInfoStep.java | 99
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentOptionsStep.java | 77
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java | 154
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java | 60
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java | 188
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/PlatformResourceGroupSelector.java | 32
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SinglePlatformResourceGroupSelector.java | 70
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java | 119
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 93
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 314
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java | 180
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/resource/BundleResourceDeploymentDataSource.java | 109
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationDataSource.java | 175
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java | 98
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 238
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java | 125
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 284
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java | 114
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 144
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesWithLatestVersionDataSource.java | 124
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/AbstractBundleRevertWizard.java | 95
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/BundleRevertWizard.java | 58
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java | 170
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/GetRevertInfoStep.java | 108
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/RevertStep.java | 101
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java | 227
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java | 107
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 214
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java | 123
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 96
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/EnhancedListGrid.java | 63
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/FullHTMLPane.java | 35
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java | 40
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SimpleCollapsiblePanel.java | 81
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SubTabLayout.java | 101
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java | 57
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java | 248
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 1004
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ListGridConfigurationEditor.java | 255
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/RadioGroupWithComponentsItem.java | 126
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/MeasurementRangeEditor.java | 123
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java | 194
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java | 59
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSelectedEvent.java | 101
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSelectedHandler.java | 28
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java | 84
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/PropertyGrid.java | 133
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 381
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableAction.java | 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java | 297
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TaggingDataSource.java | 84
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagsChangedCallback.java | 35
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java | 207
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java | 206
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java | 148
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormHandlerCollection.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormImpl.java | 101
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormImplHost.java | 23
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormImplIE6.java | 49
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicFormHandler.java | 33
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicFormSubmitCompleteEvent.java | 54
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java | 116
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java | 44
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java | 33
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 262
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeDataSource.java | 111
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java | 105
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 265
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 138
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/OldDashboardView.java | 265
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalColumn.java | 54
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java | 62
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/Portlet.java | 104
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java | 84
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletSettingsWindow.java | 87
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletView.java | 36
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletViewFactory.java | 28
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 56
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java | 60
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java | 58
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformPortletView.java | 364
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java | 56
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResource.java | 78
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java | 226
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedView.java | 94
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryView.java | 140
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java | 68
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/store/DashboardStore.java | 58
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/store/StoredDashboard.java | 77
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/store/StoredPortlet.java | 109
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java | 110
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertGWTService.java | 65
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java | 79
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AvailabilityGWTService.java | 36
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java | 90
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 34
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java | 38
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 162
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java | 52
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java | 45
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java | 48
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RepoGWTService.java | 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceBossGWTService.java | 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 65
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java | 48
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RoleGWTService.java | 44
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java | 50
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java | 103
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/TagGWTService.java | 60
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 105
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java | 139
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java | 113
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java | 93
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java | 117
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java | 100
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java | 69
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java | 182
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 219
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 159
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSelectListener.java | 29
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java | 56
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 306
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 190
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 331
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 506
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java | 149
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/AlertEditOldStyleView.java | 206
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/AlertEditView.java | 329
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/alert/ResourceAlertHistoryView.java | 51
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java | 114
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java | 64
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java | 159
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 102
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java | 103
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityBarView.java | 171
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java | 150
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java | 309
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/SmallGraphView.java | 394
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java | 130
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java | 144
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java | 113
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java | 164
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationWizard.java | 69
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/ExecutionSchedule.java | 292
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java | 147
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java | 70
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java | 406
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/detail/OperationDetailsView.java | 127
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/overview/ResourceOverviewView.java | 55
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/overview/ResourceSummaryView.java | 190
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java | 221
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 229
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationStep.java | 62
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationTemplateStep.java | 91
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java | 172
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/AbstractSelector.java | 283
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java | 85
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java | 116
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/SelectedResourceDataSource.java | 73
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java | 273
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 254
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java | 266
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java | 115
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 176
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java | 160
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 107
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 145
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java | 476
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java | 156
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java | 178
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestResultsListBox.java | 157
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java | 307
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java | 53
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java | 45
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 176
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java | 48
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java | 51
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 201
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeEvent.java | 47
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java | 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceNames.java | 242
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java | 145
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java | 78
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java | 92
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java | 65
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java | 60
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java | 66
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AvailabilityGWTServiceImpl.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleDistributionFileUploadServlet.java | 76
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleFileUploadServlet.java | 86
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java | 246
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java | 85
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ContentGWTServiceImpl.java | 50
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/FileUploadServlet.java | 184
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java | 72
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java | 86
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java | 78
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RemoteInstallGWTServiceImpl.java | 68
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RepoGWTServiceImpl.java | 47
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceBossGWTServiceImpl.java | 47
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 214
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java | 74
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java | 29
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RoleGWTServiceImpl.java | 63
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SearchGWTServiceImpl.java | 68
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 75
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/TagGWTServiceImpl.java | 86
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java | 61
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 304
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 29
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 185
modules/enterprise/gui/coregui/src/main/webapp/css/search.css | 218
modules/enterprise/gui/coregui/src/main/webapp/images/Favorite_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/Favorite_24_Selected.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/RHQ.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/ajax-loader.gif |binary
modules/enterprise/gui/coregui/src/main/webapp/images/availBar/down.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/availBar/leftCap.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/availBar/rightCap.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/availBar/unknown.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/availBar/up.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Over_end.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Over_start.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_Over_stretch.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_end.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_start.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/back/back_stretch.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/backTwo/back_Over_end.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/backTwo/back_Over_start.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/backTwo/back_Over_stretch.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/backTwo/back_end.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/backTwo/back_start.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/buttons/backTwo/back_stretch.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/header/header_bg.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/header/header_bg_line.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/header/header_bg_selected.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/header/rhq_logo_28px.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/info/icn_info_blue.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/info/icn_info_orange.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/info/icn_info_red.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_down_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_down_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_up_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/Service_up_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/availability_green_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/availability_green_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/availability_grey_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/availability_grey_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/availability_red_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/availability_red_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/availability_yellow_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/availability_yellow_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/dir_closed.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/dir_opened.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_closed.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_down_closed.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_down_opened.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_group_closed.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_group_opened.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/resources/folder_opened.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/rhq_logo_animated_100px.gif |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/arrow-down-gray-no-border.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/arrow-down-white-no-border.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-lower-left-8.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-lower-right-8.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-upper-left-8.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/corner-upper-right-8.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/menu_arrow.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/menu_arrow_down.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/star1.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/star2.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/star3.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/search/trash.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/alert/Alert_HIGH_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/alert/Alert_LOW_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/alert/Alert_MEDIUM_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/alert/Alerts_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_green_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_green_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_grey_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_grey_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_red_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_red_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_yellow_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_yellow_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleDeployment_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleDeployment_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleDestination_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleDestination_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleVersion_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/BundleVersion_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/Bundle_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/Bundle_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/Details_11.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/Ok_11.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/Warning_11.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/bundle/install-loader.gif |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/configure/Configure_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/configure/Configure_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/configure/Configure_failed_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/configure/Configure_grey_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/configure/Configure_ok_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/content/Content_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/content/Content_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/content/Content_cancel_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/content/Content_failed_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/content/Content_grey_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/content/Content_ok_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/control/Operation_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/control/Operation_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/control/Operation_cancel_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/control/Operation_failed_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/control/Operation_grey_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/control/Operation_ok_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_11.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_debug_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_debug_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_debug_multi_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_debug_multi_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_error_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_error_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_error_multi_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_error_multi_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_fatal_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_fatal_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_fatal_multi_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_fatal_multi_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_grey_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_info_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_info_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_info_multi_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_info_multi_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_warning_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_warning_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_warning_multi_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/event/Events_warning_multi_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Inventory_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Inventory_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/Inventory_grey_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/monitor/Monitor_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/monitor/Monitor_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/monitor/Monitor_failed_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/monitor/Monitor_failed_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/monitor/Monitor_grey_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Platform_down_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Platform_down_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Platform_up_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Platform_up_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Server_down_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Server_down_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Server_up_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Server_up_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_down_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_down_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_up_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_up_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/plugin_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/plugin_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/js/search.js | 35
modules/enterprise/gui/installer-war/pom.xml | 647
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java | 57
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java | 73
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java | 2
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java | 118
modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/faces-config.xml | 9
modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/jboss-web.xml | 10
modules/enterprise/gui/installer-war/src/main/webapp/header.jsp | 2
modules/enterprise/gui/installer-war/src/main/webapp/start.jsp | 2
modules/enterprise/gui/pom.xml | 91
modules/enterprise/gui/portal-war/pom.xml | 1194
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/action/navigation/hub/NavigationResourceMapping.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java | 22
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/ListAlertTemplatesUIBean.java | 302
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/config/SystemConfigForm.java | 1540
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/AbstractPluginConfigurationUIBean.java | 97
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/EditPluginConfigurationUIBean.java | 146
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginUIBean.java | 76
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsSessionUIBean.java | 51
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java | 309
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginConfigurationUIBean.java | 153
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/PluginFactory.java | 62
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java | 189
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsAction.java | 89
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsForm.java | 139
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/AddLdapGroupsFormPrepareAction.java | 353
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/RemoveLdapGroupsAction.java | 58
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/RemoveResourceGroupsForm.java | 21
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/RoleAdminPortalAction.java | 18
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/role/ViewAction.java | 22
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/user/RegisterAction.java | 66
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertDefinitionsUIBean.java | 292
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java | 586
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertDefinitionsUIBean.java | 268
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java | 612
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationContextUIBean.java | 124
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/AlertNotificationsUIBean.java | 226
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/common/CustomContentUIBean.java | 111
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/converter/AlertNotificationConverter.java | 57
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/AuthenticateUserAction.java | 37
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java | 99
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/client/RemoteClientServlet.java | 20
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/EnterpriseFacesContextUIBean.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FaceletRedirectionViewHandler.java | 21
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/ServerInfoUIBean.java | 61
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/UserPreferencesUIBean.java | 62
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PageControlView.java | 657
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PagedListDataModel.java | 10
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/ResourceNameDisambiguatingPagedListDataModel.java | 118
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/scheduling/supporting/TimeUnits.java | 78
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/servlet/ChartServlet.java | 940
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/servlet/MetricChartServlet.java | 534
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tabbar/AbstractTabComponent.java | 7
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java | 41
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/time/converter/RelativeDurationConverter.java | 15
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/AbstractConfigurationUIBean.java | 16
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/DatabaseDynamicPropertyRetriever.java | 47
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/history/ListConfigurationUpdateUIBean.java | 6
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/AbstractResourceConfigurationUIBean.java | 47
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationUIBean.java | 531
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/FileUploadComponent.java | 103
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigDirectory.java | 53
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/RawConfigUIBean.java | 124
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationComponent.java | 80
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationDefinitionComponent.java | 48
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationEditor.java | 269
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java | 332
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/test/ViewRawTestConfigurationUIBean.java | 32
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/AdvisoryDetailsUIBean.java | 53
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/AvailableResourceChannelsUIBean.java | 107
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/AvailableResourceReposUIBean.java | 107
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ChannelAssociationsUIBean.java | 130
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ChannelContentSourcesUIBean.java | 109
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ChannelDetailsUIBean.java | 70
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ChannelDisassociationsUIBean.java | 112
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ChannelPackageVersionsUIBean.java | 120
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ChannelResourcesUIBean.java | 111
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ChannelSubscriptionsUIBean.java | 113
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ChannelUnsubscriptionsUIBean.java | 151
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentProviderDetailsUIBean.java | 160
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceCandidateReposUIBean.java | 119
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceChannelsUIBean.java | 108
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceDetailsUIBean.java | 152
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourcePackageVersionsUIBean.java | 67
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceReposUIBean.java | 111
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ContentSourceSyncResultsUIBean.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateChannelUIBean.java | 63
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java | 33
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java | 245
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateRepoUIBean.java | 64
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListChannelsUIBean.java | 109
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListContentSourcesUIBean.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListPackageHistoryUIBean.java | 576
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListPackagesUIBean.java | 410
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ListReposUIBean.java | 149
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/PackageVersionDetailsUIBean.java | 86
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAdvisoryUIBean.java | 74
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoAssociationsUIBean.java | 131
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoContentSourcesUIBean.java | 109
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDetailsUIBean.java | 152
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDisassociationsUIBean.java | 110
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDistributionUIBean.java | 68
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoImportUIBean.java | 162
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java | 120
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoResourcesUIBean.java | 121
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoSubscriptionsUIBean.java | 122
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoUnsubscriptionsUIBean.java | 160
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ResourceChannelsUIBean.java | 107
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ResourceReposUIBean.java | 107
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ResourceUpdatePackageVersionsUIBean.java | 71
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/ShowInstalledPackageHistoryUIBean.java | 3
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/EditGroupDefinitionGeneralPropertiesUIBean.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/GroupDefinitionExpressionBuilderLibraryUIBean.java | 15
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/definition/group/NewGroupDefinitionGeneralPropertiesUIBean.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/download/DownloadServlet.java | 16
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/Chart.java | 2078
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/LineChart.java | 230
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/PerformanceChart.java | 5
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java | 916
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseGroupsUIBean.java | 112
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java | 129
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/InventorySummaryUIBean.java | 95
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ListResourceGroupMembersUIBean.java | 20
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupSummaryUIBean.java | 18
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewConfigurationChildResourceUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java | 107
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/EditGeneralPropertiesUIBean.java | 6
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/FavoritesUIBean.java | 49
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ListChildResourcesUIBean.java | 17
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourcePartialLineageComponent.java | 118
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourcePartialLineageRenderer.java | 88
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceUIBean.java | 53
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/AttrConstants.java | 12
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/ParamConstants.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUserPreferences.java | 10
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUserTrackingFilter.java | 3
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/QuickFavoritesUtil.java | 10
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/events/EventDetailsAction.java | 426
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/VisibilityPortalAction.java | 736
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AckAlertAction.java | 75
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java | 601
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/PortalAction.java | 288
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ReenableAlertDefinitionAction.java | 80
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java | 332
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddOthersAction.java | 57
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddOthersForm.java | 118
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddOthersFormPrepareAction.java | 68
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesAction.java | 84
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesForm.java | 122
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddRolesFormPrepareAction.java | 82
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersAction.java | 86
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersForm.java | 123
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/AddUsersFormPrepareAction.java | 83
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ConditionBean.java | 440
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionForm.java | 1530
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/DefinitionFormPrepareAction.java | 466
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionConditionsAction.java | 220
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionConditionsFormPrepareAction.java | 118
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionAction.java | 250
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionControlActionFormPrepareAction.java | 210
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionPropertiesAction.java | 224
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionPropertiesFormPrepareAction.java | 118
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionSyslogActionAction.java | 91
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/EditDefinitionSyslogActionFormPrepareAction.java | 57
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ListDefinitionsAction.java | 172
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java | 236
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java | 651
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SnmpTrapForm.java | 67
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SnmpTrapFormAction.java | 121
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SnmpTrapFormPrepareAction.java | 81
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/SyslogActionForm.java | 148
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionAction.java | 178
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsAction.java | 124
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsEmailsAction.java | 43
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsRolesAction.java | 43
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionNotificationsUsersAction.java | 43
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionAction.java | 61
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/AvailabilityConverterValidator.java | 102
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/ConditionBeanConverterValidator.java | 66
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/ConverterValidatorManager.java | 224
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/EventsConverterValidator.java | 134
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java | 343
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/OperationConverterValidator.java | 118
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/ResourceConfigurationConverterValidator.java | 86
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/TraitConverterValidator.java | 130
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ListChildrenAction.java | 538
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ResourceVisibilityPortalAction.java | 114
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/TimelineAction.java | 200
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartAction.java | 892
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java | 1584
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/AddGroupResourcesFormPrepareAction.java | 62
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/GroupForm.java | 670
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/GroupHubPortalAction.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/ResourceHubPortalAction.java | 21
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/inventory/ViewResourceAction.java | 230
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/beans/ChartDataBean.java | 80
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/beans/TimelineBean.java | 104
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/criticalalerts/RSSAction.java | 196
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/criticalalerts/ViewAction.java | 162
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/summaryCounts/ViewAction.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java | 17
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/ColumnTag.java | 1080
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MeasurementDataTypeDecorator.java | 120
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/util/MonitorUtils.java | 7
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeModelUIBean.java | 28
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeNode.java | 51
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/group/ResourceGroupTreeStateAdvisor.java | 261
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceSelectUIBean.java | 70
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java | 274
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeNode.java | 63
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeStateAdvisor.java | 413
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/schedule/OperationScheduleDetailsUIBean.java | 222
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/operation/schedule/group/ResourceGroupOperationScheduleDetailsUIBean.java | 208
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/perspectives/PerspectiveUIBean.java | 117
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/ExternalizableStrategyCommandListener.java | 10
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java | 160
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertDefinitionUIBean.java | 99
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java | 48
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemConfigurationUpdateUIBean.java | 25
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemOOBHistoryUIBean.java | 39
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemOperationHistoryUIBean.java | 19
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestConditionalFormUIBean.java | 209
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/test/TestDynamicRenderingUIBean.java | 63
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/EnterpriseFacesContextUtility.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/LookupComponent.java | 127
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/StatisticsUtility.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/WebUtility.java | 5
modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 46
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/messages.properties | 22
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/classes/seam.properties | 6
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/components.xml | 59
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/faces-config.xml | 68
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-components/configuration-components.xml | 91
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-components/inventory-components.xml | 66
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-components/layout-components.xml | 50
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-components/navigation-components.xml | 430
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-components/pagination-components.xml | 54
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-components/sorting-components.xml | 64
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-components/table-components.xml | 116
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-converters/common-converters.xml | 82
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-auto-group/inventory-beans.xml | 14
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-common/availability-beans.xml | 30
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-definition/group-definition-beans.xml | 72
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/inventory-beans.xml | 108
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans-resource-group/operation-beans.xml | 108
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/admin-beans.xml | 74
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/alert-beans.xml | 54
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/autodiscovery-beans.xml | 36
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/configuration-beans.xml | 115
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/content-beans.xml | 461
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/global-beans.xml | 124
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/inventory-beans.xml | 332
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/measurement-beans.xml | 76
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/operation-beans.xml | 104
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/test-beans.xml | 60
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-definition/group-definition-navigation.xml | 122
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation-resource-group/operation-navigation.xml | 220
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/admin-navigation.xml | 106
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/alert-navigation.xml | 269
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/autodiscovery-navigation.xml | 50
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/configuration-navigation.xml | 249
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/content-navigation.xml | 216
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/inventory-navigation.xml | 721
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/test-navigation.xml | 339
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/menu-config.xml | 4
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/pages.xml | 43
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml | 6390
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tags/facelets-components/operation-scheduler.xhtml | 18
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tags/on.component.taglib.xml | 16
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tags/on.function.taglib.xml | 22
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/admin-def.xml | 4
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/events-def.xml | 85
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/resource-common-def.xml | 1050
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/tiles/resource-def.xml | 408
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/validation/validation.xml | 68
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml | 1103
modules/enterprise/gui/portal-war/src/main/webapp/admin/AdminHome.jsp | 6
modules/enterprise/gui/portal-war/src/main/webapp/admin/config/EditServerConfig.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/admin/config/LDAPForm.jsp | 27
modules/enterprise/gui/portal-war/src/main/webapp/admin/config/SNMPForm.jsp | 171
modules/enterprise/gui/portal-war/src/main/webapp/admin/config/ServerConfigForm.jsp | 22
modules/enterprise/gui/portal-war/src/main/webapp/admin/role/AddLdapRoleGroups.jsp | 30
modules/enterprise/gui/portal-war/src/main/webapp/admin/role/RoleLdapGroupsForm.jsp | 263
modules/enterprise/gui/portal-war/src/main/webapp/admin/role/RolePermissionsForm.jsp | 21
modules/enterprise/gui/portal-war/src/main/webapp/admin/role/ViewRole.jsp | 39
modules/enterprise/gui/portal-war/src/main/webapp/admin/test/browser.jsp | 506
modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp | 777
modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp | 24
modules/enterprise/gui/portal-war/src/main/webapp/common/GenericError.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/common/Login.jsp | 6
modules/enterprise/gui/portal-war/src/main/webapp/common/NoRights.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/common/RSSFormat.jsp | 3
modules/enterprise/gui/portal-war/src/main/webapp/css/tabular.css | 3
modules/enterprise/gui/portal-war/src/main/webapp/css/win.css | 85
modules/enterprise/gui/portal-war/src/main/webapp/images/download.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/dir_closed.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/dir_open.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/folder_closed_down_16.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/folder_closed_up_16.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/logo_header.gif |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/logo_header.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/save.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/upload.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/viewfullscreen.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/js/multi-file-edit.js | 248
modules/enterprise/gui/portal-war/src/main/webapp/js/rhq.js | 2
modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/ajax/api/scripts/units.js | 128
modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/api/ext/geochrono/scripts/units.js | 172
modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/api/scripts/ext/japanese-eras.js | 494
modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/api/scripts/l10n/cs/labellers.js | 60
modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/api/scripts/l10n/cs/timeline.js | 18
modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/api/scripts/l10n/se/labellers.js | 8
modules/enterprise/gui/portal-war/src/main/webapp/js/timeline/api/scripts/units.js | 20
modules/enterprise/gui/portal-war/src/main/webapp/portlet/summaryCounts/View.jsp | 20
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlert.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertNotifications.jsp | 41
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertNotificationsOthers.jsp | 11
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertNotificationsRoles.jsp | 11
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertNotificationsUsers.jsp | 11
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/ViewAlertProperties.jsp | 33
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventOthers.jsp | 20
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventRoles.jsp | 44
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AddEventUsers.jsp | 44
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/AlertDefinitionActive.jsp | 10
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/DefinitionOthersForm.jsp | 48
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListOthers.jsp | 25
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListRoles.jsp | 27
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ListUsers.jsp | 30
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/SnmpActionProps.jsp | 34
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinition.jsp | 9
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionConditions.jsp | 6
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionNavigation.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionNotifications.jsp | 73
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionNotificationsTabs.jsp | 59
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionProperties.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSenders.jsp | 61
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSyslogAction.jsp | 45
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/ViewDefinitionSyslogActionBox.jsp | 13
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp | 4
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp | 6
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp | 4
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp | 4
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp | 4
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/visibility/ChartLayout.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/resource/group/inventory/AddResourcesForm.jsp | 3
modules/enterprise/gui/portal-war/src/main/webapp/resource/hub/GroupHub.jsp | 738
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/downloads-body.xhtml | 101
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/largeenv.xhtml | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/listAlertTemplates.xhtml | 28
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-config.xhtml | 149
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-details.xhtml | 212
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-add-map.xhtml | 32
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-map.xhtml | 57
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-update-map.xhtml | 33
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit-view-map.xhtml | 26
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-edit.xhtml | 68
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/plugin/plugin-list.xhtml | 180
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/report/resourceInstallReport-body.xhtml | 93
modules/enterprise/gui/portal-war/src/main/webapp/rhq/admin/report/resourceInstallReport.xhtml | 8
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/alert/notification/details.xhtml | 194
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/error.xhtml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/events/history-plain.xhtml | 257
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml | 39
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/core-perspective-menu.xhtml | 326
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 224
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menuitem.xhtml | 260
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/metric/advanced.xhtml | 6
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/tables-plain.xhtml | 168
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml | 35
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/advisoryInfo.xhtml | 147
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/channel.xhtml | 506
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/channelAssociations.xhtml | 311
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/channelSubscriptions.xhtml | 301
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-add-map.xhtml | 68
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-edit-map.xhtml | 69
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-view-map.xhtml | 68
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider.xhtml | 522
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentSource-add-map.xhtml | 68
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentSource-edit-map.xhtml | 69
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentSource-view-map.xhtml | 68
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentSource.xhtml | 543
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createChannel.xhtml | 74
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-add-map.xhtml | 67
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-edit-map.xhtml | 68
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider.xhtml | 162
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentSource-add-map.xhtml | 67
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentSource-edit-map.xhtml | 68
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentSource.xhtml | 162
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createRepo.xhtml | 74
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos.xhtml | 126
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listChannels.xhtml | 167
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders.xhtml | 189
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentSources.xhtml | 189
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos.xhtml | 176
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/packageVersion.xhtml | 18
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml | 838
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations.xhtml | 298
modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions.xhtml | 316
modules/enterprise/gui/portal-war/src/main/webapp/rhq/definition/group/library.xhtml | 1
modules/enterprise/gui/portal-war/src/main/webapp/rhq/definition/group/list.xhtml | 22
modules/enterprise/gui/portal-war/src/main/webapp/rhq/definition/layout/main.xhtml | 8
modules/enterprise/gui/portal-war/src/main/webapp/rhq/discovery/queue.xhtml | 1
modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml | 23
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/alert/listGroupAlertDefinitions.xhtml | 22
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/view.xhtml | 37
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/layout/summary.xhtml | 483
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/navigation/GroupTree.xhtml | 33
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml | 221
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml | 221
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main-picker.xhtml | 73
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml | 97
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/resourcePicker.xhtml | 210
modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main-layout.xhtml | 460
modules/enterprise/gui/portal-war/src/main/webapp/rhq/layout/main.xhtml | 6
modules/enterprise/gui/portal-war/src/main/webapp/rhq/perspective/main.xhtml | 42
modules/enterprise/gui/portal-war/src/main/webapp/rhq/perspective/resource.xhtml | 37
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertDefinitions.xhtml | 28
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/alert/listAlertHistory.xhtml | 71
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/add-map.xhtml | 6
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit-map.xhtml | 6
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml | 199
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/error-window.xhtml | 41
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml | 150
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/structured.xhtml | 28
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/upload-modal.xhtml | 57
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view-map.xhtml | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view-raw-modal.xhtml | 59
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml | 155
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create.xhtml | 254
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/deploy-plain.xhtml | 148
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/deploy.xhtml | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/file-upload.xhtml | 49
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-plain.xhtml | 363
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml | 157
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription-plain.xhtml | 259
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription.xhtml | 528
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages.xhtml | 6
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/update.xhtml | 154
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/view-plain.xhtml | 170
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-file-upload.xhtml | 52
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-package-1.xhtml | 233
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/view.xhtml | 1560
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/layout/main-no-leftnav.xhtml | 145
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/layout/main.xhtml | 72
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/availabilityHistory-plain.xhtml | 200
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/schedules-plain.xhtml | 172
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/traits-plain.xhtml | 105
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/navigation/ResourcesTree.xhtml | 49
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/overview-plain.xhtml | 69
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/table/recentOOBs.xhtml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/timeline-plain.xhtml | 53
modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertDefinitions.xhtml | 84
modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/alertHistory.xhtml | 70
modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/configurationUpdate.xhtml | 36
modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/oobHistory.xhtml | 26
modules/enterprise/gui/portal-war/src/main/webapp/rhq/subsystem/operationHistory.xhtml | 38
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/config/edit-raw-config.xhtml | 31
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/config/raw/edit.html | 30
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/config/raw/isolate.xhtml | 33
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/config/raw/isolate.xhtml~ | 52
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/config/raw/view.html | 32
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/config/view-raw-config.xhtml | 52
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/dynamicForm.xhtml | 82
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/rerender/child-1.xhtml | 16
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/rerender/child-2.xhtml | 16
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/rerender/child-3.xhtml | 16
modules/enterprise/gui/portal-war/src/main/webapp/rhq/test/rerender/index.xhtml | 69
modules/enterprise/gui/portal-war/src/main/webapp/test/gwt/facelet.xhtml | 46
modules/enterprise/gui/portal-war/src/main/webapp/test/gwt/simple.html | 36
modules/enterprise/gui/portal-war/src/main/webapp/test/iframe/inner.xhtml | 36
modules/enterprise/gui/portal-war/src/main/webapp/test/iframe/outer.xhtml | 28
modules/enterprise/gui/portal-war/src/main/webapp/test/menu/menu.xhtml | 13
modules/enterprise/gui/portal-war/src/test/groovy/org/rhq/enterprise/gui/util/LookupComponentTest.groovy | 92
modules/enterprise/gui/portal-war/src/test/resources/log4j.xml | 51
modules/enterprise/gui/webdav-war/pom.xml | 596
modules/enterprise/pom.xml | 149
modules/enterprise/remoting/cli/pom.xml | 706
modules/enterprise/remoting/cli/src/etc/build.xml | 2
modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.bat | 2
modules/enterprise/remoting/cli/src/etc/generate-jaxb-client-types.sh | 2
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientI18NResourceKeys.java | 102
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java | 1228
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMainWebServices.java | 756
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/InteractiveJavascriptCompletor.java | 168
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/RemoteClient.java | 474
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java | 219
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/TabularWriter.java | 218
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java | 18
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/utility/ConfigurationClassBuilder.java | 82
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/utility/ScriptUtil.java | 20
modules/enterprise/remoting/cli/src/main/scripts/rhq-client.assembly.xml | 2
modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml | 2
modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/ClientMainTest.java | 64
modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java | 4
modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/utility/ScriptAssertTest.java | 17
modules/enterprise/remoting/client-api/pom.xml | 259
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java | 559
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java | 220
modules/enterprise/remoting/pom.xml | 99
modules/enterprise/remoting/scripts/README.txt | 31
modules/enterprise/remoting/scripts/pom.xml | 110
modules/enterprise/remoting/scripts/src/main/java/org/rhq/enterprise/remoting/cli/ScriptTest.java | 64
modules/enterprise/remoting/scripts/src/main/java/org/rhq/enterprise/remoting/cli/ScriptTestRunner.java | 200
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_ChannelManager.js | 508
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_ConfigurationManager.js | 185
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_DataAccessManager.js | 62
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_EventManager.js | 144
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_MeasurementDefinitionManager.js | 77
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_MeasurementScheduleManager.js | 150
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_OperationManager.js | 211
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_ResourceGroupManager.js | 163
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_ResourceManager.js | 199
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_ResourceTypeManager.js | 80
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_RoleManager.js | 84
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_SubjectManager.js | 110
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_SystemManager.js | 44
modules/enterprise/remoting/scripts/src/test/script/org/rhq/enterprise/remoting/cli/test_alerts.js | 235
modules/enterprise/remoting/webservices/pom.xml | 490
modules/enterprise/remoting/webservices/src/main/scripts/rhq-client.build.xml | 438
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/TestRemoteInterface.java | 60
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsChannelManagerTest.java | 574
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsRepoManagerTest.java | 577
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsResourceManagerTest.java | 656
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsSubjectTest.java | 2
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsAdvisoryManagerTest.java | 118
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsDistributionManagerTest.java | 90
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsRegistrationManagerTest.java | 76
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/WsUnitTestBase.java | 72
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/util/WsResourceUtility.java | 115
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/test/util/WsSubjectUtility.java | 153
modules/enterprise/server/container-lib/pom.xml | 13
modules/enterprise/server/container-lib/src/main/java/org/rhq/jbossatx/jta/recovery/AppServerJDBCXARecovery.java | 144
modules/enterprise/server/container/pom.xml | 728
modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.bat | 121
modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.sh | 165
modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf | 2
modules/enterprise/server/container/src/main/license/license.xml | 26
modules/enterprise/server/container/src/main/resources/alert-scripts/README.txt | 2
modules/enterprise/server/container/src/main/resources/alert-scripts/example.rb | 16
modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/login-config.xml | 22
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jboss-web.deployer/server.xml | 3
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.h2.rej | 9
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.oracle.rej | 13
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.postgres.rej | 9
modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-ds.xml.sqlserver.rej | 9
modules/enterprise/server/container/src/main/resources/plugins/README.txt | 7
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 1804
modules/enterprise/server/ear/pom.xml | 1287
modules/enterprise/server/ear/src/main/license/license.xml | 26
modules/enterprise/server/ear/src/main/resources/product-plugin-service.xml | 10
modules/enterprise/server/ear/src/main/resources/server-comm-configuration.xml | 934
modules/enterprise/server/jar/pom.xml | 1228
modules/enterprise/server/jar/src/main/antlr3/org/rhq/enterprise/server/search/RHQL.g | 167
modules/enterprise/server/jar/src/main/java/META-INF/MANIFEST.MF | 42
modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementConverter.java | 355
modules/enterprise/server/jar/src/main/java/org/rhq/core/server/MeasurementParser.java | 104
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java | 239
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/agentclient/AgentClient.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/agentclient/impl/AgentClientImpl.java | 16
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionLogManagerBean.java | 604
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionLogManagerLocal.java | 116
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java | 305
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerLocal.java | 92
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDampeningManagerBean.java | 470
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDampeningManagerLocal.java | 82
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionException.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 1349
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java | 162
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 2001
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerLocal.java | 228
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 742
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java | 169
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java | 635
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerLocal.java | 107
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java | 773
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerLocal.java | 110
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/SnmpTrapSender.java | 789
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerBean.java | 203
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerLocal.java | 186
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheCoordinator.java | 57
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/jms/AlertConditionConsumerBean.java | 208
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitor.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitorMBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java | 21
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 82
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java | 508
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerRemote.java | 325
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java | 20
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RequiredPermissionsInterceptor.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 139
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerLocal.java | 25
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerRemote.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleDistributionInfo.java | 80
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 1209
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerHelper.java | 34
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerLocal.java | 177
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java | 363
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java | 112
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/RecipeParseResults.java | 75
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java | 15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java | 19
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/PartitionEventManagerBean.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerBean.java | 66
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StatusManagerLocal.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerBean.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/common/EntityManagerFacadeLocal.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 212
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 50
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationUpdateNotSupportedException.java | 42
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/DynamicConfigurationPropertyBean.java | 84
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/DynamicConfigurationPropertyLocal.java | 46
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/PropertyExpressionEvaluator.java | 81
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/TranslationNotSupportedException.java | 48
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationDefinitionUpdateReport.java | 54
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java | 139
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerLocal.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryException.java | 45
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerBean.java | 353
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerLocal.java | 183
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerRemote.java | 214
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ChannelException.java | 40
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ChannelManagerBean.java | 527
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ChannelManagerLocal.java | 177
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ChannelManagerRemote.java | 185
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 3133
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java | 246
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java | 691
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentServerServiceImpl.java | 293
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java | 4019
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java | 1110
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentUIManagerBean.java | 862
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentUIManagerLocal.java | 490
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionException.java | 45
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerBean.java | 244
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerLocal.java | 107
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DistributionManagerRemote.java | 121
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/DummyLoader.java | 63
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerBean.java | 38
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerLocal.java | 25
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/EntitlementStuffManagerRemote.java | 29
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoException.java | 65
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java | 1132
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java | 380
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerRemote.java | 300
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/metadata/ContentSourceMetadataManagerBean.java | 19
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java | 17
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java | 46
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java | 28
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java | 27
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentService.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/EmailManagerBean.java | 33
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/EmailManagerLocal.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerConfiguration.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java | 54
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginDeploymentScanner.java | 694
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginDeploymentScannerMBean.java | 91
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginScanner.java | 600
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScanner.java | 260
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScannerMBean.java | 122
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java | 24
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java | 567
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 1530
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java | 27
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java | 67
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/entitlement/EntitlementManagerBean.java | 118
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/entitlement/EntitlementManagerLocal.java | 29
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java | 19
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/LdapCommunicationException.java | 47
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/exception/LdapFilterException.java | 45
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java | 80
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerLocal.java | 50
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java | 50
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHFileSend.java | 149
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHInstallUtility.java | 351
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/WebServiceTypeAdapter.java | 102
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LRES.java | 488
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LicenseTag.java | 214
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/license/LicenseTermTag.java | 166
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java | 746
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java | 24
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java | 25
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementCompressionManagerBean.java | 842
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 1719
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java | 292
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java | 13
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementProblemManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 262
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/uibean/MetricDisplayValue.java | 162
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java | 1535
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/CancelJobException.java | 44
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/GroupOperationJob.java | 13
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/GroupOperationSchedule.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 3648
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationSchedule.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/ResourceOperationJob.java | 73
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/Extension.java | 92
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/MenuItem.java | 90
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PageLink.java | 48
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveCacheService.java | 152
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveException.java | 40
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerBean.java | 488
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerHelper.java | 42
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerLocal.java | 110
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveManagerRemote.java | 184
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveTarget.java | 108
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/RenderedExtension.java | 53
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/Tab.java | 84
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/AbstractGlobalActivator.java | 33
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/AbstractResourceOrGroupActivator.java | 33
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/Activator.java | 37
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/ActivatorHelper.java | 269
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/FacetActivator.java | 39
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/GlobalPermissionActivator.java | 39
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/InventoryActivator.java | 74
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/LicenseFeature.java | 26
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/LicenseFeatureActivator.java | 40
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/ResourceConditionSet.java | 85
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/ResourcePermissionActivator.java | 39
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/ResourceTypeActivator.java | 82
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/SuperuserActivator.java | 34
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/TraitActivator.java | 48
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/AbstractResourceOrGroupActivationContext.java | 54
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/ActivationContext.java | 30
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/ActivationContextScope.java | 35
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/GlobalActivationContext.java | 90
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/GroupActivationContext.java | 97
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/perspective/activator/context/ResourceActivationContext.java | 94
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java | 678
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java | 270
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/content/ContentSourceAdapterManager.java | 577
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/content/ContentSourcePluginClassLoader.java | 219
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/content/ContentSourcePluginContainer.java | 233
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/content/ContentSourcePluginContainerConfiguration.java | 68
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/content/ContentSourcePluginEnvironment.java | 248
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/content/ContentSourcePluginManager.java | 208
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/content/ContentSourcePluginService.java | 127
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/content/ContentSourcePluginServiceManagement.java | 82
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractJobWrapper.java | 285
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java | 493
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ClassLoaderManager.java | 254
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ConcurrentJobWrapper.java | 34
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ControlFacet.java | 43
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ControlResults.java | 104
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java | 570
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainerConfiguration.java | 99
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/RootServerPluginClassLoader.java | 148
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ScheduledJobInvocationContext.java | 71
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java | 218
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginComponent.java | 70
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginContext.java | 124
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginEnvironment.java | 75
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java | 567
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginService.java | 155
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginServiceManagement.java | 110
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginType.java | 106
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginValidator.java | 59
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginValidatorUtil.java | 310
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/StatefulJobWrapper.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertPluginValidator.java | 91
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java | 112
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSenderInfo.java | 84
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSenderPluginManager.java | 264
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertServerPluginContainer.java | 48
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/CustomAlertSenderBackingBean.java | 160
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundlePluginValidator.java | 59
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginContainer.java | 52
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginFacet.java | 65
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/BundleServerPluginManager.java | 246
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/bundle/UnknownRecipeException.java | 55
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisoryBugDetails.java | 40
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisoryCVEDetails.java | 43
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisoryDetails.java | 186
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisoryPackageDetails.java | 94
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisorySource.java | 47
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AdvisorySyncReport.java | 75
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentPluginValidator.java | 30
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProvider.java | 76
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManager.java | 857
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderPackageDetails.java | 76
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderPackageDetailsKey.java | 119
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginContainer.java | 301
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentServerPluginManager.java | 119
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/DistributionDetails.java | 147
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/DistributionFileDetails.java | 83
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/DistributionSource.java | 65
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/DistributionSyncReport.java | 77
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/InitializationException.java | 44
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageSource.java | 63
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageSyncReport.java | 123
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoDetails.java | 141
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoGroupDetails.java | 114
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoImportReport.java | 65
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/RepoSource.java | 44
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/SyncException.java | 35
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/SyncProgressWeight.java | 126
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/SyncTracker.java | 138
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ThreadUtil.java | 17
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/metadata/ContentSourcePluginMetadataManager.java | 203
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/AdvisorySourceSynchronizer.java | 174
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/DistributionSourceSynchronizer.java | 158
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/PackageSourceSynchronizer.java | 269
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/RepoSourceSynchronizer.java | 86
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/entitlement/EntitlementPluginValidator.java | 37
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/entitlement/EntitlementServerPluginContainer.java | 50
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/entitlement/EntitlementServerPluginManager.java | 51
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/generic/GenericPluginValidator.java | 30
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/generic/GenericServerPluginContainer.java | 43
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/perspective/PerspectivePluginValidator.java | 30
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/perspective/PerspectiveServerPluginContainer.java | 50
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/perspective/PerspectiveServerPluginManager.java | 260
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/perspective/metadata/PerspectivePluginMetadataManager.java | 513
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationException.java | 38
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerBean.java | 243
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerLocal.java | 52
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/RegistrationManagerRemote.java | 52
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/registration/ReleaseRepoMapping.java | 76
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteWsInvocationHandler.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/InventorySummary.java | 114
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAvailabilityManagerBean.java | 332
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAvailabilityManagerLocal.java | 166
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceBossBean.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceBossLocal.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 1176
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerLocal.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 4310
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java | 909
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerRemote.java | 262
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java | 110
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerLocal.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 425
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerLocal.java | 53
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 2705
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerLocal.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 1327
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerLocal.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/framework/ExpressionEvaluator.java | 2343
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 616
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerLocal.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedScheduler.java | 156
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedSchedulerImpl.java | 499
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerBean.java | 100
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerLocal.java | 129
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerService.java | 17
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerServiceMBean.java | 13
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/AsyncResourceDeleteJob.java | 33
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentProviderSyncJob.java | 254
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/ContentSourceSyncJob.java | 289
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/RepoSyncJob.java | 231
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java | 102
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java | 121
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerLocal.java | 31
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerRemote.java | 119
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/antlr/RHQLNode.java | 11
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/antlr/RHQLNodeAdaptor.java | 34
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java | 148
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java | 81
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java | 136
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistant.java | 21
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistantFactory.java | 19
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java | 590
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java | 291
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/AbstractSearchTranslator.java | 116
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java | 67
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java | 76
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslator.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslatorFactory.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLAdvancedTerm.java | 39
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLComparisonOperator.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLSimpleTerm.java | 13
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLTerm.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/antlr/RHQLTreeOperator.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/jpql/SearchFragment.java | 20
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/jpql/SearchFragmentType.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/subsystem/AlertSubsystemManagerBean.java | 35
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/subsystem/ConfigurationSubsystemManagerBean.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/subsystem/OperationHistorySubsystemManagerBean.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/support/SupportManagerBean.java | 13
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 25
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/tagging/TagManagerBean.java | 242
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/tagging/TagManagerLocal.java | 33
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/tagging/TagManagerRemote.java | 64
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/AccessBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/CoreTestBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/DiscoveryTestBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 658
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryRunner.java | 88
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/HibernatePerformanceMonitor.java | 48
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/HibernateStatisticsStopWatch.java | 34
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 1272
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/MethodUtil.java | 96
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/QueryUtility.java | 132
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java | 16
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java | 409
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesRemote.java | 15
modules/enterprise/server/jar/src/main/resources/perspectives/admin.xml | 5
modules/enterprise/server/jar/src/main/resources/perspectives/content.xml | 29
modules/enterprise/server/jar/src/main/resources/perspectives/middleware.xml | 5
modules/enterprise/server/jar/src/main/resources/perspectives/root.xml | 5
modules/enterprise/server/jar/src/main/resources/single-line-rhql.txt | 91
modules/enterprise/server/jar/src/test/java/javax/ejb/EJBTransactionRolledbackException.java | 58
modules/enterprise/server/jar/src/test/java/org/rhq/core/domain/util/units/test/MeasurementConverterTest.java | 390
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java | 327
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/auth/test/SubjectManagerBeanTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java | 101
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/RoleManagerBeanTest.java | 28
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java | 1070
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java | 240
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginServiceMBean.java | 24
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java | 105
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java | 570
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/DynamicConfigurationPropertyBeanTest.java | 168
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBeanTest.java | 173
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/metadata/test/ContentSourcePluginHandlingTest.java | 50
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/metadata/test/TestBase.java | 36
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/AdvisoryManagerBeanTest.java | 149
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ChannelManagerBeanTest.java | 64
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java | 3445
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentSourceManagerBeanTest.java | 294
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanEligiblePackagesTest.java | 103
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java | 22
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/DistributionManagerBeanTest.java | 91
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/QuartzScheduleFormatTest.java | 55
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/RepoManagerBeanTest.java | 496
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java | 271
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java | 20
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/test/DiscoveryBossBeanTest.java | 17
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/event/test/EventManagerTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 3
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java | 4
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java | 3
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java | 418
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/perspective/test/PerspectiveManagerBeanTest.java | 69
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/ServerPluginsBeanTest.java | 420
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java | 310
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java | 309
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentSourcePackageDetailsKeyTest.java | 69
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentProvider.java | 347
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java | 168
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginServiceMBean.java | 24
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/GenericServerPluginTest.java | 204
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java | 219
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginServiceMBean.java | 24
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestLifecycleListener.java | 91
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/registration/test/RegistrationBeanTest.java | 113
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/definition/framework/test/ExpressionEvaluatorTest.java | 209
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java | 3
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/PluginDescriptorValidationTest.java | 238
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/SubcategoryTest.java | 18
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java | 836
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateEventsSubsystemTest.java | 143
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java | 296
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateNativesSubsystemTest.java | 71
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateOperationsSubsystemTest.java | 130
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java | 466
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java | 159
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java | 210
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java | 3
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java | 4
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java | 9
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/RepoSyncJobTest.java | 117
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/search/GenericSearchAssistTest.java | 92
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/search/RHQLTest.java | 173
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/search/TestAutoCompletionManager.java | 73
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 62
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java | 44
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestContentSourcePluginService.java | 164
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestContentSourcePluginServiceMBean.java | 24
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/ResourceTreeHelper.java | 3
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java | 3
modules/enterprise/server/jar/src/test/resources/ejb3-interceptors-aop.xml | 718
modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml | 486
modules/enterprise/server/jar/src/test/resources/jboss-jms-beans.xml | 406
modules/enterprise/server/jar/src/test/resources/jndi.properties | 2
modules/enterprise/server/jar/src/test/resources/log4j.xml | 109
modules/enterprise/server/jar/src/test/resources/logging/log4j.properties | 34
modules/enterprise/server/jar/src/test/resources/login-config.xml | 126
modules/enterprise/server/jar/src/test/resources/security-beans.xml | 26
modules/enterprise/server/jar/src/test/resources/serverplugins/simple-generic-serverplugin.xml | 17
modules/enterprise/server/jar/src/test/resources/test-assist-color-number.txt | 46
modules/enterprise/server/jar/src/test/resources/test-scheduler.properties | 56
modules/enterprise/server/jar/src/test/resources/test/all_no_tx_ds.xml | 194
modules/enterprise/server/jar/src/test/resources/test/app_auth_type_ds.xml | 64
modules/enterprise/server/jar/src/test/resources/test/container_and_app_auth_type_ds.xml | 64
modules/enterprise/server/jar/src/test/resources/test/container_auth_type_ds.xml | 64
modules/enterprise/server/jar/src/test/resources/test/generic_ds.xml | 132
modules/enterprise/server/jar/src/test/resources/test/hsqldb_ds.xml | 212
modules/enterprise/server/jar/src/test/resources/test/hsqldb_encrypted_ds.xml | 250
modules/enterprise/server/jar/src/test/resources/test/informix_ds.xml | 68
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml | 12
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml | 12
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml | 26
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml | 26
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml | 26
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/constraint.xml | 46
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/constraintMinMax.xml | 32
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml | 52
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml | 76
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml | 86
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/propertyList-simple.xml | 30
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/propertyList-v1.xml | 90
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/propertyList-v2.xml | 120
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/propertyMap-v1.xml | 68
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/propertyMap-v2.xml | 96
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/update5-v1_0.xml | 166
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/update5-v2_0.xml | 190
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml | 26
modules/enterprise/server/jar/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml | 26
modules/enterprise/server/jar/src/test/resources/test/metadata/content-source-update-v1.xml | 10
modules/enterprise/server/jar/src/test/resources/test/metadata/content-source-update-v2.xml | 10
modules/enterprise/server/jar/src/test/resources/test/metadata/events/event1-1.xml | 18
modules/enterprise/server/jar/src/test/resources/test/metadata/events/event1-2.xml | 18
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml | 24
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml | 18
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v1_0.xml | 28
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update-v2_0.xml | 40
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update6-1.xml | 22
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update6-2.xml | 22
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update7-1.xml | 18
modules/enterprise/server/jar/src/test/resources/test/metadata/measurement/update7-2.xml | 18
modules/enterprise/server/jar/src/test/resources/test/metadata/natives/update5-v1_0.xml | 166
modules/enterprise/server/jar/src/test/resources/test/metadata/natives/update5-v2_0.xml | 190
modules/enterprise/server/jar/src/test/resources/test/metadata/operation/operation1-1.xml | 16
modules/enterprise/server/jar/src/test/resources/test/metadata/operation/operation2-1.xml | 16
modules/enterprise/server/jar/src/test/resources/test/metadata/operation/operation2-2.xml | 16
modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml | 12
modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update2-v1_0.xml | 30
modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update2-v2_0.xml | 30
modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v1_0.xml | 32
modules/enterprise/server/jar/src/test/resources/test/metadata/resource-type/update4-v2_0.xml | 22
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/illegal-subcat-1.xml | 24
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/nested-subcat-2children.xml | 30
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml | 32
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml | 40
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml | 36
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml | 28
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml | 28
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml | 28
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/no-subcat.xml | 18
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml | 24
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml | 24
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml | 24
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml | 24
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/services-v1_0.xml | 24
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/services-v2_0.xml | 22
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/test-subcategories.xml | 50
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/test-subcategories2.xml | 50
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/test-subcategories3.xml | 66
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/two-subcat.xml | 24
modules/enterprise/server/jar/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml | 40
modules/enterprise/server/jar/src/test/resources/test/minimal_hsqldb_ds.xml | 48
modules/enterprise/server/jar/src/test/resources/test/msaccess_ds.xml | 64
modules/enterprise/server/jar/src/test/resources/test/no_auth_type_ds.xml | 64
modules/enterprise/server/jar/src/test/resources/test/oracle_xa_2_ds.xml | 88
modules/enterprise/server/jar/src/test/resources/test/oracle_xa_3_ds.xml | 86
modules/enterprise/server/jar/src/test/resources/test/oracle_xa_4_ds.xml | 84
modules/enterprise/server/jar/src/test/resources/test/oracle_xa_5_ds.xml | 80
modules/enterprise/server/jar/src/test/resources/test/oracle_xa_ds.xml | 88
modules/enterprise/server/jar/src/test/resources/test/too_many_ds.xml | 212
modules/enterprise/server/jar/src/test/resources/test/xpath_processor_test.xml | 82
modules/enterprise/server/jar/src/test/resources/testng.xml | 24
modules/enterprise/server/jar/src/test/resources/transform/template_ds.xml | 10
modules/enterprise/server/jar/src/test/resources/validation/datasourceResources.properties | 284
modules/enterprise/server/jar/src/test/resources/validation/datasource_validation.xml | 316
modules/enterprise/server/jar/src/test/resources/validation/default_validator_rules.xml | 92
modules/enterprise/server/license-gen/jar/pom.xml | 6
modules/enterprise/server/license-gen/maven-plugin/pom.xml | 6
modules/enterprise/server/license-gen/maven-plugin/src/main/scripts/license.build.xml | 144
modules/enterprise/server/license-gen/maven-plugin/src/main/scripts/license.mojos.xml | 64
modules/enterprise/server/plugins/alert-email/pom.xml | 135
modules/enterprise/server/plugins/alert-email/src/main/java/org/rhq/enterprise/server/plugins/alertEmail/EmailSender.java | 53
modules/enterprise/server/plugins/alert-email/src/main/resources/META-INF/rhq-serverplugin.xml | 30
modules/enterprise/server/plugins/alert-irc/pom.xml | 190
modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcAlertComponent.java | 173
modules/enterprise/server/plugins/alert-irc/src/main/java/org/rhq/enterprise/server/plugins/alertIrc/IrcSender.java | 72
modules/enterprise/server/plugins/alert-irc/src/main/resources/META-INF/rhq-serverplugin.xml | 49
modules/enterprise/server/plugins/alert-microblog/pom.xml | 190
modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java | 82
modules/enterprise/server/plugins/alert-microblog/src/main/resources/META-INF/rhq-serverplugin.xml | 39
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 121
modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobiKind.java | 30
modules/enterprise/server/plugins/alert-mobicents/src/main/java/org/rhq/enterprise/server/plugins/alertMobicents/MobicentsSender.java | 170
modules/enterprise/server/plugins/alert-mobicents/src/main/resources/META-INF/rhq-serverplugin.xml | 55
modules/enterprise/server/plugins/alert-operations/pom.xml | 194
modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/AlertTokenReplacer.java | 233
modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationInfo.java | 251
modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsBackingBean.java | 379
modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java | 98
modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/PrintTokens.java | 90
modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/Token.java | 131
modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/TokenClass.java | 64
modules/enterprise/server/plugins/alert-operations/src/main/resources/META-INF/rhq-serverplugin.xml | 32
modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml | 79
modules/enterprise/server/plugins/alert-operations/src/main/token2confluence.xsl | 28
modules/enterprise/server/plugins/alert-operations/src/test/java/org/rhq/enterprise/server/plugins/alertOperations/TokenReplacementTest.java | 194
modules/enterprise/server/plugins/alert-operations/tokens.xml | 137
modules/enterprise/server/plugins/alert-roles/pom.xml | 148
modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesBackingBean.java | 95
modules/enterprise/server/plugins/alert-roles/src/main/java/org/rhq/enterprise/server/plugins/alertRoles/RolesSender.java | 113
modules/enterprise/server/plugins/alert-roles/src/main/resources/META-INF/rhq-serverplugin.xml | 32
modules/enterprise/server/plugins/alert-roles/src/main/resources/roles.xhtml | 24
modules/enterprise/server/plugins/alert-scriptlang/pom.xml | 151
modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangComponent.java | 70
modules/enterprise/server/plugins/alert-scriptlang/src/main/java/org.rhq.enterprise.server.plugins.alertScriptlang/ScriptLangSender.java | 111
modules/enterprise/server/plugins/alert-scriptlang/src/main/resources/META-INF/rhq-serverplugin.xml | 53
modules/enterprise/server/plugins/alert-scriptlang/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory | 1
modules/enterprise/server/plugins/alert-sms/README.txt | 34
modules/enterprise/server/plugins/alert-sms/pom.xml | 200
modules/enterprise/server/plugins/alert-sms/src/main/java/org/rhq/enterprise/server/plugins/alertSms/SmsSender.java | 218
modules/enterprise/server/plugins/alert-sms/src/main/resources/META-INF/rhq-serverplugin.xml | 41
modules/enterprise/server/plugins/alert-sms/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers | 17
modules/enterprise/server/plugins/alert-sms/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate | 1
modules/enterprise/server/plugins/alert-snmp/pom.xml | 156
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java | 45
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java | 84
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java | 794
modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml | 79
modules/enterprise/server/plugins/alert-subject/pom.xml | 134
modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsBackingBean.java | 96
modules/enterprise/server/plugins/alert-subject/src/main/java/org/rhq/enterprise/server/plugins/alertSubject/SubjectsSender.java | 110
modules/enterprise/server/plugins/alert-subject/src/main/resources/META-INF/rhq-serverplugin.xml | 35
modules/enterprise/server/plugins/alert-subject/src/main/resources/subjects.xhtml | 24
modules/enterprise/server/plugins/ant-bundle/pom.xml | 214
modules/enterprise/server/plugins/ant-bundle/src/main/java/org/rhq/enterprise/server/plugins/ant/AntBundleServerPluginComponent.java | 248
modules/enterprise/server/plugins/ant-bundle/src/main/resources/META-INF/rhq-serverplugin.xml | 20
modules/enterprise/server/plugins/cobbler/pom.xml | 173
modules/enterprise/server/plugins/cobbler/src/main/java/org/rhq/enterprise/server/plugins/cobbler/CobblerServerPluginComponent.java | 445
modules/enterprise/server/plugins/cobbler/src/main/resources/META-INF/rhq-serverplugin.xml | 81
modules/enterprise/server/plugins/disk/pom.xml | 275
modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java | 212
modules/enterprise/server/plugins/disk/src/main/resources/META-INF/rhq-serverplugin-content.xml | 33
modules/enterprise/server/plugins/disk/src/main/resources/META-INF/rhq-serverplugin.xml | 58
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 201
modules/enterprise/server/plugins/filetemplate-bundle/src/main/java/org/rhq/enterprise/server/plugins/filetemplate/BundleServerPluginComponent.java | 273
modules/enterprise/server/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-serverplugin.xml | 28
modules/enterprise/server/plugins/jboss-software/pom.xml | 153
modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/JBossSoftwareContentSourceAdapter.java | 275
modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java | 302
modules/enterprise/server/plugins/jboss-software/src/main/resources/META-INF/rhq-serverplugin.xml | 49
modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/test/JBossSoftwareContentSourceAdapterLiveTest.java | 199
modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/test/RssFeedParserTest.java | 178
modules/enterprise/server/plugins/jboss-software/src/test/resources/log4j.xml | 32
modules/enterprise/server/plugins/jboss-software/src/test/resources/rss-feed-example-1.txt |45481 +++++
modules/enterprise/server/plugins/jboss-software/src/test/resources/rss-feed-example-2.txt |45481 +++++
modules/enterprise/server/plugins/jboss-software/src/test/resources/rss-feed-example-3.txt |82206 ++++++++++
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 100
modules/enterprise/server/plugins/perspectives/core/perspective/src/main/resources/META-INF/rhq-serverplugin.xml | 913
modules/enterprise/server/plugins/perspectives/core/pom.xml | 41
modules/enterprise/server/plugins/perspectives/policy/app/pom.xml | 94
modules/enterprise/server/plugins/perspectives/policy/app/src/main/java/org/rhq/enterprise/server/perspective/policy/BundleDetailsUIBean.java | 157
modules/enterprise/server/plugins/perspectives/policy/app/src/main/java/org/rhq/enterprise/server/perspective/policy/BundleVersionDetailsUIBean.java | 159
modules/enterprise/server/plugins/perspectives/policy/app/src/main/java/org/rhq/enterprise/server/perspective/policy/BundlesUIBean.java | 119
modules/enterprise/server/plugins/perspectives/policy/app/src/main/resources/seam.properties | 3
modules/enterprise/server/plugins/perspectives/policy/app/src/main/webapp/WEB-INF/components.xml | 16
modules/enterprise/server/plugins/perspectives/policy/app/src/main/webapp/bundleDetails.xhtml | 108
modules/enterprise/server/plugins/perspectives/policy/app/src/main/webapp/bundleVersionDetails.xhtml | 120
modules/enterprise/server/plugins/perspectives/policy/app/src/main/webapp/bundles.xhtml | 87
modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml | 156
modules/enterprise/server/plugins/perspectives/policy/perspective/src/main/resources/META-INF/rhq-serverplugin.xml | 30
modules/enterprise/server/plugins/perspectives/policy/pom.xml | 28
modules/enterprise/server/plugins/pom.xml | 124
modules/enterprise/server/plugins/rhnhosted/.gitignore | 1
modules/enterprise/server/plugins/rhnhosted/README.testing | 24
modules/enterprise/server/plugins/rhnhosted/pom.xml | 266
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXML.java | 369
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivator.java | 155
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNConstants.java | 33
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelper.java | 490
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java | 386
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReader.java | 138
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactory.java | 78
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSummary.java | 65
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/Certificate.java | 438
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/CertificateFactory.java | 145
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyDescriptor.java | 84
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyExtractor.java | 58
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/FieldExtractor.java | 41
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/PublicKeyRing.java | 137
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/RhnSecurityProvider.java | 67
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/SimpleExtractor.java | 97
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/XmlTag.java | 210
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/ApacheXmlRpcExecutor.java | 43
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransport.java | 174
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransportFactory.java | 82
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnComm.java | 120
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnDownloader.java | 179
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java | 55
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransport.java | 114
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransportFactory.java | 29
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java | 75
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransportFactory.java | 75
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutor.java | 44
modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutorFactory.java | 100
modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml | 42
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/genSchema.sh | 4
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channel_families.xml | 1
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channels.xml | 1
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.errata.xml | 74
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.kickstartable_trees.xml | 1
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages.xml | 431
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages_short.xml | 1
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.product_names.xml | 1
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.source_packages.xml | 5
modules/enterprise/server/plugins/rhnhosted/src/main/xsd/schema0.xsd | 403
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/BaseRHNTest.java | 107
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXMLTest.java | 154
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivatorTest.java | 75
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelperTest.java | 83
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProviderTest.java | 233
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReaderTest.java | 83
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactoryTest.java | 104
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/BasicRHNTest.java | 627
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnHttpURLConnection.java | 51
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnXmlRpcExecutor.java | 274
modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnCommTest.java | 399
modules/enterprise/server/plugins/rhnhosted/src/test/resources/test-log4j.xml | 464
modules/enterprise/server/plugins/url/pom.xml | 304
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java | 14
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/HttpProvider.java | 232
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/HttpSource.java | 232
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/IndexParser.java | 2
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java | 2
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java | 404
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlSource.java | 393
modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java | 38
modules/enterprise/server/plugins/url/src/main/resources/META-INF/rhq-serverplugin-content.xml | 74
modules/enterprise/server/plugins/url/src/main/resources/META-INF/rhq-serverplugin.xml | 82
modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java | 8
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 77
modules/enterprise/server/plugins/yum/pom.xml | 288
modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java | 16
modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/RepoProvider.java | 198
modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/RepoSource.java | 189
modules/enterprise/server/plugins/yum/src/main/resources/META-INF/rhq-serverplugin-content.xml | 23
modules/enterprise/server/plugins/yum/src/main/resources/META-INF/rhq-serverplugin.xml | 30
modules/enterprise/server/pom.xml | 7
modules/enterprise/server/safe-invoker/pom.xml | 98
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java | 91
modules/enterprise/server/sars/agent-sar/pom.xml | 420
modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent-configuration.xml | 2022
modules/enterprise/server/sars/pom.xml | 108
modules/enterprise/server/xml-schemas/pom.xml | 233
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/AbstractScheduleType.java | 118
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ControlDefinition.java | 63
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/CronScheduleType.java | 45
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/PeriodicScheduleType.java | 45
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ScheduledJobDefinition.java | 87
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ServerPluginDescriptorMetadataParser.java | 366
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ServerPluginDescriptorUtil.java | 342
modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/XmlSchemas.java | 72
modules/enterprise/server/xml-schemas/src/main/resources/rhq-contentsource-packagedetails.xsd | 381
modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-alert.xsd | 118
modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-bundle.xsd | 60
modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-content.xsd | 170
modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-entitlement.xsd | 47
modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-generic.xsd | 47
modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-perspective.xsd | 1060
modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin.xsd | 269
modules/enterprise/server/xml-schemas/src/test/java/org/rhq/enterprise/server/xmlschema/ServerPluginDescriptorUtilTest.java | 358
modules/enterprise/server/xml-schemas/src/test/resources/log4j.xml | 45
modules/enterprise/server/xml-schemas/src/test/resources/test-serverplugin-alert.xml | 25
modules/enterprise/server/xml-schemas/src/test/resources/test-serverplugin-bundle.xml | 24
modules/enterprise/server/xml-schemas/src/test/resources/test-serverplugin-controls.xml | 30
modules/enterprise/server/xml-schemas/src/test/resources/test-serverplugin-entitlement.xml | 22
modules/enterprise/server/xml-schemas/src/test/resources/test-serverplugin-generic.xml | 68
modules/enterprise/server/xml-schemas/src/test/resources/test-serverplugin-perspective.xml | 14
modules/helpers/pluginAnnotations/pom.xml | 53
modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/DataType.java | 39
modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/DisplayType.java | 39
modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/MeasurementType.java | 38
modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Metric.java | 43
modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Operation.java | 38
modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Parameter.java | 41
modules/helpers/pluginAnnotations/src/main/java/org/rhq/helpers/pluginAnnotations/agent/Units.java | 38
modules/helpers/pluginGen/pom.xml | 183
modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Props.java | 799
modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/Test.java | 11
modules/helpers/pluginGen/src/main/resources/component.ftl | 16
modules/helpers/pluginGen/src/main/resources/descriptor.ftl | 27
modules/helpers/pluginGen/src/main/resources/descriptorMain.ftl | 83
modules/helpers/pluginGen/src/main/resources/discovery.ftl | 49
modules/helpers/pom.xml | 93
modules/helpers/rtfilter/pom.xml | 244
modules/jopr/LICENSE | 31
modules/jopr/LICENSE_GPL | 339
modules/jopr/LICENSE_LGPL | 504
modules/jopr/dist/agent/pom.xml | 121
modules/jopr/dist/agent/src/main/scripts/jopr-agent.assembly.xml | 36
modules/jopr/dist/pom.xml | 32
modules/jopr/dist/server/pom.xml | 222
modules/jopr/dist/server/src/main/resources-binary/jbossas/server/default/deploy/rhq-installer.war/images/logo.png |binary
modules/jopr/dist/server/src/main/resources-binary/jbossas/server/default/deploy/rhq.ear.rej/rhq-portal.war/images/logo_header.gif |binary
modules/jopr/dist/server/src/main/scripts/dist.build.xml | 68
modules/jopr/dist/server/src/main/scripts/jopr-server.assembly.xml | 30
modules/jopr/etc/jbas5-ejb-client/client.bat | 102
modules/jopr/etc/jbas5-ejb-client/client.sh | 86
modules/jopr/etc/jbas5-ejb-client/pom.xml | 280
modules/jopr/etc/jbas5-ejb-client/src/main/java/test/EjbClient.java | 181
modules/jopr/etc/jbas5-ejb-client/src/main/java/test/JBossCallbackHandler.java | 69
modules/jopr/etc/jbas5-ejb-client/src/main/java/test/JBossConfiguration.java | 66
modules/jopr/etc/jbas5-ejb-client/src/main/java/test/JaasAuthenticationInvocationHandler.java | 58
modules/jopr/etc/jbas5-ejb-client/src/main/java/test/Worker.java | 132
modules/jopr/etc/jbas5-ejb-client/src/main/resources/dummy.war |binary
modules/jopr/etc/jbas5-ejb-client/src/main/resources/log4j.xml | 54
modules/jopr/etc/jbas5-ejb2-mdb-test/jars/ejb2-test.jar |binary
modules/jopr/etc/jbas5-ejb2-mdb-test/pom.xml | 301
modules/jopr/etc/jbas5-ejb2-mdb-test/run.sh | 3
modules/jopr/etc/jbas5-ejb2-mdb-test/src/main/java/test/Main.java | 182
modules/jopr/etc/jbas5-jnp-client/classpath.txt | 57
modules/jopr/etc/jbas5-jnp-client/client.bat | 83
modules/jopr/etc/jbas5-jnp-client/client.sh | 79
modules/jopr/etc/jbas5-jnp-client/pom.xml | 212
modules/jopr/etc/jbas5-jnp-client/src/main/java/test/RmiClient.java | 42
modules/jopr/modules-plugins-pom.xml | 83
modules/jopr/modules-pom.xml | 131
modules/jopr/pom.xml | 56
modules/jopr/release.sh | 341
modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml | 360
modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/MetadataConversionUtils.java | 541
modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java | 378
modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/RhqNamespacePrefixMapper.java | 43
modules/plugins/JBossOSGi/pom.xml | 216
modules/plugins/JBossOSGi/src/main/java/org/jboss/on/plugins/jbossOsgi/JBossOSGi/BundleComponent.java | 146
modules/plugins/JBossOSGi/src/main/java/org/jboss/on/plugins/jbossOsgi/JBossOSGi/BundleDiscovery.java | 81
modules/plugins/JBossOSGi/src/main/java/org/jboss/on/plugins/jbossOsgi/JBossOSGi/JBossOsgiServerComponent.java | 277
modules/plugins/JBossOSGi/src/main/java/org/jboss/on/plugins/jbossOsgi/JBossOSGi/JBossOsgiServerDiscovery.java | 132
modules/plugins/JBossOSGi/src/main/java/org/jboss/on/plugins/jbossOsgi/JBossOSGi/OsgiEventPoller.java | 106
modules/plugins/JBossOSGi/src/main/resources/META-INF/rhq-plugin.xml | 62
modules/plugins/aliases/pom.xml | 227
modules/plugins/aliases/src/main/java/org/rhq/plugins/aliases/AliasesComponent.java | 90
modules/plugins/aliases/src/main/java/org/rhq/plugins/aliases/AliasesDiscoveryComponent.java | 58
modules/plugins/aliases/src/main/resources/META-INF/rhq-plugin.xml | 49
modules/plugins/aliases/src/test/java/org/rhq/plugins/aliases/AliasesComponentTest.java | 97
modules/plugins/aliases/src/test/resources/etc/aliases | 7
modules/plugins/aliases/src/test/resources/log4j.xml | 33
modules/plugins/ant-bundle/pom.xml | 267
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 198
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginDiscoveryComponent.java | 51
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/DeploymentAuditorBuildListener.java | 117
modules/plugins/ant-bundle/src/main/resources/META-INF/rhq-plugin.xml | 20
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java | 191
modules/plugins/ant-bundle/src/test/resources/log4j.xml | 35
modules/plugins/ant-bundle/src/test/resources/simple-build.xml | 16
modules/plugins/ant-bundle/src/test/resources/test-build.xml | 29
modules/plugins/apache/pom.xml | 501
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java | 161
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java | 105
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheFilesComponent.java | 84
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java | 169
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java | 103
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java | 70
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java | 69
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheLocationComponent.java | 85
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java | 367
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 352
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 422
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java | 180
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ModJKDiscoveryComponent.java | 7
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/ApacheAugeasNode.java | 150
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/ApacheAugeasTree.java | 244
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java | 201
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasTreeBuilderApache.java | 152
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMap.java | 86
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMapIndex.java | 73
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectiveToSimpleProperty.java | 72
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingParamPerMap.java | 100
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingPositionToConfiguration.java | 85
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java | 145
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java | 204
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectiveToSimple.java | 99
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java | 187
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/Util.java | 74
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheAugeasMapping.java | 88
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java | 240
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ConfigurationToAugeasApacheBase.java | 88
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/DirectiveMapping.java | 131
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/SpecificParams.java | 126
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java | 180
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeValueUtil.java | 71
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/ConfigurationTimestamp.java | 72
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java | 262
modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPClient.java | 17
modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 458
modules/plugins/apache/src/main/resources/httpd.aug | 58
modules/plugins/apache/src/main/resources/test_httpd.aug | 96
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java | 7
modules/plugins/apache/src/test/resources/log4j.xml | 58
modules/plugins/apt/pom.xml | 199
modules/plugins/apt/src/main/java/org/rhq/plugins/apt/AptSourcesComponent.java | 140
modules/plugins/apt/src/main/java/org/rhq/plugins/apt/AptSourcesDiscoveryComponent.java | 50
modules/plugins/apt/src/main/resources/META-INF/rhq-plugin.xml | 48
modules/plugins/apt/src/test/java/org/rhq/plugins/apt/AptSourcesComponentTest.java | 86
modules/plugins/apt/src/test/resources/log4j.xml | 32
modules/plugins/augeas/pom.xml | 98
modules/plugins/augeas/src/main/java/org/rhq/augeas/AugeasProxy.java | 180
modules/plugins/augeas/src/main/java/org/rhq/augeas/config/AugeasConfiguration.java | 69
modules/plugins/augeas/src/main/java/org/rhq/augeas/config/AugeasConfigurationSimple.java | 159
modules/plugins/augeas/src/main/java/org/rhq/augeas/config/AugeasModuleConfig.java | 119
modules/plugins/augeas/src/main/java/org/rhq/augeas/node/AugeasNode.java | 101
modules/plugins/augeas/src/main/java/org/rhq/augeas/node/AugeasNodeBase.java | 88
modules/plugins/augeas/src/main/java/org/rhq/augeas/node/AugeasNodeLazy.java | 138
modules/plugins/augeas/src/main/java/org/rhq/augeas/node/AugeasNodeReal.java | 154
modules/plugins/augeas/src/main/java/org/rhq/augeas/node/AugeasRootNode.java | 94
modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/AugeasNodeBuffer.java | 146
modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/AugeasTree.java | 158
modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/AugeasTreeBuilder.java | 46
modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/AugeasTreeException.java | 65
modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/impl/AbstractAugeasTree.java | 211
modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/impl/AugeasTreeLazy.java | 75
modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/impl/AugeasTreeReal.java | 84
modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/impl/DefaultAugeasTreeBuilder.java | 70
modules/plugins/augeas/src/main/java/org/rhq/augeas/util/Glob.java | 181
modules/plugins/augeas/src/main/java/org/rhq/augeas/util/GlobFilter.java | 145
modules/plugins/augeas/src/main/java/org/rhq/augeas/util/LensFilter.java | 45
modules/plugins/augeas/src/main/java/org/rhq/augeas/util/LensHelper.java | 109
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationComponent.java | 721
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationDiscoveryComponent.java | 188
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasPluginLifecycleListener.java | 10
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/helper/AugeasNode.java | 156
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/helper/AugeasRawConfigHelper.java | 139
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/helper/AugeasTranslator.java | 37
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/helper/AugeasUtility.java | 47
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/helper/AugeasVariable.java | 41
modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/test/AbstractAugeasConfigurationComponentTest.java | 297
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/AugeasRHQComponent.java | 55
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/AugeasRhqException.java | 66
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/AugeasToConfiguration.java | 113
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/ConfigurationToAugeas.java | 110
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/NameMap.java | 39
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/RhqAugeasMapping.java | 63
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/AugeasToConfigurationSimple.java | 127
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/ConfigurationToAugeasSimple.java | 193
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/PluginDescriptorBasedAugeasConfiguration.java | 214
modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/RhqAugeasMappingSimple.java | 80
modules/plugins/augeas/src/main/resources/META-INF/rhq-plugin.xml | 15
modules/plugins/augeas/src/test/java/org/rhq/augeas/util/test/GlobFilterTest.java | 102
modules/plugins/byteman/pom.xml | 245
modules/plugins/byteman/src/main/java/org/rhq/plugins/byteman/BytemanAgentComponent.java | 738
modules/plugins/byteman/src/main/java/org/rhq/plugins/byteman/BytemanAgentDiscoveryComponent.java | 276
modules/plugins/byteman/src/main/java/org/rhq/plugins/byteman/BytemanRuleComponent.java | 48
modules/plugins/byteman/src/main/java/org/rhq/plugins/byteman/BytemanRuleDiscoveryComponent.java | 33
modules/plugins/byteman/src/main/java/org/rhq/plugins/byteman/BytemanScriptComponent.java | 177
modules/plugins/byteman/src/main/java/org/rhq/plugins/byteman/BytemanScriptDiscoveryComponent.java | 34
modules/plugins/byteman/src/main/resources/META-INF/rhq-plugin.xml | 148
modules/plugins/cobbler/pom.xml | 254
modules/plugins/cobbler/src/main/java/org/rhq/plugins/cobbler/CobblerComponent.java | 213
modules/plugins/cobbler/src/main/java/org/rhq/plugins/cobbler/CobblerDiscoveryComponent.java | 30
modules/plugins/cobbler/src/main/resources/META-INF/rhq-plugin.xml | 93
modules/plugins/cobbler/src/test/java/org/rhq/plugins/cobbler/CobblerComponentTest.java | 121
modules/plugins/cron/pom.xml | 218
modules/plugins/cron/src/main/java/org/rhq/plugins/cron/CronComponent.java | 215
modules/plugins/cron/src/main/java/org/rhq/plugins/cron/CronDiscoveryComponent.java | 44
modules/plugins/cron/src/main/java/org/rhq/plugins/cron/CronTabComponent.java | 151
modules/plugins/cron/src/main/java/org/rhq/plugins/cron/CronTabDiscoveryComponent.java | 82
modules/plugins/cron/src/main/resources/META-INF/rhq-plugin.xml | 178
modules/plugins/cron/src/test/java/org/rhq/plugins/cron/test/CronComponentTest.java | 116
modules/plugins/cron/src/test/java/org/rhq/plugins/cron/test/CronTabComponentTest.java | 144
modules/plugins/cron/src/test/resources/etc/cron.d/another-crontab | 4
modules/plugins/cron/src/test/resources/etc/crontab | 2
modules/plugins/cron/src/test/resources/log4j.xml | 32
modules/plugins/database/pom.xml | 198
modules/plugins/filetemplate-bundle/pom.xml | 252
modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginDiscoveryComponent.java | 51
modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/FileTemplateBundlePluginServerComponent.java | 123
modules/plugins/filetemplate-bundle/src/main/java/org/rhq/plugins/filetemplate/ProcessingRecipeContext.java | 349
modules/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-plugin.xml | 20
modules/plugins/filetemplate-bundle/src/test/java/org/rhq/plugins/filetemplate/ProcessingRecipeContextTest.java | 295
modules/plugins/grub/pom.xml | 435
modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubComponent.java | 28
modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubDiscoveryComponent.java | 5
modules/plugins/grub/src/main/resources/META-INF/rhq-plugin.xml | 95
modules/plugins/grub/src/test/java/org/rhq/plugins/grub/GrubComponentTest.java | 8
modules/plugins/hardware/pom.xml | 169
modules/plugins/hibernate/pom.xml | 245
modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/EntityComponent.java | 58
modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/EntityDiscoveryComponent.java | 54
modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/StatisticsComponent.java | 79
modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml | 228
modules/plugins/hibernate/src/test/java/org/rhq/plugins/hibernate/test/HibernatePluginTest.java | 145
modules/plugins/hibernate/src/test/resources/log4j.xml | 51
modules/plugins/hosts/pom.xml | 446
modules/plugins/hosts/src/main/java/org/rhq/plugins/hosts/HostsComponent.java | 253
modules/plugins/hosts/src/main/java/org/rhq/plugins/hosts/HostsDiscoveryComponent.java | 86
modules/plugins/hosts/src/main/java/org/rhq/plugins/hosts/helper/Hosts.java | 260
modules/plugins/hosts/src/main/java/org/rhq/plugins/hosts/helper/HostsComponentHelper.java | 54
modules/plugins/hosts/src/main/java/org/rhq/plugins/hosts/helper/HostsEntry.java | 72
modules/plugins/hosts/src/main/java/org/rhq/plugins/hosts/helper/NonAugeasHostsConfigurationDelegate.java | 112
modules/plugins/hosts/src/main/java/org/rhq/plugins/hosts/helper/SimpleUnixConfigFileLine.java | 66
modules/plugins/hosts/src/main/java/org/rhq/plugins/hosts/helper/SimpleUnixConfigFileReader.java | 85
modules/plugins/hosts/src/main/resources/META-INF/rhq-plugin.xml | 105
modules/plugins/hosts/src/test/java/org/rhq/plugins/hosts/HostsComponentTest.java | 156
modules/plugins/hosts/src/test/resources/etc/hosts | 11
modules/plugins/hosts/src/test/resources/log4j.xml | 12
modules/plugins/hudson/pom.xml | 181
modules/plugins/hudson/src/main/java/org/rhq/plugins/hudson/HudsonDiscoveryComponent.java | 44
modules/plugins/hudson/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/iis/pom.xml | 6
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISResponseTimeDelegate.java | 612
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISServerComponent.java | 250
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISServerDiscoveryComponent.java | 180
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostComponent.java | 214
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostDiscoveryComponent.java | 200
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/util/IISMetaBase.java | 362
modules/plugins/iis/src/main/java/org/rhq/plugins/iis/util/Win32ServiceControlDelegate.java | 322
modules/plugins/iis/src/main/resources/META-INF/rhq-plugin.xml | 1148
modules/plugins/iptables/pom.xml | 217
modules/plugins/iptables/src/main/java/org/rhq/plugins/iptables/AugeasRHQComponent.java | 39
modules/plugins/iptables/src/main/java/org/rhq/plugins/iptables/IptablesChainComponent.java | 110
modules/plugins/iptables/src/main/java/org/rhq/plugins/iptables/IptablesChainDiscoveryComponent.java | 66
modules/plugins/iptables/src/main/java/org/rhq/plugins/iptables/IptablesComponent.java | 120
modules/plugins/iptables/src/main/java/org/rhq/plugins/iptables/IptablesConfigTransform.java | 177
modules/plugins/iptables/src/main/java/org/rhq/plugins/iptables/IptablesDiscoveryComponent.java | 61
modules/plugins/iptables/src/main/java/org/rhq/plugins/iptables/IptablesTableComponent.java | 79
modules/plugins/iptables/src/main/java/org/rhq/plugins/iptables/IptablesTableDiscoveryComponent.java | 58
modules/plugins/iptables/src/main/resources/META-INF/rhq-plugin.xml | 54
modules/plugins/iptables/src/test/java/org/rhq/plugins/iptables/AppTest.java | 38
modules/plugins/irc/pom.xml | 184
modules/plugins/irc/src/main/java/org/rhq/plugins/irc/IRCRepoComponent.java | 134
modules/plugins/irc/src/main/java/org/rhq/plugins/irc/IRCRepoDiscoveryComponent.java | 53
modules/plugins/irc/src/main/java/org/rhq/plugins/irc/IRCServerComponent.java | 186
modules/plugins/irc/src/main/java/org/rhq/plugins/irc/IRCServerDiscoveryComponent.java | 57
modules/plugins/irc/src/main/resources/META-INF/rhq-plugin.xml | 62
modules/plugins/jboss-as-5/pom.xml | 646
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java | 176
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedComponent.java | 68
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java | 221
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentDiscoveryComponent.java | 132
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 556
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerContentFacetDelegate.java | 209
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 461
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java | 644
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerPluginConfigurationProperties.java | 47
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerShutdownMethod.java | 33
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerSupportedOperations.java | 44
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ConnectorComponent.java | 99
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ConnectorDiscoveryComponent.java | 130
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java | 65
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanDiscoveryComponent.java | 64
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb3BeanComponent.java | 32
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb3BeanDiscoveryComponent.java | 98
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentComponent.java | 63
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmbeddedManagedDeploymentDiscoveryComponent.java | 34
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/EmptyFileException.java | 18
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/FileContentDelegate.java | 188
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/InProcessJBossASDiscovery.java | 121
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java | 70
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingDiscoveryComponent.java | 55
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebComponent.java | 68
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebDiscoveryComponent.java | 69
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JarContentDelegate.java | 137
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JmsDestinationComponent.java | 82
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JmsDestinationDiscoveryComponent.java | 44
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 422
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java | 169
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedDeploymentDiscoveryComponent.java | 134
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformComponent.java | 279
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformDiscoveryComponent.java | 117
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ProfileServiceComponent.java | 42
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java | 411
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentDiscoveryComponent.java | 34
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java | 76
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/VirtualHostComponent.java | 32
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/VirtualHostDiscoveryComponent.java | 121
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WarMeasurementFacetDelegate.java | 136
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java | 243
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextDiscoveryComponent.java | 180
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/api/AbstractPropertyListAdapter.java | 43
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/api/AbstractPropertyMapAdapter.java | 43
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/api/AbstractPropertySimpleAdapter.java | 86
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/api/MeasurementAdapter.java | 35
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/api/MeasurementAdapterFactory.java | 102
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/api/PropertyAdapter.java | 88
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/api/PropertyAdapterFactory.java | 125
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/AbstractPropertyMapToCompositeValueAdapter.java | 122
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyListToArrayValueAdapter.java | 94
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyListToCollectionValueAdapter.java | 101
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToCompositeValueSupportAdapter.java | 78
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToGenericValueAdapter.java | 138
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToMapCompositeValueSupportAdapter.java | 70
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToPropertiesValueAdapter.java | 89
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToTableValueAdapter.java | 94
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertySimpleToEnumValueAdapter.java | 61
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertySimpleToSimpleValueAdapter.java | 97
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/custom/ConnectionFactoryConfigPropertyAdapter.java | 418
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/custom/JMSSecurityConfigAdapter.java | 159
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/measurement/SimpleMetaValueMeasurementAdapter.java | 68
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/measurement/custom/JMSMessageCounterAdapter.java | 57
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/measurement/custom/JMSMessageStatisticsAdapter.java | 38
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/AbstractProfileServiceConnection.java | 61
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/AbstractProfileServiceConnectionProvider.java | 87
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/BasicProfileServiceConnection.java | 56
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/JaasAuthenticationInvocationHandler.java | 61
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/JaasAuthenticationProxyProfileServiceConnection.java | 73
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/LocalProfileServiceConnectionProvider.java | 56
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/ProfileServiceConnection.java | 42
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/ProfileServiceConnectionProvider.java | 36
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/RemoteProfileServiceConnectionProvider.java | 133
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/jaas/JBossCallbackHandler.java | 69
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/connection/jaas/JBossConfiguration.java | 66
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/AbstractDeployer.java | 197
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/Deployer.java | 43
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/LocalDeployer.java | 56
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/RemoteDeployer.java | 144
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java | 180
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/InPluginControlActionFacade.java | 106
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossAS5ConnectionTypeDescriptor.java | 49
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java | 152
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java | 354
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossProductType.java | 80
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossProperties.java | 85
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JavaSystemProperties.java | 36
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JmxConnectionHelper.java | 260
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/MoreKnownComponentTypes.java | 116
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java | 247
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptDiscoveryComponent.java | 167
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptFileFinder.java | 203
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java | 296
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerDiscoveryComponent.java | 45
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java | 312
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetDiscoveryComponent.java | 76
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/Util.java | 240
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ConversionUtils.java | 465
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/DebugUtils.java | 180
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/DeploymentUtils.java | 161
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/Ejb2BeanUtils.java | 92
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java | 188
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JBossASContentFacetDelegate.java | 42
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JBossConfigurationUtility.java | 83
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java | 137
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JnpConfig.java | 528
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ManagedComponentUtils.java | 186
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/MetaTypeUtils.java | 78
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/RegularExpressionNameMatcher.java | 52
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ResourceComponentUtils.java | 107
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ResourceTypeUtils.java | 93
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 2993
modules/plugins/jboss-as-5/src/test/jars/ejb2-entity-bean-test.jar |binary
modules/plugins/jboss-as-5/src/test/jars/ejb2-sfsb-test.jar |binary
modules/plugins/jboss-as-5/src/test/jars/ejb2-test.jar |binary
modules/plugins/jboss-as-5/src/test/jars/ejb3-embedded-test.ear |binary
modules/plugins/jboss-as-5/src/test/jars/ejb3-local-interface-test.jar |binary
modules/plugins/jboss-as-5/src/test/jars/ejb3-mdb-test.jar |binary
modules/plugins/jboss-as-5/src/test/jars/ejb3-sfsb-test.jar |binary
modules/plugins/jboss-as-5/src/test/jars/ejb3-slsb-test.jar |binary
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/adapter/api/MeasurementAdapterFactoryTest.java | 51
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/adapter/api/PropertyAdapterFactoryTest.java | 92
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractDestinationTest.java | 244
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractPluginTest.java | 178
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractResourceTest.java | 312
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/GeneralPluginTest.java | 43
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/QueueResourceTest.java | 127
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/TopicResourceTest.java | 117
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/AbstractEjb2ResourceTest.java | 88
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/AbstractSessionBeanTest.java | 98
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/Ejb2EntityBeanResourceTest.java | 137
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/Ejb2JarResourceTest.java | 54
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/Ejb2MDBResourceTest.java | 89
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/Ejb2SFSBResourceTest.java | 95
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/Ejb2SLSBResourceTest.java | 110
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/AbstractEjb3MessageDrivenBeanResourceTest.java | 82
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/AbstractEjb3ResourceTest.java | 82
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/AbstractEjb3SessionBeanResourceTest.java | 92
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3EmbeddedMDBResourceTest.java | 73
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3EmbeddedSFSBResourceTest.java | 83
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3EmbeddedSLSBResourceTest.java | 83
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3LocalInterfaceSFSBResourceTest.java | 82
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3LocalInterfaceSLSBResourceTest.java | 83
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3MDBResourceTest.java | 73
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3SFSBResourceTest.java | 82
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3SLSBResourceTest.java | 83
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/sbm/AbstractServiceBindingTest.java | 184
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/sbm/ServiceBindingManagerResourceTest.java | 188
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/sbm/ServiceBindingSetResourceTest.java | 347
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/util/AppServerUtils.java | 342
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/util/EjbSessionBeanTestTemplate.java | 141
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/util/JMSQueueUtil.java | 74
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/util/MethodArgDef.java | 49
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/util/ConversionUtilTest.java | 34
modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/util/ProfileServiceTestUtil.java | 131
modules/plugins/jboss-as-5/src/test/resources/log4j.xml | 51
modules/plugins/jboss-as-5/testsuite/README.txt | 10
modules/plugins/jboss-as-5/testsuite/deleteme-ds.xml | 119
modules/plugins/jboss-as-5/testsuite/pom.xml | 230
modules/plugins/jboss-as-5/testsuite/src/main/java/org/rhq/plugins/jbossas5/BootstrapServlet.java | 73
modules/plugins/jboss-as-5/testsuite/src/main/java/org/rhq/plugins/jbossas5/JBossServerTest.java | 758
modules/plugins/jboss-as-5/testsuite/src/main/webapp/WEB-INF/jboss-web.xml | 12
modules/plugins/jboss-as-5/testsuite/src/main/webapp/WEB-INF/web.xml | 43
modules/plugins/jboss-as/pom.xml | 355
modules/plugins/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/InPluginControlActionFacade.java | 96
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingComponent.java | 203
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java | 120
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java | 529
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationDiscoveryComponent.java | 190
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ConnectionFactoryComponent.java | 111
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/DatasourceComponent.java | 134
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EJB2BeanComponent.java | 222
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EJB3BeanComponent.java | 221
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java | 77
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBMDestinationDiscoveryComponent.java | 61
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java | 460
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 1159
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerOperationsDelegate.java | 420
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerShutdownMethod.java | 31
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerSupportedOperations.java | 43
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorComponent.java | 131
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java | 148
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatDiscoveryComponent.java | 128
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatServerComponent.java | 105
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatVHostDiscoveryService.java | 60
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatVHostService.java | 87
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMQDiscoveryComponent.java | 51
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMessagingComponent.java | 144
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMessagingDiscoveryComponent.java | 49
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JMSComponent.java | 148
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java | 434
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarDiscoveryComponent.java | 46
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java | 118
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstanceInfo.java | 353
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossProductType.java | 71
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossProperties.java | 85
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JavaSystemProperties.java | 36
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/MainDeployer.java | 111
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/script/ScriptComponent.java | 216
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/script/ScriptDiscoveryComponent.java | 138
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/script/ScriptFileFinder.java | 165
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/AbstractMessagingConfigurationEditor.java | 435
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/ConnectionFactoryConfigurationEditor.java | 554
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DatasourceConfigurationEditor.java | 461
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java | 483
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/EmsUtility.java | 74
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java | 209
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileNameUtility.java | 56
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossASContentFacetDelegate.java | 58
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossASSnapshotReport.java | 83
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossConfigurationUtility.java | 74
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossMBeanUtility.java | 82
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossMBeans.java | 30
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossMessagingConfigurationEditor.java | 224
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JMSConfigurationEditor.java | 211
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java | 141
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JnpConfig.java | 529
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDeploymentInformation.java | 67
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java | 313
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/XMLConfigurationEditor.java | 102
modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 2619
modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java | 330
modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/util/DatasourceConfigurationEditorTest.java | 259
modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/util/JMSConfigurationEditorTest.java | 269
modules/plugins/jboss-as/src/test/resources/delete2DS.xml | 62
modules/plugins/jboss-as/src/test/resources/deleteDS.xml | 106
modules/plugins/jboss-as/src/test/resources/jms.xml | 116
modules/plugins/jboss-as/src/test/resources/loadDS.xml | 34
modules/plugins/jboss-as/src/test/resources/log4j.xml | 51
modules/plugins/jboss-as/src/test/resources/test.war |binary
modules/plugins/jboss-as/src/test/resources/updateDS.xml | 106
modules/plugins/jboss-cache-v3/pom.xml | 578
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheComponent.java | 92
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailComponent.java | 167
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailDiscoveryComponent.java | 105
modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java | 114
modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml | 288
modules/plugins/jboss-cache-v3/src/test/jars/TestCacheEJB.jar |binary
modules/plugins/jboss-cache-v3/src/test/jars/TestEar.ear |binary
modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/AppServerUtils.java | 268
modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/CacheComponentTest.java | 261
modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/CacheStatus.java | 122
modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/MethodArgDef.java | 48
modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/OperationTest.java | 143
modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/RemoteClientTest.java | 93
modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/TestHelper.java | 195
modules/plugins/jboss-cache-v3/src/test/resources/log4j.xml | 51
modules/plugins/jboss-cache-v3/src/test/resources/test-service.xml | 20
modules/plugins/jboss-cache/pom.xml | 220
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/CacheConfigurationHelper.java | 179
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java | 295
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheDiscoveryComponent.java | 114
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheSubsystemComponent.java | 140
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheSubsystemDiscovery.java | 60
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoComponent.java | 64
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoDiscovery.java | 143
modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml | 170
modules/plugins/jdbctrace/pom.xml | 274
modules/plugins/jdbctrace/src/main/java/org/rhq/plugins/jdbctrace/JdbcTracerComponent.java | 203
modules/plugins/jdbctrace/src/main/java/org/rhq/plugins/jdbctrace/JdbcTracerDiscoveryComponent.java | 162
modules/plugins/jdbctrace/src/main/java/org/rhq/plugins/jdbctrace/JdbcTracerUtil.java | 115
modules/plugins/jdbctrace/src/main/java/org/rhq/plugins/jdbctrace/helper/JdbcTracerHelper.java | 12
modules/plugins/jdbctrace/src/main/resources/META-INF/rhq-plugin.xml | 34
modules/plugins/jdbctrace/src/main/resources/jdbctrace-rules.txt | 159
modules/plugins/jira/pom.xml | 644
modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraClient.java | 490
modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraConnection.java | 46
modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraFilterComponent.java | 128
modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraFilterDiscoveryComponent.java | 128
modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraProjectComponent.java | 98
modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraProjectDiscoveryComponent.java | 128
modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraServerComponent.java | 146
modules/plugins/jira/src/main/java/org/rhq/plugins/jira/JiraServerDiscoveryComponent.java | 114
modules/plugins/jmx/pom.xml | 518
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java | 8
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java | 2
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java | 628
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JavaUtilLoggingResourceComponent.java | 5
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java | 1142
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java | 57
modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 6
modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java | 3
modules/plugins/kickstart/pom.xml | 113
modules/plugins/kickstart/src/main/java/org/rhq/plugins/kickstart/KickstartDiscoveryComponent.java | 71
modules/plugins/kickstart/src/main/java/org/rhq/plugins/kickstart/KickstartServerComponent.java | 99
modules/plugins/kickstart/src/main/resources/META-INF/rhq-plugin.xml | 32
modules/plugins/lsof/pom.xml | 245
modules/plugins/lsof/src/main/java/org/rhq/plugins/lsof/DetectionMechanism.java | 18
modules/plugins/lsof/src/main/java/org/rhq/plugins/lsof/LsofComponent.java | 130
modules/plugins/lsof/src/main/java/org/rhq/plugins/lsof/LsofDiscoveryComponent.java | 108
modules/plugins/lsof/src/main/resources/META-INF/rhq-plugin.xml | 79
modules/plugins/mysql/pom.xml | 492
modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java | 308
modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlDiscoveryComponent.java | 20
modules/plugins/nagios/.classpath | 9
modules/plugins/nagios/.project | 23
modules/plugins/nagios/.settings/org.eclipse.jdt.core.prefs | 6
modules/plugins/nagios/.settings/org.maven.ide.eclipse.prefs | 9
modules/plugins/nagios/TODO.txt | 8
modules/plugins/nagios/pom.xml | 170
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorComponent.java | 197
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/NagiosMonitorDiscovery.java | 141
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/controller/Controller.java | 78
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/controller/NagiosManagementInterface.java | 151
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/Host.java | 80
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/HostData.java | 99
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/Metric.java | 77
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/NagiosData.java | 38
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/NagiosSystemData.java | 116
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/Service.java | 60
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/ServiceData.java | 139
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/Status.java | 60
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/data/StatusData.java | 102
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/error/InvalidHostRequestException.java | 45
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/error/InvalidMetricRequestException.java | 46
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/error/InvalidReplyTypeException.java | 28
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/error/InvalidServiceRequestException.java | 46
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/error/NagiosException.java | 33
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/network/NetworkConnection.java | 150
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/parser/LqlReplyParser.java | 143
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/reply/LqlReply.java | 78
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/request/LqlHostRequest.java | 72
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/request/LqlRequest.java | 37
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/request/LqlResourceTypeRequest.java | 61
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/request/LqlServiceRequest.java | 89
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/request/LqlStatusRequest.java | 70
modules/plugins/nagios/src/main/java/org/rhq/plugins/nagios/request/NagiosRequestType.java | 62
modules/plugins/nagios/src/main/resources/META-INF/rhq-plugin.xml | 52
modules/plugins/nagios/src/test/java/org/rhq/plugins/nagios/NagiosCommunicationTest.java | 99
modules/plugins/netservices/pom.xml | 496
modules/plugins/netservices/src/main/java/org/rhq/plugins/netservices/HTTPNetServiceComponent.java | 350
modules/plugins/netservices/src/main/java/org/rhq/plugins/netservices/HTTPNetServiceDiscoveryComponent.java | 124
modules/plugins/netservices/src/main/java/org/rhq/plugins/netservices/PingNetServiceComponent.java | 196
modules/plugins/netservices/src/main/java/org/rhq/plugins/netservices/PingNetServiceDiscoveryComponent.java | 113
modules/plugins/netservices/src/main/resources/META-INF/rhq-plugin.xml | 138
modules/plugins/nss/pom.xml | 186
modules/plugins/nss/src/main/java/org/rhq/plugin/nss/NameServiceSwitchComponent.java | 368
modules/plugins/nss/src/main/java/org/rhq/plugin/nss/NameServiceSwitchDiscoveryComponent.java | 83
modules/plugins/nss/src/main/resources/META-INF/rhq-plugin.xml | 33
modules/plugins/onewire/pom.xml | 28
modules/plugins/oracle/pom.xml | 499
modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleDiscoveryComponent.java | 38
modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/perftest/pom.xml | 6
modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/PerfTestComponent.java | 6
modules/plugins/platform/pom.xml | 404
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java | 192
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java | 5
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxDistroInfo.java | 2
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java | 680
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/PlatformComponent.java | 488
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessDiscoveryComponent.java | 58
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/WindowsPlatformComponent.java | 198
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/content/RpmPackageDiscoveryDelegate.java | 374
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/content/yum/PluginContext.java | 312
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/content/yum/Primary.java | 6
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/win/Win32EventLogDelegate.java | 398
modules/plugins/platform/src/main/java/org/rhq/plugins/platform/win/WindowsSoftwareDelegate.java | 276
modules/plugins/platform/src/test/java/org/rhq/plugins/platform/test/PlatformPluginTest.java | 226
modules/plugins/pom.xml | 332
modules/plugins/postfix/pom.xml | 226
modules/plugins/postfix/src/main/java/org/rhq/plugins/postfix/PostfixAccessComponent.java | 61
modules/plugins/postfix/src/main/java/org/rhq/plugins/postfix/PostfixAccessDiscoveryComponent.java | 52
modules/plugins/postfix/src/main/java/org/rhq/plugins/postfix/PostfixServerComponent.java | 107
modules/plugins/postfix/src/main/java/org/rhq/plugins/postfix/PostfixServerDiscoveryComponent.java | 82
modules/plugins/postfix/src/main/resources/META-INF/rhq-plugin.xml | 79
modules/plugins/postfix/src/test/java/org/rhq/plugins/postfix/PostfixAccessComponentTest.java | 84
modules/plugins/postfix/src/test/java/org/rhq/plugins/postfix/PostfixComponentTest.java | 88
modules/plugins/postfix/src/test/resources/etc/postfix/access | 5
modules/plugins/postfix/src/test/resources/etc/postfix/main.cf | 11
modules/plugins/postfix/src/test/resources/log4j.xml | 40
modules/plugins/postgres/pom.xml | 490
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseDiscoveryComponent.java | 2
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java | 95
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java | 928
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableComponent.java | 10
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java | 2
modules/plugins/postgres/src/test/java/org/rhq/plugins/postgres/test/PostgresPluginTest.java | 3
modules/plugins/postgres/src/test/resources/log4j.xml | 102
modules/plugins/raw-config-test/pom.xml | 168
modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/ConfigurationServer.groovy | 80
modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/LegacyServer.groovy | 12
modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/RawDiscoveryComponent.groovy | 22
modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/RawServer.groovy | 101
modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/StructuredAndRawDiscoveryComponent.groovy | 23
modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/StructuredAndRawServer.groovy | 199
modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/StructuredDiscoveryComponent.groovy | 24
modules/plugins/raw-config-test/src/main/groovy/org/rhq/plugins/test/rawconfig/StructuredServer.groovy | 153
modules/plugins/raw-config-test/src/main/resources/META-INF/rhq-plugin.xml | 147
modules/plugins/raw-config-test/src/test/groovy/org/rhq/plugins/test/rawconfig/RawServerTest.groovy | 29
modules/plugins/rhq-agent/pom.xml | 432
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java | 3
modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentServerComponent.java | 534
modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 1735
modules/plugins/rhq-agent/src/test/java/org/rhq/plugins/agent/AgentPluginTest.java | 2
modules/plugins/rhq-agent/src/test/resources/log4j.xml | 76
modules/plugins/rhq-agent/src/test/resources/test-agent-configuration.xml | 190
modules/plugins/rhq-server/pom.xml | 243
modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java | 70
modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java | 85
modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java | 72
modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java | 90
modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 348
modules/plugins/samba/pom.xml | 226
modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerComponent.java | 282
modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerDiscoveryComponent.java | 82
modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaShareComponent.java | 84
modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaShareDiscoveryComponent.java | 66
modules/plugins/samba/src/main/resources/META-INF/rhq-plugin.xml | 134
modules/plugins/samba/src/test/java/org/rhq/plugins/samba/SambaComponentTest.java | 76
modules/plugins/samba/src/test/java/org/rhq/plugins/samba/SambaShareComponentTest.java | 88
modules/plugins/samba/src/test/resources/etc/samba/smb.conf | 15
modules/plugins/samba/src/test/resources/log4j.xml | 40
modules/plugins/script/pom.xml | 6
modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java | 41
modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptServerComponent.java | 15
modules/plugins/script/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/script2/pom.xml | 185
modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptComponent.java | 214
modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptDiscovery.java | 59
modules/plugins/script2/src/main/resources/META-INF/rhq-plugin.xml | 45
modules/plugins/services/README.txt | 4
modules/plugins/services/pom.xml | 240
modules/plugins/services/src/main/java/org/fedoraproject/Config/Services/ChkconfigService.java | 37
modules/plugins/services/src/main/java/org/fedoraproject/Config/Services/Introspectable.java | 30
modules/plugins/services/src/main/java/org/fedoraproject/Config/Services/Service.java | 30
modules/plugins/services/src/main/java/org/fedoraproject/Config/Services/ServiceHerder.java | 45
modules/plugins/services/src/main/java/org/fedoraproject/Config/Services/SysVService.java | 48
modules/plugins/services/src/main/java/org/fedoraproject/Config/Services/XinetdService.java | 32
modules/plugins/services/src/main/java/org/rhq/plugins/services/ServiceComponent.java | 78
modules/plugins/services/src/main/java/org/rhq/plugins/services/ServiceDiscoveryComponent.java | 46
modules/plugins/services/src/main/java/org/rhq/plugins/services/ServicesComponent.java | 157
modules/plugins/services/src/main/java/org/rhq/plugins/services/ServicesDiscoveryComponent.java | 77
modules/plugins/services/src/main/java/org/rhq/services/Service.java | 102
modules/plugins/services/src/main/java/org/rhq/services/ServiceManager.java | 55
modules/plugins/services/src/main/java/org/rhq/services/ServiceStatus.java | 28
modules/plugins/services/src/main/java/org/rhq/services/SysVService.java | 149
modules/plugins/services/src/main/java/org/rhq/services/XinetdService.java | 74
modules/plugins/services/src/main/resources/META-INF/rhq-plugin.xml | 49
modules/plugins/services/src/test/resources/log4j.xml | 40
modules/plugins/snmptrapd/pom.xml | 449
modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapdDiscovery.java | 39
modules/plugins/snmptrapd/src/main/resources/META-INF/rhq-plugin.xml | 21
modules/plugins/sshd/pom.xml | 437
modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java | 410
modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDDiscoveryComponent.java | 108
modules/plugins/sshd/src/main/resources/META-INF/rhq-plugin.xml | 1332
modules/plugins/sudoers/pom.xml | 215
modules/plugins/sudoers/src/main/java/org/rhq/plugins/sudoers/SudoersComponent.java | 71
modules/plugins/sudoers/src/main/java/org/rhq/plugins/sudoers/SudoersDiscoveryComponent.java | 27
modules/plugins/sudoers/src/main/resources/META-INF/rhq-plugin.xml | 58
modules/plugins/sudoers/src/test/java/org/rhq/plugins/sudoers/SudoersComponentTest.java | 121
modules/plugins/sudoers/src/test/resources/etc/sudoers | 11
modules/plugins/sudoers/src/test/resources/log4j.xml | 40
modules/plugins/tomcat/pom.xml | 212
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatCacheComponent.java | 40
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatCacheDiscoveryComponent.java | 66
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java | 245
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java | 191
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java | 580
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatGroupComponent.java | 191
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatRoleComponent.java | 68
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 466
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java | 515
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserComponent.java | 212
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java | 84
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java | 385
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostDiscoveryComponent.java | 59
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java | 860
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java | 286
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/CreateResourceHelper.java | 45
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/EmsUtility.java | 88
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java | 155
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/TomcatApplicationDeployer.java | 87
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/TomcatConfig.java | 179
modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml | 1158
modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatPluginTest.java | 106
modules/plugins/tomcat/src/test/resources/log4j.xml | 51
modules/plugins/twitter/pom.xml | 358
modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/FeedDiscovery.java | 56
modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/TwitterDiscovery.java | 30
modules/plugins/validate-all-plugins/pom.xml | 12
modules/plugins/virt/pom.xml | 561
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/DomainConfigurationEditor.java | 319
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/LibVirt.java | 139
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/LibVirtConnection.java | 422
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationBlockDeviceComponent.java | 134
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationBlockDeviceDiscoveryComponent.java | 114
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationComponent.java | 186
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDiscoveryComponent.java | 121
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainComponent.java | 219
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationDomainDiscoveryComponent.java | 92
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationHostComponent.java | 176
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationHostDiscoveryComponent.java | 81
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationInterfaceComponent.java | 138
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationInterfaceDiscoveryComponent.java | 116
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationNetworkComponent.java | 155
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationNetworkDiscoveryComponent.java | 90
modules/plugins/virt/src/main/java/org/rhq/plugins/virt/XMLEditor.java | 377
modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml | 71
modules/pom.xml | 159
modules/test-utils/pom.xml | 31
modules/test-utils/src/main/java/org/rhq/test/AssertUtils.java | 104
modules/test-utils/src/main/java/org/rhq/test/CollectionEqualsChecker.java | 91
modules/test-utils/src/main/java/org/rhq/test/EqualsResult.java | 44
modules/test-utils/src/main/java/org/rhq/test/JMockTest.java | 51
modules/test-utils/src/main/java/org/rhq/test/MatchResult.java | 44
modules/test-utils/src/main/java/org/rhq/test/PropertyMatchException.java | 43
modules/test-utils/src/main/java/org/rhq/test/PropertyMatcher.java | 101
modules/test-utils/src/main/java/org/rhq/test/jmock/PropertyMatcher.java | 56
pom.xml | 1905
release.sh | 333
scripts/ignore-target-dirs.js | 20
3716 files changed, 623374 insertions(+), 142453 deletions(-)
---
1
0
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java | 20
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java | 8
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java | 58 +-
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java | 60 ++
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java | 16
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java | 268 ----------
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java | 212 +++++++
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java | 12
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java | 2
modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml | 2
modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java | 9
modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml | 20
modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml | 22
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 24
modules/plugins/ant-bundle/src/test/resources/simple-build.xml | 16
modules/plugins/ant-bundle/src/test/resources/test-bundle.xml | 33 +
16 files changed, 422 insertions(+), 360 deletions(-)
New commits:
commit 68643815c277948c0617bfedb7db73550fabc901
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Thu May 27 10:39:26 2010 -0400
various reworking of rhq:bundle Ant task as discussed; rename rhq:deployment element to rhq:deploymentUnit
(cherry picked from commit 8b50ba816d704ced7668a7fa6aa869416ba0c043)
Conflicts:
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
modules/plugins/ant-bundle/src/test/resources/test-build.xml
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
index 7c4925b..93e0a6a 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
@@ -46,7 +46,7 @@ import org.apache.tools.ant.helper.AntXMLContext;
import org.apache.tools.ant.helper.ProjectHelper2;
import org.rhq.bundle.ant.task.BundleTask;
-import org.rhq.bundle.ant.type.DeploymentType;
+import org.rhq.bundle.ant.type.DeploymentUnitType;
/**
* This object enables you to invoke an Ant script within the running VM. You can fully run the script
@@ -69,14 +69,11 @@ public class AntLauncher {
// TODO (ips, 04/28/10): Figure out a way to avoid assuming the prefix is "rhq".
private static final String BUNDLE_TASK_NAME = "rhq:bundle";
- private static final String INPUT_PROPERTY_TASK_NAME = "rhq:input-property";
- private static final String DEPLOY_TASK_NAME = "rhq:deploy";
/**
* Executes the specified bundle deploy Ant build file (i.e. rhq-deploy.xml).
*
* @param buildFile the path to the build file (i.e. rhq-deploy.xml)
- * @param targetName the target to run, <code>null</code> will run the default target
* @param buildProperties the properties to pass into Ant
* @param buildListeners a list of build listeners (provide callback methods for targetExecuted, taskExecuted, etc.)
*
@@ -84,8 +81,9 @@ public class AntLauncher {
*
* @throws InvalidBuildFileException if the build file is invalid
*/
- public BundleAntProject executeBundleDeployFile(File buildFile, String targetName, Properties buildProperties,
- List<BuildListener> buildListeners) throws InvalidBuildFileException {
+ public BundleAntProject executeBundleDeployFile(File buildFile, Properties buildProperties,
+ List<BuildListener> buildListeners)
+ throws InvalidBuildFileException {
parseBundleDeployFile(buildFile);
BundleAntProject project = new BundleAntProject();
@@ -121,8 +119,8 @@ public class AntLauncher {
// targets.
project.executeTarget("");
- // Now execute the target the user actually specified.
- project.executeTarget((targetName == null) ? project.getDefaultTarget() : targetName);
+ // Now execute the default target?
+ //project.executeTarget(project.getDefaultTarget());
return project;
} catch (Exception e) {
@@ -228,11 +226,11 @@ public class AntLauncher {
}
BundleTask bundleTask = (BundleTask) preconfigureTask(unconfiguredBundleTask);
- Collection<DeploymentType> deployments = bundleTask.getDeployments().values();
+ Collection<DeploymentUnitType> deployments = bundleTask.getDeploymentUnits().values();
if (deployments.isEmpty()) {
- throw new InvalidBuildFileException("The bundle task must contain at least one deployment child element.");
+ throw new InvalidBuildFileException("The bundle task must contain exactly one rhq:deploymentUnit child element.");
}
- DeploymentType deployment = deployments.iterator().next();
+ DeploymentUnitType deployment = deployments.iterator().next();
Map<File, File> files = deployment.getFiles();
for (File file : files.values()) {
project.getBundleFileNames().add(file.getName());
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
index 7d7959a..bd83825 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
@@ -121,14 +121,6 @@ public class BundleAntProject extends Project {
this.deploymentId = deploymentId;
}
- public String getDeploymentName() {
- return deploymentName;
- }
-
- public void setDeploymentName(String deploymentName) {
- this.deploymentName = deploymentName;
- }
-
public DeploymentPhase getDeploymentPhase() {
return deploymentPhase;
}
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
index f943c0d..8e3c066 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
@@ -22,7 +22,7 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.rhq.bundle.ant.DeployPropertyNames;
import org.rhq.bundle.ant.DeploymentPhase;
-import org.rhq.bundle.ant.type.DeploymentType;
+import org.rhq.bundle.ant.type.DeploymentUnitType;
import org.rhq.bundle.ant.type.InputPropertyType;
import java.io.File;
@@ -43,7 +43,7 @@ public class BundleTask extends AbstractBundleTask {
private String name;
private String version;
private String description;
- private Map<String, DeploymentType> deployments = new HashMap<String, DeploymentType>();
+ private Map<String, DeploymentUnitType> deploymentUnits = new HashMap<String, DeploymentUnitType>();
private Set<InputPropertyType> inputProperties = new HashSet<InputPropertyType>();
@Override
@@ -63,8 +63,8 @@ public class BundleTask extends AbstractBundleTask {
* The RHQ Ant launcher will ensure that the following Ant project properties are defined prior to this method being
* invoked:
*
- * rhq.deploy.name - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment} name
- * (e.g. "appserver")
+ * rhq.deploy.id - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment}'s unique id
+ * (e.g. "10001")
* rhq.deploy.dir - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment} install dir
* (e.g. "/opt/jbossas-petstore")
* rhq.deploy.phase - the {@link org.rhq.bundle.ant.DeploymentPhase deployment phase}
@@ -105,15 +105,10 @@ public class BundleTask extends AbstractBundleTask {
getProject().setDeploymentId(deploymentId);
log(DeployPropertyNames.DEPLOY_ID + "=\"" + deploymentId + "\"", Project.MSG_DEBUG);
- String deploymentName = (String) projectProps.get(DeployPropertyNames.DEPLOY_NAME);
- if (deploymentName == null) {
- throw new BuildException("Required property [" + DeployPropertyNames.DEPLOY_NAME + "] was not specified.");
- }
- getProject().setDeploymentName(deploymentName);
- DeploymentType deployment = this.deployments.get(deploymentName);
- if (deployment == null) {
- throw new BuildException("There is no deployment element defined with name '" + deploymentName + "'.");
+ if (this.deploymentUnits.size() != 1) {
+ throw new BuildException("The rhq:bundle task must contain exactly one rhq:deploymentUnit element.");
}
+ DeploymentUnitType deploymentUnit = this.deploymentUnits.values().iterator().next();
String deploymentPhaseName = (String) projectProps.get(DeployPropertyNames.DEPLOY_PHASE);
if (deploymentPhaseName == null) {
@@ -142,28 +137,31 @@ public class BundleTask extends AbstractBundleTask {
String dryRunString = (String) projectProps.get(DeployPropertyNames.DEPLOY_DRY_RUN);
boolean dryRun = Boolean.valueOf(dryRunString);
getProject().setDryRun(dryRun);
-
- log("Executing '" + deploymentPhase + "' phase for deployment '" + deploymentName + "' from bundle '"
- + this.name + "' version " + this.version + " using config " + getProject().getConfiguration() + "...");
+ String revertString = (String) projectProps.get(DeployPropertyNames.DEPLOY_REVERT);
+ boolean revert = Boolean.valueOf(revertString);
+ String cleanString = (String) projectProps.get(DeployPropertyNames.DEPLOY_CLEAN);
+ boolean clean = Boolean.valueOf(cleanString);
+
+ log("Executing '" + deploymentPhase + "' phase for deployment with id [" + deploymentId + "] from bundle '"
+ + this.name + "' version " + this.version + " using config "
+ + getProject().getConfiguration().toString(true) + " [dryRun=" + dryRun + ", revert=" + revert
+ + ", clean=" + clean + "]...");
switch (deploymentPhase) {
case INSTALL:
- String revertString = (String) projectProps.get(DeployPropertyNames.DEPLOY_REVERT);
- boolean revert = Boolean.valueOf(revertString);
- String cleanString = (String) projectProps.get(DeployPropertyNames.DEPLOY_CLEAN);
- boolean clean = Boolean.valueOf(cleanString);
- deployment.install(revert, clean);
+ // TODO: Revert doesn't really make sense for an initial install.
+ deploymentUnit.install(revert, clean);
break;
case START:
- deployment.start();
+ deploymentUnit.start();
break;
case STOP:
- deployment.stop();
+ deploymentUnit.stop();
break;
case UPGRADE:
- deployment.upgrade();
+ deploymentUnit.upgrade(revert, clean);
break;
case UNINSTALL:
- deployment.uninstall();
+ deploymentUnit.uninstall();
break;
}
}
@@ -197,12 +195,12 @@ public class BundleTask extends AbstractBundleTask {
inputProperty.init();
}
- public void addConfigured(DeploymentType deployment) {
- this.deployments.put(deployment.getName(), deployment);
+ public void addConfigured(DeploymentUnitType deployment) {
+ this.deploymentUnits.put(deployment.getName(), deployment);
}
- public Map<String, DeploymentType> getDeployments() {
- return deployments;
+ public Map<String, DeploymentUnitType> getDeploymentUnits() {
+ return deploymentUnits;
}
/**
@@ -233,8 +231,8 @@ public class BundleTask extends AbstractBundleTask {
* @throws BuildException if an error occurs
*/
protected void validateTypes() throws BuildException {
- if (this.deployments.isEmpty()) {
- throw new BuildException("At least one 'deployment' child element must be specified.");
+ if (this.deploymentUnits.isEmpty()) {
+ throw new BuildException("At least one 'rhq:deploymentUnit' child element must be specified.");
}
}
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
index 6874a63..cea5df4 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
@@ -3,6 +3,10 @@ package org.rhq.bundle.ant.type;
import org.apache.tools.ant.types.DataType;
import org.rhq.bundle.ant.BundleAntProject;
+import java.io.File;
+import java.util.List;
+import java.util.regex.Pattern;
+
/**
*
*/
@@ -11,4 +15,60 @@ public abstract class AbstractBundleType extends DataType {
public BundleAntProject getProject() {
return (BundleAntProject)super.getProject();
}
+
+ protected static Pattern getPattern(List<FileSet> fileSets) {
+ if (fileSets == null || fileSets.isEmpty()) {
+ return null;
+ }
+ boolean first = true;
+ StringBuilder regex = new StringBuilder();
+ for (FileSet fileSet : fileSets) {
+ if (!first) {
+ regex.append("|");
+ } else {
+ first = false;
+ }
+ regex.append("(");
+ File dir = fileSet.getDir();
+ if (dir != null) {
+ regex.append(dir);
+ regex.append('/');
+ }
+ if (fileSet.getIncludePatterns().length == 0) {
+ regex.append(".*");
+ } else {
+ boolean firstIncludePattern = true;
+ for (String includePattern : fileSet.getIncludePatterns()) {
+ if (!firstIncludePattern) {
+ regex.append("|");
+ } else {
+ firstIncludePattern = false;
+ }
+ regex.append("(");
+ for (int i = 0; i < includePattern.length(); i++) {
+ char c = includePattern.charAt(i);
+ if (c == '?') {
+ regex.append('.');
+ } else if (c == '*') {
+ if (i + 1 < includePattern.length()) {
+ char c2 = includePattern.charAt(++i);
+ if (c2 == '*') {
+ regex.append(".*");
+ i++;
+ continue;
+ }
+ }
+ regex.append("[^/]*");
+ } else {
+ regex.append(c);
+ }
+ // TODO: Escape backslashes.
+ }
+ regex.append(")");
+ }
+ }
+ regex.append(")");
+ }
+ return Pattern.compile(regex.toString());
+ }
}
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
index 1320630..19aaaf6 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
@@ -22,11 +22,25 @@
*/
package org.rhq.bundle.ant.type;
+import java.util.List;
+import java.util.regex.Pattern;
+
/**
- * An archive file to be exploded during the bundle deployment.
+ * An archive file to be exploded during the bundle deployment. Can optionally contain a rhq:replace child element
+ * that specifies the set of files that contain template variables (e.g. @@http.port@@) which need to be replaced with
+ * the value of the corresponding property.
*
* @author Ian Springer
*/
public class ArchiveType extends AbstractFileType {
+ private Pattern replacePattern;
+
+ public void addConfigured(ReplaceType replace) {
+ List<FileSet> fileSets = replace.getFileSets();
+ this.replacePattern = getPattern(fileSets);
+ }
+ public Pattern getReplacePattern() {
+ return replacePattern;
+ }
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java
deleted file mode 100644
index db33995..0000000
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.bundle.ant.type;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.system.SystemInfoFactory;
-import org.rhq.core.template.TemplateEngine;
-import org.rhq.core.util.updater.DeployDifferences;
-import org.rhq.core.util.updater.Deployer;
-import org.rhq.core.util.updater.DeploymentData;
-import org.rhq.core.util.updater.DeploymentProperties;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * An Ant task for deploying a bundle or previewing the deployment.
- *
- * @author Ian Springer
- */
-public class DeploymentType extends AbstractBundleType {
- private String name;
- private Map<File, File> files = new LinkedHashMap<File, File>();
- private Set<File> archives = new LinkedHashSet<File>();
- private SystemServiceType systemService;
- private Pattern ignorePattern;
- private Pattern replacePattern;
- private boolean preview;
- private String preinstallTarget;
- private String postinstallTarget;
-
- public void install(boolean revert, boolean clean) throws BuildException {
- if (this.preinstallTarget != null) {
- Target target = (Target) getProject().getTargets().get(this.preinstallTarget);
- if (target == null) {
- throw new BuildException("Specified preinstall target (" + this.preinstallTarget + ") does not exist.");
- }
- target.performTasks();
- }
-
- int deploymentId = getProject().getDeploymentId();
- DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
- getProject().getBundleVersion(), getProject().getBundleDescription());
- File deployDir = getProject().getDeployDir();
- TemplateEngine templateEngine = createTemplateEngine();
- if (this.files.isEmpty() && this.archives.isEmpty()) {
- throw new BuildException("You must specify at least one file to deploy via nested rhq:file and/or rhq:archive elements.");
- }
- if (!this.files.isEmpty()) {
- log("Deploying files " + this.files + "...", Project.MSG_VERBOSE);
- }
- if (!this.archives.isEmpty()) {
- log("Deploying archives " + this.archives + "...", Project.MSG_VERBOSE);
- }
-
- // for now, apply the pattern to all files in the deployment
- Map<File, Pattern> archiveReplacePatterns = new HashMap<File, Pattern>();
- for (File file : this.archives) {
- archiveReplacePatterns.put(file, this.replacePattern);
- }
- Set<File> rawFilesToReplace = this.files.keySet(); // TODO: CHANGE ME! only replace those raw files marked as "replace=true"
- DeploymentData dd = new DeploymentData(deploymentProps, this.archives, this.files, deployDir,
- archiveReplacePatterns, rawFilesToReplace, templateEngine, this.ignorePattern);
- Deployer deployer = new Deployer(dd);
- try {
- DeployDifferences diffs = getProject().getDeployDifferences();
- boolean dryRun = getProject().isDryRun();
- if (revert) {
- deployer.redeployAndRestoreBackupFiles(diffs, clean, dryRun);
- } else {
- deployer.deploy(diffs, clean, dryRun);
- }
- deployer.deploy(diffs);
- getProject().log("Results:\n" + diffs + "\n");
- } catch (Exception e) {
- throw new BuildException("Failed to deploy bundle '" + getProject().getBundleName() + "' version "
- + getProject().getBundleVersion() + ": " + e, e);
- }
-
- if (this.systemService != null) {
- this.systemService.install();
- }
-
- if (this.postinstallTarget != null) {
- Target target = (Target) getProject().getTargets().get(this.postinstallTarget);
- if (target == null) {
- throw new BuildException("Specified postinstall target (" + this.postinstallTarget + ") does not exist.");
- }
- target.performTasks();
- }
-
- return;
- }
-
- public void start() throws BuildException {
-
- }
-
- public void stop() throws BuildException {
-
- }
-
- public void upgrade() throws BuildException {
-
- }
-
- public void uninstall() throws BuildException {
- // TODO
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Map<File, File> getFiles() {
- return files;
- }
-
- public Set<File> getArchives() {
- return archives;
- }
-
- public boolean isPreview() {
- return this.preview;
- }
-
- public void setPreview(boolean preview) {
- this.preview = preview;
- }
-
- public String getPreinstallTarget() {
- return preinstallTarget;
- }
-
- public void setPreinstallTarget(String preinstallTarget) {
- this.preinstallTarget = preinstallTarget;
- }
-
- public String getPostinstallTarget() {
- return postinstallTarget;
- }
-
- public void setPostinstallTarget(String postinstallTarget) {
- this.postinstallTarget = postinstallTarget;
- }
-
- public void addConfigured(SystemServiceType systemService) {
- if (this.systemService != null) {
- throw new IllegalStateException("A deployment can only have one system-service child element.");
- }
- this.systemService = systemService;
- }
-
- public void addConfigured(FileType file) {
- File destFile = file.getDestinationFile();
- if (destFile == null) {
- File destDir = file.getDestinationDir();
- destFile = new File(destDir, file.getSource().getName());
- }
- this.files.put(file.getSource(), destFile);
- }
-
- public void addConfigured(ArchiveType archive) {
- this.archives.add(archive.getSource());
- }
-
- public void addConfigured(IgnoreType ignore) {
- List<FileSet> fileSets = ignore.getFileSets();
- this.ignorePattern = getPattern(fileSets);
- }
-
- public void addConfigured(ReplaceType replace) {
- List<FileSet> fileSets = replace.getFileSets();
- this.replacePattern = getPattern(fileSets);
- }
-
- private TemplateEngine createTemplateEngine() {
- TemplateEngine templateEngine = SystemInfoFactory.fetchTemplateEngine();
- // Add the deployment props to the template engine's tokens.
- Configuration config = getProject().getConfiguration();
- for (PropertySimple prop : config.getSimpleProperties().values()) {
- templateEngine.getTokens().put(prop.getName(), prop.getStringValue());
- }
- return templateEngine;
- }
-
- private static Pattern getPattern(List<FileSet> fileSets) {
- boolean first = true;
- StringBuilder regex = new StringBuilder();
- for (FileSet fileSet : fileSets) {
- if (!first) {
- regex.append("|");
- } else {
- first = false;
- }
- regex.append("(");
- File dir = fileSet.getDir();
- if (dir != null) {
- regex.append(dir);
- regex.append('/');
- }
- if (fileSet.getIncludePatterns().length == 0) {
- regex.append(".*");
- } else {
- boolean firstIncludePattern = true;
- for (String includePattern : fileSet.getIncludePatterns()) {
- if (!firstIncludePattern) {
- regex.append("|");
- } else {
- firstIncludePattern = false;
- }
- regex.append("(");
- for (int i = 0; i < includePattern.length(); i++) {
- char c = includePattern.charAt(i);
- if (c == '?') {
- regex.append('.');
- } else if (c == '*') {
- if (i + 1 < includePattern.length()) {
- char c2 = includePattern.charAt(++i);
- if (c2 == '*') {
- regex.append(".*");
- i++;
- continue;
- }
- }
- regex.append("[^/]*");
- } else {
- regex.append(c);
- }
- // TODO: Escape backslashes.
- }
- regex.append(")");
- }
- }
- regex.append(")");
- }
- return Pattern.compile(regex.toString());
- }
-}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
new file mode 100644
index 0000000..df72add
--- /dev/null
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
@@ -0,0 +1,212 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.bundle.ant.type;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Target;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.system.SystemInfoFactory;
+import org.rhq.core.template.TemplateEngine;
+import org.rhq.core.util.updater.DeployDifferences;
+import org.rhq.core.util.updater.Deployer;
+import org.rhq.core.util.updater.DeploymentData;
+import org.rhq.core.util.updater.DeploymentProperties;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * An Ant task for deploying a bundle or previewing the deployment.
+ *
+ * @author Ian Springer
+ */
+public class DeploymentUnitType extends AbstractBundleType {
+ private String name;
+ private Map<File, File> files = new LinkedHashMap<File, File>();
+ private Set<File> rawFilesToReplace = new LinkedHashSet<File>();
+ private Set<File> archives = new LinkedHashSet<File>();
+ private Map<File, Pattern> archiveReplacePatterns = new HashMap<File, Pattern>();
+ private SystemServiceType systemService;
+ private Pattern ignorePattern;
+ private boolean preview;
+ private String preinstallTarget;
+ private String postinstallTarget;
+
+ public void install(boolean revert, boolean clean) throws BuildException {
+ if (this.preinstallTarget != null) {
+ Target target = (Target) getProject().getTargets().get(this.preinstallTarget);
+ if (target == null) {
+ throw new BuildException("Specified preinstall target (" + this.preinstallTarget + ") does not exist.");
+ }
+ target.performTasks();
+ }
+
+ int deploymentId = getProject().getDeploymentId();
+ DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
+ getProject().getBundleVersion(), getProject().getBundleDescription());
+ File deployDir = getProject().getDeployDir();
+ TemplateEngine templateEngine = createTemplateEngine();
+ if (this.files.isEmpty() && this.archives.isEmpty()) {
+ throw new BuildException("You must specify at least one file to deploy via nested rhq:file and/or rhq:archive elements.");
+ }
+ if (!this.files.isEmpty()) {
+ log("Deploying files " + this.files + "...", Project.MSG_VERBOSE);
+ }
+ if (!this.archives.isEmpty()) {
+ log("Deploying archives " + this.archives + "...", Project.MSG_VERBOSE);
+ }
+
+ DeploymentData deploymentData = new DeploymentData(deploymentProps, this.archives, this.files, deployDir,
+ this.archiveReplacePatterns, this.rawFilesToReplace, templateEngine, this.ignorePattern);
+ Deployer deployer = new Deployer(deploymentData);
+ try {
+ DeployDifferences diffs = getProject().getDeployDifferences();
+ boolean dryRun = getProject().isDryRun();
+ if (revert) {
+ deployer.redeployAndRestoreBackupFiles(diffs, clean, dryRun);
+ } else {
+ deployer.deploy(diffs, clean, dryRun);
+ }
+ deployer.deploy(diffs);
+ getProject().log("Results:\n" + diffs + "\n");
+ } catch (Exception e) {
+ throw new BuildException("Failed to deploy bundle '" + getProject().getBundleName() + "' version "
+ + getProject().getBundleVersion() + ": " + e, e);
+ }
+
+ if (this.systemService != null) {
+ this.systemService.install();
+ }
+
+ if (this.postinstallTarget != null) {
+ Target target = (Target) getProject().getTargets().get(this.postinstallTarget);
+ if (target == null) {
+ throw new BuildException("Specified postinstall target (" + this.postinstallTarget + ") does not exist.");
+ }
+ target.performTasks();
+ }
+
+ return;
+ }
+
+ public void start() throws BuildException {
+
+ }
+
+ public void stop() throws BuildException {
+
+ }
+
+ public void upgrade(boolean revert, boolean clean) throws BuildException {
+ install(revert, clean);
+ }
+
+ public void uninstall() throws BuildException {
+ // TODO
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Map<File, File> getFiles() {
+ return files;
+ }
+
+ public Set<File> getArchives() {
+ return archives;
+ }
+
+ public boolean isPreview() {
+ return this.preview;
+ }
+
+ public void setPreview(boolean preview) {
+ this.preview = preview;
+ }
+
+ public String getPreinstallTarget() {
+ return preinstallTarget;
+ }
+
+ public void setPreinstallTarget(String preinstallTarget) {
+ this.preinstallTarget = preinstallTarget;
+ }
+
+ public String getPostinstallTarget() {
+ return postinstallTarget;
+ }
+
+ public void setPostinstallTarget(String postinstallTarget) {
+ this.postinstallTarget = postinstallTarget;
+ }
+
+ public void addConfigured(SystemServiceType systemService) {
+ if (this.systemService != null) {
+ throw new IllegalStateException("A deployment can only have one system-service child element.");
+ }
+ this.systemService = systemService;
+ }
+
+ public void addConfigured(FileType file) {
+ File destFile = file.getDestinationFile();
+ if (destFile == null) {
+ File destDir = file.getDestinationDir();
+ destFile = new File(destDir, file.getSource().getName());
+ }
+ this.files.put(file.getSource(), destFile);
+ if (file.isReplace()) {
+ this.rawFilesToReplace.add(file.getSource());
+ }
+ }
+
+ public void addConfigured(ArchiveType archive) {
+ this.archives.add(archive.getSource());
+ Pattern replacePattern = archive.getReplacePattern();
+ if (replacePattern != null) {
+ this.archiveReplacePatterns.put(archive.getSource(), replacePattern);
+ }
+ }
+
+ public void addConfigured(IgnoreType ignore) {
+ List<FileSet> fileSets = ignore.getFileSets();
+ this.ignorePattern = getPattern(fileSets);
+ }
+
+ private TemplateEngine createTemplateEngine() {
+ TemplateEngine templateEngine = SystemInfoFactory.fetchTemplateEngine();
+ // Add the deployment props to the template engine's tokens.
+ Configuration config = getProject().getConfiguration();
+ for (PropertySimple prop : config.getSimpleProperties().values()) {
+ templateEngine.getTokens().put(prop.getName(), prop.getStringValue());
+ }
+ return templateEngine;
+ }
+}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
index 4e2c296..2e55c0e 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
@@ -27,13 +27,15 @@ import org.apache.tools.ant.BuildException;
import java.io.File;
/**
- * A file to be copied during the bundle deployment.
+ * A file to be copied during the bundle deployment. If the replace attribute is set to true, any template variables
+ * (e.g. @@http.port@@) inside the file will be replaced with the value of the corresponding property.
*
* @author Ian Springer
*/
public class FileType extends AbstractFileType {
private File destinationDir;
private File destinationFile;
+ private boolean replace;
public File getDestinationDir() {
return this.destinationDir;
@@ -57,4 +59,12 @@ public class FileType extends AbstractFileType {
}
this.destinationFile = new File(destinationFile);
}
+
+ public boolean isReplace() {
+ return replace;
+ }
+
+ public void setReplace(boolean replace) {
+ this.replace = replace;
+ }
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
index cdf2b6c..4479d1c 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
@@ -22,8 +22,6 @@
*/
package org.rhq.bundle.ant.type;
-import org.apache.tools.ant.types.DataType;
-
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml b/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
index 9f01c2b..fee46ef 100644
--- a/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
+++ b/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
@@ -8,7 +8,7 @@
<!-- bundle task's child types -->
<typedef name="input-property" classname="org.rhq.bundle.ant.type.InputPropertyType"/>
- <typedef name="deployment" classname="org.rhq.bundle.ant.type.DeploymentType"/>
+ <typedef name="deployment-unit" classname="org.rhq.bundle.ant.type.DeploymentUnitType"/>
<!-- deployment type's child types -->
<typedef name="file" classname="org.rhq.bundle.ant.type.FileType"/>
diff --git a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
index 403bfa2..831bdf9 100644
--- a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
+++ b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
@@ -74,7 +74,7 @@ public class AntLauncherTest {
Properties inputProps = createInputProperties("/test-bundle-v1-input.properties");
List<BuildListener> buildListeners = createBuildListeners();
- BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v1.xml"), null, inputProps,
+ BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v1.xml"), inputProps,
buildListeners);
/*Map<String, String> bundleFiles = project.getBundleFiles();
assert bundleFiles != null;
@@ -94,6 +94,8 @@ public class AntLauncherTest {
String preinstallTargetExecuted = (String) project.getProperties().get("preinstallTargetExecuted");
assert preinstallTargetExecuted.equals("true");
+ String postinstallTargetExecuted = (String) project.getProperties().get("postinstallTargetExecuted");
+ assert postinstallTargetExecuted.equals("true");
}
private List<BuildListener> createBuildListeners() {
@@ -114,7 +116,7 @@ public class AntLauncherTest {
Properties inputProps = createInputProperties("/test-bundle-v2-input.properties");
List<BuildListener> buildListeners = createBuildListeners();
- BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v2.xml"), null, inputProps,
+ BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v2.xml"), inputProps,
buildListeners);
/*Map<String, String> bundleFiles = project.getBundleFiles();
assert bundleFiles != null;
@@ -136,8 +138,7 @@ public class AntLauncherTest {
private Properties createInputProperties(String resourcePath) throws IOException {
Properties inputProps = new Properties();
inputProps.setProperty(DeployPropertyNames.DEPLOY_DIR, DEPLOY_DIR.getPath());
- inputProps.setProperty(DeployPropertyNames.DEPLOY_ID, "100");
- inputProps.setProperty(DeployPropertyNames.DEPLOY_NAME, "appserver");
+ inputProps.setProperty(DeployPropertyNames.DEPLOY_ID, "100");
inputProps.setProperty(DeployPropertyNames.DEPLOY_PHASE, DeploymentPhase.INSTALL.name());
InputStream inputStream = this.getClass().getResourceAsStream(resourcePath);
try {
diff --git a/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml b/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
index 2e63b2c..76820bf 100644
--- a/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
+++ b/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
@@ -12,20 +12,21 @@
defaultValue="8080"
type="integer"/>
- <rhq:deployment name="appserver" preinstallTarget="preinstall">
+ <rhq:deployment-unit name="appserver" preinstallTarget="preinstall" postinstallTarget="postinstall">
<rhq:system-service name="foo" scriptFile="foo-script"
configFile="foo-config" overwriteScript="true"
startLevels="3,4,5" startPriority="80" stopPriority="20" root="root"/>
- <rhq:file name="test-v1.properties" destinationFile="subdir/test.properties"/>
- <rhq:archive name="file.zip"/>
- <rhq:replace>
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
+ <rhq:file name="test-v1.properties" destinationFile="subdir/test.properties" replace="true"/>
+ <rhq:archive name="file.zip">
+ <rhq:replace>
+ <rhq:fileset includes="**/*.properties"/>
+ </rhq:replace>
+ </rhq:archive>
<!-- the files that should be ignored during upgrades -->
<rhq:ignore>
<rhq:fileset includes="*.log"/>
</rhq:ignore>
- </rhq:deployment>
+ </rhq:deployment-unit>
</rhq:bundle>
@@ -36,4 +37,9 @@
<property name="preinstallTargetExecuted" value="true"/>
</target>
+ <target name="postinstall">
+ <echo>Done deploying Test Bundle v1.0 to ${rhq.deploy.dir}.</echo>
+ <property name="postinstallTargetExecuted" value="true"/>
+ </target>
+
</project>
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml b/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
index 501ba3f..6764c13 100644
--- a/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
+++ b/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
@@ -12,28 +12,34 @@
defaultValue="8080"
type="integer"/>
- <rhq:deployment name="appserver" preinstallTarget="preinstall">
+ <rhq:deployment-unit name="appserver" preinstallTarget="preinstall" postinstallTarget="postinstall">
<rhq:system-service name="foo" scriptFile="foo-script"
configFile="foo-config" overwriteScript="true"
startLevels="3,4,5" startPriority="80" stopPriority="20" root="root"/>
- <rhq:file name="test-v2.properties" destinationFile="subdir/test.properties"/>
- <rhq:archive name="file.zip"/>
- <rhq:replace>
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
+ <rhq:file name="test-v2.properties" destinationFile="subdir/test.properties" replace="true"/>
+ <rhq:archive name="file.zip">
+ <rhq:replace>
+ <rhq:fileset includes="**/*.properties"/>
+ </rhq:replace>
+ </rhq:archive>
<!-- the files that should be ignored during upgrades -->
<rhq:ignore>
<rhq:fileset includes="*.log"/>
</rhq:ignore>
- </rhq:deployment>
+ </rhq:deployment-unit>
</rhq:bundle>
<target name="main"/>
<target name="preinstall">
- <echo>Deploying Test Bundle v2.0 to ${rhq.deploy.dir}...</echo>
+ <echo>Deploying Test Bundle v1.0 to ${rhq.deploy.dir}...</echo>
<property name="preinstallTargetExecuted" value="true"/>
</target>
+ <target name="postinstall">
+ <echo>Done deploying Test Bundle v1.0 to ${rhq.deploy.dir}.</echo>
+ <property name="postinstallTargetExecuted" value="true"/>
+ </target>
+
</project>
\ No newline at end of file
diff --git a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
index 2eb1d85..f030cf0 100644
--- a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
+++ b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
@@ -36,6 +36,8 @@ import org.apache.tools.ant.Project;
import org.rhq.bundle.ant.AntLauncher;
import org.rhq.bundle.ant.BundleAntProject;
import org.rhq.bundle.ant.DeployPropertyNames;
+import org.rhq.bundle.ant.DeploymentPhase;
+import org.rhq.bundle.ant.InvalidBuildFileException;
import org.rhq.bundle.ant.LoggerAntBuildListener;
import org.rhq.core.domain.bundle.BundleDeployment;
import org.rhq.core.domain.bundle.BundleResourceDeployment;
@@ -54,6 +56,8 @@ import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.system.SystemInfoFactory;
import org.rhq.core.util.stream.StreamUtil;
import org.rhq.core.util.updater.DeployDifferences;
+import org.rhq.core.util.updater.Deployer;
+import org.rhq.core.util.updater.DeploymentsMetadata;
/**
* @author John Mazzitelli
@@ -121,9 +125,17 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
buildListeners.add(auditor);
// Parse and execute the Ant script.
- AntLauncher antLauncher = new AntLauncher();
- BundleAntProject project = antLauncher.executeBundleDeployFile(recipeFile, null, antProps,
- buildListeners);
+ executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ DeploymentPhase.STOP);
+ String deployDirString = bundleDeployment.getDestination().getDeployDir();
+ File deployDir = new File(deployDirString);
+ DeploymentsMetadata deployMetadata = new DeploymentsMetadata(deployDir);
+ DeploymentPhase installPhase = (deployMetadata.isManaged()) ? DeploymentPhase.UPGRADE :
+ DeploymentPhase.INSTALL;
+ BundleAntProject project = executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ installPhase);
+ executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ DeploymentPhase.START);
// Send the diffs to the Server so it can store them as an entry in the deployment history.
BundleManagerProvider bundleManagerProvider = request.getBundleManagerProvider();
@@ -153,6 +165,12 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
return result;
}
+ private BundleAntProject executeDeploymentPhase(File recipeFile, Properties antProps, List<BuildListener> buildListeners, DeploymentPhase stop) throws InvalidBuildFileException {
+ AntLauncher antLauncher = new AntLauncher();
+ BundleAntProject project = antLauncher.executeBundleDeployFile(recipeFile, antProps, buildListeners);
+ return project;
+ }
+
private Properties createAntProperties(BundleDeployRequest request) {
Properties antProps = new Properties();
diff --git a/modules/plugins/ant-bundle/src/test/resources/simple-build.xml b/modules/plugins/ant-bundle/src/test/resources/simple-build.xml
deleted file mode 100644
index 88ade87..0000000
--- a/modules/plugins/ant-bundle/src/test/resources/simple-build.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="test" default="init"
- xmlns:rhq="antlib:org.rhq.bundle">
-
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <property name="outfile" value="${basedir}/output.1" />
-
- <target name="init">
- <echo file="${outfile}" message="Hello World!!"/>
- </target>
-
-</project>
-
\ No newline at end of file
diff --git a/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml b/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml
new file mode 100644
index 0000000..f51fae3
--- /dev/null
+++ b/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<project name="simple-build" default="main"
+ xmlns:rhq="antlib:org.rhq.bundle">
+
+ <echo>basedir=${basedir}</echo>
+
+ <property name="outfile" value="${basedir}/output.2" />
+
+ <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
+ description="example.com corporate website hosted on JBoss EAP 4.3">
+
+ <rhq:input-property
+ name="custom.prop1"
+ description="my prop 1"
+ required="true"
+ defaultValue="default 1"/>
+
+ <rhq:input-property
+ name="custom.prop2"
+ description="my prop 2"
+ required="true"
+ defaultValue="default 2"/>
+
+ <rhq:deployment-unit name="doodibittydoo">
+ <rhq:file name="test.properties" destinationFile="config/test.properties" replace="true"/>
+ </rhq:deployment-unit>
+
+ </rhq:bundle>
+
+ <target name="main"/>
+
+</project>
\ No newline at end of file
1
0
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java | 20
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java | 8
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java | 58 +-
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java | 60 ++
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java | 16
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java | 268 ----------
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java | 212 +++++++
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java | 12
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java | 2
modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml | 2
modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java | 9
modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml | 20
modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml | 22
modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java | 3
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 24
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java | 62 --
modules/plugins/ant-bundle/src/test/resources/simple-build.xml | 16
modules/plugins/ant-bundle/src/test/resources/test-build.xml | 29 -
modules/plugins/ant-bundle/src/test/resources/test-bundle.xml | 33 +
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 9
20 files changed, 444 insertions(+), 441 deletions(-)
New commits:
commit 8262dbadeb2514fd482ad8a28cb9071af763008d
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Thu May 27 10:34:12 2010 -0400
throw IllegalArgumentException in setChildSubCategories() if arg is null
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java
index 47f54aa..7714e39 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceSubCategory.java
@@ -246,6 +246,9 @@ public class ResourceSubCategory implements Comparable<ResourceSubCategory>, Ser
}
public void setChildSubCategories(List<ResourceSubCategory> childSubCategories) {
+ if (childSubCategories == null) {
+ throw new IllegalArgumentException("childSubCategories is null.");
+ }
this.childSubCategories = childSubCategories;
}
commit 8b50ba816d704ced7668a7fa6aa869416ba0c043
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Thu May 27 10:33:03 2010 -0400
various reworking of rhq:bundle Ant task as discussed; rename rhq:deployment element to rhq:deploymentUnit
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
index 7c4925b..93e0a6a 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/AntLauncher.java
@@ -46,7 +46,7 @@ import org.apache.tools.ant.helper.AntXMLContext;
import org.apache.tools.ant.helper.ProjectHelper2;
import org.rhq.bundle.ant.task.BundleTask;
-import org.rhq.bundle.ant.type.DeploymentType;
+import org.rhq.bundle.ant.type.DeploymentUnitType;
/**
* This object enables you to invoke an Ant script within the running VM. You can fully run the script
@@ -69,14 +69,11 @@ public class AntLauncher {
// TODO (ips, 04/28/10): Figure out a way to avoid assuming the prefix is "rhq".
private static final String BUNDLE_TASK_NAME = "rhq:bundle";
- private static final String INPUT_PROPERTY_TASK_NAME = "rhq:input-property";
- private static final String DEPLOY_TASK_NAME = "rhq:deploy";
/**
* Executes the specified bundle deploy Ant build file (i.e. rhq-deploy.xml).
*
* @param buildFile the path to the build file (i.e. rhq-deploy.xml)
- * @param targetName the target to run, <code>null</code> will run the default target
* @param buildProperties the properties to pass into Ant
* @param buildListeners a list of build listeners (provide callback methods for targetExecuted, taskExecuted, etc.)
*
@@ -84,8 +81,9 @@ public class AntLauncher {
*
* @throws InvalidBuildFileException if the build file is invalid
*/
- public BundleAntProject executeBundleDeployFile(File buildFile, String targetName, Properties buildProperties,
- List<BuildListener> buildListeners) throws InvalidBuildFileException {
+ public BundleAntProject executeBundleDeployFile(File buildFile, Properties buildProperties,
+ List<BuildListener> buildListeners)
+ throws InvalidBuildFileException {
parseBundleDeployFile(buildFile);
BundleAntProject project = new BundleAntProject();
@@ -121,8 +119,8 @@ public class AntLauncher {
// targets.
project.executeTarget("");
- // Now execute the target the user actually specified.
- project.executeTarget((targetName == null) ? project.getDefaultTarget() : targetName);
+ // Now execute the default target?
+ //project.executeTarget(project.getDefaultTarget());
return project;
} catch (Exception e) {
@@ -228,11 +226,11 @@ public class AntLauncher {
}
BundleTask bundleTask = (BundleTask) preconfigureTask(unconfiguredBundleTask);
- Collection<DeploymentType> deployments = bundleTask.getDeployments().values();
+ Collection<DeploymentUnitType> deployments = bundleTask.getDeploymentUnits().values();
if (deployments.isEmpty()) {
- throw new InvalidBuildFileException("The bundle task must contain at least one deployment child element.");
+ throw new InvalidBuildFileException("The bundle task must contain exactly one rhq:deploymentUnit child element.");
}
- DeploymentType deployment = deployments.iterator().next();
+ DeploymentUnitType deployment = deployments.iterator().next();
Map<File, File> files = deployment.getFiles();
for (File file : files.values()) {
project.getBundleFileNames().add(file.getName());
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
index 7d7959a..bd83825 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/BundleAntProject.java
@@ -121,14 +121,6 @@ public class BundleAntProject extends Project {
this.deploymentId = deploymentId;
}
- public String getDeploymentName() {
- return deploymentName;
- }
-
- public void setDeploymentName(String deploymentName) {
- this.deploymentName = deploymentName;
- }
-
public DeploymentPhase getDeploymentPhase() {
return deploymentPhase;
}
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
index f943c0d..8e3c066 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/task/BundleTask.java
@@ -22,7 +22,7 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.rhq.bundle.ant.DeployPropertyNames;
import org.rhq.bundle.ant.DeploymentPhase;
-import org.rhq.bundle.ant.type.DeploymentType;
+import org.rhq.bundle.ant.type.DeploymentUnitType;
import org.rhq.bundle.ant.type.InputPropertyType;
import java.io.File;
@@ -43,7 +43,7 @@ public class BundleTask extends AbstractBundleTask {
private String name;
private String version;
private String description;
- private Map<String, DeploymentType> deployments = new HashMap<String, DeploymentType>();
+ private Map<String, DeploymentUnitType> deploymentUnits = new HashMap<String, DeploymentUnitType>();
private Set<InputPropertyType> inputProperties = new HashSet<InputPropertyType>();
@Override
@@ -63,8 +63,8 @@ public class BundleTask extends AbstractBundleTask {
* The RHQ Ant launcher will ensure that the following Ant project properties are defined prior to this method being
* invoked:
*
- * rhq.deploy.name - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment} name
- * (e.g. "appserver")
+ * rhq.deploy.id - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment}'s unique id
+ * (e.g. "10001")
* rhq.deploy.dir - the {@link org.rhq.core.domain.bundle.BundleDeployment deployment} install dir
* (e.g. "/opt/jbossas-petstore")
* rhq.deploy.phase - the {@link org.rhq.bundle.ant.DeploymentPhase deployment phase}
@@ -105,15 +105,10 @@ public class BundleTask extends AbstractBundleTask {
getProject().setDeploymentId(deploymentId);
log(DeployPropertyNames.DEPLOY_ID + "=\"" + deploymentId + "\"", Project.MSG_DEBUG);
- String deploymentName = (String) projectProps.get(DeployPropertyNames.DEPLOY_NAME);
- if (deploymentName == null) {
- throw new BuildException("Required property [" + DeployPropertyNames.DEPLOY_NAME + "] was not specified.");
- }
- getProject().setDeploymentName(deploymentName);
- DeploymentType deployment = this.deployments.get(deploymentName);
- if (deployment == null) {
- throw new BuildException("There is no deployment element defined with name '" + deploymentName + "'.");
+ if (this.deploymentUnits.size() != 1) {
+ throw new BuildException("The rhq:bundle task must contain exactly one rhq:deploymentUnit element.");
}
+ DeploymentUnitType deploymentUnit = this.deploymentUnits.values().iterator().next();
String deploymentPhaseName = (String) projectProps.get(DeployPropertyNames.DEPLOY_PHASE);
if (deploymentPhaseName == null) {
@@ -142,28 +137,31 @@ public class BundleTask extends AbstractBundleTask {
String dryRunString = (String) projectProps.get(DeployPropertyNames.DEPLOY_DRY_RUN);
boolean dryRun = Boolean.valueOf(dryRunString);
getProject().setDryRun(dryRun);
-
- log("Executing '" + deploymentPhase + "' phase for deployment '" + deploymentName + "' from bundle '"
- + this.name + "' version " + this.version + " using config " + getProject().getConfiguration() + "...");
+ String revertString = (String) projectProps.get(DeployPropertyNames.DEPLOY_REVERT);
+ boolean revert = Boolean.valueOf(revertString);
+ String cleanString = (String) projectProps.get(DeployPropertyNames.DEPLOY_CLEAN);
+ boolean clean = Boolean.valueOf(cleanString);
+
+ log("Executing '" + deploymentPhase + "' phase for deployment with id [" + deploymentId + "] from bundle '"
+ + this.name + "' version " + this.version + " using config "
+ + getProject().getConfiguration().toString(true) + " [dryRun=" + dryRun + ", revert=" + revert
+ + ", clean=" + clean + "]...");
switch (deploymentPhase) {
case INSTALL:
- String revertString = (String) projectProps.get(DeployPropertyNames.DEPLOY_REVERT);
- boolean revert = Boolean.valueOf(revertString);
- String cleanString = (String) projectProps.get(DeployPropertyNames.DEPLOY_CLEAN);
- boolean clean = Boolean.valueOf(cleanString);
- deployment.install(revert, clean);
+ // TODO: Revert doesn't really make sense for an initial install.
+ deploymentUnit.install(revert, clean);
break;
case START:
- deployment.start();
+ deploymentUnit.start();
break;
case STOP:
- deployment.stop();
+ deploymentUnit.stop();
break;
case UPGRADE:
- deployment.upgrade();
+ deploymentUnit.upgrade(revert, clean);
break;
case UNINSTALL:
- deployment.uninstall();
+ deploymentUnit.uninstall();
break;
}
}
@@ -197,12 +195,12 @@ public class BundleTask extends AbstractBundleTask {
inputProperty.init();
}
- public void addConfigured(DeploymentType deployment) {
- this.deployments.put(deployment.getName(), deployment);
+ public void addConfigured(DeploymentUnitType deployment) {
+ this.deploymentUnits.put(deployment.getName(), deployment);
}
- public Map<String, DeploymentType> getDeployments() {
- return deployments;
+ public Map<String, DeploymentUnitType> getDeploymentUnits() {
+ return deploymentUnits;
}
/**
@@ -233,8 +231,8 @@ public class BundleTask extends AbstractBundleTask {
* @throws BuildException if an error occurs
*/
protected void validateTypes() throws BuildException {
- if (this.deployments.isEmpty()) {
- throw new BuildException("At least one 'deployment' child element must be specified.");
+ if (this.deploymentUnits.isEmpty()) {
+ throw new BuildException("At least one 'rhq:deploymentUnit' child element must be specified.");
}
}
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
index 6874a63..cea5df4 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java
@@ -3,6 +3,10 @@ package org.rhq.bundle.ant.type;
import org.apache.tools.ant.types.DataType;
import org.rhq.bundle.ant.BundleAntProject;
+import java.io.File;
+import java.util.List;
+import java.util.regex.Pattern;
+
/**
*
*/
@@ -11,4 +15,60 @@ public abstract class AbstractBundleType extends DataType {
public BundleAntProject getProject() {
return (BundleAntProject)super.getProject();
}
+
+ protected static Pattern getPattern(List<FileSet> fileSets) {
+ if (fileSets == null || fileSets.isEmpty()) {
+ return null;
+ }
+ boolean first = true;
+ StringBuilder regex = new StringBuilder();
+ for (FileSet fileSet : fileSets) {
+ if (!first) {
+ regex.append("|");
+ } else {
+ first = false;
+ }
+ regex.append("(");
+ File dir = fileSet.getDir();
+ if (dir != null) {
+ regex.append(dir);
+ regex.append('/');
+ }
+ if (fileSet.getIncludePatterns().length == 0) {
+ regex.append(".*");
+ } else {
+ boolean firstIncludePattern = true;
+ for (String includePattern : fileSet.getIncludePatterns()) {
+ if (!firstIncludePattern) {
+ regex.append("|");
+ } else {
+ firstIncludePattern = false;
+ }
+ regex.append("(");
+ for (int i = 0; i < includePattern.length(); i++) {
+ char c = includePattern.charAt(i);
+ if (c == '?') {
+ regex.append('.');
+ } else if (c == '*') {
+ if (i + 1 < includePattern.length()) {
+ char c2 = includePattern.charAt(++i);
+ if (c2 == '*') {
+ regex.append(".*");
+ i++;
+ continue;
+ }
+ }
+ regex.append("[^/]*");
+ } else {
+ regex.append(c);
+ }
+ // TODO: Escape backslashes.
+ }
+ regex.append(")");
+ }
+ }
+ regex.append(")");
+ }
+ return Pattern.compile(regex.toString());
+ }
}
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
index 1320630..19aaaf6 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ArchiveType.java
@@ -22,11 +22,25 @@
*/
package org.rhq.bundle.ant.type;
+import java.util.List;
+import java.util.regex.Pattern;
+
/**
- * An archive file to be exploded during the bundle deployment.
+ * An archive file to be exploded during the bundle deployment. Can optionally contain a rhq:replace child element
+ * that specifies the set of files that contain template variables (e.g. @@http.port@@) which need to be replaced with
+ * the value of the corresponding property.
*
* @author Ian Springer
*/
public class ArchiveType extends AbstractFileType {
+ private Pattern replacePattern;
+
+ public void addConfigured(ReplaceType replace) {
+ List<FileSet> fileSets = replace.getFileSets();
+ this.replacePattern = getPattern(fileSets);
+ }
+ public Pattern getReplacePattern() {
+ return replacePattern;
+ }
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java
deleted file mode 100644
index db33995..0000000
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentType.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.bundle.ant.type;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertySimple;
-import org.rhq.core.system.SystemInfoFactory;
-import org.rhq.core.template.TemplateEngine;
-import org.rhq.core.util.updater.DeployDifferences;
-import org.rhq.core.util.updater.Deployer;
-import org.rhq.core.util.updater.DeploymentData;
-import org.rhq.core.util.updater.DeploymentProperties;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-/**
- * An Ant task for deploying a bundle or previewing the deployment.
- *
- * @author Ian Springer
- */
-public class DeploymentType extends AbstractBundleType {
- private String name;
- private Map<File, File> files = new LinkedHashMap<File, File>();
- private Set<File> archives = new LinkedHashSet<File>();
- private SystemServiceType systemService;
- private Pattern ignorePattern;
- private Pattern replacePattern;
- private boolean preview;
- private String preinstallTarget;
- private String postinstallTarget;
-
- public void install(boolean revert, boolean clean) throws BuildException {
- if (this.preinstallTarget != null) {
- Target target = (Target) getProject().getTargets().get(this.preinstallTarget);
- if (target == null) {
- throw new BuildException("Specified preinstall target (" + this.preinstallTarget + ") does not exist.");
- }
- target.performTasks();
- }
-
- int deploymentId = getProject().getDeploymentId();
- DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
- getProject().getBundleVersion(), getProject().getBundleDescription());
- File deployDir = getProject().getDeployDir();
- TemplateEngine templateEngine = createTemplateEngine();
- if (this.files.isEmpty() && this.archives.isEmpty()) {
- throw new BuildException("You must specify at least one file to deploy via nested rhq:file and/or rhq:archive elements.");
- }
- if (!this.files.isEmpty()) {
- log("Deploying files " + this.files + "...", Project.MSG_VERBOSE);
- }
- if (!this.archives.isEmpty()) {
- log("Deploying archives " + this.archives + "...", Project.MSG_VERBOSE);
- }
-
- // for now, apply the pattern to all files in the deployment
- Map<File, Pattern> archiveReplacePatterns = new HashMap<File, Pattern>();
- for (File file : this.archives) {
- archiveReplacePatterns.put(file, this.replacePattern);
- }
- Set<File> rawFilesToReplace = this.files.keySet(); // TODO: CHANGE ME! only replace those raw files marked as "replace=true"
- DeploymentData dd = new DeploymentData(deploymentProps, this.archives, this.files, deployDir,
- archiveReplacePatterns, rawFilesToReplace, templateEngine, this.ignorePattern);
- Deployer deployer = new Deployer(dd);
- try {
- DeployDifferences diffs = getProject().getDeployDifferences();
- boolean dryRun = getProject().isDryRun();
- if (revert) {
- deployer.redeployAndRestoreBackupFiles(diffs, clean, dryRun);
- } else {
- deployer.deploy(diffs, clean, dryRun);
- }
- deployer.deploy(diffs);
- getProject().log("Results:\n" + diffs + "\n");
- } catch (Exception e) {
- throw new BuildException("Failed to deploy bundle '" + getProject().getBundleName() + "' version "
- + getProject().getBundleVersion() + ": " + e, e);
- }
-
- if (this.systemService != null) {
- this.systemService.install();
- }
-
- if (this.postinstallTarget != null) {
- Target target = (Target) getProject().getTargets().get(this.postinstallTarget);
- if (target == null) {
- throw new BuildException("Specified postinstall target (" + this.postinstallTarget + ") does not exist.");
- }
- target.performTasks();
- }
-
- return;
- }
-
- public void start() throws BuildException {
-
- }
-
- public void stop() throws BuildException {
-
- }
-
- public void upgrade() throws BuildException {
-
- }
-
- public void uninstall() throws BuildException {
- // TODO
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Map<File, File> getFiles() {
- return files;
- }
-
- public Set<File> getArchives() {
- return archives;
- }
-
- public boolean isPreview() {
- return this.preview;
- }
-
- public void setPreview(boolean preview) {
- this.preview = preview;
- }
-
- public String getPreinstallTarget() {
- return preinstallTarget;
- }
-
- public void setPreinstallTarget(String preinstallTarget) {
- this.preinstallTarget = preinstallTarget;
- }
-
- public String getPostinstallTarget() {
- return postinstallTarget;
- }
-
- public void setPostinstallTarget(String postinstallTarget) {
- this.postinstallTarget = postinstallTarget;
- }
-
- public void addConfigured(SystemServiceType systemService) {
- if (this.systemService != null) {
- throw new IllegalStateException("A deployment can only have one system-service child element.");
- }
- this.systemService = systemService;
- }
-
- public void addConfigured(FileType file) {
- File destFile = file.getDestinationFile();
- if (destFile == null) {
- File destDir = file.getDestinationDir();
- destFile = new File(destDir, file.getSource().getName());
- }
- this.files.put(file.getSource(), destFile);
- }
-
- public void addConfigured(ArchiveType archive) {
- this.archives.add(archive.getSource());
- }
-
- public void addConfigured(IgnoreType ignore) {
- List<FileSet> fileSets = ignore.getFileSets();
- this.ignorePattern = getPattern(fileSets);
- }
-
- public void addConfigured(ReplaceType replace) {
- List<FileSet> fileSets = replace.getFileSets();
- this.replacePattern = getPattern(fileSets);
- }
-
- private TemplateEngine createTemplateEngine() {
- TemplateEngine templateEngine = SystemInfoFactory.fetchTemplateEngine();
- // Add the deployment props to the template engine's tokens.
- Configuration config = getProject().getConfiguration();
- for (PropertySimple prop : config.getSimpleProperties().values()) {
- templateEngine.getTokens().put(prop.getName(), prop.getStringValue());
- }
- return templateEngine;
- }
-
- private static Pattern getPattern(List<FileSet> fileSets) {
- boolean first = true;
- StringBuilder regex = new StringBuilder();
- for (FileSet fileSet : fileSets) {
- if (!first) {
- regex.append("|");
- } else {
- first = false;
- }
- regex.append("(");
- File dir = fileSet.getDir();
- if (dir != null) {
- regex.append(dir);
- regex.append('/');
- }
- if (fileSet.getIncludePatterns().length == 0) {
- regex.append(".*");
- } else {
- boolean firstIncludePattern = true;
- for (String includePattern : fileSet.getIncludePatterns()) {
- if (!firstIncludePattern) {
- regex.append("|");
- } else {
- firstIncludePattern = false;
- }
- regex.append("(");
- for (int i = 0; i < includePattern.length(); i++) {
- char c = includePattern.charAt(i);
- if (c == '?') {
- regex.append('.');
- } else if (c == '*') {
- if (i + 1 < includePattern.length()) {
- char c2 = includePattern.charAt(++i);
- if (c2 == '*') {
- regex.append(".*");
- i++;
- continue;
- }
- }
- regex.append("[^/]*");
- } else {
- regex.append(c);
- }
- // TODO: Escape backslashes.
- }
- regex.append(")");
- }
- }
- regex.append(")");
- }
- return Pattern.compile(regex.toString());
- }
-}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
new file mode 100644
index 0000000..df72add
--- /dev/null
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
@@ -0,0 +1,212 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.bundle.ant.type;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Target;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.system.SystemInfoFactory;
+import org.rhq.core.template.TemplateEngine;
+import org.rhq.core.util.updater.DeployDifferences;
+import org.rhq.core.util.updater.Deployer;
+import org.rhq.core.util.updater.DeploymentData;
+import org.rhq.core.util.updater.DeploymentProperties;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * An Ant task for deploying a bundle or previewing the deployment.
+ *
+ * @author Ian Springer
+ */
+public class DeploymentUnitType extends AbstractBundleType {
+ private String name;
+ private Map<File, File> files = new LinkedHashMap<File, File>();
+ private Set<File> rawFilesToReplace = new LinkedHashSet<File>();
+ private Set<File> archives = new LinkedHashSet<File>();
+ private Map<File, Pattern> archiveReplacePatterns = new HashMap<File, Pattern>();
+ private SystemServiceType systemService;
+ private Pattern ignorePattern;
+ private boolean preview;
+ private String preinstallTarget;
+ private String postinstallTarget;
+
+ public void install(boolean revert, boolean clean) throws BuildException {
+ if (this.preinstallTarget != null) {
+ Target target = (Target) getProject().getTargets().get(this.preinstallTarget);
+ if (target == null) {
+ throw new BuildException("Specified preinstall target (" + this.preinstallTarget + ") does not exist.");
+ }
+ target.performTasks();
+ }
+
+ int deploymentId = getProject().getDeploymentId();
+ DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
+ getProject().getBundleVersion(), getProject().getBundleDescription());
+ File deployDir = getProject().getDeployDir();
+ TemplateEngine templateEngine = createTemplateEngine();
+ if (this.files.isEmpty() && this.archives.isEmpty()) {
+ throw new BuildException("You must specify at least one file to deploy via nested rhq:file and/or rhq:archive elements.");
+ }
+ if (!this.files.isEmpty()) {
+ log("Deploying files " + this.files + "...", Project.MSG_VERBOSE);
+ }
+ if (!this.archives.isEmpty()) {
+ log("Deploying archives " + this.archives + "...", Project.MSG_VERBOSE);
+ }
+
+ DeploymentData deploymentData = new DeploymentData(deploymentProps, this.archives, this.files, deployDir,
+ this.archiveReplacePatterns, this.rawFilesToReplace, templateEngine, this.ignorePattern);
+ Deployer deployer = new Deployer(deploymentData);
+ try {
+ DeployDifferences diffs = getProject().getDeployDifferences();
+ boolean dryRun = getProject().isDryRun();
+ if (revert) {
+ deployer.redeployAndRestoreBackupFiles(diffs, clean, dryRun);
+ } else {
+ deployer.deploy(diffs, clean, dryRun);
+ }
+ deployer.deploy(diffs);
+ getProject().log("Results:\n" + diffs + "\n");
+ } catch (Exception e) {
+ throw new BuildException("Failed to deploy bundle '" + getProject().getBundleName() + "' version "
+ + getProject().getBundleVersion() + ": " + e, e);
+ }
+
+ if (this.systemService != null) {
+ this.systemService.install();
+ }
+
+ if (this.postinstallTarget != null) {
+ Target target = (Target) getProject().getTargets().get(this.postinstallTarget);
+ if (target == null) {
+ throw new BuildException("Specified postinstall target (" + this.postinstallTarget + ") does not exist.");
+ }
+ target.performTasks();
+ }
+
+ return;
+ }
+
+ public void start() throws BuildException {
+
+ }
+
+ public void stop() throws BuildException {
+
+ }
+
+ public void upgrade(boolean revert, boolean clean) throws BuildException {
+ install(revert, clean);
+ }
+
+ public void uninstall() throws BuildException {
+ // TODO
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Map<File, File> getFiles() {
+ return files;
+ }
+
+ public Set<File> getArchives() {
+ return archives;
+ }
+
+ public boolean isPreview() {
+ return this.preview;
+ }
+
+ public void setPreview(boolean preview) {
+ this.preview = preview;
+ }
+
+ public String getPreinstallTarget() {
+ return preinstallTarget;
+ }
+
+ public void setPreinstallTarget(String preinstallTarget) {
+ this.preinstallTarget = preinstallTarget;
+ }
+
+ public String getPostinstallTarget() {
+ return postinstallTarget;
+ }
+
+ public void setPostinstallTarget(String postinstallTarget) {
+ this.postinstallTarget = postinstallTarget;
+ }
+
+ public void addConfigured(SystemServiceType systemService) {
+ if (this.systemService != null) {
+ throw new IllegalStateException("A deployment can only have one system-service child element.");
+ }
+ this.systemService = systemService;
+ }
+
+ public void addConfigured(FileType file) {
+ File destFile = file.getDestinationFile();
+ if (destFile == null) {
+ File destDir = file.getDestinationDir();
+ destFile = new File(destDir, file.getSource().getName());
+ }
+ this.files.put(file.getSource(), destFile);
+ if (file.isReplace()) {
+ this.rawFilesToReplace.add(file.getSource());
+ }
+ }
+
+ public void addConfigured(ArchiveType archive) {
+ this.archives.add(archive.getSource());
+ Pattern replacePattern = archive.getReplacePattern();
+ if (replacePattern != null) {
+ this.archiveReplacePatterns.put(archive.getSource(), replacePattern);
+ }
+ }
+
+ public void addConfigured(IgnoreType ignore) {
+ List<FileSet> fileSets = ignore.getFileSets();
+ this.ignorePattern = getPattern(fileSets);
+ }
+
+ private TemplateEngine createTemplateEngine() {
+ TemplateEngine templateEngine = SystemInfoFactory.fetchTemplateEngine();
+ // Add the deployment props to the template engine's tokens.
+ Configuration config = getProject().getConfiguration();
+ for (PropertySimple prop : config.getSimpleProperties().values()) {
+ templateEngine.getTokens().put(prop.getName(), prop.getStringValue());
+ }
+ return templateEngine;
+ }
+}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
index 4e2c296..2e55c0e 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/FileType.java
@@ -27,13 +27,15 @@ import org.apache.tools.ant.BuildException;
import java.io.File;
/**
- * A file to be copied during the bundle deployment.
+ * A file to be copied during the bundle deployment. If the replace attribute is set to true, any template variables
+ * (e.g. @@http.port@@) inside the file will be replaced with the value of the corresponding property.
*
* @author Ian Springer
*/
public class FileType extends AbstractFileType {
private File destinationDir;
private File destinationFile;
+ private boolean replace;
public File getDestinationDir() {
return this.destinationDir;
@@ -57,4 +59,12 @@ public class FileType extends AbstractFileType {
}
this.destinationFile = new File(destinationFile);
}
+
+ public boolean isReplace() {
+ return replace;
+ }
+
+ public void setReplace(boolean replace) {
+ this.replace = replace;
+ }
}
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
index cdf2b6c..4479d1c 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/ReplaceType.java
@@ -22,8 +22,6 @@
*/
package org.rhq.bundle.ant.type;
-import org.apache.tools.ant.types.DataType;
-
import java.util.ArrayList;
import java.util.List;
diff --git a/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml b/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
index 9f01c2b..fee46ef 100644
--- a/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
+++ b/modules/common/ant-bundle/src/main/resources/org/rhq/bundle/antlib.xml
@@ -8,7 +8,7 @@
<!-- bundle task's child types -->
<typedef name="input-property" classname="org.rhq.bundle.ant.type.InputPropertyType"/>
- <typedef name="deployment" classname="org.rhq.bundle.ant.type.DeploymentType"/>
+ <typedef name="deployment-unit" classname="org.rhq.bundle.ant.type.DeploymentUnitType"/>
<!-- deployment type's child types -->
<typedef name="file" classname="org.rhq.bundle.ant.type.FileType"/>
diff --git a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
index 403bfa2..831bdf9 100644
--- a/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
+++ b/modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java
@@ -74,7 +74,7 @@ public class AntLauncherTest {
Properties inputProps = createInputProperties("/test-bundle-v1-input.properties");
List<BuildListener> buildListeners = createBuildListeners();
- BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v1.xml"), null, inputProps,
+ BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v1.xml"), inputProps,
buildListeners);
/*Map<String, String> bundleFiles = project.getBundleFiles();
assert bundleFiles != null;
@@ -94,6 +94,8 @@ public class AntLauncherTest {
String preinstallTargetExecuted = (String) project.getProperties().get("preinstallTargetExecuted");
assert preinstallTargetExecuted.equals("true");
+ String postinstallTargetExecuted = (String) project.getProperties().get("postinstallTargetExecuted");
+ assert postinstallTargetExecuted.equals("true");
}
private List<BuildListener> createBuildListeners() {
@@ -114,7 +116,7 @@ public class AntLauncherTest {
Properties inputProps = createInputProperties("/test-bundle-v2-input.properties");
List<BuildListener> buildListeners = createBuildListeners();
- BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v2.xml"), null, inputProps,
+ BundleAntProject project = ant.executeBundleDeployFile(getBuildXml("test-bundle-v2.xml"), inputProps,
buildListeners);
/*Map<String, String> bundleFiles = project.getBundleFiles();
assert bundleFiles != null;
@@ -136,8 +138,7 @@ public class AntLauncherTest {
private Properties createInputProperties(String resourcePath) throws IOException {
Properties inputProps = new Properties();
inputProps.setProperty(DeployPropertyNames.DEPLOY_DIR, DEPLOY_DIR.getPath());
- inputProps.setProperty(DeployPropertyNames.DEPLOY_ID, "100");
- inputProps.setProperty(DeployPropertyNames.DEPLOY_NAME, "appserver");
+ inputProps.setProperty(DeployPropertyNames.DEPLOY_ID, "100");
inputProps.setProperty(DeployPropertyNames.DEPLOY_PHASE, DeploymentPhase.INSTALL.name());
InputStream inputStream = this.getClass().getResourceAsStream(resourcePath);
try {
diff --git a/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml b/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
index 2e63b2c..76820bf 100644
--- a/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
+++ b/modules/common/ant-bundle/src/test/resources/test-bundle-v1.xml
@@ -12,20 +12,21 @@
defaultValue="8080"
type="integer"/>
- <rhq:deployment name="appserver" preinstallTarget="preinstall">
+ <rhq:deployment-unit name="appserver" preinstallTarget="preinstall" postinstallTarget="postinstall">
<rhq:system-service name="foo" scriptFile="foo-script"
configFile="foo-config" overwriteScript="true"
startLevels="3,4,5" startPriority="80" stopPriority="20" root="root"/>
- <rhq:file name="test-v1.properties" destinationFile="subdir/test.properties"/>
- <rhq:archive name="file.zip"/>
- <rhq:replace>
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
+ <rhq:file name="test-v1.properties" destinationFile="subdir/test.properties" replace="true"/>
+ <rhq:archive name="file.zip">
+ <rhq:replace>
+ <rhq:fileset includes="**/*.properties"/>
+ </rhq:replace>
+ </rhq:archive>
<!-- the files that should be ignored during upgrades -->
<rhq:ignore>
<rhq:fileset includes="*.log"/>
</rhq:ignore>
- </rhq:deployment>
+ </rhq:deployment-unit>
</rhq:bundle>
@@ -36,4 +37,9 @@
<property name="preinstallTargetExecuted" value="true"/>
</target>
+ <target name="postinstall">
+ <echo>Done deploying Test Bundle v1.0 to ${rhq.deploy.dir}.</echo>
+ <property name="postinstallTargetExecuted" value="true"/>
+ </target>
+
</project>
\ No newline at end of file
diff --git a/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml b/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
index 501ba3f..6764c13 100644
--- a/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
+++ b/modules/common/ant-bundle/src/test/resources/test-bundle-v2.xml
@@ -12,28 +12,34 @@
defaultValue="8080"
type="integer"/>
- <rhq:deployment name="appserver" preinstallTarget="preinstall">
+ <rhq:deployment-unit name="appserver" preinstallTarget="preinstall" postinstallTarget="postinstall">
<rhq:system-service name="foo" scriptFile="foo-script"
configFile="foo-config" overwriteScript="true"
startLevels="3,4,5" startPriority="80" stopPriority="20" root="root"/>
- <rhq:file name="test-v2.properties" destinationFile="subdir/test.properties"/>
- <rhq:archive name="file.zip"/>
- <rhq:replace>
- <rhq:fileset includes="**/*.properties"/>
- </rhq:replace>
+ <rhq:file name="test-v2.properties" destinationFile="subdir/test.properties" replace="true"/>
+ <rhq:archive name="file.zip">
+ <rhq:replace>
+ <rhq:fileset includes="**/*.properties"/>
+ </rhq:replace>
+ </rhq:archive>
<!-- the files that should be ignored during upgrades -->
<rhq:ignore>
<rhq:fileset includes="*.log"/>
</rhq:ignore>
- </rhq:deployment>
+ </rhq:deployment-unit>
</rhq:bundle>
<target name="main"/>
<target name="preinstall">
- <echo>Deploying Test Bundle v2.0 to ${rhq.deploy.dir}...</echo>
+ <echo>Deploying Test Bundle v1.0 to ${rhq.deploy.dir}...</echo>
<property name="preinstallTargetExecuted" value="true"/>
</target>
+ <target name="postinstall">
+ <echo>Done deploying Test Bundle v1.0 to ${rhq.deploy.dir}.</echo>
+ <property name="postinstallTargetExecuted" value="true"/>
+ </target>
+
</project>
\ No newline at end of file
diff --git a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
index cd0e4c1..eb45a59 100644
--- a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
+++ b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
@@ -36,6 +36,8 @@ import org.apache.tools.ant.Project;
import org.rhq.bundle.ant.AntLauncher;
import org.rhq.bundle.ant.BundleAntProject;
import org.rhq.bundle.ant.DeployPropertyNames;
+import org.rhq.bundle.ant.DeploymentPhase;
+import org.rhq.bundle.ant.InvalidBuildFileException;
import org.rhq.bundle.ant.LoggerAntBuildListener;
import org.rhq.core.domain.bundle.BundleDeployment;
import org.rhq.core.domain.bundle.BundleResourceDeployment;
@@ -54,6 +56,8 @@ import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.system.SystemInfoFactory;
import org.rhq.core.util.stream.StreamUtil;
import org.rhq.core.util.updater.DeployDifferences;
+import org.rhq.core.util.updater.Deployer;
+import org.rhq.core.util.updater.DeploymentsMetadata;
/**
* @author John Mazzitelli
@@ -121,9 +125,17 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
buildListeners.add(auditor);
// Parse and execute the Ant script.
- AntLauncher antLauncher = new AntLauncher();
- BundleAntProject project = antLauncher.executeBundleDeployFile(recipeFile, null, antProps,
- buildListeners);
+ executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ DeploymentPhase.STOP);
+ String deployDirString = bundleDeployment.getDestination().getDeployDir();
+ File deployDir = new File(deployDirString);
+ DeploymentsMetadata deployMetadata = new DeploymentsMetadata(deployDir);
+ DeploymentPhase installPhase = (deployMetadata.isManaged()) ? DeploymentPhase.UPGRADE :
+ DeploymentPhase.INSTALL;
+ BundleAntProject project = executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ installPhase);
+ executeDeploymentPhase(recipeFile, antProps, buildListeners,
+ DeploymentPhase.START);
// Send the diffs to the Server so it can store them as an entry in the deployment history.
BundleManagerProvider bundleManagerProvider = request.getBundleManagerProvider();
@@ -153,6 +165,12 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
return result;
}
+ private BundleAntProject executeDeploymentPhase(File recipeFile, Properties antProps, List<BuildListener> buildListeners, DeploymentPhase stop) throws InvalidBuildFileException {
+ AntLauncher antLauncher = new AntLauncher();
+ BundleAntProject project = antLauncher.executeBundleDeployFile(recipeFile, antProps, buildListeners);
+ return project;
+ }
+
private Properties createAntProperties(BundleDeployRequest request) {
Properties antProps = new Properties();
diff --git a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
index 6a9d845..4a01d15 100644
--- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
+++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
@@ -23,10 +23,11 @@
package org.rhq.plugins.ant;
import java.io.File;
-import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
+import java.util.Properties;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
@@ -58,9 +59,7 @@ import org.rhq.core.util.file.FileUtil;
import org.rhq.core.util.stream.StreamUtil;
@Test
-public class AntBundlePluginComponentTest {
- private static final String USER_HOME = System.getProperty("user.home");
-
+public class AntBundlePluginComponentTest {
private AntBundlePluginComponent plugin;
private File tmpDir;
@@ -89,42 +88,10 @@ public class AntBundlePluginComponentTest {
FileUtil.purge(this.tmpDir, true);
}
- @Test(enabled = false)
- /**
- * Test a simple Ant script that contains no RHQ tasks other than rhq:bundle.
- */
- public void testSimpleBundle() throws Exception {
- ResourceType resourceType = new ResourceType("testSimpleBundle", "plugin", ResourceCategory.SERVER, null);
- BundleType bundleType = new BundleType("testSimpleBundle", resourceType);
- Repo repo = new Repo("testSimpleBundle");
- PackageType packageType = new PackageType("testSimpleBundle", resourceType);
- Bundle bundle = new Bundle("testSimpleBundle", bundleType, repo, packageType);
- BundleVersion bundleVersion = new BundleVersion("testSimpleBundle", "1.0", bundle,
- getRecipeFromFile("test-bundle-v1.xml"));
-
- BundleDeployment deployment = new BundleDeployment();
- deployment.setBundleVersion(bundleVersion);
- deployment.setConfiguration(null);
-
- BundleDeployRequest request = new BundleDeployRequest();
- request.setBundleFilesLocation(tmpDir);
- request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
-
- BundleDeployResult results = plugin.deployBundle(request);
-
- assertResultsSuccess(results);
-
- // our ant script wrote some output that we should verify to make sure we ran it
- File outputFile = new File(tmpDir, "output.1");
- String output = new String(StreamUtil.slurp(new FileInputStream(outputFile)));
- assert output.equals("Hello World!!") : output;
-
- }
-
/**
- * Test a Ant script that includes all of the RHQ tasks.
+ * Test deployment of an RHQ bundle recipe.
*/
- @Test(enabled = false)
+ @Test
public void testAntBundle() throws Exception {
ResourceType resourceType = new ResourceType("testSimpleBundle", "plugin", ResourceCategory.SERVER, null);
BundleType bundleType = new BundleType("testSimpleBundle", resourceType);
@@ -132,23 +99,25 @@ public class AntBundlePluginComponentTest {
PackageType packageType = new PackageType("testSimpleBundle", resourceType);
Bundle bundle = new Bundle("testSimpleBundle", bundleType, repo, packageType);
BundleVersion bundleVersion = new BundleVersion("testSimpleBundle", "1.0", bundle,
- getRecipeFromFile("test-build.xml"));
+ getRecipeFromFile("test-bundle.xml"));
BundleDestination destination = new BundleDestination(bundle, "testSimpleBundle", new ResourceGroup(
- "testSimpleBundle"), "/jboss");
+ "testSimpleBundle"), "/tmp/rhq-testAntBundle");
Configuration config = new Configuration();
- config.put(new PropertySimple("custom.prop1", "custom property 1"));
- config.put(new PropertySimple("custom.prop2", "custom property 2"));
+ config.put(new PropertySimple("custom.prop1", "ABC123"));
BundleDeployment deployment = new BundleDeployment();
deployment.setBundleVersion(bundleVersion);
deployment.setConfiguration(config);
deployment.setDestination(destination);
- File file1 = new File(tmpDir, "test-v2.properties");
- File file2 = new File(tmpDir, "package.zip");
- assert file1.createNewFile() : "could not create our mock bundle file";
- assert file2.createNewFile() : "could not create our mock bundle file";
+ // create test file
+ File file1 = new File(tmpDir, "test.properties");
+ Properties props = new Properties();
+ props.setProperty("custom.prop1", "@@custom.prop1@@");
+ FileOutputStream outputStream = new FileOutputStream(file1);
+ props.store(outputStream, "blah");
+ outputStream.close();
BundleDeployRequest request = new BundleDeployRequest();
request.setBundleFilesLocation(tmpDir);
@@ -158,6 +127,7 @@ public class AntBundlePluginComponentTest {
BundleDeployResult results = plugin.deployBundle(request);
assertResultsSuccess(results);
+ // TODO: Check that custom.prop1 got replaced.
}
private void assertResultsSuccess(BundleDeployResult results) {
diff --git a/modules/plugins/ant-bundle/src/test/resources/simple-build.xml b/modules/plugins/ant-bundle/src/test/resources/simple-build.xml
deleted file mode 100644
index 88ade87..0000000
--- a/modules/plugins/ant-bundle/src/test/resources/simple-build.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="test" default="init"
- xmlns:rhq="antlib:org.rhq.bundle">
-
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <property name="outfile" value="${basedir}/output.1" />
-
- <target name="init">
- <echo file="${outfile}" message="Hello World!!"/>
- </target>
-
-</project>
-
\ No newline at end of file
diff --git a/modules/plugins/ant-bundle/src/test/resources/test-build.xml b/modules/plugins/ant-bundle/src/test/resources/test-build.xml
deleted file mode 100644
index e4e062b..0000000
--- a/modules/plugins/ant-bundle/src/test/resources/test-build.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="simple-build" default="first-target"
- xmlns:rhq="antlib:org.rhq.bundle">
-
- <echo>basedir=${basedir}</echo>
-
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <rhq:input-property
- name="custom.prop1"
- description="my prop 1"
- required="true"
- defaultValue="default 1"/>
-
- <rhq:input-property
- name="custom.prop2"
- description="my prop 2"
- required="true"
- defaultValue="default 2"/>
-
- <property name="outfile" value="${basedir}/output.2" />
-
- <target name="first-target">
- <!-- TODO -->
- </target>
-
-</project>
\ No newline at end of file
diff --git a/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml b/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml
new file mode 100644
index 0000000..f51fae3
--- /dev/null
+++ b/modules/plugins/ant-bundle/src/test/resources/test-bundle.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<project name="simple-build" default="main"
+ xmlns:rhq="antlib:org.rhq.bundle">
+
+ <echo>basedir=${basedir}</echo>
+
+ <property name="outfile" value="${basedir}/output.2" />
+
+ <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
+ description="example.com corporate website hosted on JBoss EAP 4.3">
+
+ <rhq:input-property
+ name="custom.prop1"
+ description="my prop 1"
+ required="true"
+ defaultValue="default 1"/>
+
+ <rhq:input-property
+ name="custom.prop2"
+ description="my prop 2"
+ required="true"
+ defaultValue="default 2"/>
+
+ <rhq:deployment-unit name="doodibittydoo">
+ <rhq:file name="test.properties" destinationFile="config/test.properties" replace="true"/>
+ </rhq:deployment-unit>
+
+ </rhq:bundle>
+
+ <target name="main"/>
+
+</project>
\ No newline at end of file
commit adaa75d09ecc6fd4b4ca5f3048a531c72fdddc7b
Merge: 03f3780... fddbaae...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Thu May 27 09:43:54 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 03f3780e49a02b0e8d36fa23e4d48a33fac65510
Merge: 8e741f2... 967c372...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed May 26 19:56:47 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 8e741f24a582b0c8f8f2408241bec325b2082415
Merge: c5d2b83... f8f1cc4...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed May 26 16:57:50 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit c5d2b83d4e1260e644697eca55bd8a10e4b9cd15
Merge: bbf58f0... d627f31...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Wed May 26 14:45:37 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit bbf58f0689d0ccfc361f11c8438e93003c304ed9
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue May 25 17:35:35 2010 -0400
get rid of the JMS Destinations subcategory, which is no longer assigned to any ResourceTypes
diff --git a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
index b6bfdd9..5b376e8 100644
--- a/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml
@@ -947,15 +947,12 @@
<subcategory name="Resources"
description="Different types of Resources">
<subcategory name="Datasources"
- description="Different types of Datasources"/>
+ description="Different types of Datasources"/>
<subcategory name="Connection Factories"
- description="Different types of Connection Factories"/>
- <subcategory name="JMS Destinations"
- description="Different types of JMS Destinations"/>
+ description="Different types of Connection Factories"/>
</subcategory>
<subcategory name="Applications"
- description="Different types of Applications (WARs, EARs, etc.)">
- </subcategory>
+ description="Different types of Applications (WARs, EARs, etc.)"/>
</subcategories>
<plugin-configuration>
1
0
modules/enterprise/gui/coregui/pom.xml | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 168 +++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 109 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java | 159 ++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 237 +++++++++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 80 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 1
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 50 ++
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 10
16 files changed, 730 insertions(+), 142 deletions(-)
New commits:
commit 84b4dd24ea3993cdd8aa5bc7b8dd7d6531021f47
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 09:34:39 2010 -0400
Backup version of the menubar
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java
new file mode 100644
index 0000000..b4723e5
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/GWTMenuBarView.java
@@ -0,0 +1,159 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.menu;
+
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.ui.Hyperlink;
+import com.google.gwt.user.client.ui.MenuBar;
+import com.google.gwt.user.client.ui.MenuItem;
+import com.smartgwt.client.types.ContentsType;
+import com.smartgwt.client.types.VerticalAlignment;
+import com.smartgwt.client.util.SC;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.Img;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.LayoutSpacer;
+import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.toolbar.ToolStrip;
+
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.components.AboutModalWindow;
+
+/**
+ *
+ * This is a backup menu bar that is implemented with the standard gwt component.
+ * It doesn't have many features or look very good.
+ *
+ * @author Greg Hinkle
+ */
+public class GWTMenuBarView extends VLayout {
+
+ private AboutModalWindow aboutModalWindow;
+
+ public static final String[] SECTIONS = {"Dashboard", "Demo", "Inventory", "Bundles", "Administration"};
+
+ private String selected = "Dashboard";
+
+ private HTMLFlow linksPane;
+
+ public GWTMenuBarView() {
+ super(5);
+ setHeight(50);
+ setWidth100();
+
+
+ }
+
+ public static class LinkCommand implements Command {
+ private String href;
+
+ public LinkCommand(String href) {
+ this.href = href;
+ }
+
+ public void execute() {
+ History.newItem(href);
+ }
+ }
+
+
+ protected void onDraw() {
+ super.onDraw();
+
+
+ // Create a command that will execute on menu item selection
+ Command menuCommand = new Command() {
+ public void execute() {
+ SC.say("Clicked");
+ }
+ };
+
+ // Create a menu bar
+ MenuBar menu = new MenuBar();
+ menu.setAutoOpen(true);
+ menu.setWidth("100%");
+ menu.setAnimationEnabled(false);
+ menu.setStylePrimaryName("gwtMenuBar");
+
+
+ MenuBar subsystemsMenu = new MenuBar(true);
+ subsystemsMenu.setStylePrimaryName("gwtMenu");
+ subsystemsMenu.addItem("Configuration Changes", new LinkCommand("#config"));
+ subsystemsMenu.addItem("Suspect Metrics", new LinkCommand("#config"));
+ subsystemsMenu.addItem("Operations", new LinkCommand("#config"));
+ subsystemsMenu.addItem("Alerts", new LinkCommand("#config"));
+ subsystemsMenu.addItem("Alert Definitions", new LinkCommand("#config"));
+
+ MenuBar overviewMenu = new MenuBar(true);
+ overviewMenu.setStylePrimaryName("gwtMenu");
+ overviewMenu.addItem("Subsystem Views", subsystemsMenu);
+ overviewMenu.addItem("AutoDiscovery Queue",new LinkCommand("#cofng"));
+ overviewMenu.addItem("Dashboard",new LinkCommand("#cofng"));
+
+
+ MenuBar resourcesMenu = new MenuBar(true);
+ resourcesMenu.setStylePrimaryName("gwtMenu");
+ resourcesMenu.addItem("All Resources", new LinkCommand("#fsdf"));
+ resourcesMenu.addItem("Platforms", new LinkCommand("#fsdf"));
+ resourcesMenu.addItem("Servers", new LinkCommand("#fsdf"));
+ resourcesMenu.addItem("Services", new LinkCommand("#fsdf"));
+ resourcesMenu.addSeparator();
+// resourcesMenu.addItem("Favorite Resources",)
+
+ MenuBar groupsMenu = new MenuBar(true);
+ groupsMenu.setStylePrimaryName("gwtMenu");
+ groupsMenu.addItem("All Groups", new LinkCommand("#sf"));
+ groupsMenu.addItem("Compatible Groups", new LinkCommand("#sf"));
+ groupsMenu.addItem("Mixed Groups", new LinkCommand("#sf"));
+ groupsMenu.addItem("Group Definitions", new LinkCommand("#sf"));
+ groupsMenu.addSeparator();
+ groupsMenu.addItem("New Group", new LinkCommand("#sf"));
+ groupsMenu.addItem("New Group Definition", new LinkCommand("#sf"));
+ groupsMenu.addSeparator();
+ groupsMenu.addItem("Favorites", new LinkCommand("#sf"));
+
+
+
+
+ MenuBar helpMenu = new MenuBar(true);
+ helpMenu.setStylePrimaryName("gwtMenu");
+ helpMenu.addItem("Online Documentation", new LinkCommand("#sdfs"));
+ helpMenu.addItem("Open a support case", new LinkCommand("#sdfs"));
+ helpMenu.addItem("About", new LinkCommand("#sdfs"));
+
+
+
+ menu.addItem(new MenuItem("<img src=\"images/header/rhq_logo_28px.png\"/>", true, new LinkCommand("#about")));
+ menu.addItem(new MenuItem("Overview", overviewMenu));
+ menu.addItem(new MenuItem("Resources", resourcesMenu));
+ menu.addItem(new MenuItem("Groups", groupsMenu));
+ menu.addItem(new MenuItem("Help", helpMenu));
+
+ // Return the menu
+ menu.ensureDebugId("topMenuBar");
+
+
+ addMember(menu);
+ }
+
+}
\ No newline at end of file
commit 3b1353d13a59ffeb0df4a8bd9ef88da974a14300
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu May 27 09:28:25 2010 -0400
New gwt-based menubar
L&F tweaks
Upgrade to SmartGWT 2.2 to fix rendering issue
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index ce94def..690a7b3 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>com.smartgwt</groupId>
<artifactId>smartgwt</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
</dependency>
<!--
<dependency>
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index c49908f..9231cbc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -253,7 +253,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
}
public static void setSessionSubject(Subject subject) {
-
// TODO this breaks because of reattach rules, bizarely even in queries. gonna switch out to non-subject include apis
// Create a minimized session object for validation on requests
// Subject s = new Subject(subject.getName(),subject.getFactive(), subject.getFsystem());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
index 6d4a3fd..ab30742 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
@@ -49,5 +49,171 @@ public class LinkManager {
}
}
+ public static String getSubsystemConfigurationLink() {
+ return "/rhq/subsystem/configurationUpdate.xhtml";
+ }
+
+ public static String getSubsystemSuspectMetricsLink() {
+ return "/rhq/subsystem/oobHistory.xhtml";
+ }
+
+ public static String getSubsystemOperationHistoryLink() {
+ return "/rhq/subsystem/operationHistory.xhtml";
+ }
+
+
+ public static String getSubsystemAlertHistoryLink() {
+ return "/rhq/subsystem/alertHistory.xhtml";
+ }
+
+ public static String getSubsystemAlertDefsLink() {
+ return "/rhq/subsystem/alertDefinitions.xhtml";
+ }
+
+
+ public static String getAutodiscoveryQueueLink() {
+ return "/rhq/discovery/queue.xhtml";
+ }
+
+ public static String getDashboardLink() {
+ return "/Dashboard.do";
+ }
+
+
+ public static String getHubAllResourcesLink() {
+ return "/rhq/inventory/browseResources.xhtml?subtab=all";
+ }
+
+ public static String getHubPlatformsLink() {
+ return "/rhq/inventory/browseResources.xhtml?subtab=platform";
+ }
+
+ public static String getHubServerssLink() {
+ return "/rhq/inventory/browseResources.xhtml?subtab=server";
+ }
+
+ public static String getHubServicesLink() {
+ return "/rhq/inventory/browseResources.xhtml?subtab=service";
+ }
+
+
+ public static String getSavedSearchLink(int searchId) {
+ return "/rhq/inventory/browseResources.xhtml?subtab=all&searchId=" + searchId;
+ }
+
+
+ public static String getHubAllGroupsLink() {
+ return "/rhq/inventory/browseGroups.xhtml?subtab=all";
+ }
+
+ public static String getHubCompatibleGroupsLink() {
+ return "/rhq/inventory/browseGroups.xhtml?subtab=compatible";
+ }
+
+ public static String getHubMixedGroupsLink() {
+ return "/rhq/inventory/browseGroups.xhtml?subtab=mixed";
+ }
+
+ public static String getHubGroupDefinitionsLink() {
+ return "/rhq/definition/group/list.xhtml";
+ }
+
+ public static String getHubNewGroupLink() {
+ return "/resource/group/Inventory.do?mode=new";
+ }
+
+
+ public static String getHubNewGroupDefLink() {
+ return "/rhq/definition/group/new.xhtml";
+ }
+
+
+ public static String getAdminUsersLink() {
+ return "/admin/user/UserAdmin.do?mode=list";
+ }
+
+ public static String getAdminRolesLink() {
+ return "/admin/role/RoleAdmin.do?mode=list";
+ }
+
+ public static String getAdminSysConfigLink() {
+ return "/admin/config/Config.do?mode=edit";
+ }
+
+
+ public static String getAdminPluginsLink() {
+ return "/rhq/admin/plugin/plugin-list.xhtml";
+ }
+
+
+ public static String getAdminTemplatesLink() {
+ return "/admin/config/EditDefaults.do?mode=monitor&viewMode=all";
+ }
+
+ public static String getAdminAlertNotifTemplatesLink() {
+ return "/rhq/admin/alert/template/notification/list.xhtml";
+ }
+
+
+ public static String getAdminContentProvidersLink() {
+ return "/rhq/content/listContentProviders.xhtml";
+ }
+
+ public static String getAdminContentReposLink() {
+ return "/rhq/content/listRepos.xhtml";
+ }
+
+
+ public static String getHAServersLink() {
+ return "/rhq/ha/listServers.xhtml";
+ }
+
+ public static String getHAAgentsLink() {
+ return "/rhq/ha/listAgents.xhtml";
+ }
+
+ public static String getHAAffinityGroupsLink() {
+ return "/rhq/ha/listAffinityGroups.xhtml";
+ }
+
+ public static String getHAEventsLink() {
+ return "/rhq/ha/listPartitionEvents.xhtml";
+ }
+
+
+ public static String getReportsInventoryLink() {
+ return "/rhq/admin/report/resourceInstallReport.xhtml";
+ }
+
+ public static String getAdminDownloadsLink() {
+ return "/rhq/admin/downloads.xhtml";
+ }
+
+
+ public static String getAdminLicenseLink() {
+ return "/admin/license/LicenseAdmin.do?mode=view";
+ }
+
+
+ public static String getDebugSqlLink() {
+ return "/admin/test/sql.jsp";
+ }
+
+ public static String getDebugHibernateLink() {
+ return "/admin/test/hibernate.jsp";
+ }
+
+ public static String getDebugBrowserLink() {
+ return "/admin/test/browser.jsp";
+ }
+
+ public static String getUserPrefsLink(int subjectId) {
+ return "/admin/user/UserAdmin.do?mode=edit&u=" + subjectId;
+ }
+
+ public static String getUserPasswordLink(int subjectId) {
+ return "/admin/user/UserAdmin.do?mode=editPass&u=" + subjectId;
+ }
+
-}
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
index 0eafbc6..a529ef9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java
@@ -22,8 +22,6 @@
*/
package org.rhq.enterprise.gui.coregui.client;
-import java.util.HashMap;
-
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.http.client.Request;
import com.google.gwt.http.client.RequestBuilder;
@@ -31,12 +29,10 @@ import com.google.gwt.http.client.RequestCallback;
import com.google.gwt.http.client.RequestException;
import com.google.gwt.http.client.Response;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.docs.Image;
import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.FormErrorOrientation;
import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
-import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
@@ -46,25 +42,23 @@ import com.smartgwt.client.widgets.form.fields.HeaderItem;
import com.smartgwt.client.widgets.form.fields.PasswordItem;
import com.smartgwt.client.widgets.form.fields.SubmitItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
-import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
-import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
import com.smartgwt.client.widgets.form.fields.events.KeyPressEvent;
import com.smartgwt.client.widgets.form.fields.events.KeyPressHandler;
-import com.smartgwt.client.widgets.layout.VLayout;
-import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.gwt.SubjectGWTServiceAsync;
/**
* @author Greg Hinkle
*/
public class LoginView extends Canvas {
+ private static boolean loginShowing = false;
private Window window;
private DynamicForm form;
+ private SubmitItem loginButton;
+
public LoginView() {
this(false);
@@ -89,67 +83,72 @@ public class LoginView extends Canvas {
public void showLoginDialog() {
- form = new DynamicForm();
- form.setMargin(10);
- form.setShowInlineErrors(false);
+ if (!loginShowing) {
+ loginShowing = true;
+ form = new DynamicForm();
+ form.setMargin(10);
+ form.setShowErrorText(true);
+ form.setErrorOrientation(FormErrorOrientation.BOTTOM);
- CanvasItem logo = new CanvasItem();
- logo.setCanvas(new Img("header/rhq_logo_28px.png", 80, 28));
- logo.setShowTitle(false);
+ CanvasItem logo = new CanvasItem();
+ logo.setCanvas(new Img("header/rhq_logo_28px.png", 80, 28));
+ logo.setShowTitle(false);
- HeaderItem header = new HeaderItem();
- header.setValue("RHQ Login");
+ HeaderItem header = new HeaderItem();
+ header.setValue("RHQ Login");
- TextItem user = new TextItem("user", "User");
- user.setRequired(true);
- user.setAttribute("canAutocomplete", true);
- user.setAttribute("autoComplete", true);
- PasswordItem password = new PasswordItem("password", "Password");
- password.setRequired(true);
- password.setAttribute("autocomplete", true);
+ TextItem user = new TextItem("user", "User");
+ user.setRequired(true);
+ user.setAttribute("canAutocomplete", true);
+ user.setAttribute("autoComplete", true);
+ PasswordItem password = new PasswordItem("password", "Password");
+ password.setRequired(true);
+ password.setAttribute("autocomplete", true);
- final SubmitItem login = new SubmitItem("login", "Login");
- login.setAlign(Alignment.CENTER);
- login.setColSpan(2);
+ loginButton = new SubmitItem("login", "Login");
+ loginButton.setAlign(Alignment.CENTER);
+ loginButton.setColSpan(2);
- password.addKeyPressHandler(new KeyPressHandler() {
- public void onKeyPress(KeyPressEvent event) {
- if ((event.getCharacterValue() != null) && (event.getCharacterValue() == KeyCodes.KEY_ENTER)) {
- form.submit();
+ password.addKeyPressHandler(new KeyPressHandler() {
+ public void onKeyPress(KeyPressEvent event) {
+ if ((event.getCharacterValue() != null) && (event.getCharacterValue() == KeyCodes.KEY_ENTER)) {
+ form.submit();
+ }
}
- }
- });
+ });
- form.setFields(logo, header, user, password, login);
+ form.setFields(logo, header, user, password, loginButton);
- window = new Window();
- window.setTitle("RHQ Login");
- window.setWidth(400);
- window.setHeight(250);
- window.setIsModal(true);
- window.setShowModalMask(true);
- window.setCanDragResize(true);
- window.centerInPage();
- window.addItem(form);
- window.show();
+ window = new Window();
+ window.setTitle("RHQ Login");
+ window.setWidth(400);
+ window.setHeight(250);
+ window.setIsModal(true);
+ window.setShowModalMask(true);
+ window.setCanDragResize(true);
+ window.centerInPage();
+ window.addItem(form);
+ window.show();
- form.focusInItem(user);
+ form.focusInItem(user);
- form.addSubmitValuesHandler(new SubmitValuesHandler() {
- public void onSubmitValues(SubmitValuesEvent submitValuesEvent) {
- if (form.validate()) {
- login(form.getValueAsString("user"), form.getValueAsString("password"));
+ form.addSubmitValuesHandler(new SubmitValuesHandler() {
+ public void onSubmitValues(SubmitValuesEvent submitValuesEvent) {
+ if (form.validate()) {
+ login(form.getValueAsString("user"), form.getValueAsString("password"));
+ }
}
- }
- });
+ });
+ }
}
private void login(String user, String password) {
+ loginButton.setDisabled(true);
RequestBuilder b = new RequestBuilder(RequestBuilder.GET,
"/j_security_check.do?j_username=" + user + "&j_password=" + password);
try {
@@ -158,18 +157,22 @@ public class LoginView extends Canvas {
if (response.getStatusCode() == 200) {
System.out.println("Portal-War logged in");
window.destroy();
+ loginShowing = false;
CoreGUI.checkLoginStatus();
} else {
- form.setFieldErrors("user", "The username or password provided does not match our records.", true);
+ form.setFieldErrors("login", "The username or password provided does not match our records.", true);
+ loginButton.setDisabled(false);
}
}
public void onError(Request request, Throwable exception) {
System.out.println("Portal-War login failed");
+ loginButton.setDisabled(false);
}
});
b.send();
} catch (RequestException e) {
+ loginButton.setDisabled(false);
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
index 3906118..b0413b6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
@@ -39,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table;
/**
* @author Greg Hinkle
*/
-public class BundleDeploymentListView extends VLayout {
+public class BundleDeploymentListView extends Table {
private int bundleId;
private Bundle bundle;
@@ -47,8 +47,12 @@ public class BundleDeploymentListView extends VLayout {
public BundleDeploymentListView(Bundle bundle) {
+ super("Bundle Versions");
+
this.bundle = bundle;
this.bundleId = bundle.getId();
+
+
}
public BundleDeploymentListView(BundleVersion bundleVersion) {
@@ -62,32 +66,27 @@ public class BundleDeploymentListView extends VLayout {
String title = "Bundle Versions";
-
Criteria criteria = new Criteria();
if (bundle != null) {
title = bundle.getName() + " deployments";
- criteria.setAttribute("bundleId",bundle.getId());
+ criteria.setAttribute("bundleId", bundle.getId());
}
if (bundleVersion != null) {
title = bundleVersion.getVersion() + " deployments";
criteria.setAttribute("bundleVersionId", bundleVersion.getId());
}
+ setTableTitle(title);
- Table table = new Table(title, criteria);
+ refresh(criteria);
- table.setDataSource(new BundleDeploymentDataSource());
+ setDataSource(new BundleDeploymentDataSource());
- table.getListGrid().getField("name").setCellFormatter(new CellFormatter() {
+ getListGrid().getField("name").setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord record, int i, int i1) {
return "<a href=\"#Bundles/Bundle/" + bundleId + "/deployments/" + record.getAttribute("id") + "\">" + String.valueOf(o) + "</a>";
}
});
-
-
-
- addMember(table);
-
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
index 176305b..bd2cfe9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
@@ -51,6 +51,10 @@ public class BundlesListView extends Table {
setHeight100();
}
+ public BundlesListView(Criteria criteria) {
+ super("Bundles", criteria);
+ }
+
@Override
protected void onInit() {
super.onInit();
@@ -134,9 +138,6 @@ public class BundlesListView extends Table {
});
}
- public void setCriteria(Criteria criteria) {
- this.getListGrid().fetchData(criteria);
- }
public int getMatches() {
return this.getListGrid().getTotalRows();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java
index c5d432e..f6dbee7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java
@@ -33,7 +33,7 @@ public class HeaderLabel extends HTMLFlow {
public HeaderLabel(String contents) {
super(contents);
- setHeight(60);
+ setHeight(50);
setStylePrimaryName("HeaderLabel");
setStyleName("HeaderLabel");
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index 9167473..d264d36 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -274,6 +274,7 @@ public class Table extends VLayout {
private boolean autoSizing = false;
public void refresh(Criteria criteria) {
+ this.listGrid.invalidateCache();
this.listGrid.setCriteria(criteria);
this.listGrid.markForRedraw();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java
index d640e55..a54d0ac 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java
@@ -42,6 +42,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.RecordDoubleClickEvent;
import com.smartgwt.client.widgets.grid.events.RecordDoubleClickHandler;
import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.menu.IMenuButton;
import com.smartgwt.client.widgets.menu.Menu;
import com.smartgwt.client.widgets.menu.MenuButton;
import com.smartgwt.client.widgets.menu.MenuItem;
@@ -125,7 +126,7 @@ public class OperationHistoryView extends VLayout {
}
});
- MenuButton operationsButton = new MenuButton("Run Operation", operationMenu);
+ IMenuButton operationsButton = new IMenuButton("Run Operation", operationMenu);
operationsButton.setShowMenuBelow(false);
table.addExtraWidget(operationsButton);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
index 0543eac..b493582 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
@@ -18,21 +18,32 @@
*/
package org.rhq.enterprise.gui.coregui.client.menu;
+import com.google.gwt.dom.client.Document;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.user.client.History;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Hyperlink;
import com.smartgwt.client.types.ContentsType;
import com.smartgwt.client.types.VerticalAlignment;
+import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.events.ClickEvent;
+import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.LayoutSpacer;
import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.menu.Menu;
+import com.smartgwt.client.widgets.menu.MenuBar;
+import com.smartgwt.client.widgets.menu.MenuItem;
+import com.smartgwt.client.widgets.menu.MenuItemSeparator;
+import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.AboutModalWindow;
/**
@@ -42,7 +53,7 @@ public class MenuBarView extends VLayout {
private AboutModalWindow aboutModalWindow;
- public static final String[] SECTIONS = { "Dashboard", "Demo", "Inventory", "Bundles", "Administration" };
+ public static final String[] SECTIONS = {"Dashboard", "Demo", "Inventory", "Bundles", "Administration"};
private String selected = "Dashboard";
@@ -53,19 +64,174 @@ public class MenuBarView extends VLayout {
setHeight(50);
setWidth100();
- History.addValueChangeHandler(new ValueChangeHandler<String>() {
- public void onValueChange(ValueChangeEvent<String> stringValueChangeEvent) {
- String first = stringValueChangeEvent.getValue().split("/")[0];
- if ("Resource".equals(first)) {
- first = "Inventory";
- }
+ }
- selected = first;
- linksPane.setContents(setupLinks());
- linksPane.markForRedraw();
+
+ protected void onDraw() {
+ super.onDraw();
+
+ // TODO GH: This is a nasty hack... it injects the css to override the smartgwt skin
+ String css = ".menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled {\n" +
+ " border: none;\n" +
+ " font-size: 9pt; \n" +
+ " font-weight: bold;\n" +
+ "}\n" +
+ ".menuButtonDown {\n" +
+ " background: url(\"/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images/cssButton/button_Over_stretch.png\") repeat-x scroll 0 0 #DDDDDD";
+
+ com.google.gwt.dom.client.StyleElement style = Document.get().createStyleElement();
+ style.setPropertyString("language", "text/css");
+ style.setInnerText(css);
+ Document.get().getBody().appendChild(style);
+
+
+
+
+
+ HLayout topBar = new HLayout();
+ topBar.setHeight(28);
+ topBar.setStyleName("topMenuBar");
+// url("./images/cssButton/button_stretch.png") repeat-x scroll 0 0 #DDDDDD
+// topBar.setBackgroundImage("[SKIN]/cssButton/button_stretch.png");
+// topBar.setBackgroundRepeat(BkgndRepeat.REPEAT_X);
+
+
+ Img logo = new Img("header/rhq_logo_28px.png", 80, 28);
+ logo.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
+ public void onClick(com.smartgwt.client.widgets.events.ClickEvent event) {
+ MenuBarView.this.aboutModalWindow.show();
}
});
+
+
+ topBar.addMember(logo);
+
+
+ // Create a menu bar
+ final MenuBar menu = new MenuBar();
+ menu.setHeight(28);
+
+ Menu subsystemsMenu = new Menu();
+
+ subsystemsMenu.setTitle("Subsystems");
+ subsystemsMenu.addItem(new EMenuItem("Configuration Changes", LinkManager.getSubsystemConfigurationLink(), "subsystems/configure/Configure_16.png"));//, new LinkCommand("#config"));
+ subsystemsMenu.addItem(new EMenuItem("Suspect Metrics", LinkManager.getSubsystemSuspectMetricsLink(), "subsystems/monitor/Monitor_failed_16.png"));//, new LinkCommand("#config"));
+ subsystemsMenu.addItem(new EMenuItem("Operations", LinkManager.getSubsystemOperationHistoryLink(), "subsystems/control/Operation_16.png"));//, new LinkCommand("#config"));
+ subsystemsMenu.addItem(new EMenuItem("Alerts", LinkManager.getSubsystemAlertHistoryLink(), "subsystems/alert/Alert_HIGH_16.png"));//, new LinkCommand("#config"));
+ subsystemsMenu.addItem(new EMenuItem("Alert Definitions", LinkManager.getSubsystemAlertDefsLink(), "subsystems/alert/Alerts_16.png"));//, new LinkCommand("#config"));
+
+
+ final Menu overviewMenu = new Menu();
+ overviewMenu.setTitle("Overview");
+ overviewMenu.setStyleName("SimpleMenuBarButton");
+ overviewMenu.setBorder("none");
+ com.smartgwt.client.widgets.menu.MenuItem subsystemsSubMenuItem = new com.smartgwt.client.widgets.menu.MenuItem("Subsystems");
+ subsystemsSubMenuItem.setSubmenu(subsystemsMenu);
+ overviewMenu.addItem(subsystemsSubMenuItem);
+ overviewMenu.addItem(new EMenuItem("AutoDiscovery Queue",LinkManager.getAutodiscoveryQueueLink()));//,new LinkCommand("#cofng"));
+ overviewMenu.addItem(new EMenuItem("Dashboard",LinkManager.getDashboardLink()));//,new LinkCommand("#cofng"));
+ overviewMenu.addItem(new EMenuItem("Bundles", "#Bundles"));
+
+
+ Menu resourcesMenu = new Menu();
+ resourcesMenu.setTitle("Resources");
+ resourcesMenu.setStyleName("SimpleMenuBarButton");
+ resourcesMenu.setBorder("none");
+ resourcesMenu.setStyleName("menuBarMenuButton");
+ resourcesMenu.addItem(new EMenuItem("All Resources", LinkManager.getHubAllResourcesLink()));//, new LinkCommand("#fsdf"));
+ resourcesMenu.addItem(new EMenuItem("Platforms", LinkManager.getHubPlatformsLink(),"types/Platform_up_16.png"));//, new LinkCommand("#fsdf"));
+ resourcesMenu.addItem(new EMenuItem("Servers", LinkManager.getHubServerssLink(), "types/Server_up_16.png"));//, new LinkCommand("#fsdf"));
+ resourcesMenu.addItem(new EMenuItem("Services", LinkManager.getHubServicesLink(), "types/Service_up_16.png"));//, new LinkCommand("#fsdf"));
+ resourcesMenu.addItem(new MenuItemSeparator());
+// resourcesMenu.addItem(new MenuItem("Favorite Resources"));//,)
+
+ Menu groupsMenu = new Menu();
+ groupsMenu.setStyleName("menuBarMenuButton");
+ groupsMenu.setTitle("Groups");
+ groupsMenu.addItem(new EMenuItem("All Groups", LinkManager.getHubAllGroupsLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new EMenuItem("Compatible Groups", LinkManager.getHubCompatibleGroupsLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new EMenuItem("Mixed Groups", LinkManager.getHubMixedGroupsLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new EMenuItem("Group Definitions", LinkManager.getHubGroupDefinitionsLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new MenuItemSeparator());
+ groupsMenu.addItem(new EMenuItem("New Group", LinkManager.getHubNewGroupLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new EMenuItem("New Group Definition", LinkManager.getHubNewGroupDefLink())); //, new LinkCommand("#sf"));
+ groupsMenu.addItem(new MenuItemSeparator());
+// groupsMenu.addItem(new MenuItem("Favorites")); //, new LinkCommand("#sf"));
+
+
+ Menu securityMenu = new Menu();
+ securityMenu.setTitle("Security");
+ securityMenu.addItem(new EMenuItem("Users",LinkManager.getAdminUsersLink()));
+ securityMenu.addItem(new EMenuItem("Roles",LinkManager.getAdminRolesLink()));
+ MenuItem securitySubMenuItem = new MenuItem("Security");
+ securitySubMenuItem.setSubmenu(securityMenu);
+
+
+ Menu sysConfigMenu = new Menu();
+ sysConfigMenu.setTitle("System Configuration");
+ sysConfigMenu.addItem(new EMenuItem("Settings",LinkManager.getAdminSysConfigLink()));
+ sysConfigMenu.addItem(new EMenuItem("Plugins",LinkManager.getAdminPluginsLink()));
+ sysConfigMenu.addItem(new EMenuItem("Templates",LinkManager.getAdminTemplatesLink()));
+ MenuItem sysConfigSubMenuItem = new MenuItem("System Configuration");
+ sysConfigSubMenuItem.setSubmenu(sysConfigMenu);
+
+
+ Menu contentMenu = new Menu();
+ contentMenu.setTitle("Content");
+ contentMenu.addItem(new EMenuItem("Content Providers",LinkManager.getAdminContentProvidersLink()));
+ contentMenu.addItem(new EMenuItem("Content Repositories",LinkManager.getAdminContentReposLink()));
+ MenuItem contentSubMenuItem = new MenuItem("Content");
+ contentSubMenuItem.setSubmenu(contentMenu);
+
+
+ Menu haMenu = new Menu();
+ haMenu.setTitle("High Availability");
+ haMenu.addItem(new EMenuItem("Servers",LinkManager.getHAServersLink()));
+ haMenu.addItem(new EMenuItem("Agents",LinkManager.getHAAgentsLink()));
+ haMenu.addItem(new EMenuItem("Affinity Groups",LinkManager.getHAAffinityGroupsLink()));
+ haMenu.addItem(new EMenuItem("Partition Events",LinkManager.getHAEventsLink()));
+ MenuItem haSubMentItem = new MenuItem("High Availability");
+ haSubMentItem.setSubmenu(haMenu);
+
+
+ Menu reportsMenu = new Menu();
+ reportsMenu.setTitle("Reports");
+ reportsMenu.addItem(new EMenuItem("Resource Version Inventory Report", LinkManager.getReportsInventoryLink()));
+ MenuItem reportsSubMenuItem = new MenuItem("Reports");
+ reportsSubMenuItem.setSubmenu(reportsMenu);
+
+
+ Menu adminMenu = new Menu();
+ adminMenu.setTitle("Administration");
+ adminMenu.addItem(securitySubMenuItem);
+ adminMenu.addItem(sysConfigSubMenuItem);
+ adminMenu.addItem(contentSubMenuItem);
+ adminMenu.addItem(haSubMentItem);
+ adminMenu.addItem(reportsSubMenuItem);
+ adminMenu.addItem(new EMenuItem("Downloads", LinkManager.getAdminDownloadsLink()));
+ adminMenu.addItem(new EMenuItem("License", LinkManager.getAdminLicenseLink()));
+
+
+
+
+
+ Menu helpMenu = new Menu();
+ helpMenu.setStyleName("menuBarMenuButton");
+ helpMenu.setTitle("Help");
+ helpMenu.addItem(new EMenuItem("Online Documentation", "http://www.rhq-project.org")); //, new LinkCommand("#sdfs"));
+ helpMenu.addItem(new EMenuItem("Open a support case", "http://www.rhq-project.org")); //, new LinkCommand("#sdfs"));
+// helpMenu.addItem(new MenuItem("About")); //, new LinkCommand("#sdfs"));
+
+ menu.setMenus(overviewMenu, resourcesMenu, groupsMenu, adminMenu, helpMenu);
+
+
+ topBar.addMember(menu);
+
+
+ addMember(topBar);
+ addMember(new SearchBarPane());
+
}
protected void onDraw2() {
@@ -79,9 +245,25 @@ public class MenuBarView extends VLayout {
// @Override
- protected void onDraw() {
+
+ protected void onDraw3() {
super.onDraw();
+ History.addValueChangeHandler(new ValueChangeHandler<String>() {
+ public void onValueChange(ValueChangeEvent<String> stringValueChangeEvent) {
+ String first = stringValueChangeEvent.getValue().split("/")[0];
+
+ if ("Resource".equals(first)) {
+ first = "Inventory";
+ }
+
+ selected = first;
+ linksPane.setContents(setupLinks());
+ linksPane.markForRedraw();
+ }
+ });
+
+
ToolStrip topStrip = new ToolStrip();
topStrip.setHeight(34);
topStrip.setWidth100();
@@ -148,7 +330,7 @@ public class MenuBarView extends VLayout {
private String setupLinks() {
StringBuilder headerString = new StringBuilder(
- "<table style=\"height: 34px;\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
+ "<table style=\"height: 34px;\" cellpadding=\"0\" cellspacing=\"0\"><tr>");
boolean first = true;
for (String section : SECTIONS) {
@@ -173,4 +355,35 @@ public class MenuBarView extends VLayout {
return headerString.toString();
}
+
+
+ public static class EMenuItem extends com.smartgwt.client.widgets.menu.MenuItem {
+
+ String link;
+
+ public EMenuItem(String title, String link) {
+ super(title);
+ this.link = link;
+ init();
+ }
+
+ public EMenuItem(String title, String link, String icon) {
+ super(title, icon);
+ this.link = link;
+ init();
+ }
+
+ private void init() {
+ addClickHandler(new com.smartgwt.client.widgets.menu.events.ClickHandler() {
+ public void onClick(MenuItemClickEvent menuItemClickEvent) {
+ if (link.startsWith("#")) {
+ History.newItem(link.substring(1));
+ } else {
+ Window.Location.assign(link);
+ }
+ }
+ });
+ }
+ }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
index 2792255..c97936c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
@@ -41,6 +41,9 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
*/
public class TagCloudView extends VLayout {
+ private PageList<TagReportComposite> tags;
+
+ private String selectedTag;
@Override
protected void onDraw() {
@@ -58,13 +61,13 @@ public class TagCloudView extends VLayout {
drawTags(result);
}
});
-
-
}
private void drawTags(PageList<TagReportComposite> tags) {
+ this.tags = tags;
+
addMember(new HeaderLabel("Tag Cloud"));
long max = 0;
@@ -82,7 +85,6 @@ public class TagCloudView extends VLayout {
}
});
-
StringBuilder buf = new StringBuilder();
int minFont = 8;
@@ -92,16 +94,25 @@ public class TagCloudView extends VLayout {
int font = (int) ((((double) tag.getTotal()) / (double) max) * (maxFont - minFont)) + minFont;
+ buf.append("<a href=\"#Tag/" + tag.getTag().toString() + "\" style=\"font-size: " + font + "pt; margin: 8px;\"");
- buf.append("<a href=\"#Tag/" + tag.getTag().toString() + "\" style=\"font-size: " + font + "pt; margin: 8px;\">" + tag.getTag().toString() + "</a> ");
-
+ if (tag.getTag().toString().equals(selectedTag)) {
+ buf.append(" class=\"selectedTag\"");
+ }
+ buf.append(">" + tag.getTag().toString() + "</a> ");
}
HTMLFlow flow = new HTMLFlow(buf.toString());
addMember(flow);
+ }
+
+ public void setSelectedTag(String selectedTag) {
+ this.selectedTag = selectedTag;
+ removeMembers(getMembers());
+ drawTags(tags);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
index 996c199..f837397 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
@@ -22,24 +22,16 @@
*/
package org.rhq.enterprise.gui.coregui.client.report.tag;
-import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.layout.SectionStack;
-import com.smartgwt.client.widgets.layout.SectionStackSection;
import com.smartgwt.client.widgets.layout.VLayout;
-import com.smartgwt.client.widgets.tile.TileGrid;
import com.smartgwt.client.widgets.tile.TileLayout;
-import org.rhq.core.domain.criteria.TagCriteria;
import org.rhq.core.domain.tagging.Tag;
-import org.rhq.core.domain.tagging.compsite.TagReportComposite;
-import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.bundle.list.BundlesListView;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
/**
@@ -47,17 +39,16 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchVi
*/
public class TaggedView extends VLayout implements BookmarkableView {
-
- private SectionStack sectionStack;
+ private TagCloudView tagCloudView;
private Criteria criteria;
- private SectionStackSection resourceSection;
private ResourceSearchView resourceView;
- private SectionStackSection bundleSection;
private BundlesListView bundlesView;
+ private TileLayout tileLayout;
+
public TaggedView() {
setWidth100();
setHeight100();
@@ -67,32 +58,19 @@ public class TaggedView extends VLayout implements BookmarkableView {
protected void onInit() {
super.onInit();
- TagCloudView tagCloudView = new TagCloudView();
+ tagCloudView = new TagCloudView();
tagCloudView.setAutoHeight();
addMember(tagCloudView);
-//
-// sectionStack = new SectionStack();
-// sectionStack.setHeight("*");
-//
-// sectionStack.addSection(getResourceStack());
-//
-// sectionStack.addSection(getBundleStack());
-//
-// addMember(sectionStack);
-
- TileLayout tileLayout = new TileLayout();
- tileLayout.setWidth100();
- tileLayout.setTileHeight(250);
- tileLayout.setTileWidth(getWidth()/2 - 20);
- addMember(tileLayout);
-
- tileLayout.addTile(getResourceCanvas());
- tileLayout.addTile(getBundleCanvas());
+ }
+ @Override
+ protected void onDraw() {
+ super.onDraw();
}
private void viewTag(String tagString) {
+ tagCloudView.setSelectedTag(tagString);
Tag tag = new Tag(tagString);
@@ -102,40 +80,38 @@ public class TaggedView extends VLayout implements BookmarkableView {
criteria.addCriteria("tagName", tag.getName());
- resourceView.refresh(criteria);
- bundlesView.refresh(criteria);
+ if (tileLayout == null) {
+ tileLayout = new TileLayout();
+ tileLayout.setWidth100();
+ tileLayout.setTileHeight(250);
+ tileLayout.setTileWidth(getWidth() / 2 - 20);
+ addMember(tileLayout);
-/* TagCriteria criteria = new TagCriteria();
- criteria.addFilterNamespace(tag.getNamespace());
- criteria.addFilterSemantic(tag.getSemantic());
- criteria.addFilterName(tag.getName());
+ tileLayout.addTile(getResourceCanvas(criteria));
+ tileLayout.addTile(getBundleCanvas(criteria));
- GWTServiceLookup.getTagService().findTagReportCompositesByCriteria(criteria, new AsyncCallback<PageList<TagReportComposite>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to load tag report",caught);
- }
+ }
- public void onSuccess(PageList<TagReportComposite> result) {
- TagReportComposite tagReport = result.get(0);
- sectionStack.setSectionTitle(0, "Resources: " + tagReport.getResourceCount());
- sectionStack.setSectionTitle(1, "Bundles: " + tagReport.getBundleCount());
- }
- });*/
+ resourceView.refresh(criteria);
+ bundlesView.refresh(criteria);
}
- private Canvas getResourceCanvas() {
- resourceView = new ResourceSearchView("Tagged Resources", new String[]{"pluginName","category","currentAvailability"});
+
+ private Canvas getResourceCanvas(Criteria criteria) {
+ resourceView = new ResourceSearchView(criteria, "Tagged Resources", new SortSpecifier[] {},new String[]{"pluginName", "category", "currentAvailability"});
resourceView.setShowFooter(false);
return resourceView;
}
- private Canvas getBundleCanvas() {
- bundlesView = new BundlesListView();
+
+ private Canvas getBundleCanvas(Criteria criteria) {
+ bundlesView = new BundlesListView(criteria);
bundlesView.setShowFooter(false);
return bundlesView;
}
+
public void renderView(ViewPath viewPath) {
if (!viewPath.isEnd()) {
String tagString = viewPath.getCurrent().getPath();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
index faf5121..b3820a9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
@@ -55,6 +55,7 @@ public class MessageCenterView extends HLayout implements MessageCenter.MessageL
public MessageCenterView() {
super(5);
+ setHeight100();
setAlign(Alignment.LEFT);
setAlign(VerticalAlignment.CENTER);
setOverflow(Overflow.CLIP_H);
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
index 4b8b087..05997e8 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
@@ -301,4 +301,54 @@ a:hover {
font-size: 11px;
padding: 2px;
font-weight: bold;
+}
+
+
+.topMenuBar {
+ background: url('/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images/cssButton/button_stretch.png') repeat-x scroll 0 0 #DDDDDD;
+}
+
+.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled {
+ border: none;
+ font-weight: bold;
+}
+
+
+
+/** Not used right now **/
+.gwtMenuBar {
+ background-image: url('images/header/header_bg.png');
+ /*background-image: url("http://localhost:7080/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/ski…");*/
+ background-repeat: repeat-x;
+ padding: 0px;
+ -moz-box-sizing: border-box;
+ overflow: hidden;
+ cursor: auto;
+ z-index: 9999999;
+}
+
+.gwtMenu, .gwt-MenuBarPopup, .gwt-MenuPopup {
+ z-index: 9999999;
+ background-color: white;
+}
+
+.gwt-MenuItem {
+ padding: 0 10px;
+ font-weight: bold;
+ color: #666666;
+ font-size: 9pt;
+}
+
+.gwt-MenuItemSeparator {
+ background-color: #666666;
+}
+
+.gwt-MenuItem-Selected {
+ background-color: #999999;
+}
+
+.selectedTag {
+ background-color: lightblue;
+ padding: 5px;
+ border: 1px solid darkblue;
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
index 32b1682..fb46e97 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
@@ -1,7 +1,6 @@
<html>
<head>
<title>RHQ Core Application</title>
- <link rel="stylesheet" href="CoreGUI.css">
<link rel="icon" type="image/png" href="/images/favicon.png" />
<link rel="apple-touch-icon" href="/images/favicon.png" />
@@ -10,6 +9,15 @@
</script>
+ <link rel="stylesheet" href="CoreGUI.css">
+
+ <style type="text/css">
+ .menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled {
+ border: none;
+ font-weight: bold;
+ }
+
+ </style>
</head>
<body>
<script type="text/javascript" language="javascript"
1
0
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 4 -
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java | 8 +-
modules/plugins/ant-bundle/src/test/resources/test-build.xml | 33 +++++-----
3 files changed, 24 insertions(+), 21 deletions(-)
New commits:
commit ffe84cae9d1c490df76047d26fb1fe85d6617f23
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu May 27 08:56:08 2010 -0400
fiddle with some test code - these still won't pass - still need to wait for the ant stuff to be completed
diff --git a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
index cd0e4c1..2eb1d85 100644
--- a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
+++ b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
@@ -166,9 +166,7 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
int deploymentId = bundleDeployment.getId();
antProps.setProperty(DeployPropertyNames.DEPLOY_ID, Integer.toString(deploymentId));
- if (bundleDeployment.getName() != null) {
- antProps.setProperty(DeployPropertyNames.DEPLOY_NAME, bundleDeployment.getName());
- }
+ antProps.setProperty(DeployPropertyNames.DEPLOY_NAME, bundleDeployment.getName());
antProps.setProperty(DeployPropertyNames.DEPLOY_REVERT, String.valueOf(request.isRevert()));
antProps.setProperty(DeployPropertyNames.DEPLOY_CLEAN, String.valueOf(request.isCleanDeployment()));
diff --git a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
index 6a9d845..c4dc63e 100644
--- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
+++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
@@ -57,7 +57,7 @@ import org.rhq.core.system.SystemInfoFactory;
import org.rhq.core.util.file.FileUtil;
import org.rhq.core.util.stream.StreamUtil;
-@Test
+@Test(enabled = false)
public class AntBundlePluginComponentTest {
private static final String USER_HOME = System.getProperty("user.home");
@@ -84,12 +84,11 @@ public class AntBundlePluginComponentTest {
this.plugin.start(context);
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void cleanTmpDir() {
FileUtil.purge(this.tmpDir, true);
}
- @Test(enabled = false)
/**
* Test a simple Ant script that contains no RHQ tasks other than rhq:bundle.
*/
@@ -103,6 +102,7 @@ public class AntBundlePluginComponentTest {
getRecipeFromFile("test-bundle-v1.xml"));
BundleDeployment deployment = new BundleDeployment();
+ deployment.setName("test bundle deployment name");
deployment.setBundleVersion(bundleVersion);
deployment.setConfiguration(null);
@@ -124,7 +124,6 @@ public class AntBundlePluginComponentTest {
/**
* Test a Ant script that includes all of the RHQ tasks.
*/
- @Test(enabled = false)
public void testAntBundle() throws Exception {
ResourceType resourceType = new ResourceType("testSimpleBundle", "plugin", ResourceCategory.SERVER, null);
BundleType bundleType = new BundleType("testSimpleBundle", resourceType);
@@ -141,6 +140,7 @@ public class AntBundlePluginComponentTest {
config.put(new PropertySimple("custom.prop2", "custom property 2"));
BundleDeployment deployment = new BundleDeployment();
+ deployment.setName("test bundle deployment name");
deployment.setBundleVersion(bundleVersion);
deployment.setConfiguration(config);
deployment.setDestination(destination);
diff --git a/modules/plugins/ant-bundle/src/test/resources/test-build.xml b/modules/plugins/ant-bundle/src/test/resources/test-build.xml
index e4e062b..6ab366a 100644
--- a/modules/plugins/ant-bundle/src/test/resources/test-build.xml
+++ b/modules/plugins/ant-bundle/src/test/resources/test-build.xml
@@ -5,20 +5,25 @@
<echo>basedir=${basedir}</echo>
- <rhq:bundle name="example.com (JBoss EAP 4.3)" version="1.0"
- description="example.com corporate website hosted on JBoss EAP 4.3"/>
-
- <rhq:input-property
- name="custom.prop1"
- description="my prop 1"
- required="true"
- defaultValue="default 1"/>
-
- <rhq:input-property
- name="custom.prop2"
- description="my prop 2"
- required="true"
- defaultValue="default 2"/>
+ <rhq:bundle name="example.com (JBoss EAP 4.3)"
+ version="1.0"
+ description="example.com corporate website hosted on JBoss EAP 4.3" >
+ <rhq:input-property
+ name="custom.prop1"
+ description="my prop 1"
+ required="true"
+ defaultValue="default 1"/>
+
+ <rhq:input-property
+ name="custom.prop2"
+ description="my prop 2"
+ required="true"
+ defaultValue="default 2"/>
+
+ <rhq:deployment name="test-product">
+ <rhq:file name="product.zip"/>
+ </rhq:deployment>
+ </rhq:bundle>
<property name="outfile" value="${basedir}/output.2" />
1
0