modules/integration-tests/mod_cluster-plugin-test/pom.xml
| 442 ++++------
modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModClusterPluginIntegrationTest.java
| 43
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanComponent.java
| 1
modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextDiscoveryComponent.java
| 15
modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml
| 3
5 files changed, 252 insertions(+), 252 deletions(-)
New commits:
commit 90c95c6bbf13e1dfbd67c1d6552860e28bc65ee5
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Sep 27 20:20:00 2011 -0500
Enable mod_cluster plugin for Tomcat. Also added a couple of integration tests for the
resource.
diff --git a/modules/integration-tests/mod_cluster-plugin-test/pom.xml
b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
index bae660c..4e29e2b 100644
--- a/modules/integration-tests/mod_cluster-plugin-test/pom.xml
+++ b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
@@ -58,6 +58,13 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.on</groupId>
+ <artifactId>jopr-tomcat-plugin</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>${rhq.groupId}</groupId>
@@ -288,6 +295,7 @@
<include
name="org/rhq/rhq-jmx-plugin/${project.version}/rhq-jmx-plugin-${project.version}.jar"
/>
<include
name="org/jboss/on/jopr-jboss-as-plugin/${project.version}/jopr-jboss-as-plugin-${project.version}.jar"
/>
<include
name="org/jboss/on/jopr-jboss-as-5-plugin/${project.version}/jopr-jboss-as-5-plugin-${project.version}.jar"
/>
+ <include
name="org/jboss/on/jopr-tomcat-plugin/${project.version}/jopr-tomcat-plugin-${project.version}.jar"
/>
<include
name="org/rhq/modcluster-plugin/${project.version}/modcluster-plugin-${project.version}.jar"
/>
</fileset>
<fileset dir="${rhq.deploymentDir}">
diff --git
a/modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModClusterPluginIntegrationTest.java
b/modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModClusterPluginIntegrationTest.java
index 625163b..44cf9f3 100644
---
a/modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModClusterPluginIntegrationTest.java
+++
b/modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModClusterPluginIntegrationTest.java
@@ -120,11 +120,28 @@ public class ModClusterPluginIntegrationTest {
} else if (resource.getResourceType().getName().equals("HA
Service")) {
testServiceMeasurement(resource);
testServiceMethodInvocation(resource);
+ testServiceSimpleMethodInvocation(resource);
+ } else if (resource.getResourceType().getName().equals("Catalina
Service")) {
+ testServiceSimpleMethodInvocation(resource);
}
}
}
}
+ private void testServiceSimpleMethodInvocation(Resource resource) throws
InterruptedException, Exception {
+ ResourceComponent resourceComponent =
PluginContainer.getInstance().getInventoryManager()
+ .getResourceComponent(resource);
+
+ Configuration config = new Configuration();
+ OperationResult result = ((OperationFacet)
resourceComponent).invokeOperation("enable", config);
+ log.info("Result of operation enable was: " +
result.getSimpleResult());
+ assert result.getSimpleResult().equals("true") : "The operation
execution failed!";
+
+ result = ((OperationFacet)
resourceComponent).invokeOperation("disable", config);
+ log.info("Result of operation disable was: " +
result.getSimpleResult());
+ assert result.getSimpleResult().equals("true") : "The operation
execution failed!";
+ }
+
private void testServiceMethodInvocation(Resource resource) throws
InterruptedException, Exception {
ResourceComponent resourceComponent =
PluginContainer.getInstance().getInventoryManager()
.getResourceComponent(resource);
@@ -133,7 +150,7 @@ public class ModClusterPluginIntegrationTest {
config.put(new PropertySimple("p1", "1"));
config.put(new PropertySimple("p2",
java.util.concurrent.TimeUnit.SECONDS));
OperationResult result = ((OperationFacet)
resourceComponent).invokeOperation("stop", config);
- log.info("Result of operation stopContext was: " +
result.getSimpleResult());
+ log.info("Result of operation stop was: " + result.getSimpleResult());
}
private void testLoadServiceConfiguration(Resource resource) throws Exception {
@@ -165,13 +182,14 @@ public class ModClusterPluginIntegrationTest {
.getResourceComponent(resource);
if (resourceComponent instanceof OperationFacet) {
- OperationResult result = null;
-
- result = ((OperationFacet)
resourceComponent).invokeOperation("reset", new Configuration());
- log.info("Result of operation test was: " + result);
+ for (String operationName : new String[] { "reset",
"refresh" }) {
+ OperationResult result = ((OperationFacet)
resourceComponent).invokeOperation(operationName,
+ new Configuration());
+ log.info("Result of operation " + operationName + " was:
" + result);
- result = ((OperationFacet)
resourceComponent).invokeOperation("refresh", new Configuration());
- log.info("Result of operation test was: " + result);
+ //need to wait for the reset to finish, this is a long operation
+ Thread.sleep(5000);
+ }
}
}
@@ -187,15 +205,18 @@ public class ModClusterPluginIntegrationTest {
Configuration config = new Configuration();
config.put(new PropertySimple("timeout", "1"));
config.put(new PropertySimple("unit",
java.util.concurrent.TimeUnit.SECONDS));
+
result = ((OperationFacet)
resourceComponent).invokeOperation("stopContext", config);
log.info("Result of operation stopContext was: " +
result.getSimpleResult());
+ assert result.getSimpleResult().equals("true") : "The
operation execution failed!";
result = ((OperationFacet)
resourceComponent).invokeOperation("enableContext", null);
log.info("Result of operation enableContext was: " +
result.getSimpleResult());
+ assert result.getSimpleResult().equals("true") : "The
operation execution failed!";
result = ((OperationFacet)
resourceComponent).invokeOperation("disableContext", null);
log.info("Result of operation disableContext was: " +
result.getSimpleResult());
-
+ assert result.getSimpleResult().equals("true") : "The
operation execution failed!";
} catch (Exception e) {
log.info("Operation failed. ", e);
}
@@ -204,7 +225,7 @@ public class ModClusterPluginIntegrationTest {
}
private Set<Resource> findResource(Resource parent) {
- Set<Resource> found = new HashSet<Resource>();
+ Set<Resource> foundResources = new HashSet<Resource>();
Queue<Resource> discoveryQueue = new LinkedList<Resource>();
discoveryQueue.add(parent);
@@ -214,7 +235,7 @@ public class ModClusterPluginIntegrationTest {
log.info("Discovered resource of type: " +
currentResource.getResourceType().getName());
if (currentResource.getResourceType().getPlugin().equals(PLUGIN_NAME)) {
- found.add(currentResource);
+ foundResources.add(currentResource);
}
if (currentResource.getChildResources() != null) {
@@ -224,6 +245,6 @@ public class ModClusterPluginIntegrationTest {
}
}
- return found;
+ return foundResources;
}
}
diff --git
a/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanComponent.java
b/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanComponent.java
index 2d0b55e..34a8841 100644
---
a/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanComponent.java
+++
b/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanComponent.java
@@ -33,7 +33,6 @@ import org.rhq.plugins.jmx.MBeanResourceComponent;
@SuppressWarnings({ "deprecation" })
public class ClassNameMBeanComponent extends
MBeanResourceComponent<JMXComponent<?>> {
private static final Log log = LogFactory.getLog(WebappContextComponent.class);
-
private static final String CLASS_NAME = "className";
@Override
diff --git
a/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextDiscoveryComponent.java
b/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextDiscoveryComponent.java
index faa9795..075633b 100644
---
a/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextDiscoveryComponent.java
+++
b/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextDiscoveryComponent.java
@@ -73,10 +73,17 @@ public class WebappContextDiscoveryComponent implements
ResourceDiscoveryCompone
*/
private String
getJvmRoute(ResourceDiscoveryContext<MBeanResourceComponent<?>> context) {
Configuration pluginConfig =
context.getParentResourceComponent().getResourceContext().getPluginConfiguration();
- String engineObjectName =
pluginConfig.getSimple(ENGINE_OBJECT_NAME).getStringValue();
- EmsBean engineBean = this.loadBean(engineObjectName,
context.getParentResourceComponent());
- return (String)
engineBean.getAttribute(JVM_ROUTE_PROPERTY).refresh().toString();
+ String[] engineObjectNames =
pluginConfig.getSimple(ENGINE_OBJECT_NAME).getStringValue().split("\\|");
+
+ for (String engineObjectName : engineObjectNames) {
+ EmsBean engineBean = this.loadBean(engineObjectName,
context.getParentResourceComponent());
+ if (engineBean != null) {
+ return engineBean.getAttribute(JVM_ROUTE_PROPERTY).refresh().toString();
+ }
+ }
+
+ return null;
}
/**
@@ -87,7 +94,7 @@ public class WebappContextDiscoveryComponent implements
ResourceDiscoveryCompone
* @param objectName the name of the bean to load
* @return the bean that is loaded
*/
- protected EmsBean loadBean(String objectName, MBeanResourceComponent context) {
+ protected EmsBean loadBean(String objectName, MBeanResourceComponent<?>
context) {
EmsConnection emsConnection = context.getEmsConnection();
EmsBean bean = emsConnection.getBean(objectName);
if (bean == null) {
diff --git a/modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml
b/modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml
index 536e747..35330f2 100644
--- a/modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml
@@ -13,11 +13,12 @@
<runs-inside>
<parent-resource-type name="JBossAS Server"
plugin="JBossAS" />
<parent-resource-type name="JBossAS Server"
plugin="JBossAS5" />
+ <parent-resource-type name="Tomcat Server"
plugin="Tomcat" />
</runs-inside>
<plugin-configuration>
<c:simple-property name="objectName" readOnly="true"
default="Catalina:type=ModClusterListener,*|jboss.web:service=ModCluster" />
- <c:simple-property name="engineObjectName"
readOnly="true" default="jboss.web:type=Engine" />
+ <c:simple-property name="engineObjectName"
readOnly="true" default="jboss.web:type=Engine|Catalina:type=Engine"
/>
<c:simple-property name="nameTemplate"
default="mod_cluster" />
<c:simple-property name="serverHomeDir"/>
</plugin-configuration>
commit 9ace270b8eabb2b5e8644f19dc6f9356d9cb3117
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Sep 27 16:17:44 2011 -0500
Format messy pom.xml file in preparation for more updates.
diff --git a/modules/integration-tests/mod_cluster-plugin-test/pom.xml
b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
index 32d5429..bae660c 100644
--- a/modules/integration-tests/mod_cluster-plugin-test/pom.xml
+++ b/modules/integration-tests/mod_cluster-plugin-test/pom.xml
@@ -14,47 +14,43 @@
<name>RHQ mod_cluster Plugin Integration Test</name>
<description>Integration tests for mod_cluster RHQ Agent
plugin</description>
-
+
<properties>
-
<scm.module.path>modules/integration-tests/mod_cluster-plugin-test</scm.module.path>
- <!-- jbossas.version>6.0.0.20100429-M3</jbossas.version-->
- <!-- jbossas.version>6.0.0.M1</jbossas.version-->
- <jbossas.version>6.0.0.Final</jbossas.version>
-
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
+
<scm.module.path>modules/integration-tests/mod_cluster-plugin-test</scm.module.path>
+ <!-- jbossas.version>6.0.0.20100429-M3</jbossas.version -->
+ <!-- jbossas.version>6.0.0.M1</jbossas.version -->
+ <jbossas.version>6.0.0.Final</jbossas.version>
+
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>${jbossas.version}</version>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>${jbossas.version}</version>
<type>pom</type>
<scope>import</scope>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-component-matrix</artifactId>
<version>${jbossas.version}</version>
<type>pom</type>
<scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.jboss.on</groupId>
<artifactId>jopr-jboss-as-5-plugin</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
- <!-- dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-profileservice-spi</artifactId>
- <scope>provided</scope>
- </dependency-->
+
+ <!-- dependency> <groupId>org.jboss.integration</groupId>
<artifactId>jboss-profileservice-spi</artifactId>
<scope>provided</scope> </dependency -->
<dependency>
<groupId>${rhq.groupId}</groupId>
@@ -62,7 +58,7 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>${rhq.groupId}</groupId>
<artifactId>modcluster-plugin</artifactId>
@@ -76,213 +72,181 @@
<version>1.2.14</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!--dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
- </dependency-->
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- <version>5.1.0.CR1</version>
- <classifier>jboss-aspect-jdk50-client</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jboss-security-spi</artifactId>
- <scope>test</scope>
- </dependency-->
-
- <!-- dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <scope>test</scope>
- </dependency-->
-
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <classifier>client</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <scope>test</scope>
- </dependency-->
-
- <!-- dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency-->
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- <version>5.1.0.CR1</version>
- <classifier>client</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-common</artifactId>
- <classifier>client</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
- <classifier>client</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <version>1.0.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-proxy-spi</artifactId>
- <classifier>client</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-proxy-impl</artifactId>
- <classifier>client</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-security</artifactId>
- <classifier>client</classifier>
- <scope>test</scope>
- </dependency>
-
- <!-- dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <scope>test</scope>
- </dependency-->
-
- <!-- dependency>
- <groupId>org.jboss.security</groupId>
- <artifactId>jbosssx-client</artifactId>
- <scope>test</scope>
- </dependency-->
-
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-security-aspects</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <classifier>client</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-profileservice</artifactId>
- <classifier>client</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <classifier>jmx-invoker-adaptor-client</classifier>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnp-client</artifactId>
+ <scope>test</scope>
+ </dependency>
- <!-- dependency>
- <groupId>jboss.messaging</groupId>
- <artifactId>jboss-messaging-client</artifactId>
- <scope>test</scope>
- </dependency-->
+ <!--dependency> <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId> <scope>test</scope>
</dependency -->
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>5.1.0.CR1</version>
+ <classifier>jboss-aspect-jdk50-client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- dependency> <groupId>org.jboss.security</groupId>
<artifactId>jboss-security-spi</artifactId> <scope>test</scope>
</dependency -->
+
+ <!-- dependency> <groupId>org.jboss.javaee</groupId>
<artifactId>jboss-javaee</artifactId> <scope>test</scope>
</dependency -->
+
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-jboss</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- dependency> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId> <scope>test</scope>
</dependency -->
+
+ <!-- dependency> <groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId> <scope>test</scope>
</dependency -->
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>5.1.0.CR1</version>
+ <classifier>client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-common</artifactId>
+ <classifier>client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ <classifier>client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ <version>1.0.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-proxy-spi</artifactId>
+ <classifier>client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-proxy-impl</artifactId>
+ <classifier>client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-security</artifactId>
+ <classifier>client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- dependency> <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId> <scope>test</scope>
</dependency -->
+
+ <!-- dependency> <groupId>org.jboss.security</groupId>
<artifactId>jbosssx-client</artifactId> <scope>test</scope>
</dependency -->
+
+ <dependency>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-security-aspects</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <classifier>client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-profileservice</artifactId>
+ <classifier>client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>jmx-invoker-adaptor-client</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- dependency> <groupId>jboss.messaging</groupId>
<artifactId>jboss-messaging-client</artifactId>
<scope>test</scope> </dependency -->
</dependencies>
@@ -316,7 +280,7 @@
<echo>Setting up plugin dependencies...</echo>
<property name="settings.localRepository"
location="${user.home}/.m2/repository" />
<mkdir dir="target/testsetup" />
-
+
<mkdir dir="target/testsetup/plugins" />
<copy toDir="target/testsetup/plugins"
flatten="true">
<fileset
dir="${settings.localRepository}/">
@@ -330,7 +294,7 @@
<include
name="${project.artifactId}-${project.version}.jar" />
</fileset>
</copy>
-
+
<mkdir dir="target/testsetup/lib" />
<unzip dest="target/testsetup/lib">
<fileset
dir="${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}"
includes="*.zip" />
@@ -355,10 +319,10 @@
<goal>run</goal>
</goals>
</execution>
- </executions>
+ </executions>
</plugin>
-
- <plugin>
+
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>