dev/null
|binary
modules/core/domain/pom.xml |
4
modules/enterprise/comm/pom.xml |
1
modules/enterprise/server/itests-2/pom.xml |
4
modules/enterprise/server/itests/pom.xml |
384 ----------
modules/enterprise/server/itests/src/test/resources/META-INF/ejb-jar.xml |
28
modules/enterprise/server/itests/src/test/resources/default.persistence.properties |
22
modules/enterprise/server/itests/src/test/resources/ejb3-interceptors-aop.xml |
360 ---------
modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml |
168 ----
modules/enterprise/server/itests/src/test/resources/jboss-jms-beans.xml |
132 ---
modules/enterprise/server/itests/src/test/resources/jndi.properties |
2
modules/enterprise/server/itests/src/test/resources/log4j.xml |
74 -
modules/enterprise/server/itests/src/test/resources/login-config.xml |
72 -
modules/enterprise/server/itests/src/test/resources/rhq-mdb-beans.xml |
25
modules/enterprise/server/itests/src/test/resources/security-beans.xml |
13
modules/enterprise/server/itests/src/test/resources/security.policy |
10
modules/enterprise/server/itests/src/test/resources/test-alert-sender-serverplugin.xml |
23
modules/enterprise/server/itests/src/test/resources/test-assist-color-number.txt |
46 -
modules/enterprise/server/itests/src/test/resources/test-ldap.properties |
2
modules/enterprise/server/itests/src/test/resources/test-scheduler.properties |
29
modules/enterprise/server/itests/src/test/resources/testng.xml |
12
modules/enterprise/server/jar/pom.xml |
3
modules/enterprise/server/plugins/alert-operations/pom.xml |
1
modules/helpers/rtfilter-subsystem/pom.xml |
2
modules/helpers/rtfilter/pom.xml |
2
modules/plugins/rhq-server/pom.xml |
2
pom.xml |
21
27 files changed, 23 insertions(+), 1419 deletions(-)
New commits:
commit 9c0be7ffa255126f90321417ac11fd74fa237a1f
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Sat Nov 24 15:42:48 2012 -0500
remove the obsolete enterprise/server/itests module
diff --git a/modules/enterprise/server/itests/pom.xml
b/modules/enterprise/server/itests/pom.xml
deleted file mode 100644
index c0585f8..0000000
--- a/modules/enterprise/server/itests/pom.xml
+++ /dev/null
@@ -1,384 +0,0 @@
-<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-parent</artifactId>
- <version>4.6.0-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>rhq-server-itests</artifactId>
-
- <name>RHQ Server Integration Tests</name>
- <description>RHQ enterprise server integration tests</description>
-
- <scm>
-
<
connection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/modules/ente...
-
<
developerConnection>scm:git:ssh://git.fedorahosted.org/git/rhq.git/mod...
- </scm>
-
- <properties>
- <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
- <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
- <!--
<jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
-->
- </properties>
-
- <dependencies>
- <!--================ Test Deps ================-->
-
- <!-- Note, the test deps are intentionally placed above the other scoped deps
because of classpath
- reasons. Maven orders the [test] classpath in the order listed in the pom.
We specifically
- need the embeddable-ejb3 jar above the standard ejb3 jars because we need the
embeddble packages
- loaded when testing. -->
-
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>${jboss.javaee6.spec.version}</version>
- <scope>provided</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-arquillian-container-managed</artifactId>
- <version>${jboss.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.testng</groupId>
- <artifactId>arquillian-testng-container</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
-<!--
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-container-lib</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- -->
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-core-client-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-script-bindings</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-scripting-javascript</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-server-client-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.rhq.helpers</groupId>
- <artifactId>perftest-support</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
-<!--
- <dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>jboss-ejb3-all</artifactId>
- <version>${jboss-embeddable-ejb3.version}</version>
- <scope>test</scope>
- </dependency>
- -->
-
- <!-- Shrinkwrap to build up test plugins etc. -->
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <!-- NOTE: The remaining test deps correspond to the classes contained in
hibernate-all.jar and thirdparty-all.jar. -->
-
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <scope>test</scope>
- </dependency>
-
- <!-- needed by embedded ejb container -->
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
- <!-- needed by embedded ejb container -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xercesImpl.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- 3rd Party Deps -->
-
- <!-- required by RHQ server classes, as well as EJB3 Embedded -->
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1-jboss</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS itself, which the
container build has packaged with 1.6.5 -->
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz-oracle</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
section. -->
- <scope>provided</scope> <!-- by JBossAS itself, which the
container build has packaged with 1.6.5 -->
- </dependency>
-
- <!-- This is needed cglib which is in turn needed by hibernate -->
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.18</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
-
- <!-- Dependencies for RHQ components needed for integration tests -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-serverplugin-drift</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-testng</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!-- in order to get JMS to work properly in embedded test container,
extract jms-rs.rar classes -->
- <execution>
- <id>Extract JMS classes from RAR needed for JMS tests</id>
- <phase>process-classes</phase>
- <configuration>
- <target>
- <unzip src="src/test/resources/jms-ra.rar"
dest="target">
- <patternset>
- <include name="jms-ra.jar"/>
- </patternset>
- </unzip>
- <unzip src="target/jms-ra.jar"
dest="target/test-classes">
- <patternset>
- <include name="org/**"/>
- </patternset>
- </unzip>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- Everything but the web service tests, this is the standard test
execution -->
- <configuration>
-
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
- <groups>${rhq.testng.includedGroups}</groups>
- <properties>
- <property>
- <name>listener</name>
- <value>org.rhq.test.testng.StdoutReporter</value>
- </property>
- </properties>
- <systemPropertyVariables>
- <embeddedDeployment>true</embeddedDeployment>
-
<deploymentDirectory>target/test-classes</deploymentDirectory>
-
<hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
- </systemPropertyVariables>
- <systemProperties>
- <property>
- <name>projectVersion</name>
- <value>${project.version}</value>
- </property>
- </systemProperties>
- <argLine>${jacoco.unit-test.args} -Djava.security.manager
-Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
- <additionalClasspathElements>
- <!-- The below is required for tests to run against Oracle.
-->
-
<additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
- </additionalClasspathElements>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/modules/enterprise/server/itests/src/test/resources/META-INF/ejb-jar.xml
b/modules/enterprise/server/itests/src/test/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 8222948..0000000
--- a/modules/enterprise/server/itests/src/test/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar
xmlns="http://java.sun.com/xml/ns/javaee"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- version="3.0">
-
- <description>RHQ</description>
- <display-name>RHQ</display-name>
-
- <assembly-descriptor>
-
- <!-- all our EJB3 SLSBs can define custom @RequiredPermissions annotations for
authorization checks-->
- <interceptor-binding>
- <ejb-name>*</ejb-name>
-
<interceptor-class>org.rhq.enterprise.server.authz.RequiredPermissionsInterceptor</interceptor-class>
- </interceptor-binding>
- <interceptor-binding>
- <ejb-name>*</ejb-name>
-
<interceptor-class>org.rhq.enterprise.server.common.TransactionInterruptInterceptor</interceptor-class>
- </interceptor-binding>
- <interceptor-binding>
- <ejb-name>*</ejb-name>
-
<interceptor-class>org.rhq.enterprise.server.common.PerformanceMonitorInterceptor</interceptor-class>
- </interceptor-binding>
-
- </assembly-descriptor>
-
-</ejb-jar>
diff --git a/modules/enterprise/server/itests/src/test/resources/binary-blob-sample.jar
b/modules/enterprise/server/itests/src/test/resources/binary-blob-sample.jar
deleted file mode 100644
index 0a629ec..0000000
Binary files a/modules/enterprise/server/itests/src/test/resources/binary-blob-sample.jar
and /dev/null differ
diff --git
a/modules/enterprise/server/itests/src/test/resources/default.persistence.properties
b/modules/enterprise/server/itests/src/test/resources/default.persistence.properties
deleted file mode 100644
index 8e4f317..0000000
--- a/modules/enterprise/server/itests/src/test/resources/default.persistence.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-#hibernate.connection.release_mode=after_statement
-#hibernate.transaction.flush_before_completion=false
-#hibernate.transaction.auto_close_session=false
-#hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
-#hibernate.hbm2ddl.auto=create-drop
-#hibernate.hbm2ddl.auto=create
-hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
-# Clustered cache with TreeCache
-#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
-#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
-#hibernate.dialect=org.hibernate.dialect.HSQLDialect
-hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-hibernate.bytecode.use_reflection_optimizer=false
-# I don't think this is honored, but EJB3Deployer uses it
-hibernate.bytecode.provider=javassist
-hibernate.jdbc.use_streams_for_binary=true
-hibernate.show_sql=false
-hibernate.format_sql=true
-hibernate.default_batch_fetch_size=16
-hibernate.jdbc.batch_size=20
diff --git a/modules/enterprise/server/itests/src/test/resources/ejb3-interceptors-aop.xml
b/modules/enterprise/server/itests/src/test/resources/ejb3-interceptors-aop.xml
deleted file mode 100644
index f30aa70..0000000
--- a/modules/enterprise/server/itests/src/test/resources/ejb3-interceptors-aop.xml
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
- "-//JBoss//DTD JBOSS AOP 1.0//EN"
- "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
- <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor"
scope="PER_VM"/>
- <interceptor class="org.jboss.aspects.security.SecurityClientInterceptor"
scope="PER_VM"/>
- <interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor"
scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.remoting.IsLocalInterceptor"
scope="PER_VM"/>
- <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor"
scope="PER_VM"/>
-
- <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor"
scope="PER_VM"/>
-
- <stack name="ServiceClientInterceptors">
- <interceptor-ref
name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="AsynchronousStatelessSessionClientInterceptors">
- <interceptor-ref
name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="AsynchronousStatefulSessionClientInterceptors">
- <interceptor-ref
name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="StatelessSessionClientInterceptors">
- <interceptor-ref
name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="StatefulSessionClientInterceptors">
- <interceptor-ref
name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="ClusteredStatelessSessionClientInterceptors">
- <interceptor-ref
name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <stack name="ClusteredStatefulSessionClientInterceptors">
- <interceptor-ref
name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.security.SecurityClientInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
- </stack>
-
- <interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"
scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.ENCPropagationInterceptor"
scope="PER_VM"/>
- <interceptor name="Basic Authorization"
factory="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory"
scope="PER_CLASS"/>
- <interceptor name="JACC Authorization"
factory="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory"
scope="PER_CLASS"/>
- <interceptor
factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory"
scope="PER_CLASS"/>
- <interceptor
factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"
scope="PER_CLASS"/>
- <interceptor
class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"
scope="PER_VM"/>
- <interceptor
class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"
scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"
scope="PER_VM"/>
- <interceptor
class="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"
scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.service.ServiceSingletonInterceptor"
scope="PER_VM"/>
- <interceptor class="org.jboss.ejb3.cache.StatefulReplicationInterceptor"
scope="PER_VM"/>
- <interceptor factory="org.jboss.ejb3.stateful.StatefulRemoveFactory"
scope="PER_CLASS_JOINPOINT"/>
- <interceptor factory="org.jboss.ejb3.tx.TxInterceptorFactory"
scope="PER_CLASS_JOINPOINT"/>
- <interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"
scope="PER_CLASS_JOINPOINT"/>
- <interceptor
factory="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"
scope="PER_CLASS"/>
- <interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor"
scope="PER_VM"/>
- <interceptor
factory="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"
scope="PER_CLASS"/>
- <interceptor
class="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"
scope="PER_VM"/>
-
- <domain name="Stateless Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public *
@org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public *
@javax.annotation.security.RunAs->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public *
@org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref
name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class((a)org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class,
maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="JACC Stateless Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public *
@org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="JACC Authorization"/>
- </bind>
- <bind pointcut="execution(public *
@javax.annotation.security.RunAs->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public *
@org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref
name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class((a)org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class,
maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Base Stateful Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public *
@org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public *
@javax.annotation.security.RunAs->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public *
@org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
- <interceptor-ref
name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref
name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- </bind>
- <bind pointcut="execution(public *
$instanceof{javax.ejb.SessionSynchronization}->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
-
- <bind pointcut="execution(public *
@org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public *
*->@javax.ejb.Remove(..))">
- <interceptor-ref
name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
- </bind>
- <annotation expr="!class((a)org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class,
maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Stateful Bean" extends="Base Stateful Bean"
inheritBindings="true">
- <!-- NON Clustered cache configuration -->
- <annotation expr="!class((a)org.jboss.annotation.ejb.cache.Cache) AND
!class((a)org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache
(org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
- </annotation>
- <annotation
expr="!class((a)org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND
!class((a)org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager
(org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
- </annotation>
- <annotation
expr="!class((a)org.jboss.annotation.ejb.cache.simple.CacheConfig) AND
!class((a)org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000,
idleTimeoutSeconds=300)
- </annotation>
-
- <!-- Clustered cache configuration -->
- <annotation expr="!class((a)org.jboss.annotation.ejb.cache.Cache) AND
class((a)org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache
(org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
- </annotation>
- <annotation expr="!class((a)org.jboss.annotation.ejb.cache.tree.CacheConfig)
AND class((a)org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig
(name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000,
idleTimeoutSeconds=300)
- </annotation>
- </domain>
-
- <domain name="JACC Stateful Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public *
@org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="JACC Authorization"/>
- </bind>
- <bind pointcut="execution(public *
@javax.annotation.security.RunAs->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public *
@org.jboss.annotation.ejb.Clustered->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
- <interceptor-ref
name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
- <interceptor-ref
name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref
name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- </bind>
- <bind pointcut="execution(public *
$instanceof{javax.ejb.SessionSynchronization}->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
-
- <bind pointcut="execution(public *
@org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public *
*->@javax.ejb.Remove(..))">
- <interceptor-ref
name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
- </bind>
- <annotation expr="!class((a)org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class,
maxSize=30, timeout=10000)
- </annotation>
-
- <!-- NON Clustered cache configuration -->
- <annotation expr="!class((a)org.jboss.annotation.ejb.cache.Cache) AND
!class((a)org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache
(org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
- </annotation>
- <annotation
expr="!class((a)org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND
!class((a)org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.PersistenceManager
(org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
- </annotation>
- <annotation
expr="!class((a)org.jboss.annotation.ejb.cache.simple.CacheConfig) AND
!class((a)org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000,
idleTimeoutSeconds=300)
- </annotation>
-
- <!-- Clustered cache configuration -->
- <annotation expr="!class((a)org.jboss.annotation.ejb.cache.Cache) AND
class((a)org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache
(org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
- </annotation>
- <annotation expr="!class((a)org.jboss.annotation.ejb.cache.tree.CacheConfig)
AND class((a)org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig
(name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000,
idleTimeoutSeconds=300)
- </annotation>
- </domain>
-
- <domain name="Embedded Stateful Bean" extends="Base Stateful
Bean" inheritBindings="true">
- <!-- NON Clustered cache configuration -->
- <annotation expr="!class((a)org.jboss.annotation.ejb.cache.Cache)">
- @org.jboss.annotation.ejb.cache.Cache
(org.jboss.ejb3.cache.NoPassivationCache.class)
- </annotation>
-
- </domain>
-
- <domain name="Message Driven Bean">
- <bind pointcut="execution(public *
@javax.annotation.security.RunAs->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref
name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class((a)org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class,
maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Consumer Bean">
- <bind pointcut="execution(public *
@javax.annotation.security.RunAs->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref
name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..)) AND (has(*
*->@org.jboss.annotation.ejb.CurrentMessage(..)) OR hasfield(*
*->(a)org.jboss.annotation.ejb.CurrentMessage))">
- <interceptor-ref
name="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- <annotation expr="!class((a)org.jboss.annotation.ejb.PoolClass)">
- @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class,
maxSize=30, timeout=10000)
- </annotation>
- </domain>
-
- <domain name="Service Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- </bind>
- <bind pointcut="!execution(* *->create()) AND !execution(*
*->start()) AND !execution(*->new(..))">
- <interceptor-ref
name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public *
@org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public *
@javax.annotation.security.RunAs->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref
name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..)) AND !execution(*
*->create()) AND !execution(* *->start())">
- <interceptor-ref
name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- </domain>
-
- <domain name="JACC Service Bean">
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.ENCPropagationInterceptor"/>
- </bind>
- <bind pointcut="!execution(* *->create()) AND !execution(*
*->start()) AND !execution(*->new(..))">
- <interceptor-ref
name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public *
@org.jboss.annotation.security.SecurityDomain->*(..))">
- <interceptor-ref name="Basic Authorization"/>
- </bind>
- <bind pointcut="execution(public *
@javax.annotation.security.RunAs->*(..))">
- <interceptor-ref
name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
- </bind>
- <bind pointcut="execution(public * *->*(..))">
- <interceptor-ref
name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
- <interceptor-ref
name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
- <interceptor-ref
name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
- </bind>
- <bind pointcut="execution(public * *->*(..)) AND !execution(*
*->create()) AND !execution(* *->start())">
- <interceptor-ref
name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
- </bind>
- </domain>
-
-
-</aop>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml
b/modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml
deleted file mode 100644
index 85e2fb3..0000000
--- a/modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer:2.0
bean-deployer_2_0.xsd"
- xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- This installs a custom initial context factory builder into the JVM
- that will ensure that all the default InitialContexts are going to check
- for the permission to access the RHQ internals. -->
- <bean
class="org.rhq.jndi.mbean.AccessCheckingInitialContextFactoryBuilderInstaller"
- name="AccessCheckingInitialContextFactoryBuilderInstaller">
- </bean>
-
-
- <bean name="Naming"
class="org.jnp.server.SingletonNamingServer"/>
-
- <bean name="InitialContextProperties"
class="java.util.Hashtable">
- <constructor>
- <parameter class="java.util.Map">
- <map keyClass="java.lang.String"
valueClass="java.lang.String">
- <entry>
- <key>java.naming.factory.initial</key>
- <value>org.jnp.interfaces.LocalOnlyContextFactory</value>
- </entry>
- <entry>
- <key>java.naming.factory.url.pkgs</key>
- <value>org.jboss.naming:org.jnp.interfaces</value>
- </entry>
- </map>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="java:comp/Initializer"
class="org.jboss.ejb3.embedded.JavaCompInitializer">
- <property name="jndiProperties">
- <inject bean="InitialContextProperties"/>
- </property>
- </bean>
-
- <bean name="XidFactory"
class="org.jboss.tm.XidFactoryImpl"/>
-
- <bean name="XidFactoryMBean"
class="org.jboss.ejb3.embedded.XidFactoryMBean">
- <constructor>
- <parameter class="org.jboss.tm.XidFactoryBase">
- <inject bean="XidFactory"/>
- </parameter>
- </constructor>
- </bean>
-
- <bean name="TransactionManagerInitializer"
class="org.jboss.tm.TransactionManagerInitializer">
- <property name="xidFactory">
- <inject bean="XidFactory"/>
- </property>
- <property name="initialContextProperties">
- <inject bean="InitialContextProperties"/>
- </property>
- </bean>
-
- <bean name="UserTransaction"
class="org.jboss.ejb3.embedded.UserTransactionImpl">
- <demand>TransactionManagerInitializer</demand>
- </bean>
-
- <bean name="UserTransactionBinding"
class="org.jboss.ejb3.embedded.JndiBinder">
- <property name="jndiProperties">
- <inject bean="InitialContextProperties"/>
- </property>
- <property name="target">
- <inject bean="UserTransaction"/>
- </property>
- <property name="bindTo">UserTransaction</property>
- <property name="serializable">false</property>
- </bean>
-
-
- <bean name="TransactionManager" class="java.lang.Object">
- <constructor factoryMethod="getTransactionManager">
- <factory bean="TransactionManagerInitializer"/>
- </constructor>
- </bean>
- <bean name="CachedConnectionManager"
class="org.jboss.resource.connectionmanager.CachedConnectionManagerReference">
- <property name="transactionManager">
- <inject bean="TransactionManager"/>
- </property>
- </bean>
-
- <bean name="RHQDSBootstrap"
class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
- <property
name="driverClass">${rhq.test.ds.driver-class}</property>
- <property
name="connectionURL">${rhq.test.ds.connection-url}</property>
- <property
name="userName">${rhq.test.ds.user-name}</property>
- <property name="password">${rhq.test.ds.password}</property>
- <property name="jndiName">java:/RHQDS</property>
- <property name="minSize">0</property>
- <property name="maxSize">20</property>
- <property name="blockingTimeout">3000</property>
- <property name="idleTimeout">100000</property>
- <property name="transactionManager">
- <inject bean="TransactionManager"/>
- </property>
- <property name="cachedConnectionManager">
- <inject bean="CachedConnectionManager"/>
- </property>
- <property name="initialContextProperties">
- <inject bean="InitialContextProperties"/>
- </property>
- </bean>
-
- <bean name="RHQDS" class="java.lang.Object">
- <constructor factoryMethod="getDatasource">
- <factory bean="RHQDSBootstrap"/>
- </constructor>
- </bean>
-
- <!-- needed for Quartz' no-TX data source (even though this is a local-tx,
seems like Quartz is still working) -->
- <bean name="NoTxRHQDSBootstrap"
class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
- <property
name="driverClass">${rhq.test.ds.driver-class}</property>
- <property
name="connectionURL">${rhq.test.ds.connection-url}</property>
- <property
name="userName">${rhq.test.ds.user-name}</property>
- <property name="password">${rhq.test.ds.password}</property>
- <property name="jndiName">java:/NoTxRHQDS</property>
- <property name="minSize">0</property>
- <property name="maxSize">10</property>
- <property name="blockingTimeout">1000</property>
- <property name="idleTimeout">100000</property>
- <property name="transactionManager">
- <inject bean="TransactionManager"/>
- </property>
- <property name="cachedConnectionManager">
- <inject bean="CachedConnectionManager"/>
- </property>
- <property name="initialContextProperties">
- <inject bean="InitialContextProperties"/>
- </property>
- </bean>
-
- <bean name="NoTxRHQDS" class="java.lang.Object">
- <constructor factoryMethod="getDatasource">
- <factory bean="NoTxRHQDSBootstrap"/>
- </constructor>
- </bean>
-
- <bean name="DefaultDSBootstrap"
class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
- <property
name="driverClass">org.hsqldb.jdbcDriver</property>
- <property name="connectionURL">jdbc:hsqldb:.</property>
- <!-- <property
name="connectionURL">jdbc:hsqldb:./hypersonic/localDB</property>
-->
- <property name="userName">sa</property>
- <property name="jndiName">java:/DefaultDS</property>
- <property name="minSize">0</property>
- <property name="maxSize">10</property>
- <property name="blockingTimeout">1000</property>
- <property name="idleTimeout">100000</property>
- <property name="transactionManager">
- <inject bean="TransactionManager"/>
- </property>
- <property name="cachedConnectionManager">
- <inject bean="CachedConnectionManager"/>
- </property>
- <property name="initialContextProperties">
- <inject bean="InitialContextProperties"/>
- </property>
- </bean>
-
- <bean name="DefaultDS" class="java.lang.Object">
- <constructor factoryMethod="getDatasource">
- <factory bean="DefaultDSBootstrap"/>
- </constructor>
- </bean>
-
-</deployment>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests/src/test/resources/jboss-jms-beans.xml
b/modules/enterprise/server/itests/src/test/resources/jboss-jms-beans.xml
deleted file mode 100644
index 287cffc..0000000
--- a/modules/enterprise/server/itests/src/test/resources/jboss-jms-beans.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer:2.0
bean-deployer_2_0.xsd"
- xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="jboss.mq:service=JMSProviderLoader,name=JMSProvider"
class="org.jboss.jms.jndi.JNDIProviderAdapter">
- <property name="factoryRef">java:/JmsXA</property>
- <property name="queueFactoryRef">java:/JmsXA</property>
- <property name="topicFactoryRef">java:/JmsXA</property>
- <property name="properties"
class="java.util.Properties">
- <map keyClass="java.lang.String"
valueClass="java.lang.String">
- <entry>
- <key>java.naming.factory.initial</key>
-
<value>org.jnp.interfaces.LocalOnlyContextFactory</value>
- </entry>
- <entry>
- <key>java.naming.factory.url.pkgs</key>
- <value>org.jboss.naming:org.jnp.interfaces</value>
- </entry>
- </map>
- </property>
- </bean>
-
- <bean name="b1" class="org.jboss.ejb3.embedded.JndiBinder">
- <property name="jndiProperties"><inject
bean="InitialContextProperties"/></property>
- <property name="target"><inject
bean="jboss.mq:service=JMSProviderLoader,name=JMSProvider"/></property>
- <property name="bindTo">java:/DefaultJMSProvider</property>
- <property name="serializable">true</property>
- </bean>
-
- <bean name="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool"
class="org.jboss.jms.asf.StdServerSessionPoolFactory">
- <property name="name">StdJMSPool</property>
- <property name="xidFactory"><inject
bean="XidFactoryMBean"/></property>
- <property name="transactionManager"><inject
bean="TransactionManager"/></property>
- </bean>
-
- <bean name="b2" class="org.jboss.ejb3.embedded.JndiBinder">
- <property name="jndiProperties"><inject
bean="InitialContextProperties"/></property>
- <property name="target"><inject
bean="jboss.mq:service=ServerSessionPoolMBean,name=StdJMSPool"/></property>
- <property name="bindTo">java:/StdJMSPool</property>
- <property name="serializable">false</property>
- </bean>
-
-
- <bean name="jboss.mq:service=PersistenceManager"
class="org.jboss.mq.pm.none.PersistenceManager">
- </bean>
-
- <bean name="jboss.mq:service=MessageCache"
class="org.jboss.mq.kernel.MessageCache">
- <property name="persistenceManager"><inject
bean="jboss.mq:service=PersistenceManager"/></property>
- <property name="highMemoryMark">50</property>
- <property name="maxMemoryMark">60</property>
- </bean>
-
- <bean name="jms-rar-WorkManager"
class="org.jboss.ejb3.embedded.resource.JBossWorkManager">
- </bean>
-
- <bean name="jms-rar-DeploymentInfo"
class="org.jboss.ejb3.embedded.resource.Ejb3DeploymentInfo">
- <constructor>
- <parameter
class="java.lang.String">jms-ra.rar</parameter>
- <parameter
class="java.lang.String">javax.jms.MessageListener</parameter>
- <parameter
class="java.lang.String">org.jboss.resource.adapter.jms.inflow.JmsActivationSpec</parameter>
- </constructor>
- </bean>
-
- <bean name="jboss.jca:name='jms-ra.rar',service=RARDeployment"
class="org.jboss.ejb3.embedded.resource.RARDeployment">
- <constructor>
- <parameter class="org.jboss.deployment.DeploymentInfo">
- <inject bean="jms-rar-DeploymentInfo"/>
- </parameter>
- </constructor>
- <property name="workManager"><inject
bean="jms-rar-WorkManager"/></property>
- </bean>
-
- <bean name="jboss.mq:service=StateManager"
class="org.jboss.mq.sm.none.NullStateManager">
- </bean>
-
- <bean name="BasicQueueParameters"
class="org.jboss.mq.server.BasicQueueParameters"/>
-
- <bean name="jboss.mq:service=ThreadPool"
class="org.jboss.util.threadpool.BasicThreadPool">
- <property name="name">JMSThread</property>
- <property name="threadGroupName">JBossMQ Server
Threads</property>
- <!-- The max number of threads in the pool -->
- <property name="maximumPoolSize">10</property>
- <!-- The max number of tasks before the queue is full -->
- <property name="maximumQueueSize">1000</property>
- <!-- The behavior of the pool when a task is added and the queue is full.
- abort - a RuntimeException is thrown
- run - the calling thread executes the task
- wait - the calling thread blocks until the queue has room
- discard - the task is silently discarded without being run
- discardOldest - check to see if a task is about to complete and enque
- the new task if possible, else run the task in the calling thread
- -->
- <property name="blockingMode">run</property>
- </bean>
-
- <bean name="jboss.mq:service=DestinationManager"
class="org.jboss.mq.server.JMSDestinationManager">
- <constructor>
- <parameter class="org.jboss.mq.server.BasicQueueParameters">
- <inject bean="BasicQueueParameters"/>
- </parameter>
- </constructor>
- <property name="persistenceManager"><inject
bean="jboss.mq:service=PersistenceManager"/></property>
- <property name="messageCache"><inject
bean="jboss.mq:service=MessageCache"/></property>
- <property name="stateManager"><inject
bean="jboss.mq:service=StateManager"/></property>
- <property name="threadPool"><inject
bean="jboss.mq:service=ThreadPool"/></property>
- <property name="threadGroup"><inject
bean="jboss.mq:service=ThreadPool"
property="threadGroup"/></property>
- <start method="startServer"/>
- <stop method="stopServer"/>
- </bean>
-
- <bean name="jboss.mq.destination:service=Queue,name=DLQ"
class="org.jboss.mq.kernel.Queue">
- <property name="destinationManagerPojo"><inject
bean="jboss.mq:service=DestinationManager"/></property>
- <property name="initialContextProperties"><inject
bean="InitialContextProperties"/></property>
- <property name="destinationName">DLQ</property>
- </bean>
-
- <bean name="jboss.mq:service=Invoker"
class="org.jboss.mq.server.JMSServerInvoker">
- <property name="next"><inject
bean="jboss.mq:service=DestinationManager"/></property>
- </bean>
-
- <bean name="jboss.mq:service=invocationlayer,type=JVM"
class="org.jboss.mq.kernel.JVMIL">
- <property name="jmsInvoker"><inject
bean="jboss.mq:service=Invoker"/></property>
- <!-- notice we actually switched - the non-xa connection factory JNDI Ref is the
JNDI name our EJBs use -->
- <!-- the embedded EJB container doesn't support XA, so the connection factory
our JmsXA JNDI lookup will return will be a non-XA factory -->
- <property
name="connectionFactoryJNDIRef">java:/JmsXA</property>
- <property
name="XAConnectionFactoryJNDIRef">java:/ConnectionFactory</property>
- <property name="pingPeriod">0</property>
- <property name="initialContextProperties"><inject
bean="InitialContextProperties"/></property>
- </bean>
-
-</deployment>
diff --git a/modules/enterprise/server/itests/src/test/resources/jms-ra.rar
b/modules/enterprise/server/itests/src/test/resources/jms-ra.rar
deleted file mode 100644
index c4807c6..0000000
Binary files a/modules/enterprise/server/itests/src/test/resources/jms-ra.rar and
/dev/null differ
diff --git a/modules/enterprise/server/itests/src/test/resources/jndi.properties
b/modules/enterprise/server/itests/src/test/resources/jndi.properties
deleted file mode 100644
index 9225cef..0000000
--- a/modules/enterprise/server/itests/src/test/resources/jndi.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.LocalOnlyContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
diff --git a/modules/enterprise/server/itests/src/test/resources/log4j.xml
b/modules/enterprise/server/itests/src/test/resources/log4j.xml
deleted file mode 100644
index ca0936f..0000000
--- a/modules/enterprise/server/itests/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml 39945 2006-01-12 02:44:07Z bill $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite:
http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration
xmlns:log4j="http://jakarta.apache.org/log4j/"
debug="true">
-
- <appender name="CONSOLE"
class="org.apache.log4j.ConsoleAppender">
- <!-- <errorHandler
class="org.jboss.logging.util.OnlyOnceErrorHandler"/> -->
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="WARN"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Messagen -->
- <!--
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p
[%c{1}] %m%n"/>
- -->
- <param name="ConversionPattern" value="%-5p %d{dd-MM
HH:mm:ss,SSS} [%c] (%F:%M:%L) -%m%n"/>
- </layout>
- </appender>
-
- <appender name="FILE"
class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="target/server-jar-test.log"/>
- <param name="Threshold" value="WARN"/>
- <param name="Append" value="false"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Messagen -->
- <!--
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p
[%c{1}] %m%n"/>
- -->
- <param name="ConversionPattern" value="%-5p %d{dd-MM
HH:mm:ss,SSS} [%c] (%F:%M:%L) -%m%n"/>
- </layout>
- </appender>
-
- <!-- Hibernate logs WARNINGS frequent from this class, in test envs. -->
- <category name="org.hibernate.hql.ast.QueryTranslatorImpl">
- <priority value="ERROR"/>
- </category>
-
- <!-- hides the TIMER SERVICE IS NOT INSTALLED warning - we know embedded EJB3
container doesn't support timers -->
- <category
name="org.jboss.ejb3.timerservice.jboss.JBossTimerServiceFactory">
- <priority value="ERROR"/>
- </category>
-
- <!-- hides the shutdown warnings - for some reason, the container spits out some
warnings when shutting down -->
- <category
name="org.jboss.kernel.plugins.dependency.StartStopLifecycleAction">
- <priority value="ERROR"/>
- </category>
-
- <!-- Hibernate SQL logs -->
- <!--
- <category name="org.hibernate.SQL">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
diff --git a/modules/enterprise/server/itests/src/test/resources/login-config.xml
b/modules/enterprise/server/itests/src/test/resources/login-config.xml
deleted file mode 100644
index 645294d..0000000
--- a/modules/enterprise/server/itests/src/test/resources/login-config.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE policy PUBLIC
- "-//JBoss//DTD JBOSS Security Config 3.0//EN"
- "http://www.jboss.org/j2ee/dtd/security_config.dtd">
-
-<!-- The XML based JAAS login configuration read by the
-org.jboss.security.auth.login.XMLLoginConfig mbean. Add
-an application-policy element for each security domain.
-
-The outline of the application-policy is:
-<application-policy name="security-domain-name">
- <authentication>
- <login-module code="login.module1.class.name"
flag="control_flag">
- <module-option name =
"option1-name">option1-value</module-option>
- <module-option name =
"option2-name">option2-value</module-option>
- ...
- </login-module>
-
- <login-module code="login.module2.class.name"
flag="control_flag">
- ...
- </login-module>
- ...
- </authentication>
-</application-policy>
-
-$Revision: 42748 $
--->
-
-<policy>
- <!-- Used by clients within the application server VM such as
- mbeans and servlets that access EJBs.
- -->
- <application-policy name="client-login">
- <authentication>
- <login-module code="org.jboss.security.ClientLoginModule"
- flag="required">
- <!-- Any existing security context will be restored on logout -->
- <module-option
name="restore-login-identity">true</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <application-policy name = "jbossmq">
- <authentication>
- <login-module code = "org.jboss.mq.sm.file.DynamicLoginModule"
flag = "required">
- <module-option name =
"unauthenticatedIdentity">guest</module-option>
- <module-option name =
"sm.objectname">jboss.mq:service=StateManager</module-option>
- </login-module>
- </authentication>
- </application-policy>
-
- <application-policy name="other">
- <!-- A simple server login module, which can be used when the number
- of users is relatively small. It uses two properties files:
- users.properties, which holds users (key) and their password (value).
- roles.properties, which holds users (key) and a comma-separated list of
- their roles (value).
- The unauthenticatedIdentity property defines the name of the principal
- that will be used when a null username and password are presented as is
- the case for an unuathenticated web client or MDB. If you want to
- allow such users to be authenticated add the property, e.g.,
- unauthenticatedIdentity="nobody"
- -->
- <authentication>
- <login-module
code="org.jboss.security.auth.spi.UsersRolesLoginModule"
- flag="required"/>
- </authentication>
- </application-policy>
-
-</policy>
-
diff --git a/modules/enterprise/server/itests/src/test/resources/rhq-mdb-beans.xml
b/modules/enterprise/server/itests/src/test/resources/rhq-mdb-beans.xml
deleted file mode 100644
index ad05b5e..0000000
--- a/modules/enterprise/server/itests/src/test/resources/rhq-mdb-beans.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer:2.0
bean-deployer_2_0.xsd"
- xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="jboss.mq.destination:service=Queue,name=AlertConditionQueue"
class="org.jboss.mq.kernel.Queue">
- <property name="destinationManagerPojo"><inject
bean="jboss.mq:service=DestinationManager"/></property>
- <property name="initialContextProperties"><inject
bean="InitialContextProperties"/></property>
- <property
name="destinationName">AlertConditionQueue</property>
- </bean>
-
- <bean name="jboss.mq.destination:service=Queue,name=DriftChangesetQueue"
class="org.jboss.mq.kernel.Queue">
- <property name="destinationManagerPojo"><inject
bean="jboss.mq:service=DestinationManager"/></property>
- <property name="initialContextProperties"><inject
bean="InitialContextProperties"/></property>
- <property
name="destinationName">DriftChangesetQueue</property>
- </bean>
-
- <bean name="jboss.mq.destination:service=Queue,name=DriftFileQueue"
class="org.jboss.mq.kernel.Queue">
- <property name="destinationManagerPojo"><inject
bean="jboss.mq:service=DestinationManager"/></property>
- <property name="initialContextProperties"><inject
bean="InitialContextProperties"/></property>
- <property name="destinationName">DriftFileQueue</property>
- </bean>
-
-</deployment>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests/src/test/resources/security-beans.xml
b/modules/enterprise/server/itests/src/test/resources/security-beans.xml
deleted file mode 100644
index 84fa819..0000000
--- a/modules/enterprise/server/itests/src/test/resources/security-beans.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
- xmlns="urn:jboss:bean-deployer">
-
- <bean class="org.jboss.ejb3.embedded.JaasSecurityManagerService"
- name="jboss.security:service=JaasSecurityManager">
- <property name="initialContextProperties">
- <inject bean="InitialContextProperties"/>
- </property>
- </bean>
-</deployment>
diff --git a/modules/enterprise/server/itests/src/test/resources/security.policy
b/modules/enterprise/server/itests/src/test/resources/security.policy
deleted file mode 100644
index 8860b47..0000000
--- a/modules/enterprise/server/itests/src/test/resources/security.policy
+++ /dev/null
@@ -1,10 +0,0 @@
-// We need the SecurityManager installed to enable sandboxing of CLI scripts
-// but we don't define any other security measures on the RHQ server itself.
-//
-// Granting all permissions allows us to run the RHQ server as if no security
-// manager was in place (which is assumed by default by JBoss AS) but be able
-// to use it when we need it for our own purposes.
-
-grant {
- permission java.security.AllPermission;
-};
diff --git
a/modules/enterprise/server/itests/src/test/resources/test-alert-sender-serverplugin.xml
b/modules/enterprise/server/itests/src/test/resources/test-alert-sender-serverplugin.xml
deleted file mode 100644
index f6bf879..0000000
---
a/modules/enterprise/server/itests/src/test/resources/test-alert-sender-serverplugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<alert-plugin
- name="alert-complex-test"
- displayName="Alert:ComplexTest"
- xmlns="urn:xmlns:rhq-serverplugin.alert"
- xmlns:c="urn:xmlns:rhq-configuration"
- xmlns:serverplugin="urn:xmlns:rhq-serverplugin"
- package="org.rhq.enterprise.server.alert"
- description="Alert sender plugin for testing the complex validation
behavior."
- >
-
- <!-- How does this sender show up in drop downs etc -->
- <short-name>Test Alert Sender</short-name>
-
- <!-- Class that does the actual sending -->
- <plugin-class>TestAlertSender</plugin-class>
-
- <alert-configuration>
- <c:simple-property name="persistent" type="string"
required="true" description="The property that is persisted into the
database."/>
- <c:simple-property name="ephemeral" type="string"
required="true" description="The property used only at creation/update
time. It is not stored into the datbase because the plugin actually removes it from the
configuration." />
- </alert-configuration>
-</alert-plugin>
\ No newline at end of file
diff --git
a/modules/enterprise/server/itests/src/test/resources/test-assist-color-number.txt
b/modules/enterprise/server/itests/src/test/resources/test-assist-color-number.txt
deleted file mode 100644
index 6ad90cc..0000000
--- a/modules/enterprise/server/itests/src/test/resources/test-assist-color-number.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-
-color[ number
-c
-color[
-n
-number
-r
-color[ number
-lo
-color[
-number
-number!= number!== number= number==
-be
-number
-number==
-number=="two" number=="four" number=="twenty-two"
number=="twenty-four" number=="forty-two"
-number==t
-number=="two" number=="twenty-two" number=="twenty-four"
number=="forty-two"
-number==fo
-number=="four" number=="twenty-four" number=="forty-two"
-color
-color[
-color[
-color[primary] color[other]
-color[p
-color[primary]
-color[o
-color[other]
-color[r
-color[primary] color[other]
-color[primary
-color[primary]
-color[primary]
-color[primary]!= color[primary]!== color[primary]= color[primary]==
-color[primary]=
-color[primary]="red" color[primary]="green"
color[primary]="blue"
-color[primary]=e
-color[primary]="red" color[primary]="green"
color[primary]="blue"
-color[primary]=d
-color[primary]="red"
-color[primary]=g
-color[primary]="green"
-color[primary]=b
-color[primary]="blue"
-color[primary]=r
-color[primary]="red" color[primary]="green"
\ No newline at end of file
diff --git a/modules/enterprise/server/itests/src/test/resources/test-ldap.properties
b/modules/enterprise/server/itests/src/test/resources/test-ldap.properties
deleted file mode 100644
index 3316083..0000000
--- a/modules/enterprise/server/itests/src/test/resources/test-ldap.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-rhq.test.ldap.url=${rhq.test.ldap.url}
-rhq.test.ldap.LDAPFactory=${rhq.test.ldap.LDAPFactory}
\ No newline at end of file
diff --git a/modules/enterprise/server/itests/src/test/resources/test-scheduler.properties
b/modules/enterprise/server/itests/src/test/resources/test-scheduler.properties
deleted file mode 100644
index 804639a..0000000
--- a/modules/enterprise/server/itests/src/test/resources/test-scheduler.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-# QUARTZ CONFIGURATION FOR OUR UNIT TESTS
-# our test timeout will be fast, 5 seconds
-rhq.server.operation-timeout = 5
-
-# scheduler factory config
-org.quartz.scheduler.instanceName = RHQScheduler
-org.quartz.scheduler.instanceId = AUTO
-
-# thread pool config
-org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount = 25
-org.quartz.threadPool.threadPriority = 5
-
-# database config - note the use of POSTGRES for tests
-org.quartz.jobStore.class =
org.quartz.impl.jdbcjobstore.JobStoreCMT
-org.quartz.jobStore.driverDelegateClass =
org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-# tests don't need this
-org.quartz.jobStore.isClustered = false
-org.quartz.jobStore.clusterCheckinInterval = 600000
-# make this a small non-zero time (in ms) so the scheduler (almost) never sleeps for more
predictable test timing
-org.quartz.scheduler.idleWaitTime = 10
-org.quartz.jobStore.tablePrefix = RHQ_QRTZ_
-org.quartz.jobStore.useProperties = true
-org.quartz.jobStore.dataSource = RHQDS
-org.quartz.dataSource.RHQDS.jndiURL = java:/RHQDS
-org.quartz.dataSource.RHQDS.maxConnections = 10
-org.quartz.jobStore.nonManagedTXDataSource = NoTxRHQDS
-org.quartz.dataSource.NoTxRHQDS.jndiURL = java:/NoTxRHQDS
-org.quartz.dataSource.NoTxRHQDS.maxConnections = 10
\ No newline at end of file
diff --git a/modules/enterprise/server/itests/src/test/resources/testng.xml
b/modules/enterprise/server/itests/src/test/resources/testng.xml
deleted file mode 100644
index 1452edb..0000000
--- a/modules/enterprise/server/itests/src/test/resources/testng.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-
-<suite name="EJB3 Testsuite" >
- <test name="EJB3 tests" >
- <groups>
- <run>
- <include name="integration.ejb3"/>
- </run>
- </groups>
-
- </test>
-</suite>
commit c5877685b4c127ea7db125bcbb77e141bb78b7b0
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Sat Nov 24 15:42:11 2012 -0500
Fix various pom warnings that maven was complaining about
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index ed128ff..eb56bfb 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -157,6 +157,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.6</version>
</plugin>
</plugins>
</reporting>
diff --git a/modules/enterprise/server/jar/pom.xml
b/modules/enterprise/server/jar/pom.xml
index 4421b61..dae3778 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -135,7 +135,7 @@
<groupId>org.rhq</groupId>
<artifactId>test-utils</artifactId>
<version>${project.version}</version>
- <scope>test-compile</scope>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.testng</groupId>
@@ -1134,6 +1134,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
+ <version>${clirr.version}</version>
<configuration>
<includes>
<include>**/*Remote</include>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml
b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 492149c..8566724 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -55,7 +55,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
- <version>1.0-beta-3</version>
<executions>
<execution>
<!-- translate the tokens.xml file to confluence markup
-->
diff --git a/modules/helpers/rtfilter-subsystem/pom.xml
b/modules/helpers/rtfilter-subsystem/pom.xml
index b037aed..d08c7c6 100644
--- a/modules/helpers/rtfilter-subsystem/pom.xml
+++ b/modules/helpers/rtfilter-subsystem/pom.xml
@@ -20,7 +20,7 @@
<properties>
<version.jboss.as>7.1.1.Final</version.jboss.as>
<version.junit>4.8.2</version.junit>
- <moduleName>${groupId}.${artifactId}</moduleName>
+ <moduleName>${project.groupId}.${project.artifactId}</moduleName>
</properties>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index fa76ec6..466208f 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -17,7 +17,7 @@
<description>a servlet filter that logs response times for HTTP requests to JEE
web applications</description>
<properties>
- <moduleName>${groupId}.${artifactId}</moduleName>
+ <moduleName>${project.groupId}.${project.artifactId}</moduleName>
</properties>
<dependencies>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 744c3ed..0599f90 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -8,7 +8,7 @@
<version>4.6.0-SNAPSHOT</version>
</parent>
- <groupId>${rhq.groupId}</groupId>
+ <groupId>org.rhq</groupId>
<artifactId>rhq-rhqserver-plugin</artifactId>
<packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index 0e29f7e..2d9ee76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -800,7 +800,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.1</version>
- </plugin>
+ </plugin>
<!-- === Codehaus Mojo Plugins === -->
<plugin>
@@ -835,6 +835,17 @@
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>${animal.sniffer.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>${clirr.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+
<plugin>
<groupId>com.googlecode.maven-overview-plugin</groupId>
<artifactId>maven-overview-plugin</artifactId>
@@ -857,17 +868,11 @@
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>clirr-maven-plugin</artifactId>
- <version>${clirr.version}</version>
- </plugin>
-
- <plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${jacoco.version}</version>
</plugin>
- </plugins>
+ </plugins>
</pluginManagement>
commit 4e8d80763973c00178e1ba600e0a33a60023c720
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Sat Nov 24 15:40:41 2012 -0500
Replace hardcoded DS creads with our standard datasource
property values.
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 2fcd357..71fbdbe 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -273,8 +273,8 @@
<security-domain name="RHQDSSecurityDomain"
cache-type="default">
<authentication>
<login-module code="SecureIdentity"
flag="required">
- <module-option name="username"
value="rhqadmin"/>
- <module-option name="password"
value="1eeb2f255e832171df8592078de921bc"/>
+ <module-option name="username"
value="${rhq.test.ds.user-name}"/>
+ <module-option name="password"
value="${rhq.test.ds.password}"/>
</login-module>
</authentication>
</security-domain>
diff --git a/modules/enterprise/server/itests-2/pom.xml
b/modules/enterprise/server/itests-2/pom.xml
index 7c1e91c..a86cfd3 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -251,8 +251,8 @@
<security-domain name="RHQDSSecurityDomain"
cache-type="default">
<authentication>
<login-module code="SecureIdentity"
flag="required">
- <module-option name="username"
value="rhqadmin"/>
- <module-option name="password"
value="1eeb2f255e832171df8592078de921bc"/>
+ <module-option name="username"
value="${rhq.test.ds.user-name}"/>
+ <module-option name="password"
value="${rhq.test.ds.password}"/>
</login-module>
</authentication>
</security-domain>