[rhq] 2 commits - modules/plugins
by fdrabek
modules/plugins/apache/pom.xml | 21 ++++-
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java | 37 +++-------
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasTreeBuilderApache.java | 10 +-
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasTest.java | 11 ++
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java | 13 +--
5 files changed, 50 insertions(+), 42 deletions(-)
New commits:
commit 37c8646f95f62683b9a73947422da97386fc5f6c
Merge: 04f29c2... 6aeb3ea...
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Thu Aug 5 13:55:08 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 04f29c218de34e2b51686832366fb5be11a2415a
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Thu Aug 5 13:54:15 2010 +0200
BZ-618314 - fix of apache tests
BZ-618877 - Includes can use absolute path now.
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index d8b00bc..9f46fc9 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -95,18 +95,27 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
<profile>
<id>integration-tests</id>
- <activation>
- <property>
- <name>maven.test.skip</name>
- <value>!true</value>
- </property>
- </activation>
+ <!--
+ <activation>
+ <property>
+ <name>maven.test.skip</name>
+ <value>!true</value>
+ </property>
+ </activation>
+ -->
<build>
<plugins>
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java
index cb61c0a..3e51757 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java
@@ -101,17 +101,13 @@ public class AugeasConfigurationApache extends PluginDescriptorBasedAugeasConfig
}
private void loadIncludes(String expression, List<String> foundIncludes) {
- try {
- File file = new File(expression);
-
+ try {
List<File> files = new ArrayList<File>();
- if (!file.isAbsolute()) {
- File serverRootFile = new File(serverRootPath);
- files = Glob.match(serverRootFile, expression);
- }else
- files.add(file);
-
+ File check = new File(expression);
+ File root = new File(check.isAbsolute() ? Glob.rootPortion(expression) : serverRootPath);
+ files.addAll(Glob.match(root, expression));
+
for (File fl : files){
if (fl.exists()) {
foundIncludes.add(fl.getAbsolutePath());
@@ -142,8 +138,7 @@ public class AugeasConfigurationApache extends PluginDescriptorBasedAugeasConfig
}
public void loadFiles() {
- File root = new File(serverRootPath);
-
+
for (AugeasModuleConfig module : modules) {
List<String> includeGlobs = module.getIncludedGlobs();
@@ -154,10 +149,10 @@ public class AugeasConfigurationApache extends PluginDescriptorBasedAugeasConfig
ArrayList<File> files = new ArrayList<File>();
for (String incl : includeGlobs) {
- if (incl.indexOf(File.separatorChar) == 0) {
- files.add(new File(incl));
- } else
- files.addAll(Glob.match(root, incl));
+ File check = new File(incl);
+ File root = new File(check.isAbsolute() ? Glob.rootPortion(incl) : serverRootPath);
+
+ files.addAll(Glob.match(root, incl));
}
if (module.getExcludedGlobs() != null) {
@@ -185,15 +180,11 @@ public class AugeasConfigurationApache extends PluginDescriptorBasedAugeasConfig
private static List<File> getIncludeFiles(String serverRoot, List<String> foundIncludes) {
List<File> ret = new ArrayList<File>();
- File serverRootFile = new File(serverRoot);
for (String path : foundIncludes) {
- File check = new File(path);
- if (check.isAbsolute()) {
- ret.add(check);
- } else {
- for (File f : Glob.match(serverRootFile, path)) {
- ret.add(f);
- }
+ File check = new File(path);
+ File root = new File(check.isAbsolute() ? Glob.rootPortion(path) : serverRoot);
+ for (File f :Glob.match(root, path)){
+ ret.add(f);
}
}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasTreeBuilderApache.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasTreeBuilderApache.java
index 24c2e95..e6454b7 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasTreeBuilderApache.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasTreeBuilderApache.java
@@ -70,18 +70,16 @@ public class AugeasTreeBuilderApache implements AugeasTreeBuilder {
AugeasNode rootNode = new ApacheAugeasNode(ApacheAugeasTree.AUGEAS_DATA_PATH + rootPath, tree);
tree.setRootNode(rootNode);
- File rootFile = new File(apacheConfig.getServerRootPath());
// we need to know which files are related to each glob
for (String inclName : module.getIncludedGlobs()) {
List<File> files = new ArrayList<File>();
- if (inclName.indexOf(File.separatorChar) == 0) {
- files.add(new File(inclName));
- } else
- files.addAll(Glob.match(rootFile, inclName));
-
+ File check = new File(inclName);
+ File root = new File(check.isAbsolute() ? Glob.rootPortion(inclName) : apacheConfig.getServerRootPath());
+ files.addAll(Glob.match(root, inclName));
+
if (module.getExcludedGlobs() != null)
Glob.excludeAll(files, module.getExcludedGlobs());
diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasTest.java
index 344ab1f..88a050b 100644
--- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasTest.java
+++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasTest.java
@@ -3,6 +3,8 @@ package org.rhq.plugins.apache;
import java.io.File;
import java.util.List;
+import net.augeas.Augeas;
+
import org.rhq.augeas.AugeasProxy;
import org.rhq.augeas.node.AugeasNode;
import org.rhq.augeas.tree.AugeasTree;
@@ -120,4 +122,13 @@ public class ApacheAugeasTest {
//test if the updated augeas tree can be mapped to configuration stored at files in "loadconfig" temporary directory
testLoadConfig(treeUpdate, container);
}
+
+ public boolean isAugeasInstalled(){
+ try {
+ Augeas ag = new Augeas();
+ }catch(Throwable e){
+ return false;
+ }
+ return true;
+ }
}
diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java
index 890aa10..5a6cc7e 100644
--- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java
+++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java
@@ -18,18 +18,16 @@
*/
package org.rhq.plugins.apache;
-/*
+
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import org.testng.annotations.AfterSuite;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Test;
-
import org.rhq.core.clientapi.server.discovery.InventoryReport;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementData;
@@ -43,7 +41,6 @@ import org.rhq.core.pc.plugin.PluginEnvironment;
import org.rhq.core.pc.plugin.PluginManager;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
-*/
/**
* The unit tests for the JON Apache plugin.
@@ -53,7 +50,6 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet;
public class ApachePluginTest {
private static final String PLUGIN_NAME = "Apache";
- /*
@BeforeSuite
public void start() {
//System.out.println("java.class.path=" + System.getProperty("java.class.path"));
@@ -71,6 +67,10 @@ public class ApachePluginTest {
container.getInventoryManager().executeServerScanImmediately();
container.getInventoryManager().executeServiceScanImmediately();
ApacheAugeasTest test = new ApacheAugeasTest();
+ if (!test.isAugeasInstalled()){
+ System.out.println("Augeas is not installed.");
+ return;
+ }
test.testMapping(container);
} catch (Exception e) {
e.printStackTrace();
@@ -153,5 +153,4 @@ public class ApachePluginTest {
ApachePluginTest pluginTest = new ApachePluginTest();
pluginTest.start();
}
- */
-}
\ No newline at end of file
+}
13 years, 10 months
- 1
- 0
[rhq] Branch 'nagios' - 2 commits - modules/core modules/enterprise
by Alexander Kiefer
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java | 21 ++++-
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 6 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 39 ++++------
3 files changed, 40 insertions(+), 26 deletions(-)
New commits:
commit 4bb9a240583177d7d24cb144948ce84f41ba2037
Author: alexander.kiefer79(a)googlemail.com <di34475@.dh-com.continental.steel>
Date: Thu Aug 5 11:45:28 2010 +0200
Write most of debug info only if flag is set to DEBUG in jboss-log4j.xml
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
index b4a681f..bef85bf 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
@@ -731,18 +731,12 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
// Check if the subcategories as children of resourceType are valid
// Those are the subcategories we offer for children of us
- log.info("Before call of <<checkForValidSubcategories(resourceType.getChildSubCategories())>>");
checkForValidSubcategories(resourceType.getChildSubCategories());
- log.info("After call of <<checkForValidSubcategories(resourceType.getChildSubCategories())>>");
// Check if we have a subcategory attached that needs to be linked to one of the parents
// This is a subcategory of our parent where we are supposed to be grouped in.
- log.info("Before call of <<linkSubCategoryToParents(resourceType)>>");
linkSubCategoryToParents(resourceType);
- log.info("After call of <<linkSubCategoryToParents(resourceType)>>");
- log.info("Before call of <<entityManager.persist(resourceType)>>");
entityManager.persist(resourceType);
- log.info("After call of <<entityManager.persist(resourceType)>>");
entityManager.flush();
}
@@ -1536,33 +1530,36 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
log.error(nre);
}
- log.info("Name of returned plugin: " + plugin.getName());
-
//Method to get the parent resource Type
//Got name and plugin from the rhq_resource_type table in the rhq database
ResourceType parentResourceType = LookupUtil.getResourceTypeManager().getResourceTypeByNameAndPlugin(
"NagiosMonitor", "NagiosMonitor");
- log.info("Name of parent ResourceType: " + parentResourceType.getName());
- log.info("Id of parent ResourceType: " + parentResourceType.getId());
- log.info("Desc of parent ResourceType: " + parentResourceType.getDescription());
- log.info("Plugin of parent ResourceType: " + parentResourceType.getPlugin());
+ if (log.isDebugEnabled()) {
+ log.info("Name of parent ResourceType: " + parentResourceType.getName());
+ log.info("Id of parent ResourceType: " + parentResourceType.getId());
+ log.info("Plugin of parent ResourceType: " + parentResourceType.getPlugin());
+ }
ResourceType newResourceType = new ResourceType(newResourceTypeName, plugin.getName(),
ResourceCategory.SERVICE, parentResourceType);
- log.info("Name of new ResourceType: " + newResourceType.getName());
- log.info("Id of new ResourceType: " + newResourceType.getId());
- log.info("Desc of new ResourceType: " + newResourceType.getDescription());
- log.info("Plugin of new ResourceType: " + newResourceType.getPlugin());
- log.info("Category of new ResourceType: " + newResourceType.getCategory().toString());
+ if (log.isDebugEnabled()) {
+ log.info("Name of new ResourceType: " + newResourceType.getName());
+ log.info("Id of new ResourceType: " + newResourceType.getId());
+ log.info("Plugin of new ResourceType: " + newResourceType.getPlugin());
+ log.info("Category of new ResourceType: " + newResourceType.getCategory().toString());
+ }
//Create measurement definition for new created ResourceType
MeasurementDefinition measurementDef = new MeasurementDefinition(newResourceType, metricName);
- log.info("Name of new MeasurementDefinition: " + measurementDef.getName());
- log.info("Id of new MeasurementDefinition: " + measurementDef.getId());
- log.info("Category of new MeasurementDefinition: " + measurementDef.getCategory());
- log.info("DataType of new MeasurementDefinition: " + measurementDef.getDataType());
+
+ if (log.isDebugEnabled()) {
+ log.info("Name of new MeasurementDefinition: " + measurementDef.getName());
+ log.info("Id of new MeasurementDefinition: " + measurementDef.getId());
+ log.info("Category of new MeasurementDefinition: " + measurementDef.getCategory());
+ log.info("DataType of new MeasurementDefinition: " + measurementDef.getDataType());
+ }
//Add new MeasurementDefinition to the resourceType
newResourceType.addMetricDefinition(measurementDef);
commit e91b23ea7cffa399a88355c309d2a5b51cd1de93
Author: alexander.kiefer79(a)googlemail.com <di34475@.dh-com.continental.steel>
Date: Thu Aug 5 11:39:59 2010 +0200
Enlarged debug information and check if debug ist enabled in agent
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
index bf1d5d9..1261fa9 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
@@ -139,11 +139,16 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
Set<ResourceType> newTypesToAdd = new HashSet<ResourceType>();
- //Check if the ResourceType which shall be added is already part of the plugin
+ if (log.isDebugEnabled()) {
+ log.info("Size of HashSet<ResourceType> after initialisation: " + newTypesToAdd.size());
+ }
+
+ //Check all types with were added by the plugin
for (ResourceType newTypetoAdd : resourceTypes) {
+ //Check all ChildResourceTypes that already exist
for (ResourceType alreadyExistingType : currentChildTypes) {
//Check if name and plugin of the types are equal
- //Necessary because same ChildResourceTypes can belong to different plugins
+ //Necessary because equal-named ChildResourceTypes can belong to different plugins
if (newTypetoAdd.getName().equals(alreadyExistingType.getName())
&& newTypetoAdd.getPlugin().equals(alreadyExistingType.getPlugin())) {
log.info("The ResourceType " + newTypetoAdd.getName()
@@ -152,7 +157,12 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
log.info("The ResourceType " + newTypetoAdd.getName()
+ " does not exist for the Plugin " + newTypetoAdd.getPlugin() + " yet");
- //add the new ChildResourceType to the set which will be given to the InventoryManager tp persist
+ //if ChildResourceType did not exist add the new ChildResourceType
+ //to the set which will be given to the InventoryManager to persist
+ if (log.isDebugEnabled()) {
+ log.info("new ChildResourceType " + newTypetoAdd.getName()
+ + " added to Set<ResourceTypes>");
+ }
newTypesToAdd.add(newTypetoAdd);
}
@@ -161,7 +171,10 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
}
//Create a new ResourceType in the DB for the selected type
- im.createNewResourceType(newTypesToAdd);
+ //call InventoryManager method only if Set<ResourceType> contains at least one element
+ if (newTypesToAdd.size() > 0) {
+ im.createNewResourceType(newTypesToAdd);
+ }
} catch (PluginContainerException pce) {
// This is expected when the ResourceComponent does not implement the ChildResourceTypeDiscoveryFacet
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 536d3dc..3124deb 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -2428,6 +2428,10 @@ public class InventoryManager extends AgentService implements ContainerService,
*/
public void createNewResourceType(Set<ResourceType> resourceTypes) {
+ if (log.isDebugEnabled()) {
+ log.info("<InventoryManager>.createNewResourceType() called");
+ log.info("Set<ResourceType> was given with " + resourceTypes.size() + " Elements");
+ }
//Get DiscoveryServerService object to enable communication to the remote server
DiscoveryServerService serverService = configuration.getServerServices().getDiscoveryServerService();
@@ -2435,7 +2439,7 @@ public class InventoryManager extends AgentService implements ContainerService,
//Call method to add a new ResourceType in the server DB
//but only if the Set<ResourceType> contains at least one element
if (resourceTypes.size() > 0) {
- log.info("Set<ResourceType> with new types was given to the Server");
+
serverService.addNewResourceType(resourceTypes);
}
13 years, 10 months
- 1
- 0
[rhq] modules/core modules/enterprise
by mazz
modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallInfo.java | 12
modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallStep.java | 46 -
modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/RemoteAccessInfo.java | 25
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java | 159 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RemoteInstallGWTServiceImpl.java | 42 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java | 84 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerLocal.java | 22
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java | 127 +++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHInstallUtility.java | 364 +++++-----
10 files changed, 541 insertions(+), 358 deletions(-)
New commits:
commit 6aeb3ea5ba9e3320fbb82d1b464708d69b40740b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Aug 5 04:08:18 2010 -0400
start cleaning up, enhancing remote agent install. have to just pretty up the view, things work, but the UI just has a poor layout. also, the install steps are failing to display, need to fix that too. probably no more than a couple hours work left
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallInfo.java b/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallInfo.java
index c40440e..055b5f4 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallInfo.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallInfo.java
@@ -26,6 +26,7 @@ import java.util.List;
* @author Greg Hinkle
*/
public class AgentInstallInfo implements Serializable {
+ private static final long serialVersionUID = 1L;
private String serverAddress;
private String agentAddress;
@@ -34,12 +35,10 @@ public class AgentInstallInfo implements Serializable {
private String owner;
private String version;
-
public List<AgentInstallStep> steps = new ArrayList<AgentInstallStep>();
public static final String SETUP_PROP = "rhq.agent.configuration-setup-flag";
-
public static final String SERVER_ADDRESS_PROP = "rhq.agent.server.bind-address";
public static final String SERVER_PORT_PROP = "rhq.agent.server.bind-port";
@@ -49,8 +48,8 @@ public class AgentInstallInfo implements Serializable {
public static final int DEFAULT_SERVER_PORT = 7080;
public static final int DEFAULT_AGENT_PORT = 16163;
-
public AgentInstallInfo() {
+ this(null, null);
}
public AgentInstallInfo(String serverAddress, String agentAddress) {
@@ -88,7 +87,6 @@ public class AgentInstallInfo implements Serializable {
this.version = version;
}
-
public void addStep(AgentInstallStep step) {
steps.add(step);
}
@@ -97,9 +95,6 @@ public class AgentInstallInfo implements Serializable {
return steps;
}
-
-
-
public String getConfigurationStartString() {
StringBuilder buf = new StringBuilder();
@@ -111,10 +106,9 @@ public class AgentInstallInfo implements Serializable {
buf.append("-D").append(SETUP_PROP).append("=").append("true");
buf.append(" ");
- buf.append("-d ");
+ buf.append("--daemon ");
return buf.toString();
}
-
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallStep.java b/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallStep.java
index 91b1d8e..6d65094 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallStep.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallStep.java
@@ -21,43 +21,57 @@ package org.rhq.core.domain.install.remote;
import java.io.Serializable;
/**
-* @author Greg Hinkle
-*/
+ * Encapsulates the results of a SSH command that was issued by the remote agent installer utility.
+ *
+ * @author Greg Hinkle
+ * @author John Mazzitelli
+ */
public class AgentInstallStep implements Serializable {
- int resultCode;
- String command;
- String description;
- String result;
- long time;
+ private static final long serialVersionUID = 1L;
+
+ private String command;
+ private String description;
+ private int resultCode;
+ private String result;
+ private long duration;
public AgentInstallStep() {
}
- public AgentInstallStep(int resultCode, String command, String description, String result, long time) {
- this.resultCode = resultCode;
+ public AgentInstallStep(String command, String description, int resultCode, String result, long duration) {
this.command = command;
this.description = description;
+ this.resultCode = resultCode;
this.result = result;
- this.time = time;
+ this.duration = duration;
}
- public int getResultCode() {
- return resultCode;
+ public String getCommand() {
+ return command;
}
public String getDescription() {
return description;
}
- public String getCommand() {
- return command;
+ public int getResultCode() {
+ return resultCode;
}
public String getResult() {
return result;
}
- public long getTime() {
- return time;
+ public long getDuration() {
+ return duration;
}
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("AgentInstallStep [description=").append(description).append(", result=").append(result).append(
+ ", resultCode=").append(resultCode).append(", duration=").append(duration).append("]");
+ return builder.toString();
+ }
+
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/RemoteAccessInfo.java b/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/RemoteAccessInfo.java
index 67857ce..b2ab566 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/RemoteAccessInfo.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/RemoteAccessInfo.java
@@ -24,31 +24,32 @@ import java.io.Serializable;
* @author Greg Hinkle
*/
public class RemoteAccessInfo implements Serializable {
+ private static final long serialVersionUID = 1L;
- private String host, user, pass;
- byte[] key;
+ private String host;
+ private String user;
+ private String password;
+ private byte[] key;
private int port = 22;
-
public RemoteAccessInfo(String host, String user, byte[] key) {
this.host = host;
this.user = user;
this.key = key;
}
- public RemoteAccessInfo(String host, String user, String pass) {
- this(host, 22, user, pass);
+ public RemoteAccessInfo(String host, String user, String password) {
+ this(host, 22, user, password);
}
- public RemoteAccessInfo(String host, int port, String user, String pass) {
+ public RemoteAccessInfo(String host, int port, String user, String password) {
this.host = host;
this.port = port;
this.user = user;
- this.pass = pass;
+ this.password = password;
}
public RemoteAccessInfo() {
-
}
public String getHost() {
@@ -75,12 +76,12 @@ public class RemoteAccessInfo implements Serializable {
this.user = user;
}
- public String getPass() {
- return pass;
+ public String getPassword() {
+ return password;
}
- public void setPass(String pass) {
- this.pass = pass;
+ public void setPassword(String password) {
+ this.password = password;
}
public byte[] getKey() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
index 76c64a2..621771f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
@@ -27,13 +27,9 @@ import java.util.ArrayList;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Autofit;
import com.smartgwt.client.types.ExpansionMode;
-import com.smartgwt.client.types.TitleOrientation;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.DynamicForm;
-import com.smartgwt.client.widgets.form.FormItemIfFunction;
import com.smartgwt.client.widgets.form.fields.ButtonItem;
-import com.smartgwt.client.widgets.form.fields.CanvasItem;
-import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.HeaderItem;
import com.smartgwt.client.widgets.form.fields.PasswordItem;
import com.smartgwt.client.widgets.form.fields.SpacerItem;
@@ -48,12 +44,12 @@ import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.install.remote.AgentInstallInfo;
import org.rhq.core.domain.install.remote.AgentInstallStep;
+import org.rhq.core.domain.install.remote.RemoteAccessInfo;
import org.rhq.core.domain.measurement.MeasurementConverterClient;
import org.rhq.core.domain.measurement.MeasurementUnits;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.RemoteInstallGWTServiceAsync;
-import org.rhq.core.domain.install.remote.RemoteAccessInfo;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/**
@@ -74,17 +70,14 @@ public class RemoteAgentInstallView extends VLayout {
protected void onInit() {
super.onInit();
-
addMember(getConnectionForm());
agentInfoLayout = new VLayout();
agentInfoLayout.setWidth100();
addMember(agentInfoLayout);
-
}
-
DynamicForm getConnectionForm() {
form = new DynamicForm();
@@ -93,23 +86,23 @@ public class RemoteAgentInstallView extends VLayout {
HeaderItem connectionHeader = new HeaderItem();
connectionHeader.setValue("Connection Information");
- TextItem host = new TextItem("host");
+ TextItem host = new TextItem("host", "Hostname");
host.setRequired(true);
- TextItem username = new TextItem("username");
+ TextItem username = new TextItem("username", "Username");
username.setRequired(true);
- PasswordItem password = new PasswordItem("password");
-// password.setRequired(true);
+ PasswordItem password = new PasswordItem("password", "Password");
+ // password.setRequired(true);
+ TextItem agentInstallPath = new TextItem("agentInstallPath", "Agent Install Path");
+ agentInstallPath.setRequired(true);
ButtonItem statusCheck = new ButtonItem("updateStatus", "Update Status");
-
final StaticTextItem agentStatus = new StaticTextItem("agentStatus", "Agent Status");
agentStatus.setRedrawOnChange(true);
-
statusCheck.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
if (form.validate()) {
@@ -118,91 +111,93 @@ public class RemoteAgentInstallView extends VLayout {
}
});
-
ButtonItem startButton = new ButtonItem("start", "Start Agent");
startButton.setEndRow(false);
-// startButton.setShowIfCondition(new FormItemIfFunction() {
-// public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) {
-// return form.getValue("agentStatus") != null && !"Agent Not Installed".equals(form.getValue("agentStatus"));
-// }
-// });
+ // startButton.setShowIfCondition(new FormItemIfFunction() {
+ // public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) {
+ // return form.getValue("agentStatus") != null && !"Agent Not Installed".equals(form.getValue("agentStatus"));
+ // }
+ // });
startButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- remoteInstallService.startAgent(getRemoteAccessInfo(), new AsyncCallback<String>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to start agent", caught);
- }
-
- public void onSuccess(String result) {
- CoreGUI.getMessageCenter().notify(new Message("Agent successfully started.", Message.Severity.Info));
- agentStatusCheck();
- }
- });
+ remoteInstallService.startAgent(getRemoteAccessInfo(), getAgentInstallPath(),
+ new AsyncCallback<String>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Failed to start agent", caught);
+ }
+
+ public void onSuccess(String result) {
+ CoreGUI.getMessageCenter().notify(
+ new Message("Agent successfully started.", Message.Severity.Info));
+ agentStatusCheck();
+ }
+ });
}
});
-
ButtonItem stopButton = new ButtonItem("stop", "Stop Agent");
stopButton.setStartRow(false);
-// stopButton.setShowIfCondition(new FormItemIfFunction() {
-// public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) {
-// return form.getValue("agentStatus") != null && !"Agent Not Installed".equals(form.getValue("agentStatus"));
-// }
-// });
+ // stopButton.setShowIfCondition(new FormItemIfFunction() {
+ // public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) {
+ // return form.getValue("agentStatus") != null && !"Agent Not Installed".equals(form.getValue("agentStatus"));
+ // }
+ // });
stopButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- remoteInstallService.stopAgent(getRemoteAccessInfo(), new AsyncCallback<String>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to stop agent", caught);
- }
-
- public void onSuccess(String result) {
- CoreGUI.getMessageCenter().notify(new Message("Agent successfully stopped.", Message.Severity.Info));
- agentStatusCheck();
- }
- });
+ remoteInstallService.stopAgent(getRemoteAccessInfo(), getAgentInstallPath(),
+ new AsyncCallback<String>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Failed to stop agent", caught);
+ }
+
+ public void onSuccess(String result) {
+ CoreGUI.getMessageCenter().notify(
+ new Message("Agent successfully stopped.", Message.Severity.Info));
+ agentStatusCheck();
+ }
+ });
}
});
-
ButtonItem installButton = new ButtonItem("install", "Install Agent");
installButton.setRedrawOnChange(true);
-// installButton.setShowIfCondition(new FormItemIfFunction() {
-// public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) {
-// return form.getValue("agentStatus") != null && "Agent Not Installed".equals(form.getValue("agentStatus"));
-// }
-// });
-
+ // installButton.setShowIfCondition(new FormItemIfFunction() {
+ // public boolean execute(FormItem formItem, Object o, DynamicForm dynamicForm) {
+ // return form.getValue("agentStatus") != null && "Agent Not Installed".equals(form.getValue("agentStatus"));
+ // }
+ // });
installButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- remoteInstallService.installAgent(getRemoteAccessInfo(), "/tmp/rhqAgent", new AsyncCallback<AgentInstallInfo>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to install agent", caught);
- }
+ remoteInstallService.installAgent(getRemoteAccessInfo(), getAgentInstallPath(),
+ new AsyncCallback<AgentInstallInfo>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Failed to install agent", caught);
+ }
- public void onSuccess(AgentInstallInfo result) {
- CoreGUI.getMessageCenter().notify(new Message("Agent successfully installed.", Message.Severity.Info));
+ public void onSuccess(AgentInstallInfo result) {
+ CoreGUI.getMessageCenter().notify(
+ new Message("Agent successfully installed.", Message.Severity.Info));
- for (Canvas child : agentInfoLayout.getChildren()) {
- child.destroy();
+ for (Canvas child : agentInfoLayout.getChildren()) {
+ child.destroy();
+ }
+ agentInfoLayout.addMember(buildInstallInfoCanvas(result));
+ agentInfoLayout.markForRedraw();
+ agentStatusCheck();
}
- agentInfoLayout.addMember(buildInstallInfoCanvas(result));
- agentInfoLayout.markForRedraw();
- agentStatusCheck();
- }
- });
+ });
}
});
-
- form.setFields(connectionHeader, host, username, password, statusCheck, agentStatus, new SpacerItem(), startButton, stopButton, new SpacerItem(), installButton, new SpacerItem());
+ form.setFields(connectionHeader, host, username, password, agentInstallPath, statusCheck, agentStatus,
+ new SpacerItem(), startButton, stopButton, new SpacerItem(), installButton, new SpacerItem());
return form;
}
private void agentStatusCheck() {
- remoteInstallService.agentStatus(getRemoteAccessInfo(), new AsyncCallback<String>() {
+ remoteInstallService.agentStatus(getRemoteAccessInfo(), getAgentInstallPath(), new AsyncCallback<String>() {
public void onFailure(Throwable caught) {
form.setValue("agentStatus", caught.getMessage());
}
@@ -213,7 +208,6 @@ public class RemoteAgentInstallView extends VLayout {
});
}
-
private Canvas buildInstallInfoCanvas(AgentInstallInfo info) {
VLayout installInfo = new VLayout();
@@ -239,7 +233,6 @@ public class RemoteAgentInstallView extends VLayout {
installInfo.addMember(infoForm);
-
ListGrid listGrid = new ListGrid() {
@Override
protected Canvas getExpansionComponent(ListGridRecord record) {
@@ -254,18 +247,15 @@ public class RemoteAgentInstallView extends VLayout {
listGrid.setExpansionMode(ExpansionMode.DETAIL_FIELD);
listGrid.setDetailField("result");
-
listGrid.setAutoFitData(Autofit.VERTICAL);
ListGridField step = new ListGridField("description", "Step");
ListGridField resultCode = new ListGridField("resultCode", "Result Code", 90);
- ListGridField time = new ListGridField("time", "Time", 90);
-
+ ListGridField duration = new ListGridField("duration", "Duration", 90);
- listGrid.setFields(step, resultCode, time);
+ listGrid.setFields(step, resultCode, duration);
listGrid.setData(getStepRecords(info));
-
installInfo.addMember(listGrid);
for (ListGridRecord rec : listGrid.getRecords()) {
@@ -284,20 +274,23 @@ public class RemoteAgentInstallView extends VLayout {
rec.setAttribute("description", step.getDescription());
rec.setAttribute("result", step.getResult());
rec.setAttribute("resultCode", "" + step.getResultCode());
- rec.setAttribute("time", MeasurementConverterClient.format((double) step.getTime(), MeasurementUnits.MILLISECONDS, true));
+ rec.setAttribute("duration", MeasurementConverterClient.format((double) step.getDuration(),
+ MeasurementUnits.MILLISECONDS, true));
steps.add(rec);
}
return steps.toArray(new ListGridRecord[steps.size()]);
}
-
private RemoteAccessInfo getRemoteAccessInfo() {
- RemoteAccessInfo info = new RemoteAccessInfo(
- form.getValueAsString("host"),
- form.getValueAsString("username"),
- form.getValueAsString("password")
- );
+ String host = form.getValueAsString("host");
+ String username = form.getValueAsString("username");
+ String password = form.getValueAsString("password");
+ RemoteAccessInfo info = new RemoteAccessInfo(host, username, password);
return info;
}
+
+ private String getAgentInstallPath() {
+ return form.getValueAsString("agentInstallPath");
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java
index d25a9d3..bd76bf9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java
@@ -28,21 +28,25 @@ import org.rhq.core.domain.install.remote.AgentInstallInfo;
import org.rhq.core.domain.install.remote.RemoteAccessInfo;
/**
+ * Provides methods to remotely install, start and stop agents over SSH.
+ *
* @author Greg Hinkle
+ * @author John Mazzitelli
*/
public interface RemoteInstallGWTService extends RemoteService {
- // RemoteInstallManagerRemote
- AgentInstallInfo agentInstallCheck(RemoteAccessInfo remoteAccessInfo);
+ // --- RemoteInstallManagerRemote
+ boolean agentInstallCheck(RemoteAccessInfo remoteAccessInfo, String agentInstallPath);
- AgentInstallInfo installAgent(RemoteAccessInfo remoteAccessInfo, String path);
+ AgentInstallInfo installAgent(RemoteAccessInfo remoteAccessInfo, String parentPath);
- String[] remotePathDiscover(RemoteAccessInfo remoteAccessInfo, String parentPath);
+ String startAgent(RemoteAccessInfo remoteAccessInfo, String agentInstallPath);
- String startAgent(RemoteAccessInfo remoteAccessInfo);
+ String stopAgent(RemoteAccessInfo remoteAccessInfo, String agentInstallPath);
- String stopAgent(RemoteAccessInfo remoteAccessInfo);
+ String agentStatus(RemoteAccessInfo remoteAccessInfo, String agentInstallPath);
- String agentStatus(RemoteAccessInfo remoteAccessInfo);
+ String findAgentInstallPath(RemoteAccessInfo remoteAccessInfo, String parentPath);
+ String[] remotePathDiscover(RemoteAccessInfo remoteAccessInfo, String parentPath);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RemoteInstallGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RemoteInstallGWTServiceImpl.java
index 1a6af99..321cf77 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RemoteInstallGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RemoteInstallGWTServiceImpl.java
@@ -33,36 +33,42 @@ import org.rhq.enterprise.server.util.LookupUtil;
* @author Greg Hinkle
*/
public class RemoteInstallGWTServiceImpl extends AbstractGWTServiceImpl implements RemoteInstallGWTService {
+ private static final long serialVersionUID = 1L;
private RemoteInstallManagerLocal remoteInstallManager = LookupUtil.getRemoteInstallManager();
- public AgentInstallInfo agentInstallCheck(RemoteAccessInfo remoteAccessInfo) {
- return SerialUtility.prepare(remoteInstallManager.agentInstallCheck(getSessionSubject(), remoteAccessInfo),
- "RemoteInstallService.agentInstallCheck");
+ public boolean agentInstallCheck(RemoteAccessInfo remoteAccessInfo, String agentInstallPath) {
+ return SerialUtility.prepare(remoteInstallManager.agentInstallCheck(getSessionSubject(), remoteAccessInfo,
+ agentInstallPath), "RemoteInstallService.agentInstallCheck");
}
- public AgentInstallInfo installAgent(RemoteAccessInfo remoteAccessInfo, String path) {
- return SerialUtility.prepare(remoteInstallManager.installAgent(getSessionSubject(), remoteAccessInfo, path),
- "RemoteInstallService.installAgent");
+ public AgentInstallInfo installAgent(RemoteAccessInfo remoteAccessInfo, String parentPath) {
+ return SerialUtility.prepare(remoteInstallManager.installAgent(getSessionSubject(), remoteAccessInfo,
+ parentPath), "RemoteInstallService.installAgent");
}
- public String[] remotePathDiscover(RemoteAccessInfo remoteAccessInfo, String parentPath) {
- return SerialUtility.prepare((remoteInstallManager.remotePathDiscover(getSessionSubject(), remoteAccessInfo, parentPath)),
- "RemoteInstallService.remotePathDiscover");
+ public String startAgent(RemoteAccessInfo remoteAccessInfo, String agentInstallPath) {
+ return SerialUtility.prepare(remoteInstallManager.startAgent(getSessionSubject(), remoteAccessInfo,
+ agentInstallPath), "RemoteInstallService.startAgent");
+ }
+
+ public String stopAgent(RemoteAccessInfo remoteAccessInfo, String agentInstallPath) {
+ return SerialUtility.prepare(remoteInstallManager.stopAgent(getSessionSubject(), remoteAccessInfo,
+ agentInstallPath), "RemoteInstallService.stopAgent");
}
- public String startAgent(RemoteAccessInfo remoteAccessInfo) {
- return SerialUtility.prepare(remoteInstallManager.startAgent(getSessionSubject(), remoteAccessInfo),
- "RemoteInstallService.startAgent");
+ public String agentStatus(RemoteAccessInfo remoteAccessInfo, String agentInstallPath) {
+ return SerialUtility.prepare(remoteInstallManager.agentStatus(getSessionSubject(), remoteAccessInfo,
+ agentInstallPath), "RemoteInstallService.agentStatus");
}
- public String stopAgent(RemoteAccessInfo remoteAccessInfo) {
- return SerialUtility.prepare(remoteInstallManager.stopAgent(getSessionSubject(), remoteAccessInfo),
- "RemoteInstallService.stopAgent");
+ public String findAgentInstallPath(RemoteAccessInfo remoteAccessInfo, String parentPath) {
+ return SerialUtility.prepare((remoteInstallManager.findAgentInstallPath(getSessionSubject(), remoteAccessInfo,
+ parentPath)), "RemoteInstallService.findAgentInstallPath");
}
- public String agentStatus(RemoteAccessInfo remoteAccessInfo) {
- return SerialUtility.prepare(remoteInstallManager.agentStatus(getSessionSubject(), remoteAccessInfo),
- "RemoteInstallService.agentStatus");
+ public String[] remotePathDiscover(RemoteAccessInfo remoteAccessInfo, String parentPath) {
+ return SerialUtility.prepare((remoteInstallManager.remotePathDiscover(getSessionSubject(), remoteAccessInfo,
+ parentPath)), "RemoteInstallService.remotePathDiscover");
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java
index 4763ed5..5488e6a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java
@@ -24,57 +24,95 @@ package org.rhq.enterprise.server.install.remote;
import javax.ejb.Stateless;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.install.remote.AgentInstallInfo;
import org.rhq.core.domain.install.remote.RemoteAccessInfo;
import org.rhq.enterprise.server.authz.RequiredPermission;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.authz.Permission;
/**
+ * Installs, starts and stops remote agents via SSH.
+ *
* @author Greg Hinkle
+ * @author John Mazzitelli
*/
@Stateless
public class RemoteInstallManagerBean implements RemoteInstallManagerLocal, RemoteInstallManagerRemote {
-
@RequiredPermission(Permission.MANAGE_INVENTORY)
- public AgentInstallInfo agentInstallCheck(Subject subject, RemoteAccessInfo remoteAccessInfo) {
- SSHInstallUtility sshUtil = new SSHInstallUtility(remoteAccessInfo);
-
- return sshUtil.installAgent();
+ public boolean agentInstallCheck(Subject subject, RemoteAccessInfo remoteAccessInfo, String agentInstallPath) {
+ SSHInstallUtility sshUtil = getSSHConnection(remoteAccessInfo);
+ try {
+ return sshUtil.agentInstallCheck(agentInstallPath);
+ } finally {
+ sshUtil.disconnect();
+ }
}
@RequiredPermission(Permission.MANAGE_INVENTORY)
- public AgentInstallInfo installAgent(Subject subject, RemoteAccessInfo remoteAccessInfo, String path) {
- SSHInstallUtility sshUtil = new SSHInstallUtility(remoteAccessInfo);
+ public AgentInstallInfo installAgent(Subject subject, RemoteAccessInfo remoteAccessInfo, String parentPath) {
+ SSHInstallUtility sshUtil = getSSHConnection(remoteAccessInfo);
+ try {
+ return sshUtil.installAgent(parentPath);
+ } finally {
+ sshUtil.disconnect();
+ }
+ }
- return sshUtil.installAgent();
+ @RequiredPermission(Permission.MANAGE_INVENTORY)
+ public String startAgent(Subject subject, RemoteAccessInfo remoteAccessInfo, String agentInstallPath) {
+ SSHInstallUtility sshUtil = getSSHConnection(remoteAccessInfo);
+ try {
+ return sshUtil.startAgent(agentInstallPath);
+ } finally {
+ sshUtil.disconnect();
+ }
}
@RequiredPermission(Permission.MANAGE_INVENTORY)
- public String[] remotePathDiscover(Subject subject, RemoteAccessInfo remoteAccessInfo, String parentPath) {
- SSHInstallUtility ssh = new SSHInstallUtility(remoteAccessInfo);
- ssh.connect();
- return ssh.pathDiscovery(parentPath);
+ public String stopAgent(Subject subject, RemoteAccessInfo remoteAccessInfo, String agentInstallPath) {
+ SSHInstallUtility sshUtil = getSSHConnection(remoteAccessInfo);
+ try {
+ return sshUtil.stopAgent(agentInstallPath);
+ } finally {
+ sshUtil.disconnect();
+ }
+ }
+
+ public String agentStatus(Subject subject, RemoteAccessInfo remoteAccessInfo, String agentInstallPath) {
+ SSHInstallUtility sshUtil = getSSHConnection(remoteAccessInfo);
+ try {
+ return sshUtil.agentStatus(agentInstallPath);
+ } finally {
+ sshUtil.disconnect();
+ }
}
@RequiredPermission(Permission.MANAGE_INVENTORY)
- public String startAgent(Subject subject, RemoteAccessInfo remoteAccessInfo) {
- SSHInstallUtility sshUtil = new SSHInstallUtility(remoteAccessInfo);
- return sshUtil.agentStart();
+ public String findAgentInstallPath(Subject subject, RemoteAccessInfo remoteAccessInfo, String parentPath) {
+ SSHInstallUtility sshUtil = getSSHConnection(remoteAccessInfo);
+ try {
+ return sshUtil.findAgentInstallPath(parentPath);
+ } finally {
+ sshUtil.disconnect();
+ }
}
@RequiredPermission(Permission.MANAGE_INVENTORY)
- public String stopAgent(Subject subject, RemoteAccessInfo remoteAccessInfo) {
- SSHInstallUtility sshUtil = new SSHInstallUtility(remoteAccessInfo);
- return sshUtil.agentStop();
+ public String[] remotePathDiscover(Subject subject, RemoteAccessInfo remoteAccessInfo, String parentPath) {
+ SSHInstallUtility sshUtil = getSSHConnection(remoteAccessInfo);
+ try {
+ return sshUtil.pathDiscovery(parentPath);
+ } finally {
+ sshUtil.disconnect();
+ }
}
- public String agentStatus(Subject subject, RemoteAccessInfo remoteAccessInfo) {
+ private SSHInstallUtility getSSHConnection(RemoteAccessInfo remoteAccessInfo) {
if (remoteAccessInfo.getHost() == null) {
- return "Enter a host";
+ throw new RuntimeException("Enter a host");
}
SSHInstallUtility sshUtil = new SSHInstallUtility(remoteAccessInfo);
- return sshUtil.agentStatus();
+ return sshUtil;
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerLocal.java
index c50dd52..47329fb 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerLocal.java
@@ -24,27 +24,11 @@ package org.rhq.enterprise.server.install.remote;
import javax.ejb.Local;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.install.remote.AgentInstallInfo;
-import org.rhq.core.domain.install.remote.RemoteAccessInfo;
-
/**
+ * Provides an interface to remotely install an RHQ Agent over SSH.
+ *
* @author Greg Hinkle
*/
@Local
-public interface RemoteInstallManagerLocal {
-
-
- AgentInstallInfo agentInstallCheck(Subject subject, RemoteAccessInfo remoteAccessInfo);
-
- AgentInstallInfo installAgent(Subject subject, RemoteAccessInfo remoteAccessInfo, String path);
-
- String[] remotePathDiscover(Subject subject, RemoteAccessInfo remoteAccessInfo, String parentPath);
-
- String startAgent(Subject subject, RemoteAccessInfo remoteAccessInfo);
-
- String stopAgent(Subject subject, RemoteAccessInfo remoteAccessInfo);
-
- String agentStatus(Subject subject, RemoteAccessInfo remoteAccessInfo);
-
+public interface RemoteInstallManagerLocal extends RemoteInstallManagerRemote {
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java
index 298f823..9b85f05 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java
@@ -23,28 +23,135 @@
package org.rhq.enterprise.server.install.remote;
import javax.ejb.Remote;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.install.remote.AgentInstallInfo;
+import org.rhq.core.domain.install.remote.RemoteAccessInfo;
+import org.rhq.enterprise.server.system.ServerVersion;
/**
- * Future Remote API...
+ * Provides an interface to remotely install an RHQ Agent over SSH.
*
* @author Greg Hinkle
*/
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+@WebService(targetNamespace = ServerVersion.namespace)
@Remote
public interface RemoteInstallManagerRemote {
-
- /* To Be Updated, commented :-) and Released in next version...
+ /**
+ * Checks to see if an agent is installed in the given directory.
*
- AgentInstallInfo agentInstallCheck(Subject subject, RemoteAccessInfo remoteAccessInfo);
+ * @param subject the RHQ user making the request
+ * @param remoteAccessInfo the remote machine information and remote user SSH credentials
+ * @param agentInstallPath the directory to check
+ *
+ * @return true if an agent is installed in the given install path, false if not
+ */
+ @WebMethod
+ boolean agentInstallCheck( //
+ @WebParam(name = "subject") Subject subject, //
+ @WebParam(name = "remoteAccessInfo") RemoteAccessInfo remoteAccessInfo, //
+ @WebParam(name = "agentInstallPath") String agentInstallPath);
- AgentInstallInfo installAgent(Subject subject, RemoteAccessInfo remoteAccessInfo, String path);
+ /**
+ * Installs the agent update binary distribution file to the given parent
+ * directory. Note that the agent's install directory will be a child of
+ * the given parent directory, with that child install directory usually
+ * named "rhq-agent".
+ *
+ * @param subject the RHQ user making the request
+ * @param remoteAccessInfo the remote machine information and remote user SSH credentials
+ * @param parentPath where the agent install directory will be
+ *
+ * @return info containing the results of the installation
+ */
+ @WebMethod
+ AgentInstallInfo installAgent( //
+ @WebParam(name = "subject") Subject subject, //
+ @WebParam(name = "remoteAccessInfo") RemoteAccessInfo remoteAccessInfo, //
+ @WebParam(name = "parentPath") String parentPath);
- String[] remotePathDiscover(Subject subject, RemoteAccessInfo remoteAccessInfo, String parentPath);
+ /**
+ * Starts the agent located in the given installation directory.
+ *
+ * @param subject the RHQ user making the request
+ * @param remoteAccessInfo the remote machine information and remote user SSH credentials
+ * @param agentInstallPath where the agent is installed
+ *
+ * @return results of the start command
+ */
+ @WebMethod
+ String startAgent( //
+ @WebParam(name = "subject") Subject subject, //
+ @WebParam(name = "remoteAccessInfo") RemoteAccessInfo remoteAccessInfo, //
+ @WebParam(name = "agentInstallPath") String agentInstallPath);
- String startAgent(Subject subject, RemoteAccessInfo remoteAccessInfo);
+ /**
+ * Stops the agent located in the given installation directory.
+ *
+ * @param subject the RHQ user making the request
+ * @param remoteAccessInfo the remote machine information and remote user SSH credentials
+ * @param agentInstallPath where the agent is installed
+ *
+ * @return results of the stop command
+ */
+ @WebMethod
+ String stopAgent( //
+ @WebParam(name = "subject") Subject subject, //
+ @WebParam(name = "remoteAccessInfo") RemoteAccessInfo remoteAccessInfo, //
+ @WebParam(name = "agentInstallPath") String agentInstallPath);
- String stopAgent(Subject subject, RemoteAccessInfo remoteAccessInfo);
+ /**
+ * Determines the running status of the agent located in the given installation directory.
+ *
+ * @param subject the RHQ user making the request
+ * @param remoteAccessInfo the remote machine information and remote user SSH credentials
+ * @param agentInstallPath where the agent is installed
+ *
+ * @return results of the status command
+ */
+ @WebMethod
+ String agentStatus( //
+ @WebParam(name = "subject") Subject subject, //
+ @WebParam(name = "remoteAccessInfo") RemoteAccessInfo remoteAccessInfo, //
+ @WebParam(name = "agentInstallPath") String agentInstallPath);
- String agentStatus(Subject subject, RemoteAccessInfo remoteAccessInfo);
- */
+ /**
+ * Given a root parent path to check, this will scan all subdirectories (recursively)
+ * to try to find where the agent is installed (if it is installed at all). If parentPath
+ * is null or empty, the more common locations where agents are normally installed will be
+ * scanned. Returns the path to the first location where an agent is probably installed;
+ * <code>null</code> is returned if it does not look like the agent is installed anywhere
+ * under the given parent path (or in any of the common locations, if parent path is null).
+ *
+ * @param subject the RHQ user making the request
+ * @param remoteAccessInfo the remote machine information and remote user SSH credentials
+ * @param parentPath the parent directory whose children files/directories are scanned
+ *
+ * @return the probable location of an installed agent; null if no agent install was found
+ */
+ @WebMethod
+ String findAgentInstallPath( //
+ @WebParam(name = "subject") Subject subject, //
+ @WebParam(name = "remoteAccessInfo") RemoteAccessInfo remoteAccessInfo, //
+ @WebParam(name = "parentPath") String parentPath);
+ /**
+ * Returns the given parent directory's child files/directories.
+ *
+ * @param subject the RHQ user making the request
+ * @param remoteAccessInfo the remote machine information and remote user SSH credentials
+ * @param parentPath the parent directory whose children files/directories are returned
+ *
+ * @return names of the parent's child files/directories
+ */
+ @WebMethod
+ String[] remotePathDiscover( //
+ @WebParam(name = "subject") Subject subject, //
+ @WebParam(name = "remoteAccessInfo") RemoteAccessInfo remoteAccessInfo, //
+ @WebParam(name = "parentPath") String parentPath);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHInstallUtility.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHInstallUtility.java
index 3f94c86..c81b478 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHInstallUtility.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHInstallUtility.java
@@ -22,12 +22,11 @@
*/
package org.rhq.enterprise.server.install.remote;
-import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
+import java.util.Properties;
import com.jcraft.jsch.Channel;
import com.jcraft.jsch.ChannelExec;
@@ -41,40 +40,46 @@ import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.install.remote.AgentInstallInfo;
import org.rhq.core.domain.install.remote.AgentInstallStep;
import org.rhq.core.domain.install.remote.RemoteAccessInfo;
-import org.rhq.core.util.file.FileUtil;
import org.rhq.enterprise.server.util.LookupUtil;
/**
+ * A utility object that is used to install, start and stop agents remotely over SSH.
+ *
* @author Greg Hinkle
+ * @author John Mazzitelli
*/
public class SSHInstallUtility {
- static final int DEFAULT_BUFFER_SIZE = 4096;
- static final long TIMEOUT = 10000L;
- static final long POLL_TIMEOUT = 1000L;
+ private static final String RHQ_AGENT_LATEST_VERSION_PROP = "rhq-agent.latest.version";
+ private static final int DEFAULT_BUFFER_SIZE = 4096;
+ private static final int CONNECTION_TIMEOUT = 30000;
+ private static final long TIMEOUT = 30000L;
+ private static final long POLL_TIMEOUT = 1000L;
private Log log = LogFactory.getLog(SSHInstallUtility.class);
private RemoteAccessInfo accessInfo;
private Session session;
- private String agentDestination = "/tmp/rhqAgent"; // todo: Make configurable
-
-
- private String agentFile = "rhq-enterprise-agent-3.0.0-SNAPSHOT.jar"; // Corrected below
- private String agentPath = "/projects/rhq/dev-container/jbossas/server/default/deploy/rhq.ear/rhq-downloads/rhq-agent/" + agentFile; // corrected below
-
+ private String agentFile;
+ private String agentPath;
+ private String agentVersion;
public SSHInstallUtility(RemoteAccessInfo accessInfo) {
this.accessInfo = accessInfo;
try {
File agentBinaryFile = LookupUtil.getAgentManager().getAgentUpdateBinaryFile();
- agentPath = agentBinaryFile.getCanonicalPath();
agentFile = agentBinaryFile.getName();
+ agentPath = agentBinaryFile.getCanonicalPath();
+
+ Properties props = LookupUtil.getAgentManager().getAgentUpdateVersionFileContent();
+ agentVersion = props.getProperty(RHQ_AGENT_LATEST_VERSION_PROP);
} catch (Exception e) {
- // Could not find agent file, leave the default
- log.warn("Failed agent binary file lookup", e);
+ agentVersion = getClass().getPackage().getImplementationVersion();
+ agentFile = "rhq-enterprise-agent-" + agentVersion + ".jar";
+ agentPath = "/tmp/rhq-agent/" + agentFile;
+ log.warn("Failed agent binary file lookup - using [" + agentPath + "]", e);
}
if (!new File(agentPath).exists()) {
@@ -84,32 +89,27 @@ public class SSHInstallUtility {
connect();
}
-
public void connect() {
try {
JSch jsch = new JSch();
+ //if (accessInfo.getKey() != null) {
+ // jsch.addIdentity(...);
+ //}
-// if (accessInfo.getKey() != null) {
- jsch.addIdentity("/Users/ghinkle/.ssh/ghinkleawskey.pem");
-
-// }
+ session = jsch.getSession(accessInfo.getUser(), accessInfo.getHost(), accessInfo.getPort());
- session = jsch.getSession(accessInfo.getUser(), accessInfo.getHost(), 22); // accessInfo.getPort());
-
- if (accessInfo.getPass() != null) {
- session.setPassword(accessInfo.getPass());
+ if (accessInfo.getPassword() != null) {
+ session.setPassword(accessInfo.getPassword());
}
- java.util.Properties config = new java.util.Properties();
+ Properties config = new Properties();
config.put("StrictHostKeyChecking", "no");
session.setConfig(config);
- //session.connect();
- session.connect(30000); // making a connection with timeout.
+ session.connect(CONNECTION_TIMEOUT); // making a connection with timeout.
} catch (JSchException e) {
- e.printStackTrace();
- throw new RuntimeException(e);
+ throw new RuntimeException("Failed SSH connection", e);
}
}
@@ -117,36 +117,145 @@ public class SSHInstallUtility {
session.disconnect();
}
+ public boolean agentInstallCheck(String agentInstallPath) {
+ String agentWrapperScript = buildAgentWrapperScriptPath(agentInstallPath);
+
+ String value = executeCommand("if [ -f '" + agentWrapperScript + "' ]; then echo \"exists\"; fi",
+ "Agent Install Check");
+ if (value == null || value.trim().length() == 0) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ public AgentInstallInfo installAgent(String parentPath) {
+
+ AgentInstallInfo info = new AgentInstallInfo(parentPath, accessInfo.getUser(), agentVersion);
+
+ executeCommand("uname -a", "Machine uname", info);
+ executeCommand("java -version", "Java Version Check", info);
+ executeCommand("mkdir -p '" + parentPath + "'", "Create Agent Install Directory", info);
+
+ log.info("Copying agent binary update distribution file to [" + accessInfo.getHost() + "]...");
+
+ long start = System.currentTimeMillis();
+ boolean fileSent = SSHFileSend.sendFile(session, agentPath, parentPath);
+ AgentInstallStep scpStep = new AgentInstallStep("ssh copy '" + agentPath + "' -> '" + parentPath + "'",
+ "Remote copy the agent binary update distribution", 0, fileSent ? "Success" : "Failed", getTimeDiff(start));
+ info.addStep(scpStep);
+
+ log.info("Agent binary update distribution file copied");
+
+ executeCommand("cd '" + parentPath + "'", "Change to install directory", info);
+ executeCommand("java -jar '" + parentPath + "/" + agentFile + "' '--install=" + parentPath + "'",
+ "Install Agent", info);
+
+ String serverAddress = LookupUtil.getServerManager().getServer().getAddress();
+
+ log.info("Will start new agent @ [" + accessInfo.getHost() + "] pointing to server @ [" + serverAddress + "]");
+
+ String agentScript = parentPath + "/rhq-agent/bin/rhq-agent.sh"; // NOTE: NOT the wrapper script
+ String properties = new AgentInstallInfo(serverAddress, accessInfo.getHost()).getConfigurationStartString();
+
+ // Tell the script to store a pid file to make the wrapper script work
+ String envCmd1 = "RHQ_AGENT_IN_BACKGROUND='" + parentPath + "/rhq-agent/bin/rhq-agent.pid'";
+ String envCmd2 = "export RHQ_AGENT_IN_BACKGROUND";
+
+ String startCommand = envCmd1 + " ; " + envCmd2 + " ; nohup '" + agentScript + "' " + properties + " &";
+ executeCommand(startCommand, "Start New Agent", info);
+
+ return info;
+ }
+
+ public String startAgent(String agentInstallPath) {
+ String agentWrapperScript = buildAgentWrapperScriptPath(agentInstallPath);
+
+ return executeCommand("'" + agentWrapperScript + "' start", "Agent Start");
+ }
+
+ public String stopAgent(String agentInstallPath) {
+ String agentWrapperScript = buildAgentWrapperScriptPath(agentInstallPath);
+
+ return executeCommand("'" + agentWrapperScript + "' stop", "Agent Stop");
+ }
+
+ public String agentStatus(String agentInstallPath) {
+ String agentWrapperScript = buildAgentWrapperScriptPath(agentInstallPath);
+
+ if (!agentInstallCheck(agentInstallPath)) {
+ return "Agent Not Installed";
+ }
+
+ return executeCommand("'" + agentWrapperScript + "' status", "Agent Status");
+ }
+
+ public String findAgentInstallPath(String parentPath) {
+ if (parentPath == null || parentPath.trim().length() == 0) {
+ // user doesn't know where the agent might be - let's try to guess
+ String[] possiblePaths = new String[] { "/opt", "/usr/local", "/usr/share", "/rhq",
+ "/home/" + accessInfo.getUser() };
+ for (String possiblePath : possiblePaths) {
+ String path = findAgentInstallPath(possiblePath);
+ if (path != null) {
+ return path;
+ }
+ }
+ return null;
+ }
+
+ if (parentPath.endsWith("rhq-agent") || parentPath.endsWith("rhq-agent/")) {
+ return parentPath; // assume the caller's parent path *is* the agent install path
+ }
+
+ String full = executeCommand("find '" + parentPath + "' -name rhq-agent -print", "Find Agent Install Path");
+ if (full == null || full.trim().length() == 0) {
+ return null;
+ }
+ String[] results = full.split("\n");
+ String path = results[0];
+ return path;
+ }
public String[] pathDiscovery(String parentPath) {
- String full = executeCommand("ls" + parentPath);
+ String full = executeCommand("ls -1 '" + parentPath + "'", "Path Discovery");
return full.split("\n");
}
+ private String buildAgentWrapperScriptPath(String agentInstallPath) {
+ // its possible the caller is giving us the parent install directory, whereas we
+ // want the child "rhq-agent" directory. Our find method will take care of this
+ // and return the path we want - if it doesn't, just use the path the user gave us
+ // and let the chips fall where they may
+ String foundAgentInstall = findAgentInstallPath(agentInstallPath);
+ if (foundAgentInstall != null) {
+ agentInstallPath = foundAgentInstall;
+ }
+ String agentWrapperScript = agentInstallPath + "/bin/rhq-agent-wrapper.sh";
+ return agentWrapperScript;
+ }
private String executeCommand(String command, String description) {
return executeCommand(command, description, new AgentInstallInfo(null, null));
}
-
private String executeCommand(String command, String description, AgentInstallInfo info) {
- log.info("Running: " + description);
+ log.info("Running SSH command [" + description + "]");
long start = System.currentTimeMillis();
String result = null;
try {
result = executeCommand(command);
- info.addStep(new AgentInstallStep(0, command, description, result, (System.currentTimeMillis() - start)));
+ info.addStep(new AgentInstallStep(command, description, 0, result, getTimeDiff(start)));
} catch (ExecuteException e) {
- info.addStep(new AgentInstallStep(e.errorCode, command, e.message, description, (System.currentTimeMillis() - start)));
+ info.addStep(new AgentInstallStep(command, description, e.errorCode, e.getMessage(), getTimeDiff(start)));
}
- log.info("Result [" + description + "]: " + result);
+ log.info("Result of SSH command [" + description + "]: " + result);
return result;
}
-
private String executeCommand(String command) {
ChannelExec channel = null;
- int exitStatus = 0;
+ int exitStatus = -1;
InputStream is = null;
InputStream es = null;
@@ -158,46 +267,63 @@ public class SSHInstallUtility {
is = channel.getInputStream();
es = channel.getErrStream();
- channel.connect(10000); // connect and execute command
+ channel.connect(CONNECTION_TIMEOUT); // connect and execute command
String out = read(is, channel);
String err = read(es, channel);
- // System.out.println("Output: " + out);
+ if (log.isTraceEnabled()) {
+ log.trace("SSH command output: " + out);
+ }
+
if (err.length() > 0) {
- // System.out.println("Error [" + channel.getExitStatus() + "]: " + err);
- if (channel.getExitStatus() != 0) {
- throw new ExecuteException(channel.getExitStatus(), err);
+ exitStatus = channel.getExitStatus();
+
+ if (log.isTraceEnabled()) {
+ log.trace("SSH command error [" + exitStatus + "]: " + err);
+ }
+
+ if (exitStatus != 0) {
+ throw new ExecuteException(exitStatus, err);
} else if (out.length() == 0) {
return err;
}
+ } else {
+ exitStatus = 0;
}
+
return out;
+ } catch (ExecuteException ee) {
+ throw ee;
} catch (Exception e) {
- e.printStackTrace();
+ throw new ExecuteException(exitStatus, e.toString());
} finally {
- try {
- is.close();
- } catch (Exception e) {
- e.printStackTrace();
+ if (is != null) {
+ try {
+ is.close();
+ } catch (Exception e) {
+ }
}
- try {
- es.close();
- } catch (Exception e) {
- e.printStackTrace();
+
+ if (es != null) {
+ try {
+ es.close();
+ } catch (Exception e) {
+ }
}
if (channel != null) {
- channel.disconnect();
+ try {
+ channel.disconnect();
+ } catch (Exception e) {
+ log.error("Failed to disconnect", e);
+ }
}
}
- return "exit: " + exitStatus;
}
-
- public String read(InputStream is, Channel channel) throws IOException {
- // read command output
+ private String read(InputStream is, Channel channel) throws IOException {
byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
ByteArrayOutputStream bos = new ByteArrayOutputStream();
final long endTime = System.currentTimeMillis() + TIMEOUT;
@@ -211,116 +337,33 @@ public class SSHInstallUtility {
}
}
if (channel.isClosed()) {
- // int exitStatus = channel.getExitStatus();
- // System.out.println("exit status: " + exitStatus);
+ if (log.isDebugEnabled()) {
+ log.debug("SSH reading exit status=" + channel.getExitStatus());
+ }
break;
}
try {
Thread.sleep(POLL_TIMEOUT);
} catch (InterruptedException e) {
- e.printStackTrace();
}
}
return bos.toString();
}
-
- public String read2(BufferedReader reader) throws IOException {
- StringBuilder buf = new StringBuilder();
- while (true) {
- String line = reader.readLine();
- if (line == null) {
- break;
- }
- buf.append(line + "\n");
- }
- return buf.toString();
- }
-
- public String agentStop() {
- String agentWrapperScript = agentDestination + "/rhq-agent/bin/rhq-agent-wrapper.sh ";
-
- return executeCommand(agentWrapperScript + " stop", "Agent Stop");
- }
-
- public String agentStart() {
- String agentWrapperScript = agentDestination + "/rhq-agent/bin/rhq-agent-wrapper.sh ";
-
- return executeCommand(agentWrapperScript + " start", "Agent Start");
- }
-
- public String agentStatus() {
- String agentWrapperScript = agentDestination + "/rhq-agent/bin/rhq-agent-wrapper.sh ";
-
-
- String value = executeCommand("if [ -f " + agentWrapperScript + " ]; then echo \"exists\"; fi");
- if (value == null || value.length() == 0) {
- return "Agent Not Installed";
- }
-
- return executeCommand(agentWrapperScript + " status", "Agent Status");
+ private long getTimeDiff(long start) {
+ return System.currentTimeMillis() - start;
}
- public AgentInstallInfo installAgent() {
-
-
- AgentInstallInfo info = new AgentInstallInfo(agentDestination, accessInfo.getUser(), "3.0.0-SNAPSHOT");
-
-
- executeCommand("uname -a", "Machine uname", info);
-
- executeCommand("java -version", "Java Version Check", info);
-
- executeCommand("mkdir -p " + agentDestination, "Create Agent Install Directory", info);
-
-
- log.info("Copying Agent Distribution");
- long start = System.currentTimeMillis();
- boolean fileSent = SSHFileSend.sendFile(session, agentPath, agentDestination);
- info.addStep(new AgentInstallStep(0, "scp agent-installer", "Remote copy the agent distribution", fileSent ? "Success" : "Failed", (System.currentTimeMillis() - start)));
- log.info("Agent Distribution Copied");
-
-
- executeCommand("cd " + agentDestination, "Change to install directory", info);
-
- executeCommand("java -jar " + agentDestination + "/" + agentFile + " --install=" + agentDestination, "Install Agent", info);
-
-
- String serverAddress = LookupUtil.getCloudManager().getAllCloudServers().get(0).getAddress();
-
- System.out.println("Install an agent at " + accessInfo.getHost() + " point to the server " + serverAddress);
-
-
- AgentInstallInfo agentInfo = new AgentInstallInfo(serverAddress, accessInfo.getHost());
-
- String agentScript = agentDestination + "/rhq-agent/bin/rhq-agent.sh ";
- String agentWrapperScript = agentDestination + "/rhq-agent/bin/rhq-agent-wrapper.sh ";
-
-
- String properties = agentInfo.getConfigurationStartString();
-
- // Tell the script to store a pid file to make the wrapper script work
- String pidFileProp = "export RHQ_AGENT_IN_BACKGROUND=" + agentDestination + "/rhq-agent/bin/rhq-agent.pid";
-
- String startCommand = pidFileProp + " ; nohup " + agentScript + properties + "&";
- executeCommand(startCommand, "Agent Start With Configuration", info);
-
-
- return info;
- }
-
-
- public static class ExecuteException extends RuntimeException {
+ private static class ExecuteException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
int errorCode;
- String message;
public ExecuteException(int errorCode, String message) {
+ super(message);
this.errorCode = errorCode;
- this.message = message;
}
}
-
public static void main(String[] args) throws IOException {
String pass = null;
@@ -331,19 +374,18 @@ public class SSHInstallUtility {
SSHInstallUtility ssh = new SSHInstallUtility(info);
- System.out.println("Agent status: " + ssh.agentStatus());
-
- System.out.println("Set server address: " + ssh.executeCommand("echo '71.162.145.95 ghinkle' >> /etc/hosts"));
-
- ssh.agentStop();
-
- ssh.installAgent();
-
- ssh.agentStatus();
-
- ssh.agentStop();
- ssh.agentStatus();
- ssh.agentStart();
+ String parentPath = "/tmp/new-remote-agent";
+ String agentInstallPath = parentPath + "/rhq-agent";
+
+ System.out.println("Agent status: " + ssh.agentStatus(agentInstallPath));
+ System.out.println("Agent stop: " + ssh.stopAgent(agentInstallPath));
+ System.out.println("Agent find: " + ssh.findAgentInstallPath(parentPath));
+ System.out.println("Agent install: " + ssh.installAgent(parentPath));
+ System.out.println("Agent find: " + ssh.findAgentInstallPath(parentPath));
+ System.out.println("Agent status: " + ssh.agentStatus(agentInstallPath));
+ System.out.println("Agent stop: " + ssh.stopAgent(agentInstallPath));
+ System.out.println("Agent status: " + ssh.agentStatus(agentInstallPath));
+ System.out.println("Agent start: " + ssh.startAgent(agentInstallPath));
ssh.disconnect();
}
13 years, 10 months
- 1
- 0
[rhq] Branch 'nagios' - modules/core
by Alexander Kiefer
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java | 126 ++++++----
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 7
2 files changed, 91 insertions(+), 42 deletions(-)
New commits:
commit 7e8cfed01bc8a496b0cbcbe967b8883d6bf52e10
Author: alexander.kiefer79(a)googlemail.com <di34475@.dh-com.continental.steel>
Date: Wed Aug 4 17:45:05 2010 +0200
Added a check if a ChildResourceType which shall be added is already existing for a plugin in method ChildResourceTypeDiscoveryRunner.call()
Added a check that the ServerService method createNewResourceType() is only called if the given set of ChildResourceTypes is not empty
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
index 59e9615..bf1d5d9 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
@@ -1,5 +1,25 @@
package org.rhq.core.pc.inventory;
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 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.
+ */
+
+import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.Callable;
@@ -21,19 +41,6 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
private Log log = LogFactory.getLog(ChildResourceTypeDiscoveryRunner.class);
- //TODO: Maybe will be needed for later purpose
- //private MeasurementManager measurementManager;
- //private int resourceId;
-
- //TODO: maybe to be implemented for later usage
- // public ChildResourceTypeDiscoveryRunner(MeasurementManager measurementManager) {
- //
- // }
-
- // public ChildResourceTypeDiscoveryRunner(int resourceId) {
- // this.resourceId = resourceId;
- // }
-
//Default Ctor
public ChildResourceTypeDiscoveryRunner() {
@@ -49,23 +56,33 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
public Set<ResourceType> call() {
- log.info("<ChildResourceTypeDiscoveryRunner>call() called");
+ if (log.isDebugEnabled()) {
+ log.info("<ChildResourceTypeDiscoveryRunner>call() called");
+ }
+
+ //Set<ResourceTypes> for the ResourceTypes which shall be added later
Set<ResourceType> resourceTypes = null;
long start = System.currentTimeMillis();
+ //get InventoryManager instance
InventoryManager im = PluginContainer.getInstance().getInventoryManager();
- log.info("InventoryManager instance created");
- //TODO: Do testing and split code to more than one method if it works well
- // Run a full scan for all resources in the inventory
+ if (log.isDebugEnabled()) {
+ log.info("InventoryManager instance created");
+ }
+ //Get current plattform
Resource platform = im.getPlatform();
- log.info("Platform returned with name: " + platform.getName());
+ if (log.isDebugEnabled()) {
+ log.info("Platform returned with name: " + platform.getName());
+ }
// Next discover all other services and non-top-level servers
Set<Resource> children = platform.getChildResources();
- log.info("Platform " + platform.getName() + " has " + children.size() + " ChildResources");
+ if (log.isDebugEnabled()) {
+ log.info("Platform " + platform.getName() + " has " + children.size() + " ChildResources");
+ }
if (children != null) {
for (Resource child : children) {
@@ -75,44 +92,76 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
log.debug("Category of server: " + child.getResourceType().getCategory().toString());
}
- //Check if really is of Category SERVER
+ //Check if really is of Category SERVER because our Plugin has to be of that category
if (child.getResourceType().getCategory() == ResourceCategory.SERVER) {
- log.info("Server " + child.getName() + "has passed the Server Category test succesfull");
- //ChildResourceTypeDiscoveryFacet.class.isAssignableFrom(server.getClass())
- //check if child resource implements the interface ChildResourceTypeDiscoveryFacet
- //if (server instanceof ChildResourceTypeDiscoveryFacet)
-
- //if (ChildResourceTypeDiscoveryFacet.class.isAssignableFrom(server.getClass())) {
-
- // log.info("Server " + server.getName()
- // + " implements the interface ChildResourceTypeDiscoveryFacet");
- // //Get ResourceContainer for each server instance
+ if (log.isDebugEnabled()) {
+ log.info("Server " + child.getName() + "has passed the Server Category test succesfull");
+ }
ResourceContainer container = im.getResourceContainer(child.getId());
- log.info("Server " + child.getName() + " is running in ResourceContainer " + container.toString());
+ if (log.isDebugEnabled()) {
+ log.info("Server " + child.getName() + " is running in ResourceContainer "
+ + container.toString());
+ }
if (container.getResourceComponentState() != ResourceContainer.ResourceComponentState.STARTED
|| container.getAvailability() == null
|| container.getAvailability().getAvailabilityType() == AvailabilityType.DOWN) {
// Don't collect metrics for resources that are down
- //if (log.isDebugEnabled()) {
- log.info("ChildType not discoverd for inactive resource component: " + container.getResource());
- //}
+ if (log.isDebugEnabled()) {
+ log.info("ChildType not discoverd for inactive resource component: "
+ + container.getResource());
+ }
} else {
try {
+ //Get Facet Component
ChildResourceTypeDiscoveryFacet discoveryComponent = ComponentUtil.getComponent(child
.getId(), ChildResourceTypeDiscoveryFacet.class, FacetLockType.READ, 30 * 1000, true,
true);
- //get Set<ResourceType> --> all the Services which are running under the specific server
+ //get Set<ResourceType> --> all the ChildResourceTypes which shall be added dynamically
resourceTypes = discoverChildResourceTypes(discoveryComponent);
+ if (log.isDebugEnabled()) {
+ log.info("Container.getResource(): " + container.getResource().getName());
+ log.info("Container.getResource().getResourceType(): "
+ + container.getResource().getResourceType().getName());
+
+ }
+
+ //all the ChildResourceTypes which are already part of the plugin
+ Set<ResourceType> currentChildTypes = container.getResource().getResourceType()
+ .getChildResourceTypes();
+
+ Set<ResourceType> newTypesToAdd = new HashSet<ResourceType>();
+
+ //Check if the ResourceType which shall be added is already part of the plugin
+ for (ResourceType newTypetoAdd : resourceTypes) {
+ for (ResourceType alreadyExistingType : currentChildTypes) {
+ //Check if name and plugin of the types are equal
+ //Necessary because same ChildResourceTypes can belong to different plugins
+ if (newTypetoAdd.getName().equals(alreadyExistingType.getName())
+ && newTypetoAdd.getPlugin().equals(alreadyExistingType.getPlugin())) {
+ log.info("The ResourceType " + newTypetoAdd.getName()
+ + " already exists for the Plugin " + newTypetoAdd.getPlugin());
+ } else {
+ log.info("The ResourceType " + newTypetoAdd.getName()
+ + " does not exist for the Plugin " + newTypetoAdd.getPlugin() + " yet");
+
+ //add the new ChildResourceType to the set which will be given to the InventoryManager tp persist
+ newTypesToAdd.add(newTypetoAdd);
+
+ }
+
+ }
+ }
+
//Create a new ResourceType in the DB for the selected type
- im.createNewResourceType(resourceTypes);
+ im.createNewResourceType(newTypesToAdd);
} catch (PluginContainerException pce) {
// This is expected when the ResourceComponent does not implement the ChildResourceTypeDiscoveryFacet
@@ -121,11 +170,6 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
throw new RuntimeException("Error submitting service scan", e);
}
}
- // } else {
- // log.info("Server " + server.getName()
- // + " does not implement the interface ChildResourceTypeDiscoveryFacet");
- //
- // }
}
}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 87eea06..536d3dc 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -2433,7 +2433,12 @@ public class InventoryManager extends AgentService implements ContainerService,
if (serverService != null) {
//Call method to add a new ResourceType in the server DB
- serverService.addNewResourceType(resourceTypes);
+ //but only if the Set<ResourceType> contains at least one element
+ if (resourceTypes.size() > 0) {
+ log.info("Set<ResourceType> with new types was given to the Server");
+ serverService.addNewResourceType(resourceTypes);
+ }
+
}
}
13 years, 10 months
- 1
- 0
[rhq] 3 commits - modules/core modules/enterprise modules/helpers modules/plugins pom.xml
by Heiko W. Rupp
modules/core/domain/pom.xml | 36 ++--
modules/core/plugin-validator/pom.xml | 18 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2
modules/helpers/bundleGen/pom.xml | 2
modules/helpers/pluginGen/pom.xml | 2
modules/helpers/pluginGen/src/main/resources/pom.ftl | 2
modules/plugins/hadoop/pom.xml | 2
modules/plugins/irc/pom.xml | 2
modules/plugins/netservices/pom.xml | 2
modules/plugins/snmptrapd/pom.xml | 28 +--
modules/plugins/twitter/pom.xml | 2
pom.xml | 144 +++++++++++++++++--
12 files changed, 182 insertions(+), 60 deletions(-)
New commits:
commit 7a2158b5c63e88c3af86f14a745adc5b61d4d9b8
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Aug 4 17:11:09 2010 +0200
Comment out javadoc generation for now, as it breaks with some already defined package-info.java file.
diff --git a/pom.xml b/pom.xml
index 19deabe..2a0db1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1097,6 +1097,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
</plugin>
+<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -1105,6 +1106,7 @@
<additionalJOption>-J-Xmx768m</additionalJOption>
</configuration>
</plugin>
+-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
commit 9d953ef12f55f76a00c0bd4a44397dfca1cb7252
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Aug 4 16:52:30 2010 +0200
Add some more properties for maven site generation and unify some commons-codec and commons-logging versions
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 1cdaadc..0806490 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -27,7 +27,7 @@
<jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
</properties>
-
+
<dependencies>
<!-- the notorious util jar -->
@@ -52,7 +52,7 @@
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
-
+
<!-- required by PersistenceUtil and EJB3 Embedded -->
<dependency>
<groupId>hibernate-entitymanager</groupId>
@@ -73,8 +73,8 @@
<artifactId>jaxb-api</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
</dependency>
-
- <!-- needed for hibernate Instrument task
+
+ <!-- needed for hibernate Instrument task
<dependency>
<groupId>javassist</groupId>
<artifactId>javassist</artifactId>
@@ -82,8 +82,8 @@
<scope>runtime</scope>
</dependency>
-->
-
- <!-- needed for hibernate Instrument task
+
+ <!-- needed for hibernate Instrument task
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -124,7 +124,7 @@
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -188,7 +188,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <version>${commons-codec.version}</version>
<scope>test</scope>
</dependency>
@@ -239,7 +239,7 @@
<artifactId>smartgwt</artifactId>
<version>2.0</version>
</dependency>-->
-
+
</dependencies>
<build>
@@ -315,7 +315,7 @@
</plugins>
</build>
-
+
<profiles>
<profile>
@@ -345,7 +345,7 @@
Instrumentation is useful for various property-level things such as field-level lazy load.
Using it turned out not t be a current option since the instrumented class carries with
it hibernate imports that we can't put in the domain jar since it's used on the Agent and
- in Remote Java Clients. But this worked, so here ya go...
+ in Remote Java Clients. But this worked, so here ya go...
<taskdef
name="instrument"
classname="org.hibernate.tool.instrument.javassist.InstrumentTask">
@@ -364,13 +364,13 @@
<echo>*** Copying updated files from target${file.separator}classes${file.separator} to ${deployment.dir}${file.separator}...</echo>
<copy todir="${deployment.dir}" verbose="${rhq.verbose}">
<fileset dir="target/classes" />
- </copy>
+ </copy>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
- </execution>
+ </execution>
<execution>
<id>undeploy</id>
@@ -387,13 +387,13 @@
</goals>
</execution>
- </executions>
+ </executions>
</plugin>
</plugins>
</build>
</profile>
-
+
<profile>
<id>javadoc</id>
<activation>
@@ -411,11 +411,11 @@
<executions>
<execution>
<id>javadoc-domain-api</id>
- <phase>compile</phase>
+ <phase>compile</phase>
<goals>
<goal>javadoc</goal>
</goals>
- <configuration>
+ <configuration>
<doctitle>RHQ ${project.version} - Domain</doctitle>
<reportOutputDirectory>${javadoc.outputDirectory}</reportOutputDirectory>
<destDir>domain</destDir>
@@ -436,7 +436,7 @@
</plugins>
</build>
</profile>
-
+
</profiles>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index dfcdfde..5adfabf 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -1,15 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
-
+
<groupId>org.rhq</groupId>
- <artifactId>rhq-plugin-validator</artifactId>
+ <artifactId>rhq-plugin-validator</artifactId>
<packaging>maven-plugin</packaging>
<name>RHQ Plugin Validator Maven 2 Plugin</name>
@@ -20,23 +20,23 @@
<artifactId>rhq-core-domain</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-util</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-plugin-container</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
@@ -50,7 +50,7 @@
<artifactId>maven-project</artifactId>
<version>2.0.8</version>
</dependency>
-
+
</dependencies>
-
+
</project>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index 465a9eb..6b1bed8 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml
index 940e46d..221ae3e 100644
--- a/modules/helpers/pluginGen/pom.xml
+++ b/modules/helpers/pluginGen/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
diff --git a/modules/helpers/pluginGen/src/main/resources/pom.ftl b/modules/helpers/pluginGen/src/main/resources/pom.ftl
index eb02eb6..6aa89e9 100644
--- a/modules/helpers/pluginGen/src/main/resources/pom.ftl
+++ b/modules/helpers/pluginGen/src/main/resources/pom.ftl
@@ -208,7 +208,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${r"${commons-logging.version}"}</version>
</dependency>
<dependency>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index c75e471..7fc2837 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -128,7 +128,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index 44a34b9..ab18766 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -147,7 +147,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 67d24a0..9f35dbf 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.2</version>
+ <version>${commons-codec.version}</version>
</dependency>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 89178cc..93bb45a 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -4,14 +4,14 @@
<groupId>org.rhq</groupId>
<version>4.0.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>org.rhq</groupId>
<artifactId>rhq-snmptrapd-plugin</artifactId>
<name>RHQ SnmpTrapd Plugin</name>
<description>RHQ SnmpTrapd Plugin</description>
-
+
<scm>
<connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/plugins/snmptrapd</connection>
<developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/plugins/snmptrapd</developerConnection>
@@ -20,7 +20,7 @@
<properties>
<scm.module.path>modules/plugins/snmptrapd/</scm.module.path>
</properties>
-
+
<build>
<plugins>
<plugin>
@@ -30,7 +30,7 @@
<target>1.5</target>
</configuration>
</plugin>
-
+
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0</version>
@@ -73,11 +73,11 @@
-->
</executions>
</plugin>
-
-
+
+
</plugins>
</build>
-
+
<profiles>
<profile>
<id>dev</id>
@@ -116,13 +116,13 @@
<id>deploy-jar-meta-inf</id>
<phase>package</phase>
<configuration>
- <tasks>
- <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
+ <tasks>
+ <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" />
<echo>*** Updating META-INF dir in ${deployment.file}...</echo>
<unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}">
<patternset><include name="META-INF/**" /></patternset>
</unjar>
- <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
+ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
</jar>
</tasks>
</configuration>
@@ -130,7 +130,7 @@
<goal>run</goal>
</goals>
</execution>
-
+
<execution>
<id>undeploy</id>
<phase>clean</phase>
@@ -155,7 +155,7 @@
</profiles>
-
+
<dependencies>
<dependency>
<groupId>org.rhq</groupId>
@@ -196,7 +196,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${commons-logging.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index c27ee72..a6fdf4f 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -138,7 +138,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>org.rhq</groupId>
diff --git a/pom.xml b/pom.xml
index 1708440..19deabe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<packaging>pom</packaging>
<name>RHQ</name>
- <description>parent POM for all RHQ modules</description>
+ <description>RHQ is a server management and monitoring suite primarily targeted at JBoss software.</description>
<url>http://rhq-project.org/</url>
<inceptionYear>2008</inceptionYear>
@@ -27,7 +27,7 @@
<issueManagement>
<system>bugzilla</system>
- <url>https://bugzilla.redhat.com/</url>
+ <url>https://bugzilla.redhat.com/browse.cgi?product=RHQ%20Project</url>
</issueManagement>
@@ -95,6 +95,7 @@
<quartz.version>1.6.5</quartz.version>
<jna.version>3.2.5</jna.version>
<twitter4j.version>2.1.2</twitter4j.version>
+ <commons-codec.version>1.4</commons-codec.version>
<!--
defaults for datasource used by integration tests -
@@ -1085,15 +1086,134 @@
</profiles>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- </plugins>
- </reporting>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ <additionalJOption>-J-Xmx768m</additionalJOption>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <!-- more properties related to mvn site -->
+ <licenses>
+ <license>
+ <name>GPL</name>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <name>Charles Crouch</name>
+ <timezone>-6</timezone>
+ </developer>
+ <developer>
+ <name>Jason Dobies</name>
+ <timezone>-5</timezone>
+ <roles>
+ <role>retired</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Filip Drabeck</name>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Greg Hinkle</name>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
+ <name>Lukas Krejci</name>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>Joseph Marques</name>
+ <url>http://josephmarques.wordpress.com</url>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
+ <name>Fady Matar</name>
+ <timezone>+2</timezone>
+ <roles>
+ <role>retired</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>John 'Mazz' Mazzitelli</name>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
+ <name>Simeon Pinder</name>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
+ <name>Heiko W. Rupp</name>
+ <email>hrupp(a)redhat.com</email>
+ <url>http://pilhuhn.blogspot.com</url>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <name>John Sanda</name>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
+ <name>Jessica Sant</name>
+ <timezone>-5</timezone>
+ <roles>
+ <role>retired</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Jay Shaughnessy</name>
+ <timezone>-5</timezone>
+ </developer>
+ <developer>
+ <name>Ian Springer</name>
+ <timezone>-5</timezone>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Alex Kiefer</name>
+ <timezone>+1</timezone>
+ </contributor>
+ <contributor>
+ <name>Rafael Torres Coelho Soares</name>
+ <timezone>-7</timezone>
+ </contributor>
+ </contributors>
+ <mailingLists>
+ <mailingList>
+ <name>User List</name>
+ <subscribe>https://fedorahosted.org/mailman/listinfo/rhq-users</subscribe>
+ <unsubscribe>https://fedorahosted.org/mailman/listinfo/rhq-users</unsubscribe>
+ <post>rhq-users(a)lists.fedorahosted.org</post>
+ <archive>https://fedorahosted.org/pipermail/rhq-users/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Developer List</name>
+ <subscribe>https://fedorahosted.org/mailman/listinfo/rhq-devel</subscribe>
+ <unsubscribe>https://fedorahosted.org/mailman/listinfo/rhq-devel</unsubscribe>
+ <post>rhq-devel(a)lists.fedorahosted.org</post>
+ <archive>https://fedorahosted.org/pipermail/rhq-devel/</archive>
+ </mailingList>
+ </mailingLists>
</project>
commit 22de3f90d81a5ac1a3eadb69a61b40f6b1779e0f
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Aug 4 15:25:36 2010 +0200
Use jaxb-impl version from parent pom
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index c1187d1..6634e78 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.3</version>
+ <version>${jaxb-impl.version}</version>
</dependency>
</dependencies>
13 years, 10 months
- 1
- 0
[rhq] Branch 'release-3.0.0' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by ips
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/plugindoc/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/webdav-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-email/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-irc/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-microblog/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-operations/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-roles/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-snmp/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-subject/pom.xml | 2 +-
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 2 +-
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/pluginAnnotations/pom.xml | 2 +-
modules/helpers/pluginGen/pom.xml | 2 +-
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 2 +-
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
103 files changed, 103 insertions(+), 103 deletions(-)
New commits:
commit 89bfcede9e749ad7e6eb0c1d713b683309d42dd0
Author: hudson auto <wnstb(a)yahoo.com>
Date: Tue Aug 3 18:02:06 2010 -0400
[maven-release-plugin] prepare for next development iteration
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 96f9e51..eda9133 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 415dd4e..bc7965b 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 2486d75..2cf950b 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 8817795..ee81a94 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index b0db99a..d177f9e 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 76acfc4..a51f92b 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 0fae81e..7ff6a10 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index a42d297..e0ced84 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index d32decc..0911918 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index 4beb8cc..d47d4c8 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index e9be9d0..e1ce7ef 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 5b3ada6..2e58102 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 839e480..7739177 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index fec83f5..eeb7e81 100644
--- a/modules/core/plugindoc/pom.xml
+++ b/modules/core/plugindoc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 8e55867..7aad64c 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 39dcd56..bc41dc5 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index f236dea..d9f1c1c 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 4e319cf..8942239 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index a0c4220..8b9da9c 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index a81fe83..611eb9d 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 9d2cdc2..798a8ca 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 767e48c..df05645 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index ef8d761..acbe21f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 4f5e53f..1beadca 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 6306aee..0c529ba 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index eca7071..a794cd6 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml
index 04e976b..aa880be 100644
--- a/modules/enterprise/gui/webdav-war/pom.xml
+++ b/modules/enterprise/gui/webdav-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 1d0cf17..3b0dbb8 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 6c43106..05187c7 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-cli</artifactId>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 4ea7be9..e86ef41 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-client-api</artifactId>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index d9ac321..910b617 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-parent</artifactId>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 32cd4c5..2ea73ee 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-webservices</artifactId>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index d88b2f2..2c98817 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index cd37cb1..3fd11e8 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 280478e..bf15866 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 5c4ee6c..79fdc38 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index 61c56d9..dd5bc18 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 943c663..c0973f3 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index e87f1e4..a62fee8 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index aa74ff3..3193539 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index c60bf1a..e69bfbc 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index 14aa22d..ca33bb7 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index b882dc9..af75153 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 1baa20e..09839b8 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index bd56101..73f405e 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index ea8c6cc..4c44f10 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 3ae7078..0033d1b 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index b1cd16a..61965f2 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 8cb842d..7451668 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index ec1d124..0ac61d3 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 09a445e..5a78451 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 6a969ce..2b16f4a 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index a90070e..e4ab9b2 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index cf176f6..a6cba32 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 924bcd5..9c7cc74 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index 75cb124..ebdd3da 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 5dba344..06c8981 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 0ce07bb..aa278b8 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 6e5b779..0cc2084 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 4f02c23..14738d0 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index 1927eaf..d056f74 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml
index 45e824d..28dc9b1 100644
--- a/modules/helpers/pluginGen/pom.xml
+++ b/modules/helpers/pluginGen/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 7cafb10..a0721a9 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index 954afff..5d327ee 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 0f718e3..c37598e 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 515e8bc..cc160c9 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 43e9a1b..700a6af 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 32bdc8b..915106a 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index a7e3b2d..d920440 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 955f7fe..d5aaad5 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 1b63b2f..30889f7 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index c7f1b09..b79645d 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index f833164..f7cf265 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 4e0e67c..acb08ef 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 04fc28b..7dd0fde 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index f470bb0..65fa7b8 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 7fc105f..853c020 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index d8a764a..a0ade77 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 71a1552..b9ed2b3 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 577fbc3..b3846fa 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index d69797f..443e524 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index de4d322..ac9885a 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 53f093b..d0c9053 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 78fecf5..06ae2ae 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 7670ee7..1acdb0f 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 7a6e787..39c75da 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 430e324..97b83b0 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 2b93bca..85d6105 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 60d7b29..283ab6a 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 55c744b..5a4466c 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 0e8bc27..a190dcd 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index ebf6790..8f4e675 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 34c0196..0d41574 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 551c94f..7719b14 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 6ad34d5..2d9d715 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index c6be989..3579496 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 1c9179d..41df1b8 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index f68b216..205d5b0 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 4a7b236..e299efa 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index 908940c..b3d5e87 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 31691ad..bc96ae3 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index a89017e..2235687 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
<name>RHQ Test Utils</name>
diff --git a/pom.xml b/pom.xml
index 3321979..7ff85bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.EmbJopr</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
13 years, 10 months
- 1
- 0
[rhq] Changes to 'refs/tags/RHQ_3_0_0_EmbJopr'
by ips
Tag 'RHQ_3_0_0_EmbJopr' created by hudson auto <wnstb(a)yahoo.com> at 2010-08-03 22:01 +0000
[maven-release-plugin] copy for tag RHQ_3_0_0_EmbJopr
Changes since RHQ_3_0_0_GA:
Ian Springer (4):
fix NPE in discoverResources() (https://bugzilla.redhat.com/show_bug.cgi?id=590953)
fix NPE in ApplicationServerComponent.getMetric() that occurred in EWP 5.1 when not started in cluster mode
fix logic error in my previous commit
increase facet timeouts for create-resource and delete-resource calls to 15 and 5 minutes, respectively (https://jira.jboss.org/browse/EMBJOPR-176); remove unsed getPackageType() method
hudson auto (2):
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release RHQ_3_0_0_EmbJopr
---
modules/common/ant-bundle/pom.xml | 2
modules/common/filetemplate-bundle/pom.xml | 2
modules/common/jboss-as/pom.xml | 2
modules/common/pom.xml | 2
modules/core/client-api/pom.xml | 2
modules/core/comm-api/pom.xml | 2
modules/core/dbutils/pom.xml | 2
modules/core/domain/pom.xml | 2
modules/core/gui/pom.xml | 2
modules/core/native-system/pom.xml | 2
modules/core/plugin-api/pom.xml | 2
modules/core/plugin-container/pom.xml | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceFactoryManager.java | 24 +-----
modules/core/plugin-validator/pom.xml | 2
modules/core/plugindoc/pom.xml | 2
modules/core/pom.xml | 2
modules/core/util/pom.xml | 2
modules/enterprise/agent/pom.xml | 2
modules/enterprise/agentupdate/pom.xml | 2
modules/enterprise/comm/pom.xml | 2
modules/enterprise/gui/base-perspective-jar/pom.xml | 2
modules/enterprise/gui/base-perspective-war/pom.xml | 2
modules/enterprise/gui/content_http-war/pom.xml | 2
modules/enterprise/gui/coregui/pom.xml | 2
modules/enterprise/gui/installer-war/pom.xml | 2
modules/enterprise/gui/pom.xml | 2
modules/enterprise/gui/portal-war/pom.xml | 2
modules/enterprise/gui/webdav-war/pom.xml | 2
modules/enterprise/pom.xml | 2
modules/enterprise/remoting/cli/pom.xml | 2
modules/enterprise/remoting/client-api/pom.xml | 2
modules/enterprise/remoting/pom.xml | 2
modules/enterprise/remoting/webservices/pom.xml | 2
modules/enterprise/server/container-lib/pom.xml | 2
modules/enterprise/server/container/pom.xml | 2
modules/enterprise/server/ear/pom.xml | 2
modules/enterprise/server/jar/pom.xml | 2
modules/enterprise/server/plugins/alert-email/pom.xml | 2
modules/enterprise/server/plugins/alert-irc/pom.xml | 2
modules/enterprise/server/plugins/alert-microblog/pom.xml | 2
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2
modules/enterprise/server/plugins/alert-operations/pom.xml | 2
modules/enterprise/server/plugins/alert-roles/pom.xml | 2
modules/enterprise/server/plugins/alert-snmp/pom.xml | 2
modules/enterprise/server/plugins/alert-subject/pom.xml | 2
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2
modules/enterprise/server/plugins/cobbler/pom.xml | 2
modules/enterprise/server/plugins/disk/pom.xml | 2
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2
modules/enterprise/server/plugins/jboss-software/pom.xml | 2
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2
modules/enterprise/server/plugins/pom.xml | 2
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2
modules/enterprise/server/plugins/url/pom.xml | 2
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2
modules/enterprise/server/plugins/yum/pom.xml | 2
modules/enterprise/server/safe-invoker/pom.xml | 2
modules/enterprise/server/sars/agent-sar/pom.xml | 2
modules/enterprise/server/sars/pom.xml | 2
modules/enterprise/server/xml-schemas/pom.xml | 2
modules/helpers/pluginAnnotations/pom.xml | 2
modules/helpers/pluginGen/pom.xml | 2
modules/helpers/pom.xml | 2
modules/helpers/rtfilter/pom.xml | 2
modules/plugins/aliases/pom.xml | 2
modules/plugins/ant-bundle/pom.xml | 2
modules/plugins/apache/pom.xml | 2
modules/plugins/augeas/pom.xml | 2
modules/plugins/cobbler/pom.xml | 2
modules/plugins/cron/pom.xml | 2
modules/plugins/database/pom.xml | 2
modules/plugins/filetemplate-bundle/pom.xml | 2
modules/plugins/grub/pom.xml | 2
modules/plugins/hibernate/pom.xml | 2
modules/plugins/hosts/pom.xml | 2
modules/plugins/hudson/pom.xml | 2
modules/plugins/iis/pom.xml | 2
modules/plugins/jboss-as-5/pom.xml | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentDiscoveryComponent.java | 12 +--
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 38 ++++++----
modules/plugins/jboss-as/pom.xml | 2
modules/plugins/jboss-cache-v3/pom.xml | 2
modules/plugins/jboss-cache/pom.xml | 2
modules/plugins/jmx/pom.xml | 2
modules/plugins/mysql/pom.xml | 2
modules/plugins/netservices/pom.xml | 2
modules/plugins/oracle/pom.xml | 2
modules/plugins/perftest/pom.xml | 2
modules/plugins/platform/pom.xml | 2
modules/plugins/pom.xml | 2
modules/plugins/postfix/pom.xml | 2
modules/plugins/postgres/pom.xml | 2
modules/plugins/rhq-agent/pom.xml | 2
modules/plugins/rhq-server/pom.xml | 2
modules/plugins/samba/pom.xml | 2
modules/plugins/script/pom.xml | 2
modules/plugins/snmptrapd/pom.xml | 2
modules/plugins/sshd/pom.xml | 2
modules/plugins/sudoers/pom.xml | 2
modules/plugins/tomcat/pom.xml | 2
modules/plugins/twitter/pom.xml | 2
modules/plugins/validate-all-plugins/pom.xml | 2
modules/pom.xml | 2
modules/test-utils/pom.xml | 2
pom.xml | 2
106 files changed, 140 insertions(+), 140 deletions(-)
---
13 years, 10 months
- 1
- 0
[rhq] Branch 'release-3.0.0' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by ips
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/plugindoc/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/webdav-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-email/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-irc/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-microblog/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-operations/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-roles/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-snmp/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-subject/pom.xml | 2 +-
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 2 +-
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/pluginAnnotations/pom.xml | 2 +-
modules/helpers/pluginGen/pom.xml | 2 +-
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 2 +-
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
103 files changed, 103 insertions(+), 103 deletions(-)
New commits:
commit 077c75c350edd5cd82bbd147bd72c35007972590
Author: hudson auto <wnstb(a)yahoo.com>
Date: Tue Aug 3 18:01:48 2010 -0400
[maven-release-plugin] prepare release RHQ_3_0_0_EmbJopr
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index eda9133..96f9e51 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index bc7965b..415dd4e 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 2cf950b..2486d75 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index ee81a94..8817795 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index d177f9e..b0db99a 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index a51f92b..76acfc4 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 7ff6a10..0fae81e 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index e0ced84..a42d297 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 0911918..d32decc 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index d47d4c8..4beb8cc 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index e1ce7ef..e9be9d0 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 2e58102..5b3ada6 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 7739177..839e480 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index eeb7e81..fec83f5 100644
--- a/modules/core/plugindoc/pom.xml
+++ b/modules/core/plugindoc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 7aad64c..8e55867 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index bc41dc5..39dcd56 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index d9f1c1c..f236dea 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 8942239..4e319cf 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 8b9da9c..a0c4220 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 611eb9d..a81fe83 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 798a8ca..9d2cdc2 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index df05645..767e48c 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index acbe21f..ef8d761 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 1beadca..4f5e53f 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 0c529ba..6306aee 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index a794cd6..eca7071 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml
index aa880be..04e976b 100644
--- a/modules/enterprise/gui/webdav-war/pom.xml
+++ b/modules/enterprise/gui/webdav-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 3b0dbb8..1d0cf17 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 05187c7..6c43106 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<artifactId>rhq-remoting-cli</artifactId>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index e86ef41..4ea7be9 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<artifactId>rhq-remoting-client-api</artifactId>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 910b617..d9ac321 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<artifactId>rhq-remoting-parent</artifactId>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 2ea73ee..32cd4c5 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<artifactId>rhq-remoting-webservices</artifactId>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 2c98817..d88b2f2 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 3fd11e8..cd37cb1 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index bf15866..280478e 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 79fdc38..5c4ee6c 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index dd5bc18..61c56d9 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index c0973f3..943c663 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index a62fee8..e87f1e4 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index 3193539..aa74ff3 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index e69bfbc..c60bf1a 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index ca33bb7..14aa22d 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index af75153..b882dc9 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 09839b8..1baa20e 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 73f405e..bd56101 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 4c44f10..ea8c6cc 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 0033d1b..3ae7078 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index 61965f2..b1cd16a 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 7451668..8cb842d 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index 0ac61d3..ec1d124 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 5a78451..09a445e 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 2b16f4a..6a969ce 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index e4ab9b2..a90070e 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index a6cba32..cf176f6 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 9c7cc74..924bcd5 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index ebdd3da..75cb124 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 06c8981..5dba344 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index aa278b8..0ce07bb 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 0cc2084..6e5b779 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 14738d0..4f02c23 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index d056f74..1927eaf 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml
index 28dc9b1..45e824d 100644
--- a/modules/helpers/pluginGen/pom.xml
+++ b/modules/helpers/pluginGen/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index a0721a9..7cafb10 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index 5d327ee..954afff 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index c37598e..0f718e3 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index cc160c9..515e8bc 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 700a6af..43e9a1b 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 915106a..32bdc8b 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index d920440..a7e3b2d 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index d5aaad5..955f7fe 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 30889f7..1b63b2f 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index b79645d..c7f1b09 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index f7cf265..f833164 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index acb08ef..4e0e67c 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 7dd0fde..04fc28b 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 65fa7b8..f470bb0 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 853c020..7fc105f 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index a0ade77..d8a764a 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index b9ed2b3..71a1552 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index b3846fa..577fbc3 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 443e524..d69797f 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index ac9885a..de4d322 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index d0c9053..53f093b 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 06ae2ae..78fecf5 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 1acdb0f..7670ee7 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 39c75da..7a6e787 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 97b83b0..430e324 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 85d6105..2b93bca 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 283ab6a..60d7b29 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 5a4466c..55c744b 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index a190dcd..0e8bc27 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 8f4e675..ebf6790 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 0d41574..34c0196 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 7719b14..551c94f 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 2d9d715..6ad34d5 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 3579496..c6be989 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 41df1b8..1c9179d 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 205d5b0..f68b216 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index e299efa..4a7b236 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index b3d5e87..908940c 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index bc96ae3..31691ad 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 2235687..a89017e 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
</parent>
<artifactId>test-utils</artifactId>
<name>RHQ Test Utils</name>
diff --git a/pom.xml b/pom.xml
index 7ff85bb..3321979 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.EmbJopr</version>
<packaging>pom</packaging>
<name>RHQ</name>
13 years, 10 months
- 1
- 0
[rhq] Branch 'apache-noaugeas' - modules/plugins
by fdrabek
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheConfigurationBase.java | 14
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheConfigurationBaseComponent.java | 111 +++++
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java | 160 --------
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java | 8
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 | 105 -----
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java | 102 -----
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java | 10
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java | 10
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 | 12
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 4
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 91 ----
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheConfigWriter.java | 112 ++---
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirective.java | 15
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java | 18
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/mapping/ApacheDirectiveRegExpression.java | 1
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/mapping/load/MappingDirectivePerMapIndex.java | 1
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/Glob.java | 191 ++++++++++
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/GlobFilter.java | 145 +++++++
modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/Glob.java | 181 ---------
modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/GlobFilter.java | 145 -------
modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 6
23 files changed, 578 insertions(+), 1033 deletions(-)
New commits:
commit 109c314edd75b60a189fcd2190d1d606a62947ee
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue Aug 3 22:40:14 2010 +0200
[Apache] update configuration without augeas.
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheConfigurationBase.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheConfigurationBase.java
new file mode 100644
index 0000000..2f00aa4
--- /dev/null
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheConfigurationBase.java
@@ -0,0 +1,14 @@
+package org.rhq.plugins.apache;
+
+import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
+import org.rhq.core.pluginapi.inventory.ResourceComponent;
+import org.rhq.plugins.apache.parser.ApacheDirective;
+import org.rhq.plugins.apache.parser.ApacheDirectiveTree;
+
+public interface ApacheConfigurationBase<T extends ResourceComponent> extends ResourceComponent<T> {
+ public abstract ApacheDirective getNode(ApacheDirectiveTree tree);
+ public void finishConfigurationUpdate(ConfigurationUpdateReport report);
+ public abstract ApacheDirectiveTree loadParser();
+ public abstract boolean saveParser(ApacheDirectiveTree tree);
+ public void conditionalRestart() throws Exception;
+}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheConfigurationBaseComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheConfigurationBaseComponent.java
new file mode 100644
index 0000000..3148780
--- /dev/null
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheConfigurationBaseComponent.java
@@ -0,0 +1,111 @@
+package org.rhq.plugins.apache;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
+import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
+import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
+import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.plugins.apache.parser.ApacheDirective;
+import org.rhq.plugins.apache.parser.ApacheDirectiveTree;
+import org.rhq.plugins.apache.parser.mapping.ApacheAugeasMapping;
+import org.rhq.plugins.apache.util.AugeasNodeSearch;
+
+public class ApacheConfigurationBaseComponent implements ApacheConfigurationBase,ConfigurationFacet, DeleteResourceFacet {
+
+ protected ResourceContext<ApacheConfigurationBase> resourceContext;
+ private final Log log = LogFactory.getLog(this.getClass());
+ protected ApacheConfigurationBase parentComponent;
+
+ public void start(ResourceContext context) throws InvalidPluginConfigurationException, Exception {
+ resourceContext = context;
+ parentComponent = resourceContext.getParentResourceComponent();
+ }
+
+ public void stop() {
+ }
+
+ public AvailabilityType getAvailability() {
+ return AvailabilityType.UP;
+ }
+
+ public void deleteResource() throws Exception {
+ ApacheDirectiveTree tree = loadParser();
+ ApacheDirective myNode = getNode(tree);
+
+ if (myNode != null) {
+ myNode.remove();
+
+ saveParser(tree);
+
+ //TODO do we want to delete empty file?
+ // parentVhost.deleteEmptyFile(tree, myNode);
+ conditionalRestart();
+ } else {
+ log.info("Could find the configuration corresponding to the directory " + resourceContext.getResourceKey() + ". Ignoring.");
+ }
+ }
+
+ public Configuration loadResourceConfiguration() throws Exception {
+ ApacheConfigurationBase parentNode = resourceContext.getParentResourceComponent();
+ ApacheDirectiveTree tree = parentNode.loadParser();
+ ConfigurationDefinition resourceConfigDef = resourceContext.getResourceType().getResourceConfigurationDefinition();
+ ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
+ return mapping.updateConfiguration(getNode(tree), resourceConfigDef);
+ }
+
+ public void updateResourceConfiguration(ConfigurationUpdateReport report) {
+ ApacheConfigurationBase parentNode = (ApacheConfigurationBase) resourceContext.getParentResourceComponent();
+
+ ApacheDirectiveTree tree = null;
+ try {
+ tree = parentNode.loadParser();
+ ConfigurationDefinition resourceConfigDef = resourceContext.getResourceType()
+ .getResourceConfigurationDefinition();
+ ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
+ ApacheDirective directoryNode = getNode(tree);
+ mapping.updateApache(directoryNode, report.getConfiguration(), resourceConfigDef);
+ if (parentNode.saveParser(tree)){
+ report.setStatus(ConfigurationUpdateStatus.SUCCESS);
+ log.info("Apache configuration was updated");
+ finishConfigurationUpdate(report);
+ }else{
+ report.setStatus(ConfigurationUpdateStatus.FAILURE);
+ log.info("Update of apache configuration failed.");
+ }
+
+ } catch (Exception e) {
+ if (tree != null)
+ log.error("Saving of configuration failed.");
+ else
+ log.error("Saving of configuration failed.", e);
+ report.setStatus(ConfigurationUpdateStatus.FAILURE);
+ }
+ }
+
+ public void finishConfigurationUpdate(ConfigurationUpdateReport report) {
+ parentComponent.finishConfigurationUpdate(report);
+ }
+
+ public ApacheDirective getNode(ApacheDirectiveTree tree){
+ ApacheDirective node = AugeasNodeSearch.findNodeById(parentComponent.getNode(tree), resourceContext.getResourceKey());
+ return node;
+ }
+
+ public ApacheDirectiveTree loadParser(){
+ return parentComponent.loadParser();
+ }
+
+ public boolean saveParser(ApacheDirectiveTree tree){
+ return parentComponent.saveParser(tree);
+ }
+
+ public void conditionalRestart() throws Exception{
+ parentComponent.conditionalRestart();
+ }
+}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
deleted file mode 100644
index 3321053..0000000
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2009 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.plugins.apache;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
-import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
-import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceContext;
-import org.rhq.plugins.apache.parser.ApacheDirective;
-import org.rhq.plugins.apache.parser.ApacheDirectiveTree;
-import org.rhq.plugins.apache.parser.mapping.ApacheAugeasMapping;
-import org.rhq.plugins.apache.util.AugeasNodeSearch;
-
-/**
- * Component for configuring the <Directory> and underlying directives inside
- * Apache configuration.
- *
- * @author Lukas Krejci
- */
-public class ApacheDirectoryComponent implements ResourceComponent<ApacheVirtualHostServiceComponent>, ConfigurationFacet, DeleteResourceFacet {
-
- private final Log log = LogFactory.getLog(this.getClass());
- public static final String REGEXP_PROP = "regexp";
- public static final String DIRECTORY_DIRECTIVE = "<Directory";
-
- private ResourceContext<ApacheVirtualHostServiceComponent> resourceContext;
-
- public void start(ResourceContext<ApacheVirtualHostServiceComponent> context) throws InvalidPluginConfigurationException, Exception {
- resourceContext = context;
- }
-
-
- public void stop() {
- }
-
- public AvailabilityType getAvailability() {
- return AvailabilityType.UP;
- }
-
- public Configuration loadResourceConfiguration() throws Exception {
- ApacheVirtualHostServiceComponent parentVirtualHost = resourceContext.getParentResourceComponent();
- ApacheDirectiveTree tree = parentVirtualHost.loadParser();
- ConfigurationDefinition resourceConfigDef = resourceContext.getResourceType().getResourceConfigurationDefinition();
-
- ApacheDirective virtualHostNode = parentVirtualHost.getNode(tree);
- ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
- return mapping.updateConfiguration(getNode(virtualHostNode), resourceConfigDef);
- }
-
- public void updateResourceConfiguration(ConfigurationUpdateReport report) {
- ApacheVirtualHostServiceComponent parentVirtualHost = resourceContext.getParentResourceComponent();
-
- ApacheDirectiveTree tree = null;
- try {
- tree = parentVirtualHost.loadParser();
- ConfigurationDefinition resourceConfigDef = resourceContext.getResourceType()
- .getResourceConfigurationDefinition();
- ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
- ApacheDirective directoryNode = getNode(tree.getRootNode());
- mapping.updateApache(directoryNode, report.getConfiguration(), resourceConfigDef);
- parentVirtualHost.saveParser(tree);
-
- report.setStatus(ConfigurationUpdateStatus.SUCCESS);
- log.info("Apache configuration was updated");
-
- resourceContext.getParentResourceComponent().finishConfigurationUpdate(report);
- } catch (Exception e) {
- if (tree != null)
- log.error("Augeas failed to save configuration ");
- else
- log.error("Augeas failed to save configuration", e);
- report.setStatus(ConfigurationUpdateStatus.FAILURE);
- }
- }
-
-
- public void deleteResource() throws Exception {
- ApacheVirtualHostServiceComponent parentVirtualHost = resourceContext.getParentResourceComponent();
- ApacheDirectiveTree tree = parentVirtualHost.loadParser();
- ApacheDirective virtualHostNode = parentVirtualHost.getNode(tree);
-
- ApacheDirective myNode = getNode(virtualHostNode);
-
- if (myNode != null) {
- myNode.remove();
- resourceContext.getParentResourceComponent().saveParser(tree);
-
- ApacheVirtualHostServiceComponent parentVhost = resourceContext.getParentResourceComponent();
-
- //TODO do we want to delete empty file?
- // parentVhost.deleteEmptyFile(tree, myNode);
- parentVhost.conditionalRestart();
- } else {
- log.info("Could find the configuration corresponding to the directory " + resourceContext.getResourceKey() + ". Ignoring.");
- }
- }
-
- /**
- * Gets the node from under given node corresponding to the Directory this
- * component is managing.
- *
- * @param virtualHost the node of the parent virtualHost (or root node of the augeas tree)
- * @return
- */
- public ApacheDirective getNode(ApacheDirective virtualHost) {
- ApacheDirective directory = AugeasNodeSearch.findNodeById(virtualHost, resourceContext.getResourceKey());
- return directory;
- }
-
- public ApacheDirective getNode(){
- ApacheDirectiveTree tree = loadParser();
- ApacheDirective virtHostNode = resourceContext.getParentResourceComponent().getNode(tree);
- return getNode(virtHostNode);
- }
-
-
- /**
- * @see ApacheServerComponent#finishConfigurationUpdate(ConfigurationUpdateReport)
- */
- public void finishConfigurationUpdate(ConfigurationUpdateReport report) {
- resourceContext.getParentResourceComponent().finishConfigurationUpdate(report);
- }
-
- public ApacheDirectiveTree loadParser(){
- return resourceContext.getParentResourceComponent().loadParser();
- }
-
- public boolean saveParser(ApacheDirectiveTree tree){
- return resourceContext.getParentResourceComponent().saveParser(tree);
- }
-}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java
index e497fbd..44ee365 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java
@@ -39,12 +39,14 @@ import org.rhq.plugins.apache.parser.ApacheDirectiveTree;
import org.rhq.plugins.apache.util.AugeasNodeSearch;
import org.rhq.plugins.apache.util.AugeasNodeValueUtil;
+
+
/**
* Discovery component for Apache discovery directives.
*
* @author Lukas Krejci
*/
-public class ApacheDirectoryDiscoveryComponent implements ResourceDiscoveryComponent<ApacheVirtualHostServiceComponent> {
+public class ApacheDirectoryDiscoveryComponent implements ResourceDiscoveryComponent<ApacheConfigurationBase> {
/* (non-Javadoc)
* @see org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent#discoverResources(org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext)
@@ -53,7 +55,7 @@ public class ApacheDirectoryDiscoveryComponent implements ResourceDiscoveryCompo
public static final String [] PARENT_DIRECTIVES = {"<IfModule"};
public Set<DiscoveredResourceDetails> discoverResources(
- ResourceDiscoveryContext<ApacheVirtualHostServiceComponent> context)
+ ResourceDiscoveryContext<ApacheConfigurationBase> context)
throws InvalidPluginConfigurationException, Exception {
Set<DiscoveredResourceDetails> discoveredResources = new LinkedHashSet<DiscoveredResourceDetails>();
@@ -80,7 +82,7 @@ public class ApacheDirectoryDiscoveryComponent implements ResourceDiscoveryCompo
isRegexp = false;
}
- pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.REGEXP_PROP, isRegexp));
+ pluginConfiguration.put(new PropertySimple(ApacheVirtualHostServiceComponent.REGEXP_PROP, isRegexp));
String resourceKey = ifmoduleParams;
String resourceName = AugeasNodeValueUtil.unescape(directoryParam);
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheFilesComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheFilesComponent.java
deleted file mode 100644
index 58b823c..0000000
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheFilesComponent.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2009 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.plugins.apache;
-
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
-import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
-import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceContext;
-
-/**
- * Represents a <Files> section in the apache configuration.
- *
- * This class is a stub and is not implemented as of yet.
- *
- * @author Lukas Krejci
- */
-public class ApacheFilesComponent implements ResourceComponent<ApacheServerComponent>, ConfigurationFacet, DeleteResourceFacet {
-
- ResourceContext<ApacheServerComponent> resourceContext;
-
- public void start(ResourceContext<ApacheServerComponent> context) throws InvalidPluginConfigurationException, Exception {
- // TODO Auto-generated method stub
- resourceContext = context;
- }
-
- public void stop() {
- // TODO Auto-generated method stub
- }
-
- public AvailabilityType getAvailability() {
- //TODO implement this
- return AvailabilityType.UP;
- }
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.configuration.ConfigurationFacet#loadResourceConfiguration()
- */
- public Configuration loadResourceConfiguration() throws Exception {
- // TODO Auto-generated method stub
- return resourceContext.getResourceType().getResourceConfigurationDefinition().getDefaultTemplate().createConfiguration();
- }
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.configuration.ConfigurationFacet#updateResourceConfiguration(org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport)
- */
- public void updateResourceConfiguration(ConfigurationUpdateReport report) {
- // TODO Auto-generated method stub
- }
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.inventory.DeleteResourceFacet#deleteResource()
- */
- public void deleteResource() throws Exception {
- // TODO Auto-generated method stub
-
- }
-
-
-}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java
deleted file mode 100644
index 16398f2..0000000
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2009 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.plugins.apache;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
-import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
-import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceContext;
-import org.rhq.plugins.apache.parser.ApacheDirective;
-import org.rhq.plugins.apache.parser.ApacheDirectiveTree;
-import org.rhq.plugins.apache.parser.mapping.ApacheAugeasMapping;
-import org.rhq.plugins.apache.util.AugeasNodeSearch;
-
-
-public class ApacheIfModuleComponent implements ResourceComponent<ApacheVirtualHostServiceComponent>, ConfigurationFacet, DeleteResourceFacet {
-
- private ResourceContext<ApacheVirtualHostServiceComponent> context;
- private ApacheVirtualHostServiceComponent parentComponent;
- private final Log log = LogFactory.getLog(this.getClass());
- private static final String IFMODULE_DIRECTIVE_NAME="<IfModule";
-
- public void start(ResourceContext<ApacheVirtualHostServiceComponent> context)
- throws InvalidPluginConfigurationException, Exception {
-
- this.context = context;
- parentComponent = context.getParentResourceComponent();
- }
-
- public void stop(){
- }
-
- public AvailabilityType getAvailability() {
- return parentComponent.getAvailability();
- }
-
- public Configuration loadResourceConfiguration() throws Exception {
- ApacheDirectiveTree tree = parentComponent.loadParser();
- ConfigurationDefinition resourceConfigDef = context.getResourceType().getResourceConfigurationDefinition();
-
- ApacheDirective virtualHostNode = parentComponent.getNode(tree);
- ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
- return mapping.updateConfiguration(getNode(virtualHostNode), resourceConfigDef);
- }
-
- public void updateResourceConfiguration(ConfigurationUpdateReport report) {
- ApacheDirectiveTree tree = null;
- try {
- tree = parentComponent.loadParser();
- ConfigurationDefinition resourceConfigDef = context.getResourceType()
- .getResourceConfigurationDefinition();
- ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
-
- ApacheDirective directoryNode = getNode(parentComponent.getNode(tree));
- mapping.updateApache(directoryNode, report.getConfiguration(), resourceConfigDef);
- parentComponent.saveParser(tree);
-
- report.setStatus(ConfigurationUpdateStatus.SUCCESS);
- log.info("Apache configuration was updated");
-
- context.getParentResourceComponent().finishConfigurationUpdate(report);
- } catch (Exception e) {
- if (tree != null)
- log.error("Augeas failed to save configuration ");
- else
- log.error("Augeas failed to save configuration", e);
- report.setStatus(ConfigurationUpdateStatus.FAILURE);
- }
- }
- public void deleteResource() throws Exception {
-
- }
-
- private ApacheDirective getNode(ApacheDirective virtualHost) {
- ApacheDirective directory = AugeasNodeSearch.findNodeById(virtualHost, context.getResourceKey());
- return directory;
- }
-}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java
deleted file mode 100644
index f65765a..0000000
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2009 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.plugins.apache;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
-import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceContext;
-import org.rhq.plugins.apache.parser.ApacheDirective;
-import org.rhq.plugins.apache.parser.ApacheDirectiveTree;
-import org.rhq.plugins.apache.parser.mapping.ApacheAugeasMapping;
-import org.rhq.plugins.apache.util.AugeasNodeSearch;
-
-public class ApacheIfModuleDirectoryComponent implements ResourceComponent<ApacheDirectoryComponent>, ConfigurationFacet {
-
- private ResourceContext<ApacheDirectoryComponent> context;
- private ApacheDirectoryComponent parentComponent;
- private final Log log = LogFactory.getLog(this.getClass());
- private static final String IFMODULE_DIRECTIVE_NAME="<IfModule";
-
- public void start(ResourceContext<ApacheDirectoryComponent> context)
- throws InvalidPluginConfigurationException, Exception {
-
- this.context = context;
- parentComponent = context.getParentResourceComponent();
-
- }
-
- public void stop() {
- }
-
- public AvailabilityType getAvailability() {
- return parentComponent.getAvailability();
- }
-
- public Configuration loadResourceConfiguration() throws Exception {
- ConfigurationDefinition resourceConfigDef = context.getResourceType().getResourceConfigurationDefinition();
-
- ApacheDirective directoryNode = parentComponent.getNode();
- ApacheDirectiveTree tree = parentComponent.loadParser();
- ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
- return mapping.updateConfiguration(getNode(directoryNode), resourceConfigDef);
- }
-
- public void updateResourceConfiguration(ConfigurationUpdateReport report) {
- ApacheDirectiveTree tree = null;
- try {
- tree = parentComponent.loadParser();
- ConfigurationDefinition resourceConfigDef = context.getResourceType()
- .getResourceConfigurationDefinition();
- ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
- ApacheDirective directoryNode = getNode(parentComponent.getNode());
- mapping.updateApache(directoryNode, report.getConfiguration(), resourceConfigDef);
- parentComponent.saveParser(tree);
-
- report.setStatus(ConfigurationUpdateStatus.SUCCESS);
- log.info("Apache configuration was updated");
-
- context.getParentResourceComponent().finishConfigurationUpdate(report);
- } catch (Exception e) {
- if (tree != null)
- log.error("Augeas failed to save configuration ");
- else
- log.error("Augeas failed to save configuration", e);
- report.setStatus(ConfigurationUpdateStatus.FAILURE);
- }
- }
-
- private ApacheDirective getNode(ApacheDirective virtualHost) {
- ApacheDirective directory = AugeasNodeSearch.findNodeById(virtualHost, context.getResourceKey());
- return directory;
- }
-
-}
-
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java
index 82c71ea..efa1f91 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java
@@ -32,21 +32,23 @@ import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
import org.rhq.plugins.apache.parser.ApacheDirective;
+import org.rhq.plugins.apache.parser.ApacheDirectiveTree;
import org.rhq.plugins.apache.util.AugeasNodeSearch;
-public class ApacheIfModuleDirectoryDiscoveryComponent implements ResourceDiscoveryComponent<ApacheDirectoryComponent> {
+public class ApacheIfModuleDirectoryDiscoveryComponent implements ResourceDiscoveryComponent<ApacheConfigurationBaseComponent> {
private static final String [] parentRes = {"<IfModule"};
private static final String IFMODULE_NODE_NAME = "<IfModule";
public Set<DiscoveredResourceDetails> discoverResources(
- ResourceDiscoveryContext<ApacheDirectoryComponent> context)
+ ResourceDiscoveryContext<ApacheConfigurationBaseComponent> context)
throws InvalidPluginConfigurationException, Exception {
- ApacheDirectoryComponent directory = context.getParentResourceComponent();
+ ApacheConfigurationBaseComponent directory = context.getParentResourceComponent();
Set<DiscoveredResourceDetails> discoveredResources = new LinkedHashSet<DiscoveredResourceDetails>();
- ApacheDirective parentNode = directory.getNode();
+ ApacheDirectiveTree tree = directory.loadParser();
+ ApacheDirective parentNode = directory.getNode(tree);
List<ApacheDirective> ifModuleNodes = AugeasNodeSearch.searchNode(parentRes, IFMODULE_NODE_NAME, parentNode);
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java
index 64f2464..b2de482 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java
@@ -35,20 +35,20 @@ import org.rhq.plugins.apache.parser.ApacheDirective;
import org.rhq.plugins.apache.parser.ApacheDirectiveTree;
import org.rhq.plugins.apache.util.AugeasNodeSearch;
-public class ApacheIfModuleDiscoveryComponent implements ResourceDiscoveryComponent<ApacheVirtualHostServiceComponent> {
+public class ApacheIfModuleDiscoveryComponent implements ResourceDiscoveryComponent<ApacheConfigurationBase> {
private static final String [] parentRes = {"<IfModule"};
private static final String IFMODULE_NODE_NAME = "<IfModule";
public Set<DiscoveredResourceDetails> discoverResources(
- ResourceDiscoveryContext<ApacheVirtualHostServiceComponent> context)
+ ResourceDiscoveryContext<ApacheConfigurationBase> context)
throws InvalidPluginConfigurationException, Exception {
Set<DiscoveredResourceDetails> discoveredResources = new LinkedHashSet<DiscoveredResourceDetails>();
- ApacheVirtualHostServiceComponent virtualHost = context.getParentResourceComponent();
+ ApacheConfigurationBase parentComponent = context.getParentResourceComponent();
- ApacheDirectiveTree tree = virtualHost.loadParser();
- ApacheDirective parentNode = virtualHost.getNode(tree);
+ ApacheDirectiveTree tree = parentComponent.loadParser();
+ ApacheDirective parentNode = parentComponent.getNode(tree);
List<ApacheDirective> ifModuleNodes = AugeasNodeSearch.searchNode(parentRes, IFMODULE_NODE_NAME, parentNode);
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheLocationComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheLocationComponent.java
deleted file mode 100644
index 8ebbfde..0000000
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheLocationComponent.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2009 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.plugins.apache;
-
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.measurement.AvailabilityType;
-import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
-import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
-import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
-import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
-import org.rhq.core.pluginapi.inventory.ResourceContext;
-import org.rhq.plugins.platform.PlatformComponent;
-
-/**
- * Represents a <Location> section in the apache configuration.
- *
- * This class is a stub and is not implemented as of yet.
- *
- * @author Lukas Krejci
- */
-public class ApacheLocationComponent implements ResourceComponent<ApacheServerComponent>, ConfigurationFacet, DeleteResourceFacet {
-
- ResourceContext<ApacheServerComponent> resourceContext;
-
- public void start(ResourceContext<ApacheServerComponent> context) throws InvalidPluginConfigurationException, Exception {
- // TODO Auto-generated method stub
- resourceContext = context;
- }
-
- public void stop() {
- // TODO Auto-generated method stub
- }
-
- public AvailabilityType getAvailability() {
- //TODO implement this
- return AvailabilityType.UP;
- }
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.configuration.ConfigurationFacet#loadResourceConfiguration()
- */
- public Configuration loadResourceConfiguration() throws Exception {
- // TODO Auto-generated method stub
- return resourceContext.getResourceType().getResourceConfigurationDefinition().getDefaultTemplate().createConfiguration();
- }
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.configuration.ConfigurationFacet#updateResourceConfiguration(org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport)
- */
- public void updateResourceConfiguration(ConfigurationUpdateReport report) {
- // TODO Auto-generated method stub
- }
-
- /* (non-Javadoc)
- * @see org.rhq.core.pluginapi.inventory.DeleteResourceFacet#deleteResource()
- */
- public void deleteResource() throws Exception {
- // TODO Auto-generated method stub
-
- }
-
-
-}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java
index 69da577..44d6f11 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java
@@ -52,7 +52,6 @@ import org.rhq.core.pluginapi.event.log.LogFileEventPoller;
import org.rhq.core.pluginapi.inventory.CreateChildResourceFacet;
import org.rhq.core.pluginapi.inventory.CreateResourceReport;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.measurement.MeasurementFacet;
import org.rhq.core.pluginapi.operation.OperationFacet;
@@ -68,13 +67,13 @@ import org.rhq.plugins.apache.parser.ApacheParserImpl;
import org.rhq.plugins.apache.parser.mapping.ApacheAugeasMapping;
import org.rhq.plugins.apache.util.ApacheBinaryInfo;
import org.rhq.plugins.apache.util.ConfigurationTimestamp;
+import org.rhq.plugins.apache.util.Glob;
import org.rhq.plugins.apache.util.HttpdAddressUtility;
import org.rhq.plugins.platform.PlatformComponent;
import org.rhq.plugins.www.snmp.SNMPClient;
import org.rhq.plugins.www.snmp.SNMPException;
import org.rhq.plugins.www.snmp.SNMPSession;
import org.rhq.plugins.www.snmp.SNMPValue;
-import org.rhq.plugins.www.util.Glob;
import org.rhq.plugins.www.util.WWWUtils;
/**
@@ -83,7 +82,7 @@ import org.rhq.plugins.www.util.WWWUtils;
* @author Ian Springer
* @author Lukas Krejci
*/
-public class ApacheServerComponent implements ResourceComponent<PlatformComponent>,MeasurementFacet, OperationFacet,
+public class ApacheServerComponent implements ApacheConfigurationBase<PlatformComponent>,MeasurementFacet, OperationFacet,
ConfigurationFacet, CreateChildResourceFacet {
public static final String CONFIGURATION_NOT_SUPPORTED_ERROR_MESSAGE = "Configuration is supported only for Apache version 2 and up using Augeas. You either have an old version of Apache or Augeas is not installed.";
@@ -783,7 +782,12 @@ public class ApacheServerComponent implements ResourceComponent<PlatformComponen
public boolean saveParser(ApacheDirectiveTree tree){
ApacheConfigWriter writer = new ApacheConfigWriter(tree);
- return writer.save();
+ return writer.save(tree.getRootNode());
+ }
+
+ @Override
+ public ApacheDirective getNode(ApacheDirectiveTree tree) {
+ return tree.getRootNode();
}
}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
index 11867ad..5d8548e 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java
@@ -47,12 +47,12 @@ import org.rhq.plugins.apache.parser.ApacheParser;
import org.rhq.plugins.apache.parser.ApacheParserImpl;
import org.rhq.plugins.apache.util.ApacheBinaryInfo;
import org.rhq.plugins.apache.util.AugeasNodeValueUtil;
+import org.rhq.plugins.apache.util.Glob;
+import org.rhq.plugins.apache.util.GlobFilter;
import org.rhq.plugins.apache.util.HttpdAddressUtility;
import org.rhq.plugins.apache.util.OsProcessUtility;
import org.rhq.plugins.apache.util.HttpdAddressUtility.Address;
import org.rhq.plugins.platform.PlatformComponent;
-import org.rhq.plugins.www.util.Glob;
-import org.rhq.plugins.www.util.GlobFilter;
/**
* The discovery component for Apache 2.x servers.
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
index 45662b7..719e3d8 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java
@@ -65,17 +65,19 @@ import org.rhq.plugins.www.snmp.SNMPSession;
import org.rhq.plugins.www.snmp.SNMPValue;
import org.rhq.plugins.www.util.WWWUtils;
+
+
/**
* @author Ian Springer
* @author Lukas Krejci
*/
-public class ApacheVirtualHostServiceComponent implements ResourceComponent<ApacheServerComponent>, MeasurementFacet,
+public class ApacheVirtualHostServiceComponent extends ApacheConfigurationBaseComponent implements MeasurementFacet,
ConfigurationFacet, DeleteResourceFacet, CreateChildResourceFacet {
private final Log log = LogFactory.getLog(this.getClass());
public static final String URL_CONFIG_PROP = "url";
public static final String MAIN_SERVER_RESOURCE_KEY = "MainServer";
-
+ public static final String REGEXP_PROP = "regexp";
public static final String RESPONSE_TIME_LOG_FILE_CONFIG_PROP = ResponseTimeConfiguration.RESPONSE_TIME_LOG_FILE_CONFIG_PROP;
public static final String RESPONSE_TIME_URL_EXCLUDES_CONFIG_PROP = ResponseTimeConfiguration.RESPONSE_TIME_URL_EXCLUDES_CONFIG_PROP;
public static final String RESPONSE_TIME_URL_TRANSFORMS_CONFIG_PROP = ResponseTimeConfiguration.RESPONSE_TIME_URL_TRANSFORMS_CONFIG_PROP;
@@ -86,7 +88,6 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
/** Multiply by 1/1000 to convert logged response times, which are in microseconds, to milliseconds. */
private static final double RESPONSE_TIME_LOG_TIME_MULTIPLIER = 0.001;
- private ResourceContext<ApacheServerComponent> resourceContext;
private URL url;
private ResponseTimeLogParser logParser;
@@ -95,9 +96,9 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
public static final String RESOURCE_TYPE_NAME = "Apache Virtual Host";
- public void start(ResourceContext<ApacheServerComponent> resourceContext) throws Exception {
- this.resourceContext = resourceContext;
- Configuration pluginConfig = this.resourceContext.getPluginConfiguration();
+ public void start(ResourceContext context) throws Exception {
+ super.start(context);
+ Configuration pluginConfig = resourceContext.getPluginConfiguration();
String url = pluginConfig.getSimple(URL_CONFIG_PROP).getStringValue();
if (url != null) {
try {
@@ -133,41 +134,6 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
return (this.url != null && WWWUtils.isAvailable(this.url)) ? AvailabilityType.UP : AvailabilityType.DOWN;
}
- public Configuration loadResourceConfiguration() throws Exception {
- ApacheServerComponent parent = resourceContext.getParentResourceComponent();
-
- ApacheDirectiveTree tree =loadParser();
- ConfigurationDefinition resourceConfigDef = resourceContext.getResourceType()
- .getResourceConfigurationDefinition();
-
- ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
- return mapping.updateConfiguration(getNode(tree), resourceConfigDef);
- }
-
- public void updateResourceConfiguration(ConfigurationUpdateReport report) {
- ApacheDirectiveTree tree = null;
- try {
- tree = loadParser();
- ConfigurationDefinition resourceConfigDef = resourceContext.getResourceType()
- .getResourceConfigurationDefinition();
- ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
- ApacheDirective virtHostNode = getNode(tree);
- mapping.updateApache(virtHostNode, report.getConfiguration(), resourceConfigDef);
- saveParser(tree);
- ApacheConfigWriter writer = new ApacheConfigWriter(tree);
- report.setStatus(ConfigurationUpdateStatus.SUCCESS);
- log.info("Apache configuration was updated");
-
- finishConfigurationUpdate(report);
- } catch (Exception e) {
- if (tree != null)
- log.error("Augeas failed to save configuration");
- else
- log.error("Augeas failed to save configuration", e);
- report.setStatus(ConfigurationUpdateStatus.FAILURE);
- }
- }
-
public void deleteResource() throws Exception {
if (MAIN_SERVER_RESOURCE_KEY.equals(resourceContext.getResourceKey())) {
throw new IllegalArgumentException("Cannot delete the virtual host representing the main server configuration.");
@@ -195,7 +161,8 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
return;
log.debug("Collecting metrics for VirtualHost service #" + primaryIndex + "...");
- SNMPSession snmpSession = this.resourceContext.getParentResourceComponent().getSNMPSession();
+ ApacheServerComponent server = (ApacheServerComponent) this.resourceContext.getParentResourceComponent();
+ SNMPSession snmpSession = server.getSNMPSession();
if (!snmpSession.ping()) {
log.debug("Failed to connect to SNMP agent at " + snmpSession + " - aborting metric collection...");
@@ -251,7 +218,7 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
//pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.DIRECTIVE_INDEX_PROP, seq));
//we don't support this yet... need to figure out how...
- pluginConfiguration.put(new PropertySimple(ApacheDirectoryComponent.REGEXP_PROP, false));
+ pluginConfiguration.put(new PropertySimple(ApacheVirtualHostServiceComponent.REGEXP_PROP, false));
String dirNameToSet = AugeasNodeValueUtil.escape(directoryName);
//now actually create the data in augeas
@@ -268,7 +235,8 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
report.setResourceName(directoryName);
report.setStatus(CreateResourceStatus.SUCCESS);
- resourceContext.getParentResourceComponent().finishChildResourceCreate(report);
+ ApacheServerComponent server = (ApacheServerComponent) this.resourceContext.getParentResourceComponent();
+ server.finishChildResourceCreate(report);
} catch (Exception e) {
report.setException(e);
report.setStatus(CreateResourceStatus.FAILURE);
@@ -351,21 +319,6 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
return virtualHosts.get(0);
}
- /**
- * @see ApacheServerComponent#finishConfigurationUpdate(ConfigurationUpdateReport)
- */
- public void finishConfigurationUpdate(ConfigurationUpdateReport report) {
- resourceContext.getParentResourceComponent().finishConfigurationUpdate(report);
- }
-
- /**
- * @see ApacheServerComponent#conditionalRestart()
- *
- * @throws Exception
- */
- public void conditionalRestart() throws Exception {
- resourceContext.getParentResourceComponent().conditionalRestart();
- }
private void collectSnmpMetric(MeasurementReport report, int primaryIndex, SNMPSession snmpSession,
MeasurementScheduleRequest schedule) throws SNMPException {
@@ -433,7 +386,8 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
* @throws Exception on SNMP error
*/
private int getWwwServiceIndex() throws Exception {
- ConfigurationTimestamp currentTimestamp = resourceContext.getParentResourceComponent().getConfigurationTimestamp();
+ ApacheServerComponent server = (ApacheServerComponent) this.resourceContext.getParentResourceComponent();
+ ConfigurationTimestamp currentTimestamp = server.getConfigurationTimestamp();
if (!lastConfigurationTimeStamp.equals(currentTimestamp)) {
snmpWwwServiceIndex = -1;
//don't go through this configuration again even if we fail further below.. we'd fail again.
@@ -442,7 +396,7 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
//configuration has changed. re-read the service index of this virtual host
//we have to scan the SNMP to find the entry corresponding to this vhost.
- SNMPSession snmpSession = resourceContext.getParentResourceComponent().getSNMPSession();
+ SNMPSession snmpSession = server.getSNMPSession();
List<SNMPValue> names;
List<SNMPValue> ports;
@@ -468,13 +422,12 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
//convert the vhost addresses into fully qualified ip/port addresses
List<HttpdAddressUtility.Address> vhostAddresses = new ArrayList<HttpdAddressUtility.Address>(
vhostAddressStrings.length);
-
- ApacheServerComponent parent = resourceContext.getParentResourceComponent();
+
if (vhostAddressStrings.length == 1 && MAIN_SERVER_RESOURCE_KEY.equals(vhostAddressStrings[0])) {
- vhostAddresses.add(parent.getAddressUtility().getMainServerSampleAddress(tree));
+ vhostAddresses.add(server.getAddressUtility().getMainServerSampleAddress(tree));
} else {
for (int i = 0; i < vhostAddressStrings.length; ++i) {
- vhostAddresses.add(parent.getAddressUtility().getVirtualHostSampleAddress(tree, vhostAddressStrings[i],
+ vhostAddresses.add(server.getAddressUtility().getVirtualHostSampleAddress(tree, vhostAddressStrings[i],
vhostServerName));
}
}
@@ -534,12 +487,4 @@ public class ApacheVirtualHostServiceComponent implements ResourceComponent<Apac
private ResourceType getDirectoryResourceType() {
return resourceContext.getResourceType().getChildResourceTypes().iterator().next();
}
-
- public ApacheDirectiveTree loadParser(){
- return resourceContext.getParentResourceComponent().loadParser();
- }
-
- public boolean saveParser(ApacheDirectiveTree tree){
- return resourceContext.getParentResourceComponent().saveParser(tree);
- }
}
\ No newline at end of file
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheConfigWriter.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheConfigWriter.java
index 9158551..eff7404 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheConfigWriter.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheConfigWriter.java
@@ -2,74 +2,68 @@ package org.rhq.plugins.apache.parser;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.OutputStream;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.HashMap;
+import java.util.Map;
public class ApacheConfigWriter {
- public ApacheConfigWriter(ApacheDirectiveTree tree){
-
- }
+ private Map<String,OutputStream> streams;
- private void findUpdated(ApacheDirective dir,List<ApacheDirective> updatedNodes){
- if (dir.isUpdated()){
- updatedNodes.add(dir);
- }
- for (ApacheDirective directive : dir.getChildDirectives()){
- findUpdated(directive,updatedNodes);
- }
+ public ApacheConfigWriter(ApacheDirectiveTree tree){
+ streams = new HashMap<String,OutputStream>();
}
- private Set<String> findUpdatedFiles(List<ApacheDirective> updatedNodes){
- Set<String> updatedFiles = new HashSet<String>();
- for (ApacheDirective dir : updatedNodes){
- updatedFiles.contains(dir.getFile());
- }
- return updatedFiles;
- }
-
- public boolean save(){
+ public boolean save(ApacheDirective dir){
+ try {
+ if (dir.isRootNode()){
+ for (ApacheDirective directive : dir.getChildDirectives())
+ writeToFile(directive);
+ }else
+ writeToFile(dir);
+ for (OutputStream stream : streams.values()){
+ stream.flush();
+ stream.close();
+ }
+ }catch(Exception e){
+ return false;
+ }finally{
+ try {
+ for (OutputStream stream : streams.values()){
+ stream.flush();
+ stream.close();
+ }
+ } catch(IOException ee){
+ return false;
+ }
+ }
+
return true;
}
-
- private ApacheDirective findFirstFileDirective(ApacheDirective node,String file){
- if (node.getFile().equals(file)){
- return node.getParentNode();
- }
- for (ApacheDirective dir : node.getChildDirectives()){
- ApacheDirective dd = findFirstFileDirective(dir, file);
- if (dd!=null)
- return dd.getParentNode();
- }
- return null;
- }
-
- public void saveFile(String file,ApacheDirective dir) throws Exception{
- File fl = new File(file);
- if (!fl.exists())
- fl.createNewFile();
-
- OutputStream str = new FileOutputStream(fl);
- for (ApacheDirective d : dir.getChildDirectives()){
- if (dir.getFile().equals(file)){
- writeToFile(str,dir,file);
- }
- }
- }
-
- private void writeToFile(OutputStream str,ApacheDirective dir,String file) throws Exception{
- if (dir.getFile().equals(file)){
- str.write(dir.getText().getBytes());
- if (dir.isNested()){
- for (ApacheDirective tempDir : dir.getChildDirectives()){
- writeToFile(str, tempDir, file);
- }
- str.write(("</"+dir.getName()+">").getBytes());
+ private void writeToFile(ApacheDirective dir) throws Exception{
+ String fileName = dir.getFile();
+ OutputStream str;
+
+ if (!streams.containsKey(fileName)){
+ File fl = new File(fileName);
+ if (!fl.exists())
+ fl.createNewFile();
+
+ str = new FileOutputStream(fl);
+ streams.put(fileName, str);
+ }else
+ str = streams.get(fileName);
+
+ if (dir.isNested()){
+ str.write((dir.getText()+">"+'\n').getBytes());
+ for (ApacheDirective tempDir : dir.getChildDirectives()){
+ writeToFile(tempDir);
}
- }else
- return;
- }
+ str.write(("</"+dir.getName()+">"+'\n').getBytes());
+ }else
+ str.write((dir.getText()+'\n').getBytes());
+
+ }
}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirective.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirective.java
index 9314949..335f549 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirective.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirective.java
@@ -12,14 +12,17 @@ public class ApacheDirective {
private boolean isNested;
private boolean isRootNode;
private boolean isComment;
+ private String whitespaces;
private static final String WS = "[ \t]*";
private static final String WORD = "\"(?:[^\"\n]|\\\")*\"|'(?:[^'\n]|\\\')*'|[^'\" \t\n]+";
- private static final String DIRECTIVE_PATTERN = WS + "(" + WORD + ")" + WS;
+ private static final String DIRECTIVE_PATTERN = WS+ "(" + WORD + ")" + WS;
private static final String COMMENT_PATTERN="^[\t ]*#.*+$";
+ private static final String WHITESPACE_PATTERN="^([\t ]*).*$";
private boolean updated=false;
- private final Pattern directivePattern = Pattern.compile(DIRECTIVE_PATTERN);
- private final Pattern commentPattern = Pattern.compile(COMMENT_PATTERN);
+ private static final Pattern directivePattern = Pattern.compile(DIRECTIVE_PATTERN);
+ private static final Pattern commentPattern = Pattern.compile(COMMENT_PATTERN);
+ private static final Pattern whitespacesPattern = Pattern.compile(WHITESPACE_PATTERN);
private List<ApacheDirective> childNodes;
private ApacheDirective parentNode;
private String file;
@@ -41,6 +44,12 @@ public class ApacheDirective {
}else{
int startIndex = 0;
boolean updated = true;
+
+ Matcher whsMatcher = whitespacesPattern.matcher(directive);
+ if ( whsMatcher.find()){
+ whitespaces = whsMatcher.group(1);
+ }
+
while (updated & startIndex < directive.length()){
updated = false;
Matcher m = directivePattern.matcher(directive);
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java
index e646880..2917645 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java
@@ -1,10 +1,9 @@
package org.rhq.plugins.apache.parser;
import java.io.File;
-import java.util.ArrayList;
import java.util.List;
-import org.rhq.plugins.www.util.Glob;
+import org.rhq.plugins.apache.util.Glob;
public class ApacheParserImpl implements ApacheParser{
@@ -46,18 +45,9 @@ public class ApacheParserImpl implements ApacheParser{
}
private List<File> getIncludeFiles(String foundInclude) {
- List<File> ret = new ArrayList<File>();
- File serverRootFile = new File(serverRootPath);
- File check = new File(foundInclude);
- if (check.isAbsolute()) {
- ret.add(check);
- } else {
- for (File f : Glob.match(serverRootFile, foundInclude)) {
- ret.add(f);
- }
- }
-
- return ret;
+ File check = new File(foundInclude);
+ File root = new File(check.isAbsolute() ? Glob.rootPortion(foundInclude) : serverRootPath);
+ return Glob.match(root, foundInclude);
}
@Override
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/mapping/ApacheDirectiveRegExpression.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/mapping/ApacheDirectiveRegExpression.java
index 5c992fd..ba8e0ff 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/mapping/ApacheDirectiveRegExpression.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/mapping/ApacheDirectiveRegExpression.java
@@ -28,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
import org.rhq.plugins.apache.parser.ApacheDirective;
/**
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/mapping/load/MappingDirectivePerMapIndex.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/mapping/load/MappingDirectivePerMapIndex.java
index 1aadb8c..2feb510 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/mapping/load/MappingDirectivePerMapIndex.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/mapping/load/MappingDirectivePerMapIndex.java
@@ -34,6 +34,7 @@ import org.rhq.plugins.apache.parser.ApacheDirective;
import org.rhq.plugins.apache.parser.ApacheParserException;
import org.rhq.plugins.apache.parser.mapping.ApacheDirectiveRegExpression;
+
/**
* A mapping strategy similar to {@link MappingDirectivePerMap}.
* In addition to base class, the map definition is checked for
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/Glob.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/Glob.java
new file mode 100644
index 0000000..370e3e7
--- /dev/null
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/Glob.java
@@ -0,0 +1,191 @@
+
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2009 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.plugins.apache.util;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A helper class for easy work with glob patterns.
+ *
+ * @author Lukas Krejci
+ */
+public class Glob {
+
+ private static final Log log = LogFactory.getLog(Glob.class);
+
+ private Glob() {
+
+ }
+
+ /**
+ * Checks whether the provided string is a wildcard glob pattern.
+ *
+ * @param globPattern
+ * @return
+ */
+ public static boolean isWildcard(String globPattern) {
+ for(char specialChar : GlobFilter.WILDCARD_CHARS) {
+ if (globPattern.indexOf(specialChar) >= 0) return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks if the file matches the glob pattern with given path as a root of the filesystem.
+ *
+ * If the glob pattern denotes an absolute path, it is understood to be under the supplied
+ * fs root.
+ *
+ * @param rootPath
+ * @param globPattern
+ * @param file
+ * @return
+ */
+ public static boolean matches(File rootPath, String globPattern, File file) {
+ String rootPortion = rootPortion(globPattern);
+ globPattern = globPattern.substring(rootPortion.length());
+
+ globPattern = new File(rootPath, globPattern).getAbsolutePath();
+
+ return new GlobFilter(globPattern).accept(file);
+ }
+
+ /**
+ * Returns a fixed size list of matches.
+ *
+ * The parent path specifies the "root" from which the glob pattern applies.
+ * The glob pattern can span several directories with wildcards present only
+ * on the lowest level.
+ * The glob pattern is always relative to the specified parent path, even if it denotes
+ * an absolute path. In that case, the leading root path is chopped off and the rest is
+ * appended to the parent path.
+ *
+ * @param parentPath the parent path to start the pattern search
+ * @param globPattern the glob pattern to match against
+ * @return the list of matches
+ */
+ public static List<File> match(File parentPath, String globPattern) {
+ if (!parentPath.exists()) {
+ throw new IllegalArgumentException("Path '" + parentPath + "' does not exist.");
+ }
+ if (!parentPath.isDirectory()) {
+ throw new IllegalArgumentException("Path '" + parentPath + "' is not a directory.");
+ }
+
+ String rootPortion = rootPortion(globPattern);
+ globPattern = globPattern.substring(rootPortion.length());
+
+ //now search for the first special character in the patterns
+ int specialCharIdx = globPattern.length();
+ for(char specialChar : GlobFilter.WILDCARD_CHARS) {
+ int idx = globPattern.indexOf(specialChar);
+ if (idx >= 0 && specialCharIdx > idx) {
+ specialCharIdx = idx;
+ }
+ }
+
+ if (specialCharIdx > 0) {
+ //now search for the first path separator preceding the special char
+ int globParentIdx = globPattern.lastIndexOf(File.separatorChar, specialCharIdx);
+ if (globParentIdx > 0) {
+ //move the parent path down to the nearest parent of the wildcard part of the
+ //glob pattern
+ parentPath = new File(parentPath, globPattern.substring(0, globParentIdx));
+ globPattern = createGlobPattern(parentPath.getAbsolutePath(), globPattern.substring(globParentIdx));
+ } else {
+ globPattern = createGlobPattern(parentPath.getAbsolutePath(),globPattern);
+ }
+ } else {
+ globPattern = createGlobPattern(parentPath.getAbsolutePath(),globPattern);
+ }
+
+ globPattern = new File(globPattern).getAbsolutePath();
+ File[] files = parentPath.listFiles(new GlobFilter(globPattern));
+ if (files == null) {
+ throw new IllegalStateException("Could not list files in " + parentPath);
+ }
+ return Arrays.asList(files);
+ }
+
+ private static String createGlobPattern(String parent,String pattern){
+ if (!parent.endsWith(File.separator))
+ parent = parent + File.separatorChar;
+ return parent+pattern;
+ }
+ public static List<File> matchAll(File parentPath, String... globPattern) {
+ return matchAll(parentPath, Arrays.asList(globPattern));
+ }
+
+ public static List<File> matchAll(File parentPath, List<String> globPatterns) {
+ ArrayList<File> matches = new ArrayList<File>();
+ for(String p : globPatterns) {
+ matches.addAll(match(parentPath, p));
+ }
+
+ return matches;
+ }
+
+ public static void exclude(List<File> matches, String globPattern) {
+ GlobFilter filter = new GlobFilter(globPattern);
+
+ Iterator<File> it = matches.iterator();
+ while (it.hasNext()) {
+ if (filter.accept(it.next())) {
+ it.remove();
+ }
+ }
+ }
+
+ public static void excludeAll(List<File> matches, String... globPattern) {
+ excludeAll(matches, Arrays.asList(globPattern));
+ }
+
+ public static void excludeAll(List<File> matches, List<String> globPatterns) {
+ for(String p : globPatterns) {
+ exclude(matches, p);
+ }
+ }
+
+ public static String rootPortion(String path) {
+ File[] roots = File.listRoots();
+ if (roots != null) {
+ for (File root : roots) {
+ if (path.startsWith(root.getPath())) {
+ return root.getPath();
+ }
+ }
+ } else {
+ log.warn("Could not determine file system roots. This is strange.");
+ }
+
+ return "";
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/GlobFilter.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/GlobFilter.java
new file mode 100644
index 0000000..e08577e
--- /dev/null
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/GlobFilter.java
@@ -0,0 +1,145 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2009 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.plugins.apache.util;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.regex.Pattern;
+
+/**
+ * A filter implementing a glob pattern match.
+ *
+ * @author Lukas Krejci
+ */
+public class GlobFilter implements FileFilter {
+
+ private String globPattern;
+ private Pattern regexPattern;
+
+ public static final char[] WILDCARD_CHARS;
+
+ static {
+ if (File.separatorChar == '\\') {
+ WILDCARD_CHARS = new char[] { '*', '?' };
+ } else {
+ WILDCARD_CHARS = new char[] { '*', '?', '[', ']' };
+ }
+ }
+
+ public GlobFilter(String globPattern) {
+ if (globPattern == null) {
+ throw new IllegalArgumentException("The glob pattern cannot be null.");
+ }
+
+ this.globPattern = globPattern;
+ this.regexPattern = convert(globPattern);
+ }
+
+ public String getGlobPattern() {
+ return globPattern;
+ }
+
+ /* (non-Javadoc)
+ * @see java.io.FileFilter#accept(java.io.File)
+ */
+ public boolean accept(File pathname) {
+ return regexPattern.matcher(pathname.getAbsolutePath()).matches();
+ }
+
+ private static Pattern convert(String globPattern) {
+ StringBuilder regexPattern = new StringBuilder("^");
+ int i = 0;
+ //path starts require special handling only on UNIX platforms
+ boolean pathStart = File.separatorChar != '\\';
+ boolean inRangeSpec = false;
+
+ while (i < globPattern.length()) {
+ switch (globPattern.charAt(i)) {
+ case '\\':
+ if (File.separatorChar == '\\') {
+ //we're on windows, \ is a separator
+ regexPattern.append("\\\\");
+ } else {
+ //anywhere else, \ is a escape sequence
+ if (i == globPattern.length() - 1) {
+ throw new IllegalArgumentException("Illegal glob pattern: " + globPattern);
+ }
+ regexPattern.append("\\").append(globPattern.charAt(i + 1));
+ i += 1; //just skip the next character
+ }
+ pathStart = false;
+ break;
+ case '*':
+ if (pathStart) {
+ //on UNIX platforms, the "/*" doesn't match
+ //the hidden files (i.e. the ones prefixed by dot
+ regexPattern.append("($|[^\\.].*)");
+ } else if (inRangeSpec) {
+ //* has no special meaning inside a range spec
+ regexPattern.append("\\*");
+ } else {
+ regexPattern.append(".*");
+ }
+ pathStart = false;
+ break;
+ case '?':
+ if (inRangeSpec) {
+ //? has no special meaning inside a range spec
+ regexPattern.append("\\?");
+ } else {
+ regexPattern.append(".");
+ }
+ pathStart = false;
+ break;
+ case '.':
+ regexPattern.append("\\.");
+ pathStart = false;
+ break;
+ case '/':
+ regexPattern.append("\\/");
+ if (File.separatorChar != '\\') {
+ pathStart = true;
+ }
+ break;
+ case '[':
+ regexPattern.append("[");
+ inRangeSpec = true;
+ break;
+ case ']':
+ regexPattern.append(']');
+ inRangeSpec = false;
+ break;
+ default:
+ regexPattern.append(globPattern.charAt(i));
+ pathStart = false;
+ break;
+ }
+ i++;
+ }
+
+ regexPattern.append("$");
+
+ return Pattern.compile(regexPattern.toString());
+ }
+}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/Glob.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/Glob.java
deleted file mode 100644
index 2d52c93..0000000
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/Glob.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2009 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.plugins.www.util;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * A helper class for easy work with glob patterns.
- *
- * @author Lukas Krejci
- */
-public class Glob {
-
- private Glob() {
-
- }
-
- /**
- * Checks whether the provided string is a wildcard glob pattern.
- *
- * @param globPattern
- * @return
- */
- public static boolean isWildcard(String globPattern) {
- for(char specialChar : GlobFilter.WILDCARD_CHARS) {
- if (globPattern.indexOf(specialChar) >= 0) return true;
- }
- return false;
- }
-
- /**
- * Checks if the file matches the glob pattern with given path as a root of the filesystem.
- *
- * If the glob pattern denotes an absolute path, it is understood to be under the supplied
- * fs root.
- *
- * @param rootPath
- * @param globPattern
- * @param file
- * @return
- */
- public static boolean matches(File rootPath, String globPattern, File file) {
- String rootPortion = rootPortion(globPattern);
- globPattern = globPattern.substring(rootPortion.length());
-
- globPattern = new File(rootPath, globPattern).getAbsolutePath();
-
- return new GlobFilter(globPattern).accept(file);
- }
-
- /**
- * Returns a fixed size list of matches.
- *
- * The parent path specifies the "root" from which the glob pattern applies.
- * The glob pattern can span several directories with wildcards present only
- * on the lowest level.
- * The glob pattern is always relative to the specified parent path, even if it denotes
- * an absolute path. In that case, the leading root path is chopped off and the rest is
- * appended to the parent path.
- *
- * @param parentPath the parent path to start the pattern search
- * @param globPattern the glob pattern to match against
- * @return the list of matches
- */
- public static List<File> match(File parentPath, String globPattern) {
- if (!parentPath.exists()) {
- throw new IllegalArgumentException("Path '" + parentPath + "' does not exist.");
- }
- if (!parentPath.isDirectory()) {
- throw new IllegalArgumentException("Path '" + parentPath + "' is not a directory.");
- }
-
- String rootPortion = rootPortion(globPattern);
- globPattern = globPattern.substring(rootPortion.length());
-
- //now search for the first special character in the patterns
- int specialCharIdx = globPattern.length();
- for(char specialChar : GlobFilter.WILDCARD_CHARS) {
- int idx = globPattern.indexOf(specialChar);
- if (idx >= 0 && specialCharIdx > idx) {
- specialCharIdx = idx;
- }
- }
-
- if (specialCharIdx > 0) {
- //now search for the first path separator preceding the special char
- int globParentIdx = globPattern.lastIndexOf(File.separatorChar, specialCharIdx);
- if (globParentIdx > 0) {
- //move the parent path down to the nearest parent of the wildcard part of the
- //glob pattern
- parentPath = new File(parentPath, globPattern.substring(0, globParentIdx));
- globPattern = createGlobPattern(parentPath.getAbsolutePath(), globPattern.substring(globParentIdx));
- } else {
- globPattern = createGlobPattern(parentPath.getAbsolutePath(),globPattern);
- }
- } else {
- globPattern = createGlobPattern(parentPath.getAbsolutePath(),globPattern);
- }
-
- globPattern = new File(globPattern).getAbsolutePath();
- File[] files = parentPath.listFiles(new GlobFilter(globPattern));
- if (files == null) {
- throw new IllegalStateException("Could not list files in " + parentPath);
- }
- return Arrays.asList(files);
- }
-
- private static String createGlobPattern(String parent,String pattern){
- if (!parent.endsWith(File.separator))
- parent = parent + File.separatorChar;
- return parent+pattern;
- }
- public static List<File> matchAll(File parentPath, String... globPattern) {
- return matchAll(parentPath, Arrays.asList(globPattern));
- }
-
- public static List<File> matchAll(File parentPath, List<String> globPatterns) {
- ArrayList<File> matches = new ArrayList<File>();
- for(String p : globPatterns) {
- matches.addAll(match(parentPath, p));
- }
-
- return matches;
- }
-
- public static void exclude(List<File> matches, String globPattern) {
- GlobFilter filter = new GlobFilter(globPattern);
-
- Iterator<File> it = matches.iterator();
- while (it.hasNext()) {
- if (filter.accept(it.next())) {
- it.remove();
- }
- }
- }
-
- public static void excludeAll(List<File> matches, String... globPattern) {
- excludeAll(matches, Arrays.asList(globPattern));
- }
-
- public static void excludeAll(List<File> matches, List<String> globPatterns) {
- for(String p : globPatterns) {
- exclude(matches, p);
- }
- }
-
- private static String rootPortion(String path) {
- for (File root : File.listRoots()) {
- if (path.startsWith(root.getPath())) {
- return root.getPath();
- }
- }
-
- return "";
- }
-}
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/GlobFilter.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/GlobFilter.java
deleted file mode 100644
index 9b1f54e..0000000
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/GlobFilter.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2009 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.plugins.www.util;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.regex.Pattern;
-
-/**
- * A filter implementing a glob pattern match.
- *
- * @author Lukas Krejci
- */
-public class GlobFilter implements FileFilter {
-
- private String globPattern;
- private Pattern regexPattern;
-
- public static final char[] WILDCARD_CHARS;
-
- static {
- if (File.separatorChar == '\\') {
- WILDCARD_CHARS = new char[] { '*', '?' };
- } else {
- WILDCARD_CHARS = new char[] { '*', '?', '[', ']' };
- }
- }
-
- public GlobFilter(String globPattern) {
- if (globPattern == null) {
- throw new IllegalArgumentException("The glob pattern cannot be null.");
- }
-
- this.globPattern = globPattern;
- this.regexPattern = convert(globPattern);
- }
-
- public String getGlobPattern() {
- return globPattern;
- }
-
- /* (non-Javadoc)
- * @see java.io.FileFilter#accept(java.io.File)
- */
- public boolean accept(File pathname) {
- return regexPattern.matcher(pathname.getAbsolutePath()).matches();
- }
-
- private static Pattern convert(String globPattern) {
- StringBuilder regexPattern = new StringBuilder("^");
- int i = 0;
- //path starts require special handling only on UNIX platforms
- boolean pathStart = File.separatorChar != '\\';
- boolean inRangeSpec = false;
-
- while (i < globPattern.length()) {
- switch (globPattern.charAt(i)) {
- case '\\':
- if (File.separatorChar == '\\') {
- //we're on windows, \ is a separator
- regexPattern.append("\\\\");
- } else {
- //anywhere else, \ is a escape sequence
- if (i == globPattern.length() - 1) {
- throw new IllegalArgumentException("Illegal glob pattern: " + globPattern);
- }
- regexPattern.append("\\").append(globPattern.charAt(i + 1));
- i += 1; //just skip the next character
- }
- pathStart = false;
- break;
- case '*':
- if (pathStart) {
- //on UNIX platforms, the "/*" doesn't match
- //the hidden files (i.e. the ones prefixed by dot
- regexPattern.append("($|[^\\.].*)");
- } else if (inRangeSpec) {
- //* has no special meaning inside a range spec
- regexPattern.append("\\*");
- } else {
- regexPattern.append(".*");
- }
- pathStart = false;
- break;
- case '?':
- if (inRangeSpec) {
- //? has no special meaning inside a range spec
- regexPattern.append("\\?");
- } else {
- regexPattern.append(".");
- }
- pathStart = false;
- break;
- case '.':
- regexPattern.append("\\.");
- pathStart = false;
- break;
- case '/':
- regexPattern.append("\\/");
- if (File.separatorChar != '\\') {
- pathStart = true;
- }
- break;
- case '[':
- regexPattern.append("[");
- inRangeSpec = true;
- break;
- case ']':
- regexPattern.append(']');
- inRangeSpec = false;
- break;
- default:
- regexPattern.append(globPattern.charAt(i));
- pathStart = false;
- break;
- }
- i++;
- }
-
- regexPattern.append("$");
-
- return Pattern.compile(regexPattern.toString());
- }
-}
diff --git a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
index 697b309..f4a1162 100644
--- a/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml
@@ -673,7 +673,7 @@
</c:group>
</resource-configuration>
- <service name="Directory" class="ApacheDirectoryComponent" discovery="ApacheDirectoryDiscoveryComponent" createDeletePolicy="both">
+ <service name="Directory" class="ApacheConfigurationBaseComponent" discovery="ApacheDirectoryDiscoveryComponent" createDeletePolicy="both">
<plugin-configuration>
<c:simple-property name="directiveIndex" readOnly="true" required="true" type="integer"/>
<c:simple-property name="regexp" displayName="Regular Expression" type="boolean" default="false" readOnly="true"
@@ -701,7 +701,7 @@
&UseCanonicalName;
&UseCanonicalPhysicalPort;
</resource-configuration>
- <service name="IfModule Parameters" discovery="ApacheIfModuleDirectoryDiscoveryComponent" class="ApacheIfModuleDirectoryComponent">
+ <service name="IfModule Parameters" discovery="ApacheIfModuleDirectoryDiscoveryComponent" class="ApacheConfigurationBaseComponent">
<resource-configuration>
&IfModulePosition;
&Order;
@@ -726,7 +726,7 @@
</resource-configuration>
</service>
</service>
- <service name="IfModule" discovery="ApacheIfModuleDiscoveryComponent" class="ApacheIfModuleComponent" createDeletePolicy="both">
+ <service name="IfModule" discovery="ApacheIfModuleDiscoveryComponent" class="ApacheConfigurationBaseComponent" createDeletePolicy="both">
<resource-configuration>
&IfModulePosition;
&Order;
13 years, 10 months
- 1
- 0
[rhq] etc/dev-utils modules/enterprise pom.xml
by ips
etc/dev-utils/jdk.sh | 26 ++++++++++----------
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 -
pom.xml | 2 -
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit a143b2509596a7c354972c94f8e187bc57523b9a
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Aug 3 16:36:31 2010 -0400
upgrade RichFaces from 3.3.3.CR1 to 3.3.3.Final; fix a couple bugs in jdk.sh
diff --git a/etc/dev-utils/jdk.sh b/etc/dev-utils/jdk.sh
index 1e387f1..bf8193e 100755
--- a/etc/dev-utils/jdk.sh
+++ b/etc/dev-utils/jdk.sh
@@ -9,24 +9,23 @@ if [ $# -gt 1 ]; then
echo "Usage: jdk n" >&2
echo "(sets JAVA_HOME to the value of the JAVAn_HOME environment variable, if it is defined)" >&2
echo >&2
- echo "For example, jdk 5 sets JAVA_HOME to the value of JAVA5_HOME." >&2
- return
-fi
-
-if [ -z "${JAVA_HOME}" ]; then
- echo "ERROR: JAVA_HOME is not defined." >&2
+ echo "For example, 'jdk 6' sets JAVA_HOME to the value of JAVA6_HOME." >&2
return
fi
export JAVA_HOME
echo current JAVA_HOME=${JAVA_HOME}
-if [ ! -d "${JAVA_HOME}" ]; then
- echo "WARNING: ${JAVA_HOME} does not exist."
-elif [ ! -f "${JAVA_HOME}/bin/java" ]; then
- echo "WARNING: ${JAVA_HOME}/bin/java does not exist."
-fi
if [ $# -eq 0 ]; then
+ if [ -z "${JAVA_HOME}" ]; then
+ echo "JAVA_HOME is not defined." >&2
+ else
+ if [ ! -d "${JAVA_HOME}" ]; then
+ echo "${JAVA_HOME} does not exist." >&2
+ elif [ ! -f "${JAVA_HOME}/bin/java" ]; then
+ echo "${JAVA_HOME}/bin/java does not exist." >&2
+ fi
+ fi
return
fi
@@ -67,7 +66,8 @@ if [ ! -f "${_NEW_JAVA_HOME}/bin/java" ]; then
return
fi
+JAVA_HOME=${_NEW_JAVA_HOME}
+echo "new JAVA_HOME=${JAVA_HOME}"
+"${JAVA_HOME}/bin/java" -version
unset _JDK_VERSION _NEW_JAVA_HOME
-JAVA_HOME=${_NEW_JAVA_HOME}
-echo "New JAVA_HOME=${JAVA_HOME}"
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index c917be9..e09921f 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -28,7 +28,7 @@
used once it's released. -->
<seam.version>2.1.0.SP1</seam.version>
<jboss-el.version>1.0_02.CR5</jboss-el.version>
- <richfaces.version>3.3.2.SR1</richfaces.version>
+ <richfaces.version>3.3.3.Final</richfaces.version>
</properties>
<dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 521bc40..1708440 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
<postgresql.version>8.4-701.jdbc3</postgresql.version>
<h2.version>1.1.117</h2.version>
<jtds.version>1.2.2</jtds.version>
- <richfaces.version>3.3.3.CR1</richfaces.version>
+ <richfaces.version>3.3.3.Final</richfaces.version>
<jline.version>0.9.94</jline.version>
<sigar.version>1.6.5.132</sigar.version>
<quartz.version>1.6.5</quartz.version>
13 years, 10 months
- 1
- 0