[jboss-cvs] JBossAS SVN: r102438 - in trunk: build and 22 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 15 21:19:58 EDT 2010
Author: smcgowan at redhat.com
Date: 2010-03-15 21:19:57 -0400 (Mon, 15 Mar 2010)
New Revision: 102438
Modified:
trunk/aspects/build.xml
trunk/aspects/pom.xml
trunk/build/build-web.xml
trunk/build/build.xml
trunk/build/pom.xml
trunk/client/pom.xml
trunk/cluster/pom.xml
trunk/component-matrix/pom.xml
trunk/connector/pom.xml
trunk/console/pom.xml
trunk/deployment/pom.xml
trunk/ejb3/pom.xml
trunk/ejb3/src/main/java/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java
trunk/hibernate-int/pom.xml
trunk/iiop/pom.xml
trunk/messaging/pom.xml
trunk/profileservice/pom.xml
trunk/security/pom.xml
trunk/server/pom.xml
trunk/server/src/main/java/org/jboss/ejb/EnterpriseContext.java
trunk/server/src/main/java/org/jboss/ejb/EntityEnterpriseContext.java
trunk/server/src/main/java/org/jboss/ejb/MessageDrivenEnterpriseContext.java
trunk/server/src/main/java/org/jboss/ejb/StatefulSessionEnterpriseContext.java
trunk/server/src/main/java/org/jboss/ejb/StatelessSessionEnterpriseContext.java
trunk/server/src/main/java/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java
trunk/server/src/main/java/org/jboss/ejb/txtimer/TimerImpl.java
trunk/server/src/main/java/org/jboss/ejb/txtimer/TimerServiceImpl.java
trunk/testsuite/build.xml
trunk/testsuite/imports/config/tests-clustering.xml
trunk/testsuite/imports/sections/web.xml
trunk/tomcat/pom.xml
trunk/varia/pom.xml
trunk/webservices/pom.xml
Log:
JBAS-7558 - update to use new Java EE API releases
Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/aspects/build.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -91,7 +91,6 @@
<path refid="jboss.common.logging.spi.classpath"/>
<path refid="jboss.common.logging.log4j.classpath"/>
<path refid="jboss.common.logging.jdk.classpath"/>
- <path refid="jboss.jboss.javaee.classpath"/>
<path refid="org.jboss.aspects.classpath"/>
<path refid="sun.jaxb.classpath"/>
</path>
Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/aspects/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -61,10 +61,34 @@
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-security-aspects</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-transaction-aspects</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
@@ -126,6 +150,16 @@
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.test</groupId>
@@ -148,6 +182,14 @@
<artifactId>jboss-vfs</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </dependency>
<!-- Required by the jboss-aop-jboss5-deployer jar. -->
<dependency>
<groupId>org.jboss.aop</groupId>
Modified: trunk/build/build-web.xml
===================================================================
--- trunk/build/build-web.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/build/build-web.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -129,7 +129,7 @@
<exclude name="common/lib/jboss-ejb3-security.jar" />
<exclude name="common/lib/jboss-ejb3-timerservice-spi.jar" />
<exclude name="common/lib/jboss-ejb3-transactions.jar" />
- <exclude name="common/lib/jboss-ejb-api_3.1.jar" />
+ <exclude name="common/lib/jboss-ejb-api_3.1_spec.jar" />
<exclude name="common/lib/jboss-ha-client.jar" />
<exclude name="common/lib/jbossha.jar" />
<exclude name="common/lib/jboss-ha-server-api.jar" />
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/build/build.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -1950,8 +1950,19 @@
<fileset refid="org.jboss.metadata:jboss-metadata-ejb:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-rar:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-war:jar"/>
- <fileset refid="org.jboss.javaee:jboss-jaspi-api:jar"/>
- <fileset refid="org.jboss.javaee:jboss-javaee:jar"/>
+ <fileset refid="org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
<fileset refid="org.jboss.naming:jnpserver:jar"/>
<fileset refid="jboss.jbossts:jbossjts:jar"/>
<fileset refid="jboss.jbossts:jbossjts-integration:jar"/>
@@ -1959,7 +1970,6 @@
<fileset refid="org.jboss.marshalling:jboss-marshalling:jar"/>
<fileset refid="org.jboss.marshalling:jboss-marshalling-river:jar"/>
<fileset refid="jboss:jboss-serialization:jar"/>
- <fileset refid="org.jboss.javaee:jboss-ejb-api_3.1:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-cache:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-common:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/>
@@ -1994,7 +2004,6 @@
<fileset refid="org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar"/>
<fileset refid="org.hibernate:hibernate-validator:jar"/>
<fileset refid="org.hibernate:hibernate-validator-legacy:jar"/>
- <fileset refid="org.jboss.interceptor:jboss-interceptor-api:jar"/>
<fileset refid="org.jboss.jpa:jboss-jpa-deployers:jar"/>
<fileset refid="org.jboss.jpa:jboss-jpa-vfs3:jar"/>
<fileset refid="org.jboss.jpa:jboss-jpa-impl:jar"/>
@@ -2013,9 +2022,9 @@
<fileset refid="joesnmp:joesnmp:jar"/>
<fileset refid="wutka-dtdparser:dtdparser:jar"/>
<fileset refid="apache-bsf:bsf:jar"/>
- <fileset refid="jboss.web:el-api:jar"/>
- <fileset refid="jboss.web:jsp-api:jar"/>
- <fileset refid="jboss.web:servlet-api:jar"/>
+ <fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
<fileset refid="org.jboss.weld:weld-api:jar"/>
<mapper refid="remove-versions" />
</copy>
@@ -2131,7 +2140,6 @@
<fileset refid="javax.enterprise:cdi-api:jar"/>
<fileset refid="javax.inject:javax.inject:jar"/>
<fileset refid="org.jboss:jboss-common-core:jar"/>
- <fileset refid="org.jboss.interceptor:jboss-interceptor-api:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
@@ -2140,11 +2148,22 @@
<fileset refid="org.jboss.slf4j:slf4j-jboss-logging:jar"/>
<fileset refid="org.jboss.integration:jboss-integration:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-ext-api:jar"/>
- <fileset refid="org.jboss.javaee:jboss-jaspi-api:jar"/>
- <fileset refid="org.jboss.javaee:jboss-javaee:jar"/>
<fileset refid="org.jboss.security:jboss-security-spi:jar"/>
<fileset refid="org.jboss.naming:jnp-client:jar"/>
<fileset refid="org.jboss.security:jbosssx-client:jar"/>
+ <fileset refid="org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
<fileset refid="org.jboss.mx:jboss-j2se:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx:jar"/>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/build/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -84,12 +84,40 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<classifier>client</classifier>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -266,6 +294,12 @@
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
@@ -327,8 +361,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>el-api</artifactId>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -421,10 +455,16 @@
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-pojo</artifactId>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api_3.1</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -432,6 +472,20 @@
<artifactId>jboss-ejb3-common</artifactId>
<classifier>client</classifier>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
@@ -471,18 +525,77 @@
<artifactId>jboss-ejb3-security</artifactId>
<classifier>client</classifier>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor-api</artifactId>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
<optional>true</optional>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.enterprise.deploy</groupId>
+ <artifactId>jboss-jad-api_1.2_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.5_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.auth.message</groupId>
+ <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.registry</groupId>
+ <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
<type>sar</type>
Modified: trunk/client/pom.xml
===================================================================
--- trunk/client/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/client/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -90,12 +90,64 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-common</artifactId>
<classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
<classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -120,6 +172,12 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-security</artifactId>
<classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -150,9 +208,59 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.enterprise.deploy</groupId>
+ <artifactId>jboss-jad-api_1.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.5_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.auth.message</groupId>
+ <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.registry</groupId>
+ <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: trunk/cluster/pom.xml
===================================================================
--- trunk/cluster/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/cluster/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -179,6 +179,12 @@
<dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-server-cache-jbc</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/component-matrix/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -35,7 +35,6 @@
<version.commons.beanutils>1.8.0</version.commons.beanutils>
<version.fastinfoset>1.2.2</version.fastinfoset>
<version.inject.api>1</version.inject.api>
- <version.interceptor.api>1.1</version.interceptor.api>
<version.jacorb>2.3.1jboss.patch01-brew</version.jacorb>
<version.javassist>3.11.0.GA</version.javassist>
<version.javax.faces>2.0.2-FCS</version.javax.faces>
@@ -138,7 +137,7 @@
<version.spring.integration>1.0.0.CR2</version.spring.integration>
<version.staxex>2.1.1</version.staxex>
<version.streambuffer>1.0</version.streambuffer>
- <version.suffix.org.jboss.javaee>.GA</version.suffix.org.jboss.javaee>
+ <version.org.jboss.spec.javaee>1.0.0.Beta1</version.org.jboss.spec.javaee>
<version.sun.jaxb>2.2</version.sun.jaxb>
<version.sun-jaxws>2.2</version.sun-jaxws>
<version.sun-policy>2.0-b01</version.sun-policy>
@@ -407,12 +406,6 @@
</dependency>
<dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${version.javax.validation}</version>
- </dependency>
-
- <dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6.1</version>
@@ -485,24 +478,6 @@
</dependency>
<dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${version.javax.faces}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${version.sun.jaxb}</version>
- </dependency>
-
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.sun.jaxb}</version>
@@ -901,30 +876,6 @@
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${version.jaxws.api}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-factories</artifactId>
<version>${version.jboss.jbossws}</version>
@@ -978,30 +929,6 @@
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
- <version>${version.jaxrpc.api}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <version>${version.saaj.api}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-resources</artifactId>
<version>${version.jboss.jbossws}</version>
@@ -1105,35 +1032,219 @@
<dependency>
<groupId>jboss.web</groupId>
- <artifactId>el-api</artifactId>
+ <artifactId>jasper-jdt</artifactId>
<version>${version.jboss.web}</version>
</dependency>
<dependency>
<groupId>jboss.web</groupId>
- <artifactId>jasper-jdt</artifactId>
+ <artifactId>jbossweb</artifactId>
<version>${version.jboss.web}</version>
</dependency>
+
+ <!-- JBoss EE API Dependencies -->
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>jbossweb</artifactId>
- <version>${version.jboss.web}</version>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
</dependency>
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${version.jboss.web}</version>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.enterprise.deploy</groupId>
+ <artifactId>jboss-jad-api_1.2_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.5_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.auth.message</groupId>
+ <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
+ </dependency>
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${version.jboss.web}</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>1.0.0.Beta2</version>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.registry</groupId>
+ <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${version.weld.api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ <version>${version.weld.api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${version.inject.api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${version.javax.faces}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${version.jsr181.api}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>${version.org.hibernate.javax.persistence}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${version.sun.jaxb}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${version.javax.validation}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ <version>${version.jaxrpc.api}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>${version.saaj.api}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${version.jaxws.api}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- END OF Java EE API Dependencies -->
+
+ <dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
<version>${version.jgroups}</version>
@@ -1322,12 +1433,6 @@
</dependency>
<dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <version>${version.org.hibernate.javax.persistence}</version>
- </dependency>
-
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${version.org.hibernate.validator}</version>
@@ -1859,12 +1964,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api_3.1</artifactId>
- <version>${version.org.jboss.ejb.api}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-common</artifactId>
<version>${version.org.jboss.ejb3.common.client}</version>
@@ -2210,84 +2309,12 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <version>5.2.0.Beta1</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- <version>3.0.0${version.suffix.org.jboss.javaee}_SP1</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
- <version>${version.org.jboss.ejb3.ext.api}</version>
+ <version>${version.org.jboss.ejb3.ext.api}</version>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
- <version>1.1.0${version.suffix.org.jboss.javaee}_SP1</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jad-api</artifactId>
- <version>1.2.0${version.suffix.org.jboss.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
- <version>1.0.0${version.suffix.org.jboss.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- <version>1.5.0${version.suffix.org.jboss.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- <version>1.1.0${version.suffix.org.jboss.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- <version>1.0.1${version.suffix.org.jboss.javaee}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor-api</artifactId>
- <version>${version.interceptor.api}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${version.weld.api}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- <version>${version.weld.api}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${version.inject.api}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.jpa</groupId>
<artifactId>jboss-jpa-deployers</artifactId>
<version>${version.org.jboss.jpa.deployers}</version>
@@ -2650,12 +2677,6 @@
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
<groupId>sun-fi</groupId>
<artifactId>FastInfoset</artifactId>
<version>${version.fastinfoset}</version>
@@ -2668,18 +2689,6 @@
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.2</version>
- </dependency>
-
- <dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<version>${version.sun-jaxws}</version>
@@ -2932,7 +2941,24 @@
<exclude>org.jboss.microcontainer:jboss-jmx-aop-mc-int</exclude>
<exclude>org.jboss.microcontainer:jboss-jmx-mc-int</exclude>
<exclude>org.jboss.microcontainer:jboss-kernel</exclude>
- <exclude>org.jboss.microcontainer:jboss-spring-int</exclude>
+ <exclude>org.jboss.microcontainer:jboss-spring-int</exclude>
+ <!-- JBAS-7558 Exclude older jboss-javaee artifacts -->
+ <exclude>org.jboss.javaee:jboss-javaee</exclude>
+ <exclude>org.jboss.javaee:jboss-ejb-api</exclude>
+ <exclude>org.jboss.javaee:jboss-ejb-api_3.1</exclude>
+ <exclude>org.jboss.javaee:jboss-jacc-api</exclude>
+ <exclude>org.jboss.javaee:jboss-jad-api</exclude>
+ <exclude>org.jboss.javaee:jboss-jaspi-api</exclude>
+ <exclude>org.jboss.javaee:jboss-jca-api</exclude>
+ <exclude>org.jboss.javaee:jboss-jms-api</exclude>
+ <exclude>org.jboss.javaee:servlet-api</exclude>
+ <exclude>org.jboss.javaee:jsp-api</exclude>
+ <exclude>org.jboss.javaee:jboss-transaction-api</exclude>
+ <exclude>org.jboss.interceptor:jboss-interceptor-api</exclude>
+ <exclude>jboss.web:el-api</exclude>
+ <exclude>jboss.web:jsp-api</exclude>
+ <exclude>jboss.web:servlet-api</exclude>
+ <!-- <exclude>jboss.web:servlet-api</exclude> -->
</excludes>
</bannedDependencies>
</rules>
Modified: trunk/connector/pom.xml
===================================================================
--- trunk/connector/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/connector/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -175,16 +175,16 @@
<artifactId>jboss-integration</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.5_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -213,6 +213,16 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/console/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -108,8 +108,8 @@
<!-- Not a dependency of twiddle but needed to make the thirdparty library
built pass?! jboss.web:jsp-api:jar is not defined, otherwise -->
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
</dependency>
</dependencies>
Modified: trunk/deployment/pom.xml
===================================================================
--- trunk/deployment/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/deployment/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -83,8 +83,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jad-api</artifactId>
+ <groupId>org.jboss.spec.javax.enterprise.deploy</groupId>
+ <artifactId>jboss-jad-api_1.2_spec</artifactId>
</dependency>
<dependency>
@@ -121,6 +121,16 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
@@ -133,6 +143,20 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-ejb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
@@ -141,11 +165,27 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-war</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -160,23 +200,23 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.5_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
</dependency>
<dependency>
Modified: trunk/ejb3/pom.xml
===================================================================
--- trunk/ejb3/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/ejb3/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -237,17 +237,29 @@
<artifactId>jbosscache-core</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
+ <exclusion>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -256,13 +268,77 @@
<artifactId>jboss-ejb3-core</artifactId>
<classifier>client</classifier>
<exclusions>
- <exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-core</artifactId>
+ <version>${version.org.jboss.ejb3.core.client}</version>
+ <exclusions>
+ <exclusion>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.jboss.ejb3.vfs</groupId>
<artifactId>jboss-ejb3-vfs-spi</artifactId>
@@ -276,22 +352,40 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3.timeout</groupId>
<artifactId>jboss-ejb3-timeout-3.1</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
</dependency>
<dependency>
@@ -353,6 +447,12 @@
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-corba-ots-spi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: trunk/ejb3/src/main/java/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/ejb3/src/main/java/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java 2010-03-16 01:19:57 UTC (rev 102438)
@@ -31,7 +31,9 @@
import javax.ejb.EJBException;
import javax.ejb.Timer;
+import javax.ejb.TimerConfig;
import javax.ejb.TimerService;
+import javax.ejb.ScheduleExpression;
import javax.management.ObjectName;
import org.jboss.ejb.AllowedOperationsAssociation;
@@ -59,6 +61,18 @@
AllowedOperationsAssociation.assertAllowedIn(timerMethod, IN_BUSINESS_METHOD | IN_EJB_TIMEOUT | IN_SERVICE_ENDPOINT_METHOD);
}
+ public Timer createSingleActionTimer(Date expiration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createSingleActionTimer");
+ return delegate.createSingleActionTimer(expiration, timerConfig);
+ }
+
+ public Timer createSingleActionTimer(long duration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createSingleActionTimer");
+ return delegate.createSingleActionTimer(duration, timerConfig);
+ }
+
public Timer createTimer(Date initialExpiration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
{
assertAllowedIn("TimerService.createTimer");
@@ -77,12 +91,42 @@
return delegate.createTimer(initialDuration, intervalDuration, info);
}
+ public Timer createIntervalTimer(Date initialDuration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createIntervalTimer");
+ return delegate.createIntervalTimer(initialDuration, intervalDuration, timerConfig);
+ }
+
+ public Timer createIntervalTimer(long initialDuration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createIntervalTimer");
+ return delegate.createIntervalTimer(initialDuration, intervalDuration, timerConfig);
+ }
+
public Timer createTimer(long duration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
{
assertAllowedIn("TimerService.createTimer");
return delegate.createTimer(duration, info);
- }
+ }
+ public Timer createCalendarTimer(ScheduleExpression schedule) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return delegate.createCalendarTimer(schedule);
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return delegate.createCalendarTimer(schedule, info);
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return delegate.createCalendarTimer(schedule, timerConfig);
+ }
+
// protected EJBContainer getContainer()
// {
// return (EJBContainer) container;
Modified: trunk/hibernate-int/pom.xml
===================================================================
--- trunk/hibernate-int/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/hibernate-int/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -108,6 +108,16 @@
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: trunk/iiop/pom.xml
===================================================================
--- trunk/iiop/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/iiop/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -149,6 +149,12 @@
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-corba-ots-spi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -159,12 +165,20 @@
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
@@ -233,8 +247,12 @@
<exclusions>
<exclusion>
<groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
+ <artifactId>jboss-ejb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -248,14 +266,40 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-ejb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-rar</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-war</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: trunk/messaging/pom.xml
===================================================================
--- trunk/messaging/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/messaging/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -68,6 +68,16 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
@@ -76,6 +86,20 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-ejb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
@@ -88,6 +112,12 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-war</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jboss.messaging</groupId>
@@ -104,8 +134,8 @@
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
Modified: trunk/profileservice/pom.xml
===================================================================
--- trunk/profileservice/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/profileservice/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -91,6 +91,22 @@
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -184,12 +200,58 @@
<artifactId>stax-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.auth.message</groupId>
+ <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-ext-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: trunk/security/pom.xml
===================================================================
--- trunk/security/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/security/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -125,13 +125,13 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
</dependency>
<dependency>
@@ -145,8 +145,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
+ <groupId>org.jboss.spec.javax.security.auth.message</groupId>
+ <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
</dependency>
<dependency>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/server/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -311,6 +311,16 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
@@ -323,6 +333,20 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-ejb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
@@ -331,6 +355,12 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-war</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -349,16 +379,22 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor-api</artifactId>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ </dependency>
+
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -377,16 +413,26 @@
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
</dependency>
<dependency>
@@ -405,8 +451,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.5_spec</artifactId>
</dependency>
<dependency>
Modified: trunk/server/src/main/java/org/jboss/ejb/EnterpriseContext.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/EnterpriseContext.java 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/server/src/main/java/org/jboss/ejb/EnterpriseContext.java 2010-03-16 01:19:57 UTC (rev 102438)
@@ -29,6 +29,7 @@
import java.util.Properties;
import java.util.Set;
import java.util.Stack;
+import java.util.Map;
import javax.ejb.EJBContext;
import javax.ejb.EJBException;
@@ -565,8 +566,15 @@
return userTransaction;
}
- }
+ public Map<String, Object> getContextData()
+ {
+ // TODO: implement
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ }
+
// Inner classes -------------------------------------------------
protected class UserTransactionImpl
Modified: trunk/server/src/main/java/org/jboss/ejb/EntityEnterpriseContext.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/EntityEnterpriseContext.java 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/server/src/main/java/org/jboss/ejb/EntityEnterpriseContext.java 2010-03-16 01:19:57 UTC (rev 102438)
@@ -35,7 +35,9 @@
import javax.ejb.EJBObject;
import javax.ejb.EntityBean;
import javax.ejb.EntityContext;
+import javax.ejb.ScheduleExpression;
import javax.ejb.Timer;
+import javax.ejb.TimerConfig;
import javax.ejb.TimerService;
import javax.transaction.UserTransaction;
@@ -407,6 +409,18 @@
this.timerService = timerService;
}
+ public Timer createSingleActionTimer(long duration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createSingleActionTimer");
+ return timerService.createSingleActionTimer(duration, timerConfig);
+ }
+
+ public Timer createSingleActionTimer(Date expiration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createSingleActionTimer");
+ return timerService.createSingleActionTimer(expiration, timerConfig);
+ }
+
public Timer createTimer(long duration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
{
assertAllowedIn("TimerService.createTimer");
@@ -419,6 +433,12 @@
return timerService.createTimer(initialDuration, intervalDuration, info);
}
+ public Timer createIntervalTimer(long initialDuration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createIntervalTimer");
+ return timerService.createIntervalTimer(initialDuration, intervalDuration, timerConfig);
+ }
+
public Timer createTimer(Date expiration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
{
assertAllowedIn("TimerService.createTimer");
@@ -431,6 +451,30 @@
return timerService.createTimer(initialExpiration, intervalDuration, info);
}
+ public Timer createIntervalTimer(Date initialExpiration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createIntervalTimer");
+ return timerService.createIntervalTimer(initialExpiration, intervalDuration, timerConfig);
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return timerService.createCalendarTimer(schedule);
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return timerService.createCalendarTimer(schedule, info);
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return timerService.createCalendarTimer(schedule, timerConfig);
+ }
+
public Collection getTimers() throws IllegalStateException, EJBException
{
assertAllowedIn("TimerService.getTimers");
@@ -444,4 +488,4 @@
IN_BUSINESS_METHOD | IN_EJB_TIMEOUT);
}
}
-}
\ No newline at end of file
+}
Modified: trunk/server/src/main/java/org/jboss/ejb/MessageDrivenEnterpriseContext.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/MessageDrivenEnterpriseContext.java 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/server/src/main/java/org/jboss/ejb/MessageDrivenEnterpriseContext.java 2010-03-16 01:19:57 UTC (rev 102438)
@@ -35,7 +35,9 @@
import javax.ejb.MessageDrivenBean;
import javax.ejb.MessageDrivenContext;
import javax.ejb.Timer;
+import javax.ejb.TimerConfig;
import javax.ejb.TimerService;
+import javax.ejb.ScheduleExpression;
import javax.transaction.UserTransaction;
import org.jboss.metadata.MessageDrivenMetaData;
@@ -249,6 +251,18 @@
this.timerService = timerService;
}
+ public Timer createSingleActionTimer(long duration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createSingleActionTimer");
+ return timerService.createSingleActionTimer(duration, timerConfig);
+ }
+
+ public Timer createSingleActionTimer(Date expiration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createSingleActionTimer");
+ return timerService.createSingleActionTimer(expiration, timerConfig);
+ }
+
public Timer createTimer(long duration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
{
assertAllowedIn("TimerService.createTimer");
@@ -261,18 +275,48 @@
return timerService.createTimer(initialDuration, intervalDuration, info);
}
+ public Timer createIntervalTimer(long initialDuration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createIntervalTimer");
+ return timerService.createIntervalTimer(initialDuration, intervalDuration, timerConfig);
+ }
+
public Timer createTimer(Date expiration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
{
assertAllowedIn("TimerService.createTimer");
return timerService.createTimer(expiration, info);
}
+ public Timer createIntervalTimer(Date initialExpiration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createIntervalTimer");
+ return timerService.createIntervalTimer(initialExpiration, intervalDuration, timerConfig);
+ }
+
public Timer createTimer(Date initialExpiration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
{
assertAllowedIn("TimerService.createTimer");
return timerService.createTimer(initialExpiration, intervalDuration, info);
}
+ public Timer createCalendarTimer(ScheduleExpression schedule) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return timerService.createCalendarTimer(schedule);
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return timerService.createCalendarTimer(schedule, info);
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return timerService.createCalendarTimer(schedule, timerConfig);
+ }
+
public Collection getTimers() throws IllegalStateException, EJBException
{
assertAllowedIn("TimerService.getTimers");
@@ -285,4 +329,4 @@
IN_BUSINESS_METHOD | IN_EJB_TIMEOUT);
}
}
-}
\ No newline at end of file
+}
Modified: trunk/server/src/main/java/org/jboss/ejb/StatefulSessionEnterpriseContext.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/StatefulSessionEnterpriseContext.java 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/server/src/main/java/org/jboss/ejb/StatefulSessionEnterpriseContext.java 2010-03-16 01:19:57 UTC (rev 102438)
@@ -279,5 +279,11 @@
{
return id;
}
+
+ public boolean wasCancelCalled()
+ {
+ throw new UnsupportedOperationException("NOT IMPLEMENTED");
+ }
+
}
}
Modified: trunk/server/src/main/java/org/jboss/ejb/StatelessSessionEnterpriseContext.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/StatelessSessionEnterpriseContext.java 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/server/src/main/java/org/jboss/ejb/StatelessSessionEnterpriseContext.java 2010-03-16 01:19:57 UTC (rev 102438)
@@ -299,6 +299,11 @@
};
}
+ public boolean wasCancelCalled()
+ {
+ throw new UnsupportedOperationException("NOT IMPLEMENTED");
+ }
+
private void checkUserTransactionMethods()
{
AllowedOperationsAssociation.assertAllowedIn("UserTransaction methods",
@@ -328,6 +333,18 @@
this.timerService = timerService;
}
+ public Timer createSingleActionTimer(long duration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createSingleActionTimer");
+ return timerService.createSingleActionTimer(duration, timerConfig);
+ }
+
+ public Timer createSingleActionTimer(Date expiration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createSingleActionTimer");
+ return timerService.createSingleActionTimer(expiration, timerConfig);
+ }
+
public Timer createTimer(long duration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
{
assertAllowedIn("TimerService.createTimer");
@@ -340,6 +357,12 @@
return timerService.createTimer(initialDuration, intervalDuration, info);
}
+ public Timer createIntervalTimer(long initialDuration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createIntervalTimer");
+ return timerService.createIntervalTimer(initialDuration, intervalDuration, timerConfig);
+ }
+
public Timer createTimer(Date expiration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
{
assertAllowedIn("TimerService.createTimer");
@@ -352,6 +375,30 @@
return timerService.createTimer(initialExpiration, intervalDuration, info);
}
+ public Timer createIntervalTimer(Date initialExpiration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createIntervalTimer");
+ return timerService.createIntervalTimer(initialExpiration, intervalDuration, timerConfig);
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return timerService.createCalendarTimer(schedule);
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return timerService.createCalendarTimer(schedule, info);
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ assertAllowedIn("TimerService.createCalendarTimer");
+ return timerService.createCalendarTimer(schedule, timerConfig);
+ }
+
public Collection getTimers() throws IllegalStateException, EJBException
{
assertAllowedIn("TimerService.getTimers");
@@ -364,4 +411,4 @@
IN_BUSINESS_METHOD | IN_EJB_TIMEOUT | IN_SERVICE_ENDPOINT_METHOD);
}
}
-}
\ No newline at end of file
+}
Modified: trunk/server/src/main/java/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/server/src/main/java/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java 2010-03-16 01:19:57 UTC (rev 102438)
@@ -35,6 +35,8 @@
import javax.ejb.TimerService;
import javax.ejb.Timer;
+import javax.ejb.TimerConfig;
+import javax.ejb.ScheduleExpression;
import javax.ejb.EJBException;
import javax.management.ObjectName;
import javax.transaction.TransactionManager;
@@ -74,12 +76,25 @@
throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
}
+ public Timer createSingleActionTimer(long duration, TimerConfig timerConfig) throws IllegalArgumentException,
+ IllegalStateException,
+ EJBException
+ {
+ throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
+ }
+
public Timer createTimer(long initialDuration, long intervalDuration, Serializable info)
throws IllegalArgumentException, IllegalStateException, EJBException
{
throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
}
+ public Timer createIntervalTimer(long initialDuration, long intervalDuration, TimerConfig timerConfig)
+ throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
+ }
+
public Timer createTimer(Date expiration, Serializable info) throws IllegalArgumentException,
IllegalStateException,
EJBException
@@ -87,12 +102,47 @@
throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
}
+ public Timer createSingleActionTimer(Date expiration, TimerConfig timerConfig) throws IllegalArgumentException,
+ IllegalStateException,
+ EJBException
+ {
+ throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
+ }
+
public Timer createTimer(Date initialExpiration, long intervalDuration, Serializable info)
throws IllegalArgumentException, IllegalStateException, EJBException
{
throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
}
+ public Timer createIntervalTimer(Date initialExpiration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException,
+ IllegalStateException,
+ EJBException
+ {
+ throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule) throws IllegalArgumentException,
+ IllegalStateException,
+ EJBException
+ {
+ throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, Serializable info) throws IllegalArgumentException,
+ IllegalStateException,
+ EJBException
+ {
+ throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
+ }
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, TimerConfig timerConfig) throws IllegalArgumentException,
+ IllegalStateException,
+ EJBException
+ {
+ throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
+ }
+
public Collection getTimers() throws IllegalStateException, EJBException
{
return Collections.EMPTY_LIST;
Modified: trunk/server/src/main/java/org/jboss/ejb/txtimer/TimerImpl.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/txtimer/TimerImpl.java 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/server/src/main/java/org/jboss/ejb/txtimer/TimerImpl.java 2010-03-16 01:19:57 UTC (rev 102438)
@@ -31,6 +31,7 @@
import javax.ejb.EJBException;
import javax.ejb.NoSuchObjectLocalException;
import javax.ejb.TimerHandle;
+import javax.ejb.ScheduleExpression;
import javax.transaction.Status;
import javax.transaction.Synchronization;
import javax.transaction.Transaction;
@@ -296,6 +297,55 @@
}
/**
+ * Get the schedule expression corresponding to this timer.
+ * @return
+ * @throws IllegalStateException If this method is invoked while the instance
+ * is in a state that does not allow access to this method. Also thrown if
+ * invoked on a timer that was created with one of the non-ScheduleExpression
+ * TimerService.createTimer APIs.
+ * @throws NoSuchObjectLocalException If invoked on a timer that has expired or
+ * has been cancelled.
+ * @throws EJBException If this method could not complete due to a system-level
+ * failure.
+ * @since 3.1
+ */
+ public ScheduleExpression getSchedule()
+ {
+ throw new UnsupportedOperationException("getSchedule: NOT IMPLEMENTED");
+ }
+
+ /**
+ * Query whether this timer is a calendar-based timer.
+ * @return true if this timer is a calendar-based timer.
+ * @throws IllegalStateException If this method is invoked while the instance
+ * is in a state that does not allow access to this method.
+ * @throws NoSuchObjectLocalException If invoked on a timer that has expired
+ * or has been cancelled.
+ * @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+ public boolean isCalendarTimer()
+ {
+ throw new UnsupportedOperationException("isCalendarTimer: NOT IMPLEMENTED");
+ }
+
+ /**
+ * Query whether this timer has persistent semantics.
+ *
+ * @return true if this timer has persistent guarantees.
+ * @throws IllegalStateException If this method is invoked while the instance
+ * is in a state that does not allow access to this method.
+ * @throws NoSuchObjectLocalException If invoked on a timer that has expired
+ * or has been cancelled.
+ * @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+ public boolean isPersistent()
+ {
+ throw new UnsupportedOperationException("isPersistent: NOT IMPLEMENTED");
+ }
+
+ /**
* Return true if objectId, createDate, periode are equal
*/
public boolean equals(Object obj)
Modified: trunk/server/src/main/java/org/jboss/ejb/txtimer/TimerServiceImpl.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/txtimer/TimerServiceImpl.java 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/server/src/main/java/org/jboss/ejb/txtimer/TimerServiceImpl.java 2010-03-16 01:19:57 UTC (rev 102438)
@@ -33,8 +33,10 @@
import javax.ejb.EJBException;
import javax.ejb.Timer;
+import javax.ejb.TimerConfig;
import javax.ejb.TimerHandle;
import javax.ejb.TimerService;
+import javax.ejb.ScheduleExpression;
import javax.transaction.SystemException;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
@@ -172,6 +174,46 @@
}
/**
+ * Create a single-action timer that expires after a specified duration.
+ *
+ * @param duration The number of milliseconds that must elapse before the timer expires.
+ * @param timerConfig Timer configuration.
+ *
+ * @return The newly created Timer.
+ *
+ * @throws IllegalArgumentException If duration is negative
+ * @throws IllegalStateException If this method is invoked while the instance is in
+ * a state that does not allow access to this method.
+ * @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+
+ public Timer createSingleActionTimer(long duration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ throw new UnsupportedOperationException("createSingleActionTimer: NOT IMPLEMENTED");
+ }
+
+ /**
+ * Create a single-action timer that expires at a given point in time.
+ *
+ * @param expiration The point in time at which the timer must expire.
+ * @param timerConfig Timer configuration.
+ *
+ * @return The newly created Timer.
+ *
+ * @throws IllegalArgumentException If expiration is null or expiration.getTime() is negative.
+ * @throws IllegalStateException If this method is invoked while the instance is in
+ * a state that does not allow access to this method.
+ * @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+
+ public Timer createSingleActionTimer(Date expiration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException
+ {
+ throw new UnsupportedOperationException("createSingleActionTimer: NOT IMPLEMENTED");
+ }
+
+ /**
* Create an interval txtimer whose first expiration occurs after a specified duration,
* and whose subsequent expirations occur after a specified interval.
*
@@ -287,7 +329,120 @@
}
return activeTimers;
}
-
+
+ /**
+ * Create a calendar-based timer based on the input schedule expression.
+ *
+ * @param schedule A schedule expression describing the timeouts for this timer.
+ * @return The newly created Timer.
+ * @throws IllegalArgumentException If Schedule represents an invalid schedule
+ * expression.
+ * @throws IllegalStateException If this method is invoked while the instance
+ * is in a state that does not allow access to this method.
+ * @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+
+ public Timer createCalendarTimer(ScheduleExpression schedule)
+ {
+ throw new UnsupportedOperationException("createCalendarTimer: NOT IMPLEMENTED");
+ }
+
+ /**
+ * Create a calendar-based timer based on the input schedule expression.
+ *
+ * @param schedule A schedule expression describing the timeouts for this timer.
+ * @param timerConfig Timer configuration.
+ * @return The newly created Timer.
+ * @throws IllegalArgumentException If Schedule represents an invalid schedule
+ * expression.
+ * @throws IllegalStateException If this method is invoked while the instance
+ * is in a state that does not allow access to this method.
+ * @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, TimerConfig timerConfig)
+ {
+ throw new UnsupportedOperationException("createCalendarTimer: NOT IMPLEMENTED");
+ }
+
+ /**
+ * Create a calendar-based timer based on the input schedule expression.
+ *
+ * @param schedule A schedule expression describing the timeouts for this timer.
+ * @param info Application information to be delivered along with the timer
+ * expiration. This can be null.
+ * @return The newly created Timer.
+ * @throws IllegalArgumentException If Schedule represents an invalid schedule
+ * expression.
+ * @throws IllegalStateException If this method is invoked while the instance
+ * is in a state that does not allow access to this method.
+ * @throws EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+
+ public Timer createCalendarTimer(ScheduleExpression schedule, Serializable info)
+ {
+ throw new UnsupportedOperationException("createCalendarTimer: NOT IMPLEMENTED");
+ }
+
+ /**
+ * Create an interval timer whose first expiration occurs after a specified duration and
+ * whose subsequent expirations occur after a specified interval.
+ *
+ * @param initialExpiration The point in time at which the first timer expiration must occur.
+ *
+ * @param intervalDuration The number of milliseconds that must elapse between
+ * timer expiration notifications. Expiration notifications are
+ * scheduled relative to the time of the first expiration.
+ * If expiration is delayed(e.g. due to the interleaving of other
+ * method calls on the bean) two or more expiration notifications
+ * may occur in close succession to "catch up".
+ * @param timerConfig Timer configuration.
+ *
+ * @return The newly created Timer.
+ * @throws IllegalArgumentException If initialExpiration is null, or initialExpiration.getTime()
+ * is negative, or intervalDuration is negative.
+ * @throws IllegalStateException If this method is invoked while the instance is in
+ * a state that does not allow access to this method.
+ * @throws javax.ejb.EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+ public Timer createIntervalTimer(Date initialExpiration, long intervalDuration, TimerConfig timerConfig)
+ {
+ throw new UnsupportedOperationException("createIntervalTimer: NOT IMPLEMENTED");
+ }
+
+ /**
+ * Create an interval timer whose first expiration occurs after a specified duration and
+ * whose subsequent expirations occur after a specified interval.
+ *
+ * @param initialDuration The number of milliseconds that must elapse before the first
+ * timer expiration notifications.
+ *
+ * @param intervalDuration The number of milliseconds that must elapse between
+ * timer expiration notifications.
+ * Expiration notifications are scheduled relative to the time
+ * of the first expiration. If expiration is delayed(e.g. due to
+ * the interleaving of other method calls on the bean) two or more
+ * expiration notifications may occur in close succession to "catch up".
+ * @param timerConfig Timer configuration.
+ *
+ * @return The newly created Timer.
+ * @throws IllegalArgumentException If initialExpiration is null, or initialExpiration.getTime()
+ * is negative, or intervalDuration is negative.
+ * @throws IllegalStateException If this method is invoked while the instance is in
+ * a state that does not allow access to this method.
+ * @throws javax.ejb.EJBException If this method could not complete due to a system-level failure.
+ * @since 3.1
+ */
+
+ public Timer createIntervalTimer(long initialDuration, long intervalDuration, TimerConfig timerConfig)
+ {
+ throw new UnsupportedOperationException("createIntervalTimer: NOT IMPLEMENTED");
+ }
+
// Package protected ---------------------------------------------
/**
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/testsuite/build.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -252,11 +252,11 @@
<fileset refid="javax.faces:jsf-api:jar"/>
<fileset refid="javax.faces:jsf-impl:jar"/>
<fileset refid="javax.validation:validation-api:jar"/>
- <fileset refid="jboss.web:el-api:jar"/>
<fileset refid="jboss.web:jasper-jdt:jar"/>
<fileset refid="jboss.web:jbossweb:jar"/>
- <fileset refid="jboss.web:jsp-api:jar"/>
- <fileset refid="jboss.web:servlet-api:jar"/>
+ <fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
<fileset refid="trove:trove:jar"/>
<fileset refid="wutka-dtdparser:dtdparser:jar"/>
<fileset refid="org.codehaus.woodstox:wstx-lgpl:jar"/>
@@ -281,7 +281,7 @@
<fileset refid="org.hibernate:hibernate-entitymanager:jar"/>
<fileset refid="org.hibernate:hibernate-jbosscache:jar"/>
<fileset refid="org.hibernate:hibernate-testing:jar"/>
- <fileset refid="org.jboss.interceptor:jboss-interceptor-api:jar"/>
+ <fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
<fileset refid="org.jboss.ws:jbossws-framework:jar"/>
<fileset refid="org.jboss.ws:jbossws-spi:jar"/>
@@ -403,14 +403,19 @@
<fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
<fileset refid="org.jboss.mx:jboss-mbeans:jar"/>
<fileset refid="org.jboss.mx:jboss-mbeanserver:jar"/>
- <fileset refid="org.jboss.javaee:jboss-jaspi-api:jar"/>
- <fileset refid="org.jboss.javaee:jboss-javaee:jar"/>
- <fileset refid="org.jboss.javaee:jboss-ejb-api:jar"/>
- <fileset refid="org.jboss.javaee:jboss-jacc-api:jar"/>
- <fileset refid="org.jboss.javaee:jboss-jad-api:jar"/>
- <fileset refid="org.jboss.javaee:jboss-jca-api:jar"/>
- <fileset refid="org.jboss.javaee:jboss-jms-api:jar"/>
- <fileset refid="org.jboss.javaee:jboss-transaction-api:jar"/>
+ <fileset refid="org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
<fileset refid="org.jboss:jboss-vfs:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-jca"/>
<fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-jca-deployer"/>
@@ -441,11 +446,8 @@
<fileset refid="org.jboss.test:jboss-test:jar"/>
<path refid="org.jboss.jbossas.tomcat.classpath"/>
<fileset refid="org.jboss.jbossas:jboss-as-varia:jar"/>
- <fileset refid="jboss.web:el-api:jar"/>
<fileset refid="jboss.web:jasper-jdt:jar"/>
<fileset refid="jboss.web:jbossweb:jar"/>
- <fileset refid="jboss.web:jsp-api:jar"/>
- <fileset refid="jboss.web:servlet-api:jar"/>
</path>
<!-- The combined thirdparty classpath -->
@@ -1259,7 +1261,7 @@
and doesn't include JPA, so these WebJPA tests are disabled
<antcall target="tests-web-profile" inheritRefs="true"/>
-->
- <antcall target="tests-web-ondemand-disabled" inheritRefs="true"/>
+ <antcall target="tests-web-ondemand-disabled" inheritRefs="true"/>
<antcall target="tests-jts" inheritRefs="true"/>
<antcall target="tests-jacc-security" inheritRefs="true"/>
@@ -3093,9 +3095,11 @@
<sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
<sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
<sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.cluster.node0.hajndi.url" value="${node0.hajndi.url}"/>
<sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
<sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
<sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
+ <sysproperty key="jbosstest.cluster.node1.hajndi.url" value="${node1.hajndi.url}"/>
<!-- Pass along any jbosstest.* system properties -->
Modified: trunk/testsuite/imports/config/tests-clustering.xml
===================================================================
--- trunk/testsuite/imports/config/tests-clustering.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/testsuite/imports/config/tests-clustering.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -452,10 +452,12 @@
<sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
<sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
<sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.cluster.node0.hajndi.url" value="${node0.hajndi.url}"/>
<sysproperty key="jbosstest.cluster.node0.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node0.config}"/>
<sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
<sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
<sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
+ <sysproperty key="jbosstest.cluster.node1.hajndi.url" value="${node1.hajndi.url}"/>
<sysproperty key="jbosstest.cluster.node1.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node1.config}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/testsuite/imports/sections/web.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -782,7 +782,7 @@
<!-- WAR with servlet classes -->
<war destfile="${build.lib}/servlet-classes.war"
webxml="${build.resources}/web/servlet-classes/web.xml">
- <lib refid="jboss.web:servlet-api:jar"/>
+ <lib refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
<lib dir="${build.lib}">
<include name="jbosstest-web-util.jar"/>
<include name="resources.jar"/>
Modified: trunk/tomcat/pom.xml
===================================================================
--- trunk/tomcat/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/tomcat/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -234,10 +234,30 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-war</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -274,8 +294,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
+ <groupId>org.jboss.spec.javax.security.auth.message</groupId>
+ <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -289,20 +309,38 @@
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
<classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jca-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.hibernate.javax.persistence</groupId>
<artifactId>hibernate-jpa-2.0-api</artifactId>
</dependency>
@@ -317,6 +355,12 @@
<dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-server-cache-jbc</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
@@ -331,7 +375,47 @@
<artifactId>jboss-as-security</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.5_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-iiop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
</dependency>
<dependency>
Modified: trunk/varia/pom.xml
===================================================================
--- trunk/varia/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/varia/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -296,6 +296,16 @@
<dependency>
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -329,8 +339,8 @@
</dependency>
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
<dependency>
Modified: trunk/webservices/pom.xml
===================================================================
--- trunk/webservices/pom.xml 2010-03-16 00:26:15 UTC (rev 102437)
+++ trunk/webservices/pom.xml 2010-03-16 01:19:57 UTC (rev 102438)
@@ -124,6 +124,36 @@
<artifactId>jboss-ejb3-core</artifactId>
<scope>provided</scope>
<classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
@@ -133,6 +163,34 @@
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -144,6 +202,18 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- transitive dependencies -->
@@ -179,6 +249,14 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-jaxrpc</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
More information about the jboss-cvs-commits
mailing list