Index: deployment/pom.xml
===================================================================
--- deployment/pom.xml (revision 102428)
+++ deployment/pom.xml (working copy)
@@ -83,8 +83,8 @@
- org.jboss.javaee
- jboss-jad-api
+ org.jboss.spec.javax.enterprise.deploy
+ jboss-jad-api_1.2_spec
@@ -121,6 +121,16 @@
org.jboss.metadata
jboss-metadata-common
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
org.jboss.metadata
@@ -133,6 +143,20 @@
org.jboss.metadata
jboss-metadata-ejb
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
org.jboss.metadata
@@ -141,11 +165,27 @@
org.jboss.metadata
jboss-metadata-war
+
+
+ jboss.web
+ servlet-api
+
+
org.jboss.integration
jboss-transaction-spi
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
@@ -160,23 +200,23 @@
- org.jboss.javaee
- jboss-ejb-api
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
- org.jboss.javaee
- jboss-jacc-api
+ org.jboss.spec.javax.security.jacc
+ jboss-jacc-api_1.1_spec
- org.jboss.javaee
- jboss-jca-api
+ org.jboss.spec.javax.resource
+ jboss-connector-api_1.5_spec
- org.jboss.javaee
- jboss-jms-api
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
Index: profileservice/pom.xml
===================================================================
--- profileservice/pom.xml (revision 102428)
+++ profileservice/pom.xml (working copy)
@@ -91,6 +91,22 @@
org.jboss.jbossas
jboss-as-system-jmx
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
+ org.jboss.javaee
+ jboss-jaspi-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ jboss.web
+ servlet-api
+
@@ -184,12 +200,58 @@
stax-api
- org.jboss.javaee
- jboss-javaee
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
+ org.jboss.spec.javax.annotation
+ jboss-annotations-api_1.1_spec
+
+
+ org.jboss.spec.javax.servlet
+ jboss-servlet-api_3.0_spec
+
+
+ org.jboss.spec.javax.servlet.jsp
+ jboss-jsp-api_2.2_spec
+
+
+ org.jboss.spec.javax.el
+ jboss-el-api_2.2_spec
+
+
+ org.jboss.spec.javax.security.jacc
+ jboss-jacc-api_1.1_spec
+
+
+ org.jboss.spec.javax.security.auth.message
+ jboss-jaspi-api_1.0_spec
+
+
+ org.jboss.spec.javax.transaction
+ jboss-transaction-api_1.1_spec
+
+
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
+
+
+ org.jboss.spec.javax.interceptor
+ jboss-interceptors-api_1.1_spec
+
+
org.jboss.ejb3
jboss-ejb3-ext-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
Index: cluster/pom.xml
===================================================================
--- cluster/pom.xml (revision 102428)
+++ cluster/pom.xml (working copy)
@@ -179,6 +179,12 @@
org.jboss.cluster
jboss-ha-server-cache-jbc
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
Index: ejb3/src/main/java/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java
===================================================================
--- ejb3/src/main/java/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java (revision 102428)
+++ ejb3/src/main/java/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java (working copy)
@@ -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;
Index: ejb3/pom.xml
===================================================================
--- ejb3/pom.xml (revision 102428)
+++ ejb3/pom.xml (working copy)
@@ -237,17 +237,29 @@
jbosscache-core
- org.jboss.metadata
- jboss-metadata
+ org.jboss.metadata
+ jboss-metadata
-
- org.jboss.microcontainer
- jboss-dependency
+
+ org.jboss.ejb3
+ jboss-ejb3-core
- org.jboss.microcontainer
- jboss-kernel
+ org.jboss.javaee
+ jboss-jacc-api
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
@@ -256,13 +268,77 @@
jboss-ejb3-core
client
-
+
+ org.jboss.microcontainer
+ jboss-dependency
+
+
+ org.jboss.javaee
+ jboss-jaspi-api
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+
+
+
+ org.jboss.ejb3
+ jboss-ejb3-core
+ ${version.org.jboss.ejb3.core.client}
+
+
org.jboss.microcontainer
- jboss-dependency
-
+ jboss-dependency
+
+
+ org.jboss.microcontainer
+ jboss-kernel
+
+
+ org.jboss.javaee
+ jboss-jaspi-api
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
-
+
org.jboss.ejb3.vfs
jboss-ejb3-vfs-spi
@@ -276,22 +352,40 @@
org.jboss
jboss-vfs
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
org.jboss.ejb3.timeout
jboss-ejb3-timeout-3.1
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
- org.jboss.javaee
- jboss-ejb-api
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
- org.jboss.javaee
- jboss-jms-api
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
@@ -353,6 +447,12 @@
org.jboss.integration
jboss-corba-ots-spi
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
Index: tomcat/pom.xml
===================================================================
--- tomcat/pom.xml (revision 102428)
+++ tomcat/pom.xml (working copy)
@@ -234,10 +234,30 @@
org.jboss.metadata
jboss-metadata-common
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
org.jboss.metadata
jboss-metadata-war
+
+
+ jboss.web
+ servlet-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
org.jboss
@@ -274,8 +294,8 @@
- org.jboss.javaee
- jboss-jaspi-api
+ org.jboss.spec.javax.security.auth.message
+ jboss-jaspi-api_1.0_spec
org.jboss.jbossas
@@ -289,20 +309,38 @@
org.jboss.ejb3
jboss-ejb3-core
client
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
+ org.jboss.javaee
+ jboss-jaspi-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
- org.jboss.javaee
- jboss-jacc-api
-
-
- org.jboss.javaee
- jboss-jca-api
-
-
- org.jboss.javaee
- jboss-ejb-api
-
-
org.hibernate.javax.persistence
hibernate-jpa-2.0-api
@@ -317,6 +355,12 @@
org.jboss.cluster
jboss-ha-server-cache-jbc
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
org.jboss.jbossas
@@ -331,7 +375,47 @@
jboss-as-security
+ org.jboss.spec.javax.security.jacc
+ jboss-jacc-api_1.1_spec
+
+
+ org.jboss.spec.javax.resource
+ jboss-connector-api_1.5_spec
+
+
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
+
+
+ org.hibernate.javax.persistence
+ hibernate-jpa-2.0-api
+
+
+ org.jboss.spec.javax.servlet
+ jboss-servlet-api_3.0_spec
+
+
+ org.jboss.spec.javax.servlet.jsp
+ jboss-jsp-api_2.2_spec
+
+
+ org.jboss.spec.javax.el
+ jboss-el-api_2.2_spec
+
+
org.jboss.jbossas
+ jboss-as-iiop
+
+
+ org.jboss.mx
+ jboss-j2se
+
+
+ org.jboss.jbossas
+ jboss-as-security
+
+
+ org.jboss.jbossas
jboss-as-server
Index: hibernate-int/pom.xml
===================================================================
--- hibernate-int/pom.xml (revision 102428)
+++ hibernate-int/pom.xml (working copy)
@@ -108,6 +108,16 @@
org.jboss.integration
jboss-transaction-spi
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
Index: varia/pom.xml
===================================================================
--- varia/pom.xml (revision 102428)
+++ varia/pom.xml (working copy)
@@ -296,6 +296,16 @@
org.jboss.integration
jboss-transaction-spi
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
@@ -329,8 +339,8 @@
- jboss.web
- servlet-api
+ org.jboss.spec.javax.servlet
+ jboss-servlet-api_3.0_spec
Index: component-matrix/pom.xml
===================================================================
--- component-matrix/pom.xml (revision 102428)
+++ component-matrix/pom.xml (working copy)
@@ -35,7 +35,6 @@
1.8.0
1.2.2
1
- 1.1
2.3.1jboss.patch01-brew
3.11.0.GA
2.0.2-FCS
@@ -127,7 +126,7 @@
1.0.2.GA
1.0.0.CR3
2.0.0.CR3
- 3.0.0.CR4
+ 3.0.0.CR3
2.1.0.CR2
2.1.0.CR4
1.5.6
@@ -138,7 +137,7 @@
1.0.0.CR2
2.1.1
1.0
- .GA
+ 1.0.0.Beta1
2.2
2.2
2.0-b01
@@ -407,12 +406,6 @@
- javax.validation
- validation-api
- ${version.javax.validation}
-
-
-
dom4j
dom4j
1.6.1
@@ -485,24 +478,6 @@
- javax.faces
- jsf-api
- ${version.javax.faces}
-
-
-
- javax.servlet
- jstl
- 1.2
-
-
-
- sun-jaxb
- jaxb-api
- ${version.sun.jaxb}
-
-
-
com.sun.xml.bind
jaxb-impl
${version.sun.jaxb}
@@ -901,30 +876,6 @@
- javax.xml.ws
- jaxws-api
- ${version.jaxws.api}
-
-
- javax.jws
- jsr181-api
-
-
- javax.xml.bind
- jaxb-api
-
-
- javax.xml.soap
- saaj-api
-
-
- javax.annotation
- jsr250-api
-
-
-
-
-
org.jboss.ws.native
jbossws-native-factories
${version.jboss.jbossws}
@@ -978,30 +929,6 @@
- javax.xml
- jaxrpc-api
- ${version.jaxrpc.api}
-
-
- javax.xml.soap
- saaj-api
-
-
-
-
-
- javax.xml.soap
- saaj-api
- ${version.saaj.api}
-
-
- javax.activation
- activation
-
-
-
-
-
org.jboss.ws.native
jbossws-native-resources
${version.jboss.jbossws}
@@ -1105,35 +1032,219 @@
jboss.web
- el-api
+ jasper-jdt
${version.jboss.web}
jboss.web
- jasper-jdt
+ jbossweb
${version.jboss.web}
+
+
- jboss.web
- jbossweb
- ${version.jboss.web}
+ org.jboss.spec.javax.annotation
+ jboss-annotations-api_1.1_spec
+ ${version.org.jboss.spec.javaee}
- jboss.web
- jsp-api
- ${version.jboss.web}
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
+ ${version.org.jboss.spec.javaee}
+
+
+ org.jboss.spec.javax.el
+ jboss-el-api_2.2_spec
+ ${version.org.jboss.spec.javaee}
+
+
+
+ org.jboss.spec.javax.enterprise.deploy
+ jboss-jad-api_1.2_spec
+ ${version.org.jboss.spec.javaee}
+
+
+
+ org.jboss.spec.javax.interceptor
+ jboss-interceptors-api_1.1_spec
+ ${version.org.jboss.spec.javaee}
+
+
+
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
+ ${version.org.jboss.spec.javaee}
+
+
+
+ org.jboss.spec.javax.resource
+ jboss-connector-api_1.5_spec
+ ${version.org.jboss.spec.javaee}
+
+
+
+ org.jboss.spec.javax.security.jacc
+ jboss-jacc-api_1.1_spec
+ ${version.org.jboss.spec.javaee}
+
+
+
+ org.jboss.spec.javax.security.auth.message
+ jboss-jaspi-api_1.0_spec
+ ${version.org.jboss.spec.javaee}
+
+
+
+ org.jboss.spec.javax.servlet.jsp
+ jboss-jsp-api_2.2_spec
+ ${version.org.jboss.spec.javaee}
+
- jboss.web
- servlet-api
- ${version.jboss.web}
+ org.jboss.spec.javax.servlet
+ jboss-servlet-api_3.0_spec
+ 1.0.0.Beta2
+ org.jboss.spec.javax.transaction
+ jboss-transaction-api_1.1_spec
+ ${version.org.jboss.spec.javaee}
+
+
+
+ org.jboss.spec.javax.xml.registry
+ jboss-jaxr-api_1.0_spec
+ ${version.org.jboss.spec.javaee}
+
+
+
+ javax.activation
+ activation
+ 1.1
+
+
+
+ javax.enterprise
+ cdi-api
+ ${version.weld.api}
+
+
+
+ org.jboss.weld
+ weld-api
+ ${version.weld.api}
+
+
+
+ javax.inject
+ javax.inject
+ ${version.inject.api}
+
+
+
+ javax.faces
+ jsf-api
+ ${version.javax.faces}
+
+
+
+ javax.jws
+ jsr181-api
+ ${version.jsr181.api}
+
+
+
+ javax.mail
+ mail
+ 1.4.2
+
+
+
+ org.hibernate.javax.persistence
+ hibernate-jpa-2.0-api
+ ${version.org.hibernate.javax.persistence}
+
+
+
+ javax.servlet
+ jstl
+ 1.2
+
+
+
+ sun-jaxb
+ jaxb-api
+ ${version.sun.jaxb}
+
+
+
+ stax
+ stax-api
+ 1.0
+
+
+
+ javax.validation
+ validation-api
+ ${version.javax.validation}
+
+
+
+ javax.xml
+ jaxrpc-api
+ ${version.jaxrpc.api}
+
+
+ javax.xml.soap
+ saaj-api
+
+
+
+
+
+ javax.xml.soap
+ saaj-api
+ ${version.saaj.api}
+
+
+ javax.activation
+ activation
+
+
+
+
+
+ javax.xml.ws
+ jaxws-api
+ ${version.jaxws.api}
+
+
+ javax.jws
+ jsr181-api
+
+
+ javax.xml.bind
+ jaxb-api
+
+
+ javax.xml.soap
+ saaj-api
+
+
+ javax.annotation
+ jsr250-api
+
+
+
+
+
+
+
jgroups
jgroups
${version.jgroups}
@@ -1322,12 +1433,6 @@
- org.hibernate.javax.persistence
- hibernate-jpa-2.0-api
- ${version.org.hibernate.javax.persistence}
-
-
-
org.hibernate
hibernate-validator
${version.org.hibernate.validator}
@@ -1859,12 +1964,6 @@
- org.jboss.javaee
- jboss-ejb-api_3.1
- ${version.org.jboss.ejb.api}
-
-
-
org.jboss.ejb3
jboss-ejb3-common
${version.org.jboss.ejb3.common.client}
@@ -2210,84 +2309,12 @@
- org.jboss.javaee
- jboss-javaee
- 5.2.0.Beta1
-
-
-
- org.jboss.javaee
- jboss-ejb-api
- 3.0.0${version.suffix.org.jboss.javaee}_SP1
-
-
-
org.jboss.ejb3
jboss-ejb3-ext-api
- ${version.org.jboss.ejb3.ext.api}
+ ${version.org.jboss.ejb3.ext.api}
- org.jboss.javaee
- jboss-jacc-api
- 1.1.0${version.suffix.org.jboss.javaee}_SP1
-
-
-
- org.jboss.javaee
- jboss-jad-api
- 1.2.0${version.suffix.org.jboss.javaee}
-
-
-
- org.jboss.javaee
- jboss-jaspi-api
- 1.0.0${version.suffix.org.jboss.javaee}
-
-
-
- org.jboss.javaee
- jboss-jca-api
- 1.5.0${version.suffix.org.jboss.javaee}
-
-
-
- org.jboss.javaee
- jboss-jms-api
- 1.1.0${version.suffix.org.jboss.javaee}
-
-
-
- org.jboss.javaee
- jboss-transaction-api
- 1.0.1${version.suffix.org.jboss.javaee}
-
-
-
- org.jboss.interceptor
- jboss-interceptor-api
- ${version.interceptor.api}
-
-
-
- javax.enterprise
- cdi-api
- ${version.weld.api}
-
-
-
- org.jboss.weld
- weld-api
- ${version.weld.api}
-
-
-
- javax.inject
- javax.inject
- ${version.inject.api}
-
-
-
org.jboss.jpa
jboss-jpa-deployers
${version.org.jboss.jpa.deployers}
@@ -2650,12 +2677,6 @@
- stax
- stax-api
- 1.0
-
-
-
sun-fi
FastInfoset
${version.fastinfoset}
@@ -2668,18 +2689,6 @@
- javax.activation
- activation
- 1.1
-
-
-
- javax.mail
- mail
- 1.4.2
-
-
-
com.sun.xml.ws
jaxws-rt
${version.sun-jaxws}
@@ -2933,6 +2942,23 @@
org.jboss.microcontainer:jboss-jmx-mc-int
org.jboss.microcontainer:jboss-kernel
org.jboss.microcontainer:jboss-spring-int
+
+ org.jboss.javaee:jboss-javaee
+ org.jboss.javaee:jboss-ejb-api
+ org.jboss.javaee:jboss-ejb-api_3.1
+ org.jboss.javaee:jboss-jacc-api
+ org.jboss.javaee:jboss-jad-api
+ org.jboss.javaee:jboss-jaspi-api
+ org.jboss.javaee:jboss-jca-api
+ org.jboss.javaee:jboss-jms-api
+ org.jboss.javaee:servlet-api
+ org.jboss.javaee:jsp-api
+ org.jboss.javaee:jboss-transaction-api
+ org.jboss.interceptor:jboss-interceptor-api
+ jboss.web:el-api
+ jboss.web:jsp-api
+ jboss.web:servlet-api
+
Index: server/src/main/java/org/jboss/ejb/txtimer/TimerImpl.java
===================================================================
--- server/src/main/java/org/jboss/ejb/txtimer/TimerImpl.java (revision 102428)
+++ server/src/main/java/org/jboss/ejb/txtimer/TimerImpl.java (working copy)
@@ -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)
Index: server/src/main/java/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java
===================================================================
--- server/src/main/java/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java (revision 102428)
+++ server/src/main/java/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java (working copy)
@@ -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;
Index: server/src/main/java/org/jboss/ejb/txtimer/TimerServiceImpl.java
===================================================================
--- server/src/main/java/org/jboss/ejb/txtimer/TimerServiceImpl.java (revision 102428)
+++ server/src/main/java/org/jboss/ejb/txtimer/TimerServiceImpl.java (working copy)
@@ -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 ---------------------------------------------
/**
Index: server/src/main/java/org/jboss/ejb/EnterpriseContext.java
===================================================================
--- server/src/main/java/org/jboss/ejb/EnterpriseContext.java (revision 102428)
+++ server/src/main/java/org/jboss/ejb/EnterpriseContext.java (working copy)
@@ -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 getContextData()
+ {
+ // TODO: implement
+ throw new UnsupportedOperationException("Not yet implemented");
+ }
+
+ }
+
// Inner classes -------------------------------------------------
protected class UserTransactionImpl
Index: server/src/main/java/org/jboss/ejb/StatefulSessionEnterpriseContext.java
===================================================================
--- server/src/main/java/org/jboss/ejb/StatefulSessionEnterpriseContext.java (revision 102428)
+++ server/src/main/java/org/jboss/ejb/StatefulSessionEnterpriseContext.java (working copy)
@@ -279,5 +279,11 @@
{
return id;
}
+
+ public boolean wasCancelCalled()
+ {
+ throw new UnsupportedOperationException("NOT IMPLEMENTED");
+ }
+
}
}
Index: server/src/main/java/org/jboss/ejb/MessageDrivenEnterpriseContext.java
===================================================================
--- server/src/main/java/org/jboss/ejb/MessageDrivenEnterpriseContext.java (revision 102428)
+++ server/src/main/java/org/jboss/ejb/MessageDrivenEnterpriseContext.java (working copy)
@@ -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
+}
Index: server/src/main/java/org/jboss/ejb/StatelessSessionEnterpriseContext.java
===================================================================
--- server/src/main/java/org/jboss/ejb/StatelessSessionEnterpriseContext.java (revision 102428)
+++ server/src/main/java/org/jboss/ejb/StatelessSessionEnterpriseContext.java (working copy)
@@ -299,6 +299,11 @@
};
}
+ public boolean wasCancelCalled()
+ {
+ throw new RuntimeException("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
+}
Index: server/src/main/java/org/jboss/ejb/EntityEnterpriseContext.java
===================================================================
--- server/src/main/java/org/jboss/ejb/EntityEnterpriseContext.java (revision 102428)
+++ server/src/main/java/org/jboss/ejb/EntityEnterpriseContext.java (working copy)
@@ -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
+}
Index: server/pom.xml
===================================================================
--- server/pom.xml (revision 102428)
+++ server/pom.xml (working copy)
@@ -311,6 +311,16 @@
org.jboss.metadata
jboss-metadata-common
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
org.jboss.metadata
@@ -323,6 +333,20 @@
org.jboss.metadata
jboss-metadata-ejb
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
org.jboss.metadata
@@ -331,6 +355,12 @@
org.jboss.metadata
jboss-metadata-war
+
+
+ jboss.web
+ servlet-api
+
+
@@ -349,16 +379,22 @@
- org.jboss.javaee
- jboss-ejb-api
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
- org.jboss.interceptor
- jboss-interceptor-api
+ org.jboss.spec.javax.interceptor
+ jboss-interceptors-api_1.1_spec
+ org.jboss.spec.javax.annotation
+ jboss-annotations-api_1.1_spec
+
+
+
+
junit
junit
test
@@ -377,16 +413,26 @@
org.jboss.integration
jboss-transaction-spi
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
- org.jboss.javaee
- jboss-jacc-api
+ org.jboss.spec.javax.security.jacc
+ jboss-jacc-api_1.1_spec
- org.jboss.javaee
- jboss-jms-api
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
@@ -405,8 +451,8 @@
- org.jboss.javaee
- jboss-jca-api
+ org.jboss.spec.javax.resource
+ jboss-connector-api_1.5_spec
Index: messaging/pom.xml
===================================================================
--- messaging/pom.xml (revision 102428)
+++ messaging/pom.xml (working copy)
@@ -68,6 +68,16 @@
org.jboss.metadata
jboss-metadata-common
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
org.jboss.metadata
@@ -76,6 +86,20 @@
org.jboss.metadata
jboss-metadata-ejb
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
org.jboss.metadata
@@ -88,6 +112,12 @@
org.jboss.metadata
jboss-metadata-war
+
+
+ jboss.web
+ servlet-api
+
+
jboss.messaging
@@ -104,8 +134,8 @@
xml-apis
- org.jboss.javaee
- jboss-jms-api
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
org.jboss.security
Index: webservices/pom.xml
===================================================================
--- webservices/pom.xml (revision 102428)
+++ webservices/pom.xml (working copy)
@@ -124,6 +124,36 @@
jboss-ejb3-core
provided
client
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
+ org.jboss.javaee
+ jboss-jaspi-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
org.jboss.ejb3
@@ -133,6 +163,34 @@
org.jboss.cache
jbosscache-core
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
+ org.jboss.javaee
+ jboss-jaspi-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
@@ -144,6 +202,18 @@
org.jboss.microcontainer
jboss-kernel
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
@@ -179,6 +249,14 @@
org.jboss
jboss-jaxrpc
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
Index: testsuite/imports/config/tests-clustering.xml
===================================================================
--- testsuite/imports/config/tests-clustering.xml (revision 102428)
+++ testsuite/imports/config/tests-clustering.xml (working copy)
@@ -452,10 +452,12 @@
+
+
Index: testsuite/imports/sections/web.xml
===================================================================
--- testsuite/imports/sections/web.xml (revision 102428)
+++ testsuite/imports/sections/web.xml (working copy)
@@ -782,7 +782,7 @@
-
+
Index: testsuite/build.xml
===================================================================
--- testsuite/build.xml (revision 102428)
+++ testsuite/build.xml (working copy)
@@ -252,11 +252,11 @@
-
-
-
+
+
+
@@ -281,7 +281,7 @@
-
+
@@ -403,14 +403,19 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -441,11 +446,8 @@
-
-
-
@@ -1259,7 +1261,7 @@
and doesn't include JPA, so these WebJPA tests are disabled
-->
-
+
@@ -3093,9 +3095,11 @@
+
+
Index: connector/pom.xml
===================================================================
--- connector/pom.xml (revision 102428)
+++ connector/pom.xml (working copy)
@@ -175,16 +175,16 @@
jboss-integration
- org.jboss.javaee
- jboss-ejb-api
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
- org.jboss.javaee
- jboss-jca-api
+ org.jboss.spec.javax.resource
+ jboss-connector-api_1.5_spec
- org.jboss.javaee
- jboss-jms-api
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
org.jboss.jbossas
@@ -213,6 +213,16 @@
org.jboss.metadata
jboss-metadata-common
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
org.jboss.metadata
Index: build/build-web.xml
===================================================================
--- build/build-web.xml (revision 102428)
+++ build/build-web.xml (working copy)
@@ -129,7 +129,7 @@
-
+
Index: build/pom.xml
===================================================================
--- build/pom.xml (revision 102428)
+++ build/pom.xml (working copy)
@@ -84,12 +84,40 @@
org.jboss.jbossas
jboss-as-ejb3
true
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
org.jboss.jbossas
jboss-as-ejb3
client
true
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
org.jboss.jbossas
@@ -266,6 +294,12 @@
javax.enterprise
cdi-api
true
+
+
+ org.jboss.interceptor
+ jboss-interceptor-api
+
+
javax.inject
@@ -327,8 +361,8 @@
true
- jboss.web
- el-api
+ org.jboss.spec.javax.el
+ jboss-el-api_2.2_spec
true
@@ -421,10 +455,16 @@
org.jboss.cache
jbosscache-pojo
true
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
- org.jboss.javaee
- jboss-ejb-api_3.1
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
true
@@ -432,6 +472,20 @@
jboss-ejb3-common
client
true
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
org.jboss.ejb3
@@ -471,15 +525,31 @@
jboss-ejb3-security
client
true
+
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
+ org.jboss.javaee
+ jboss-servlet-api
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
- org.jboss.interceptor
- jboss-interceptor-api
+ org.jboss.spec.javax.interceptor
+ jboss-interceptors-api_1.1_spec
true
- org.jboss.javaee
- jboss-javaee
+ org.jboss.spec
+ jboss-javaee_6.0_spec
+ ${version.org.jboss.spec.javaee}
+ pom
true
Index: build/build.xml
===================================================================
--- build/build.xml (revision 102428)
+++ build/build.xml (working copy)
@@ -1950,8 +1950,19 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1959,7 +1970,6 @@
-
@@ -1994,7 +2004,6 @@
-
@@ -2013,9 +2022,9 @@
-
-
-
+
+
+
@@ -2131,7 +2140,6 @@
-
@@ -2140,11 +2148,22 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: iiop/pom.xml
===================================================================
--- iiop/pom.xml (revision 102428)
+++ iiop/pom.xml (working copy)
@@ -149,6 +149,12 @@
org.jboss.integration
jboss-corba-ots-spi
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
@@ -159,12 +165,20 @@
jboss
jboss-common-logging-spi
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
- org.jboss.javaee
- jboss-ejb-api
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
@@ -233,8 +247,12 @@
org.jboss.javaee
- jboss-javaee
+ jboss-ejb-api
+
+ org.jboss.javaee
+ jboss-jms-api
+
@@ -248,14 +266,40 @@
org.jboss.metadata
jboss-metadata-ejb
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
org.jboss.metadata
jboss-metadata-rar
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
org.jboss.metadata
jboss-metadata-war
+
+
+ jboss.web
+ servlet-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
Index: aspects/pom.xml
===================================================================
--- aspects/pom.xml (revision 102428)
+++ aspects/pom.xml (working copy)
@@ -61,10 +61,34 @@
org.jboss.aspects
jboss-security-aspects
+
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
+ org.jboss.javaee
+ jboss-jaspi-api
+
+
+ jboss.web
+ servlet-api
+
+
org.jboss.aspects
jboss-transaction-aspects
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ jboss.web
+ servlet-api
+
+
org.jboss.security
@@ -126,6 +150,16 @@
org.jboss.integration
jboss-transaction-spi
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
org.jboss.test
@@ -148,6 +182,14 @@
jboss-vfs
+
+ org.jboss.spec.javax.transaction
+ jboss-transaction-api_1.1_spec
+
+
+ org.jboss.spec.javax.servlet
+ jboss-servlet-api_3.0_spec
+
org.jboss.aop
Index: aspects/build.xml
===================================================================
--- aspects/build.xml (revision 102428)
+++ aspects/build.xml (working copy)
@@ -91,7 +91,6 @@
-
Index: console/pom.xml
===================================================================
--- console/pom.xml (revision 102428)
+++ console/pom.xml (working copy)
@@ -108,8 +108,8 @@
- jboss.web
- jsp-api
+ org.jboss.spec.javax.servlet.jsp
+ jboss-jsp-api_2.2_spec
Index: security/pom.xml
===================================================================
--- security/pom.xml (revision 102428)
+++ security/pom.xml (working copy)
@@ -125,13 +125,13 @@
- org.jboss.javaee
- jboss-ejb-api
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
- org.jboss.javaee
- jboss-jacc-api
+ org.jboss.spec.javax.security.jacc
+ jboss-jacc-api_1.1_spec
@@ -145,8 +145,8 @@
- org.jboss.javaee
- jboss-jaspi-api
+ org.jboss.spec.javax.security.auth.message
+ jboss-jaspi-api_1.0_spec
Index: client/pom.xml
===================================================================
--- client/pom.xml (revision 102428)
+++ client/pom.xml (working copy)
@@ -90,12 +90,64 @@
org.jboss.ejb3
jboss-ejb3-common
client
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
org.jboss.ejb3
jboss-ejb3-core
client
+
+
+ org.jboss.javaee
+ jboss-ejb-api_3.1
+
+
+ org.jboss.javaee
+ jboss-ejb-api
+
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
+ org.jboss.javaee
+ jboss-jca-api
+
+
+ org.jboss.javaee
+ jboss-transaction-api
+
+
+ org.jboss.javaee
+ jboss-jaspi-api
+
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
+ org.jboss.javaee
+ jboss-jms-api
+
+
@@ -120,6 +172,12 @@
org.jboss.ejb3
jboss-ejb3-security
client
+
+
+ org.jboss.javaee
+ jboss-jacc-api
+
+
@@ -150,9 +208,59 @@
- org.jboss.javaee
- jboss-javaee
+ org.jboss.spec.javax.annotation
+ jboss-annotations-api_1.1_spec
+
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.1_spec
+
+
+ org.jboss.spec.javax.el
+ jboss-el-api_2.2_spec
+
+
+ org.jboss.spec.javax.enterprise.deploy
+ jboss-jad-api_1.2_spec
+
+
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
+
+
+ org.jboss.spec.javax.resource
+ jboss-connector-api_1.5_spec
+
+
+
+ org.jboss.spec.javax.security.jacc
+ jboss-jacc-api_1.1_spec
+
+
+
+ org.jboss.spec.javax.security.auth.message
+ jboss-jaspi-api_1.0_spec
+
+
+
+ org.jboss.spec.javax.servlet.jsp
+ jboss-jsp-api_2.2_spec
+
+
+
+ org.jboss.spec.javax.servlet
+ jboss-servlet-api_3.0_spec
+
+
+
+ org.jboss.spec.javax.transaction
+ jboss-transaction-api_1.1_spec
+
+
+
+ org.jboss.spec.javax.xml.registry
+ jboss-jaxr-api_1.0_spec
+
org.jboss.jbossas