[jboss-cvs] JBossAS SVN: r102915 - in trunk: ejb3/src/main/java/org/jboss/as/ejb3/timerservice and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 24 14:08:39 EDT 2010
Author: jaikiran
Date: 2010-03-24 14:08:38 -0400 (Wed, 24 Mar 2010)
New Revision: 102915
Modified:
trunk/component-matrix/pom.xml
trunk/ejb3/src/main/java/org/jboss/as/ejb3/timerservice/TimerServiceFacade.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/StatelessSessionEnterpriseContext.java
trunk/server/src/main/java/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java
Log:
JBAS-7845 Upgraded to 1.0.0.Beta2 of jboss-ejb-api_3.1_spec
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-03-24 18:06:05 UTC (rev 102914)
+++ trunk/component-matrix/pom.xml 2010-03-24 18:08:38 UTC (rev 102915)
@@ -139,6 +139,7 @@
<version.staxex>2.1.1</version.staxex>
<version.streambuffer>1.0</version.streambuffer>
<version.org.jboss.spec.javaee>1.0.0.Beta1</version.org.jboss.spec.javaee>
+ <version.spec.javaee.ejb.api>1.0.0.Beta2</version.spec.javaee.ejb.api>
<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>
@@ -1109,7 +1110,7 @@
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <version>${version.org.jboss.spec.javaee}</version>
+ <version>${version.spec.javaee.ejb.api}</version>
</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-24 18:06:05 UTC (rev 102914)
+++ trunk/ejb3/src/main/java/org/jboss/as/ejb3/timerservice/TimerServiceFacade.java 2010-03-24 18:08:38 UTC (rev 102915)
@@ -115,12 +115,6 @@
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");
@@ -137,7 +131,7 @@
return objectName;
}
- public Collection<?> getTimers() throws IllegalStateException, EJBException
+ public Collection<Timer> getTimers() throws IllegalStateException, EJBException
{
assertAllowedIn("TimerService.getTimers");
return delegate.getTimers();
Modified: trunk/server/src/main/java/org/jboss/ejb/EntityEnterpriseContext.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/EntityEnterpriseContext.java 2010-03-24 18:06:05 UTC (rev 102914)
+++ trunk/server/src/main/java/org/jboss/ejb/EntityEnterpriseContext.java 2010-03-24 18:08:38 UTC (rev 102915)
@@ -463,19 +463,13 @@
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
+ public Collection<Timer> getTimers() throws IllegalStateException, EJBException
{
assertAllowedIn("TimerService.getTimers");
return timerService.getTimers();
Modified: trunk/server/src/main/java/org/jboss/ejb/MessageDrivenEnterpriseContext.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/MessageDrivenEnterpriseContext.java 2010-03-24 18:06:05 UTC (rev 102914)
+++ trunk/server/src/main/java/org/jboss/ejb/MessageDrivenEnterpriseContext.java 2010-03-24 18:08:38 UTC (rev 102915)
@@ -28,16 +28,17 @@
import java.security.Principal;
import java.util.Collection;
import java.util.Date;
+
import javax.ejb.EJBContext;
import javax.ejb.EJBException;
import javax.ejb.EJBHome;
import javax.ejb.EJBLocalHome;
import javax.ejb.MessageDrivenBean;
import javax.ejb.MessageDrivenContext;
+import javax.ejb.ScheduleExpression;
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;
@@ -305,19 +306,13 @@
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
+ public Collection<Timer> getTimers() throws IllegalStateException, EJBException
{
assertAllowedIn("TimerService.getTimers");
return timerService.getTimers();
Modified: trunk/server/src/main/java/org/jboss/ejb/StatelessSessionEnterpriseContext.java
===================================================================
--- trunk/server/src/main/java/org/jboss/ejb/StatelessSessionEnterpriseContext.java 2010-03-24 18:06:05 UTC (rev 102914)
+++ trunk/server/src/main/java/org/jboss/ejb/StatelessSessionEnterpriseContext.java 2010-03-24 18:08:38 UTC (rev 102915)
@@ -387,19 +387,13 @@
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
+ public Collection<Timer> getTimers() throws IllegalStateException, EJBException
{
assertAllowedIn("TimerService.getTimers");
return timerService.getTimers();
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-24 18:06:05 UTC (rev 102914)
+++ trunk/server/src/main/java/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java 2010-03-24 18:08:38 UTC (rev 102915)
@@ -129,13 +129,6 @@
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
@@ -143,7 +136,7 @@
throw new IllegalStateException("The object does not implement javax.ejb.TimedObject interface!");
}
- public Collection getTimers() throws IllegalStateException, EJBException
+ public Collection<Timer> getTimers() throws IllegalStateException, EJBException
{
return Collections.EMPTY_LIST;
}
More information about the jboss-cvs-commits
mailing list