Thanks to the apiComparator plugin for IDEA.
- correct parameter names (important for javadoc / ide / etc?)
- Timer* use java.util.Date not java.sql.Date
- removed superclass exceptions from 'throws' list
- added missing @deprecated tags
Maas
wrote:
> What's the advantage to supporting JDBC through JCA? Is it that
> JCA requires logic to deal with associating with transactions and
> security, and if JDBC works through that we don't have to implement the
> same features twice? Or are there other considerations?
>
> Aaron
>
> On Fri, 15 Aug 2003, David Jencks wrote:
> > IMNSHO jdbc support should be through the JCA (connector) support and
> > jca-jdbc wrappers.
> >
> > I think jca should be a separate module ("connector")
> >
> > AFAIK the only specific communication with the ejb subsystem needed can
> > be provided by an interceptor that makes sure connection handles get
> > re-associated under the correct security context.
>
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/AccessLocalException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/AccessLocalException.java,v
retrieving revision 1.1
diff -u -r1.1 AccessLocalException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/AccessLocalException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/AccessLocalException.java 15 Aug 2003 21:47:37 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -68,10 +69,12 @@
public AccessLocalException() {
super();
}
-
public AccessLocalException(String s) {
- super(s);
+
+ public AccessLocalException(String message) {
+ super(message);
}
-
public AccessLocalException(String s, Exception e) {
- super(s, e);
+
+ public AccessLocalException(String message, Exception ex) {
+ super(message, ex);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/CreateException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/CreateException.java,v
retrieving revision 1.1
diff -u -r1.1 CreateException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/CreateException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/CreateException.java 15 Aug 2003 21:47:37 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -68,7 +69,8 @@
public CreateException() {
super();
}
-
public CreateException(String s) {
- super(s);
+
+ public CreateException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/DuplicateKeyException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/DuplicateKeyException.java,v
retrieving revision 1.1
diff -u -r1.1 DuplicateKeyException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/DuplicateKeyException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/DuplicateKeyException.java 15 Aug 2003 21:47:37 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -68,7 +69,8 @@
public DuplicateKeyException() {
super();
}
-
public DuplicateKeyException(String s) {
- super(s);
+
+ public DuplicateKeyException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBContext.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBContext.java,v
retrieving revision 1.1
diff -u -r1.1 EJBContext.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBContext.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBContext.java 15 Aug 2003 21:47:37 -0000
@@ -58,22 +58,47 @@
* ====================================================================
*/
package javax.ejb;
-
import java.security.Identity;
import java.security.Principal;
import java.util.Properties;
import javax.transaction.UserTransaction;
-
/**
+
+import java.security.Identity;
+import java.security.Principal;
+import java.util.Properties;
+import javax.transaction.UserTransaction;
+
+/**
*
*
*
* @version $Revision: 1.1 $ $Date: 2003/08/14 16:14:31 $
*/
public interface EJBContext {
- Identity getCallerIdentity() throws IllegalStateException;
-
Principal getCallerPrincipal() throws IllegalStateException;
-
EJBHome getEJBHome() throws IllegalStateException;
-
EJBLocalHome getEJBLocalHome() throws IllegalStateException;
-
Properties getEnvironment();
-
boolean getRollbackOnly() throws IllegalStateException;
-
TimerService getTimerService() throws IllegalStateException;
-
UserTransaction getUserTransaction() throws IllegalStateException;
-
boolean isCallerInRole(Identity identity) throws IllegalStateException;
-
boolean isCallerInRole(String string) throws IllegalStateException;
-
void setRollbackOnly() throws IllegalStateException;
}
+ EJBHome getEJBHome();
+
+ EJBLocalHome getEJBLocalHome();
+
+ /**
+ * @deprecated
+ */
+ Properties getEnvironment();
+
+ /**
+ * @deprecated
+ */
+ Identity getCallerIdentity();
+
+ Principal getCallerPrincipal();
+
+ /**
+ * @deprecated
+ */
+ boolean isCallerInRole(Identity role);
+
+ boolean isCallerInRole(String roleName);
+
+ UserTransaction getUserTransaction() throws IllegalStateException;
+
+ void setRollbackOnly() throws IllegalStateException;
+
+ boolean getRollbackOnly() throws IllegalStateException;
+
+ TimerService getTimerService() throws IllegalStateException;
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBException.java,v
retrieving revision 1.1
diff -u -r1.1 EJBException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBException.java 15 Aug 2003 21:47:38 -0000
@@ -58,7 +58,11 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
*
*
*
@@ -68,20 +72,43 @@
public EJBException() {
super();
}
-
public EJBException(Exception e) {
- super(e);
+
+ public EJBException(Exception ex) {
+ super(ex);
}
-
public EJBException(String s) {
- super(s);
+
+ public EJBException(String message) {
+ super(message);
}
-
public EJBException(String s, Exception e) {
- super(s, e);
+
+ public EJBException(String message, Exception ex) {
+ super(message, ex);
}
-
public Exception getCausedByException() {
+
+ public Exception getCausedByException() {
Throwable cause = getCause();
if (cause instanceof Exception) {
return (Exception) cause;
}
return null;
+ }
+
+ public String getMessage() {
+ return getMessage() + "todo";
+ }
+
+
+ public void printStackTrace(PrintStream ps) {
+ super.printStackTrace(ps);
+ }
+
+
+ public void printStackTrace() {
+ super.printStackTrace();
+ }
+
+
+ public void printStackTrace(PrintWriter pw) {
+ super.printStackTrace(pw);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBHome.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBHome.java,v
retrieving revision 1.1
diff -u -r1.1 EJBHome.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBHome.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBHome.java 15 Aug 2003 21:47:38 -0000
@@ -58,8 +58,11 @@
* ====================================================================
*/
package javax.ejb;
-
import java.rmi.Remote;
import java.rmi.RemoteException;
-
/**
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
*
*
*
@@ -67,6 +70,10 @@
*/
public interface EJBHome extends Remote {
EJBMetaData getEJBMetaData() throws RemoteException;
-
HomeHandle getHomeHandle() throws RemoteException;
-
void remove(Handle handle) throws RemoteException, RemoveException;
-
void remove(Object object) throws RemoteException, RemoveException;
}
+
+ HomeHandle getHomeHandle() throws RemoteException;
+
+ void remove(Handle handle) throws RemoteException, RemoveException;
+
+ void remove(Object primaryKey) throws RemoteException, RemoveException;
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalHome.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalHome.java,v
retrieving revision 1.1
diff -u -r1.1 EJBLocalHome.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalHome.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalHome.java 15 Aug 2003 21:47:38 -0000
@@ -58,11 +58,13 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
* @version $Revision: 1.1 $ $Date: 2003/08/14 16:14:31 $
*/
public interface EJBLocalHome {
- void remove(Object object) throws RemoveException, EJBException;
}
+ void remove(Object primaryKey) throws RemoveException, EJBException;
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalObject.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalObject.java,v
retrieving revision 1.1
diff -u -r1.1 EJBLocalObject.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalObject.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalObject.java 15 Aug 2003 21:47:38 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -66,6 +67,10 @@
*/
public interface EJBLocalObject {
EJBLocalHome getEJBLocalHome() throws EJBException;
-
Object getPrimaryKey() throws EJBException;
-
boolean isIdentical(EJBLocalObject ejbLocalObject) throws EJBException;
-
void remove() throws RemoveException, EJBException;
}
+
+ Object getPrimaryKey() throws EJBException;
+
+ boolean isIdentical(EJBLocalObject obj) throws EJBException;
+
+ void remove() throws RemoveException, EJBException;
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBObject.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBObject.java,v
retrieving revision 1.1
diff -u -r1.1 EJBObject.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBObject.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBObject.java 15 Aug 2003 21:47:39 -0000
@@ -58,8 +58,11 @@
* ====================================================================
*/
package javax.ejb;
-
import java.rmi.Remote;
import java.rmi.RemoteException;
-
/**
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
*
*
*
@@ -67,7 +70,12 @@
*/
public interface EJBObject extends Remote {
EJBHome getEJBHome() throws RemoteException;
-
Handle getHandle() throws RemoteException;
-
Object getPrimaryKey() throws RemoteException;
-
boolean isIdentical(EJBObject ejbObject) throws RemoteException;
-
void remove() throws RemoteException, RemoveException;
}
+
+ Handle getHandle() throws RemoteException;
+
+ Object getPrimaryKey() throws RemoteException;
+
+ boolean isIdentical(EJBObject obj) throws RemoteException;
+
+ void remove() throws RemoteException, RemoveException;
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/EntityBean.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EntityBean.java,v
retrieving revision 1.1
diff -u -r1.1 EntityBean.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/EntityBean.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/EntityBean.java 15 Aug 2003 21:47:39 -0000
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.ejb;
-
import java.rmi.RemoteException;
-
/**
+
+import java.rmi.RemoteException;
+
+/**
*
*
*
@@ -67,10 +69,16 @@
*/
public interface EntityBean extends EnterpriseBean {
void ejbActivate() throws EJBException, RemoteException;
-
void ejbLoad() throws EJBException, RemoteException;
-
void ejbPassivate() throws EJBException, RemoteException;
-
void ejbRemove() throws RemoveException, EJBException, RemoteException;
-
void ejbStore() throws EJBException, RemoteException;
-
void setEntityContext(EntityContext entityContext) throws EJBException, RemoteException;
-
void unsetEntityContext() throws EJBException, RemoteException;
+
+ void ejbLoad() throws EJBException, RemoteException;
+
+ void ejbPassivate() throws EJBException, RemoteException;
+
+ void ejbRemove() throws RemoveException, EJBException, RemoteException;
+
+ void ejbStore() throws EJBException, RemoteException;
+
+ void setEntityContext(EntityContext ctx) throws EJBException, RemoteException;
+
+ void unsetEntityContext() throws EJBException, RemoteException;
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/FinderException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/FinderException.java,v
retrieving revision 1.1
diff -u -r1.1 FinderException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/FinderException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/FinderException.java 15 Aug 2003 21:47:39 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -68,7 +69,8 @@
public FinderException() {
super();
}
-
public FinderException(String s) {
- super(s);
+
+ public FinderException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/MessageDrivenBean.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/MessageDrivenBean.java,v
retrieving revision 1.1
diff -u -r1.1 MessageDrivenBean.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/MessageDrivenBean.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/MessageDrivenBean.java 15 Aug 2003 21:47:39 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -66,4 +67,6 @@
*/
public interface MessageDrivenBean extends EnterpriseBean {
void ejbRemove() throws EJBException;
-
void setMessageDrivenContext(MessageDrivenContext messageDrivenContext) throws EJBException;
}
+
+ void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException;
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchEntityException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchEntityException.java,v
retrieving revision 1.1
diff -u -r1.1 NoSuchEntityException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchEntityException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchEntityException.java 15 Aug 2003 21:47:40 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -68,10 +69,12 @@
public NoSuchEntityException() {
super();
}
-
public NoSuchEntityException(Exception e) {
- super(e);
+
+ public NoSuchEntityException(Exception ex) {
+ super(ex);
}
-
public NoSuchEntityException(String s) {
- super(s);
+
+ public NoSuchEntityException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchObjectLocalException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchObjectLocalException.java,v
retrieving revision 1.1
diff -u -r1.1 NoSuchObjectLocalException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchObjectLocalException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchObjectLocalException.java 15 Aug 2003 21:47:40 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -68,9 +69,12 @@
public NoSuchObjectLocalException() {
super();
}
-
public NoSuchObjectLocalException(String s) {
- super(s);
+
+ public NoSuchObjectLocalException(String message) {
+ super(message);
}
-
public NoSuchObjectLocalException(String s, Exception e) {
- super(s, e);
- }
}
+
+ public NoSuchObjectLocalException(String message, Exception ex) {
+ super(message, ex);
+ }
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/ObjectNotFoundException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/ObjectNotFoundException.java,v
retrieving revision 1.1
diff -u -r1.1 ObjectNotFoundException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/ObjectNotFoundException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/ObjectNotFoundException.java 15 Aug 2003 21:47:40 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -68,7 +69,8 @@
public ObjectNotFoundException() {
super();
}
-
public ObjectNotFoundException(String s) {
- super(s);
+
+ public ObjectNotFoundException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/RemoveException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/RemoveException.java,v
retrieving revision 1.1
diff -u -r1.1 RemoveException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/RemoveException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/RemoveException.java 15 Aug 2003 21:47:40 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -68,7 +69,8 @@
public RemoveException() {
super();
}
-
public RemoveException(String s) {
- super(s);
+
+ public RemoveException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionBean.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionBean.java,v
retrieving revision 1.1
diff -u -r1.1 SessionBean.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionBean.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionBean.java 15 Aug 2003 21:47:41 -0000
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.ejb;
-
import java.rmi.RemoteException;
-
/**
+
+import java.rmi.RemoteException;
+
+/**
*
*
*
@@ -67,7 +69,10 @@
*/
public interface SessionBean extends EnterpriseBean {
void ejbActivate() throws EJBException, RemoteException;
-
void ejbPassivate() throws EJBException, RemoteException;
-
void ejbRemove() throws EJBException, RemoteException;
-
void setSessionContext(SessionContext sessionContext) throws EJBException, RemoteException;
+
+ void ejbPassivate() throws EJBException, RemoteException;
+
+ void ejbRemove() throws EJBException, RemoteException;
+
+ void setSessionContext(SessionContext ctx) throws EJBException, RemoteException;
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionSynchronization.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionSynchronization.java,v
retrieving revision 1.1
diff -u -r1.1 SessionSynchronization.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionSynchronization.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionSynchronization.java 15 Aug 2003 21:47:41 -0000
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.ejb;
-
import java.rmi.RemoteException;
-
/**
+
+import java.rmi.RemoteException;
+
+/**
*
*
*
@@ -67,6 +69,8 @@
*/
public interface SessionSynchronization {
void afterBegin() throws EJBException, RemoteException;
-
void afterCompletion(boolean b) throws EJBException, RemoteException;
-
void beforeCompletion() throws EJBException, RemoteException;
+
+ void afterCompletion(boolean committed) throws EJBException, RemoteException;
+
+ void beforeCompletion() throws EJBException, RemoteException;
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/Timer.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/Timer.java,v
retrieving revision 1.1
diff -u -r1.1 Timer.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/Timer.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/Timer.java 15 Aug 2003 21:47:41 -0000
@@ -58,8 +58,11 @@
* ====================================================================
*/
package javax.ejb;
-
import java.io.Serializable;
import java.sql.Date;
-
/**
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
*
*
*
@@ -67,8 +70,12 @@
*/
public interface Timer {
void cancel() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-
TimerHandle getHandle() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-
Serializable getInfo() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-
Date getNextTimeout() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-
long getTimeRemaining() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
+
+ long getTimeRemaining() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
+
+ Date getNextTimeout() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
+
+ Serializable getInfo() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
+
+ TimerHandle getHandle() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/TimerService.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/TimerService.java,v
retrieving revision 1.1
diff -u -r1.1 TimerService.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/TimerService.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/TimerService.java 15 Aug 2003 21:47:41 -0000
@@ -58,17 +58,25 @@
* ====================================================================
*/
package javax.ejb;
-
import java.io.Serializable;
import java.sql.Date;
import java.util.Collection;
-
/**
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Date;
+
+/**
*
*
*
* @version $Revision: 1.1 $ $Date: 2003/08/14 16:14:31 $
*/
public interface TimerService {
- Timer createTimer(Date date, long l, Serializable serializable) throws IllegalArgumentException, IllegalStateException, EJBException;
-
Timer createTimer(Date date, Serializable serializable) throws IllegalArgumentException, IllegalStateException, EJBException;
-
Timer createTimer(long l1, long l2, Serializable serializable) throws IllegalArgumentException, IllegalStateException, EJBException;
-
Timer createTimer(long l, Serializable serializable) throws IllegalArgumentException, IllegalStateException, EJBException;
-
Collection getTimers() throws IllegalStateException, EJBException;
+ Timer createTimer(Date initialExpiration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException;
+
+ Timer createTimer(Date expiration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException;
+
+ Timer createTimer(long initialDuration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException;
+
+ Timer createTimer(long duration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException;
+
+ Collection getTimers() throws IllegalStateException, EJBException;
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRequiredLocalException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRequiredLocalException.java,v
retrieving revision 1.1
diff -u -r1.1 TransactionRequiredLocalException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRequiredLocalException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRequiredLocalException.java 15 Aug 2003 21:47:41 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -68,6 +69,8 @@
public TransactionRequiredLocalException() {
super();
}
-
public TransactionRequiredLocalException(String s) {
- super(s);
- }
}
+
+ public TransactionRequiredLocalException(String message) {
+ super(message);
+ }
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRolledbackLocalException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRolledbackLocalException.java,v
retrieving revision 1.1
diff -u -r1.1 TransactionRolledbackLocalException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRolledbackLocalException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRolledbackLocalException.java 15 Aug 2003 21:47:42 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -68,10 +69,12 @@
public TransactionRolledbackLocalException() {
super();
}
-
public TransactionRolledbackLocalException(String s) {
- super(s);
+
+ public TransactionRolledbackLocalException(String message) {
+ super(message);
}
-
public TransactionRolledbackLocalException(String s, Exception e) {
- super(s, e);
+
+ public TransactionRolledbackLocalException(String message, Exception ex) {
+ super(message, ex);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/ejb/spi/HandleDelegate.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/ejb/spi/HandleDelegate.java,v
retrieving revision 1.1
diff -u -r1.1 HandleDelegate.java
--- incubator-geronimo/specs/j2ee/src/java/javax/ejb/spi/HandleDelegate.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/ejb/spi/HandleDelegate.java 15 Aug 2003 21:47:42 -0000
@@ -58,16 +58,25 @@
* ====================================================================
*/
package javax.ejb.spi;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import javax.ejb.EJBHome;
import javax.ejb.EJBObject;
-
/**
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import javax.ejb.EJBHome;
+import javax.ejb.EJBObject;
+
+/**
*
*
*
* @version $Revision: 1.1 $ $Date: 2003/08/14 16:14:32 $
*/
public interface HandleDelegate {
- EJBHome readEJBHome(ObjectInputStream objectInputStream) throws ClassNotFoundException, IOException;
-
EJBObject readEJBObject(ObjectInputStream objectInputStream) throws ClassNotFoundException, IOException;
-
void writeEJBHome(EJBHome ejbHome, ObjectOutputStream objectOutputStream) throws IOException;
-
void writeEJBObject(EJBObject ejbObject, ObjectOutputStream objectOutputStream) throws IOException;
+ EJBHome readEJBHome(ObjectInputStream istream) throws ClassNotFoundException, IOException;
+
+ EJBObject readEJBObject(ObjectInputStream istream) throws ClassNotFoundException, IOException;
+
+ void writeEJBHome(EJBHome ejbHome, ObjectOutputStream ostream) throws IOException;
+
+ void writeEJBObject(EJBObject ejbObject, ObjectOutputStream ostream) throws IOException;
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicCommitException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicCommitException.java,v
retrieving revision 1.1
diff -u -r1.1 HeuristicCommitException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicCommitException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicCommitException.java 15 Aug 2003 21:47:42 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
@@ -68,6 +69,8 @@
public HeuristicCommitException() {
super();
}
-
public HeuristicCommitException(String s) {
- super(s);
- }
}
+
+ public HeuristicCommitException(String message) {
+ super(message);
+ }
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicMixedException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicMixedException.java,v
retrieving revision 1.1
diff -u -r1.1 HeuristicMixedException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicMixedException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicMixedException.java 15 Aug 2003 21:47:42 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
@@ -68,7 +69,8 @@
public HeuristicMixedException() {
super();
}
-
public HeuristicMixedException(String s) {
- super(s);
+
+ public HeuristicMixedException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicRollbackException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicRollbackException.java,v
retrieving revision 1.1
diff -u -r1.1 HeuristicRollbackException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicRollbackException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicRollbackException.java 15 Aug 2003 21:47:43 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
@@ -68,7 +69,8 @@
public HeuristicRollbackException() {
super();
}
-
public HeuristicRollbackException(String s) {
- super(s);
+
+ public HeuristicRollbackException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/InvalidTransactionException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/InvalidTransactionException.java,v
retrieving revision 1.1
diff -u -r1.1 InvalidTransactionException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/InvalidTransactionException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/InvalidTransactionException.java 15 Aug 2003 21:47:43 -0000
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.transaction;
-
import java.rmi.RemoteException;
-
/**
+
+import java.rmi.RemoteException;
+
+/**
*
*
*
@@ -69,6 +71,8 @@
public InvalidTransactionException() {
super();
}
-
public InvalidTransactionException(String s) {
- super(s);
- }
}
+
+ public InvalidTransactionException(String message) {
+ super(message);
+ }
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/NotSupportedException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/NotSupportedException.java,v
retrieving revision 1.1
diff -u -r1.1 NotSupportedException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/NotSupportedException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/NotSupportedException.java 15 Aug 2003 21:47:43 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
@@ -68,7 +69,8 @@
public NotSupportedException() {
super();
}
-
public NotSupportedException(String s) {
- super(s);
+
+ public NotSupportedException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/RollbackException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/RollbackException.java,v
retrieving revision 1.1
diff -u -r1.1 RollbackException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/RollbackException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/RollbackException.java 15 Aug 2003 21:47:43 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
@@ -68,7 +69,8 @@
public RollbackException() {
super();
}
-
public RollbackException(String s) {
- super(s);
+
+ public RollbackException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/Synchronization.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/Synchronization.java,v
retrieving revision 1.1
diff -u -r1.1 Synchronization.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/Synchronization.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/Synchronization.java 15 Aug 2003 21:47:44 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
@@ -66,4 +67,6 @@
*/
public interface Synchronization {
void beforeCompletion();
-
void afterCompletion(int i);
}
+
+ void afterCompletion(int status);
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/SystemException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/SystemException.java,v
retrieving revision 1.1
diff -u -r1.1 SystemException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/SystemException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/SystemException.java 15 Aug 2003 21:47:44 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
@@ -66,13 +67,17 @@
*/
public class SystemException extends Exception {
public int errorCode;
-
public SystemException() {
+
+ public SystemException() {
super();
}
-
public SystemException(String s) {
- super(s);
+
+ public SystemException(String message) {
+ super(message);
}
-
public SystemException(int errorCode) {
+
+ public SystemException(int errorCode) {
super();
this.errorCode = errorCode;
- }
}
+ }
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/Transaction.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/Transaction.java,v
retrieving revision 1.1
diff -u -r1.1 Transaction.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/Transaction.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/Transaction.java 15 Aug 2003 21:47:44 -0000
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.transaction;
-
import javax.transaction.xa.XAResource;
-
/**
+
+import javax.transaction.xa.XAResource;
+
+/**
*
*
*
@@ -67,10 +69,16 @@
*/
public interface Transaction {
void commit() throws HeuristicMixedException, HeuristicRollbackException, RollbackException, SecurityException, SystemException;
-
boolean delistResource(XAResource xaResource, int i) throws IllegalStateException, SystemException;
-
boolean enlistResource(XAResource xaResource) throws IllegalStateException, RollbackException, SystemException;
-
int getStatus() throws SystemException;
-
void registerSynchronization(Synchronization synchronization) throws IllegalStateException, RollbackException, SystemException;
-
void rollback() throws IllegalStateException, SystemException;
-
void setRollbackOnly() throws IllegalStateException, SystemException;
+
+ boolean delistResource(XAResource xaRes, int flag) throws IllegalStateException, SystemException;
+
+ boolean enlistResource(XAResource xaRes) throws IllegalStateException, RollbackException, SystemException;
+
+ int getStatus() throws SystemException;
+
+ void registerSynchronization(Synchronization synch) throws IllegalStateException, RollbackException, SystemException;
+
+ void rollback() throws IllegalStateException, SystemException;
+
+ void setRollbackOnly() throws IllegalStateException, SystemException;
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionManager.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionManager.java,v
retrieving revision 1.1
diff -u -r1.1 TransactionManager.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionManager.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionManager.java 15 Aug 2003 21:47:44 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
@@ -66,11 +67,20 @@
*/
public interface TransactionManager {
void begin() throws NotSupportedException, SystemException;
-
void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException, RollbackException, SecurityException, SystemException;
-
int getStatus() throws SystemException;
-
Transaction getTransaction() throws SystemException;
-
void resume(Transaction transaction) throws IllegalStateException, InvalidTransactionException, SystemException;
-
void rollback() throws IllegalStateException, SecurityException, SystemException;
-
void setRollbackOnly() throws IllegalStateException, SystemException;
-
void setTransactionTimeout(int i) throws SystemException;
-
Transaction suspend() throws SystemException;
}
+
+ void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException, RollbackException, SecurityException, SystemException;
+
+ int getStatus() throws SystemException;
+
+ Transaction getTransaction() throws SystemException;
+
+ void resume(Transaction tobj) throws IllegalStateException, InvalidTransactionException, SystemException;
+
+ void rollback() throws IllegalStateException, SecurityException, SystemException;
+
+ void setRollbackOnly() throws IllegalStateException, SystemException;
+
+ void setTransactionTimeout(int seconds) throws SystemException;
+
+ Transaction suspend() throws SystemException;
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRequiredException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRequiredException.java,v
retrieving revision 1.1
diff -u -r1.1 TransactionRequiredException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRequiredException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRequiredException.java 15 Aug 2003 21:47:45 -0000
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.transaction;
-
import java.rmi.RemoteException;
-
/**
+
+import java.rmi.RemoteException;
+
+/**
*
*
*
@@ -69,6 +71,8 @@
public TransactionRequiredException() {
super();
}
-
public TransactionRequiredException(String s) {
- super(s);
- }
}
+
+ public TransactionRequiredException(String message) {
+ super(message);
+ }
+}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRolledbackException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRolledbackException.java,v
retrieving revision 1.1
diff -u -r1.1 TransactionRolledbackException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRolledbackException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRolledbackException.java 15 Aug 2003 21:47:45 -0000
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.transaction;
-
import java.rmi.RemoteException;
-
/**
+
+import java.rmi.RemoteException;
+
+/**
*
*
*
@@ -69,7 +71,8 @@
public TransactionRolledbackException() {
super();
}
-
public TransactionRolledbackException(String s) {
- super(s);
+
+ public TransactionRolledbackException(String message) {
+ super(message);
}
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/UserTransaction.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/UserTransaction.java,v
retrieving revision 1.1
diff -u -r1.1 UserTransaction.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/UserTransaction.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/UserTransaction.java 15 Aug 2003 21:47:45 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
@@ -66,9 +67,14 @@
*/
public interface UserTransaction {
void begin() throws NotSupportedException, SystemException;
-
void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException, RollbackException, SecurityException, SystemException;
-
int getStatus() throws SystemException;
-
void rollback() throws IllegalStateException, SecurityException, SystemException;
-
void setRollbackOnly() throws IllegalStateException, SystemException;
-
void setTransactionTimeout(int i) throws SystemException;
+
+ void commit() throws HeuristicMixedException, HeuristicRollbackException, IllegalStateException, RollbackException, SecurityException, SystemException;
+
+ int getStatus() throws SystemException;
+
+ void rollback() throws IllegalStateException, SecurityException, SystemException;
+
+ void setRollbackOnly() throws IllegalStateException, SystemException;
+
+ void setTransactionTimeout(int seconds) throws SystemException;
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAException.java,v
retrieving revision 1.1
diff -u -r1.1 XAException.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAException.java 15 Aug 2003 21:47:45 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction.xa;
-
/**
+
+/**
*
*
*
@@ -90,14 +91,18 @@
public static final int XAER_RMFAIL = -7;
public static final int XAER_DUPID = -8;
public static final int XAER_OUTSIDE = -9;
-
public int errorCode;
-
public XAException() {
+
+ public int errorCode;
+
+ public XAException() {
super();
}
-
public XAException(String s) {
- super(s);
+
+ public XAException(String message) {
+ super(message);
}
-
public XAException(int errorCode) {
+
+ public XAException(int errorCode) {
super();
this.errorCode = errorCode;
}
Index: incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAResource.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAResource.java,v
retrieving revision 1.1
diff -u -r1.1 XAResource.java
--- incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAResource.java 14 Aug 2003 16:14:32 -0000 1.1
+++ incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAResource.java 15 Aug 2003 21:47:46 -0000
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction.xa;
-
/**
+
+/**
*
*
*
@@ -76,13 +77,24 @@
int TMSUSPEND = 33554432;
int XA_RDONLY = 3;
int XA_OK = 0;
-
void commit(Xid xid, boolean b) throws XAException;
-
void end(Xid xid, int i) throws XAException;
-
void forget(Xid xid) throws XAException;
-
int getTransactionTimeout() throws XAException;
-
boolean isSameRM(XAResource xaResource) throws XAException;
-
int prepare(Xid xid) throws XAException;
-
Xid[] recover(int i) throws XAException;
-
void rollback(Xid xid) throws XAException;
-
boolean setTransactionTimeout(int i) throws XAException;
-
void start(Xid xid, int i) throws XAException;
}
+
+ void commit(Xid xid, boolean onePhase) throws XAException;
+
+ void end(Xid xid, int flags) throws XAException;
+
+ void forget(Xid xid) throws XAException;
+
+ int getTransactionTimeout() throws XAException;
+
+ boolean isSameRM(XAResource xaResource) throws XAException;
+
+ int prepare(Xid xid) throws XAException;
+
+ Xid[] recover(int flag) throws XAException;
+
+ void rollback(Xid xid) throws XAException;
+
+ boolean setTransactionTimeout(int seconds) throws XAException;
+
+ void start(Xid xid, int flags) throws XAException;
+}
