jboynes 2003/08/15 16:46:10
Modified: specs/j2ee/src/java/javax/ejb AccessLocalException.java
CreateException.java DuplicateKeyException.java
EJBContext.java EJBException.java EJBHome.java
EJBLocalHome.java EJBLocalObject.java
EJBMetaData.java EJBObject.java EnterpriseBean.java
EntityBean.java EntityContext.java
FinderException.java Handle.java HomeHandle.java
MessageDrivenBean.java MessageDrivenContext.java
NoSuchEntityException.java
NoSuchObjectLocalException.java
ObjectNotFoundException.java RemoveException.java
SessionBean.java SessionContext.java
SessionSynchronization.java TimedObject.java
Timer.java TimerHandle.java TimerService.java
TransactionRequiredLocalException.java
TransactionRolledbackLocalException.java
specs/j2ee/src/java/javax/ejb/spi HandleDelegate.java
specs/j2ee/src/java/javax/transaction
HeuristicCommitException.java
HeuristicMixedException.java
HeuristicRollbackException.java
InvalidTransactionException.java
NotSupportedException.java RollbackException.java
Status.java Synchronization.java
SystemException.java Transaction.java
TransactionManager.java
TransactionRequiredException.java
TransactionRolledbackException.java
UserTransaction.java
specs/j2ee/src/java/javax/transaction/xa XAException.java
XAResource.java Xid.java
specs/j2ee/src/java/javax/xml/rpc/handler
MessageContext.java
Log:
Fix for API signatures, reformat and optimize imports
From Maas van den Berg [EMAIL PROTECTED]
Revision Changes Path
1.2 +9 -6
incubator-geronimo/specs/j2ee/src/java/javax/ejb/AccessLocalException.java
Index: AccessLocalException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/AccessLocalException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AccessLocalException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ AccessLocalException.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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);
}
}
1.2 +6 -4
incubator-geronimo/specs/j2ee/src/java/javax/ejb/CreateException.java
Index: CreateException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/CreateException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CreateException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ CreateException.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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);
}
}
1.2 +6 -4
incubator-geronimo/specs/j2ee/src/java/javax/ejb/DuplicateKeyException.java
Index: DuplicateKeyException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/DuplicateKeyException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DuplicateKeyException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ DuplicateKeyException.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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);
}
}
1.2 +39 -14
incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBContext.java
Index: EJBContext.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBContext.java 14 Aug 2003 16:14:31 -0000 1.1
+++ EJBContext.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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$ $Date$
*/
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;
+}
1.2 +36 -9
incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBException.java
Index: EJBException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ EJBException.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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);
}
}
1.2 +13 -6
incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBHome.java
Index: EJBHome.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBHome.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBHome.java 14 Aug 2003 16:14:31 -0000 1.1
+++ EJBHome.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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;
+}
1.2 +5 -3
incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalHome.java
Index: EJBLocalHome.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalHome.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBLocalHome.java 14 Aug 2003 16:14:31 -0000 1.1
+++ EJBLocalHome.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -58,11 +58,13 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
* @version $Revision$ $Date$
*/
public interface EJBLocalHome {
- void remove(Object object) throws RemoveException, EJBException;
}
+ void remove(Object primaryKey) throws RemoveException, EJBException;
+}
1.2 +10 -5
incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalObject.java
Index: EJBLocalObject.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBLocalObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBLocalObject.java 14 Aug 2003 16:14:31 -0000 1.1
+++ EJBLocalObject.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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;
+}
1.2 +13 -7
incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBMetaData.java
Index: EJBMetaData.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBMetaData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBMetaData.java 14 Aug 2003 16:14:31 -0000 1.1
+++ EJBMetaData.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -66,9 +67,14 @@
*/
public interface EJBMetaData {
EJBHome getEJBHome();
-
Class getHomeInterfaceClass();
-
Class getPrimaryKeyClass();
-
Class getRemoteInterfaceClass();
-
boolean isSession();
-
boolean isStatelessSession();
+
+ Class getHomeInterfaceClass();
+
+ Class getPrimaryKeyClass();
+
+ Class getRemoteInterfaceClass();
+
+ boolean isSession();
+
+ boolean isStatelessSession();
}
1.2 +15 -7
incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBObject.java
Index: EJBObject.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EJBObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBObject.java 14 Aug 2003 16:14:31 -0000 1.1
+++ EJBObject.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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;
+}
1.2 +5 -3
incubator-geronimo/specs/j2ee/src/java/javax/ejb/EnterpriseBean.java
Index: EnterpriseBean.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EnterpriseBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnterpriseBean.java 14 Aug 2003 16:14:31 -0000 1.1
+++ EnterpriseBean.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.ejb;
-
import java.io.Serializable;
-
/**
+
+import java.io.Serializable;
+
+/**
*
*
*
1.2 +17 -9
incubator-geronimo/specs/j2ee/src/java/javax/ejb/EntityBean.java
Index: EntityBean.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EntityBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EntityBean.java 14 Aug 2003 16:14:31 -0000 1.1
+++ EntityBean.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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;
}
1.2 +7 -4
incubator-geronimo/specs/j2ee/src/java/javax/ejb/EntityContext.java
Index: EntityContext.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/EntityContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EntityContext.java 14 Aug 2003 16:14:31 -0000 1.1
+++ EntityContext.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
@@ -66,6 +67,8 @@
*/
public interface EntityContext extends EJBContext {
EJBLocalObject getEJBLocalObject() throws IllegalStateException;
-
EJBObject getEJBObject() throws IllegalStateException;
-
Object getPrimaryKey() throws IllegalStateException;
+
+ EJBObject getEJBObject() throws IllegalStateException;
+
+ Object getPrimaryKey() throws IllegalStateException;
}
1.2 +6 -4
incubator-geronimo/specs/j2ee/src/java/javax/ejb/FinderException.java
Index: FinderException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/FinderException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FinderException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ FinderException.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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);
}
}
1.2 +8 -4
incubator-geronimo/specs/j2ee/src/java/javax/ejb/Handle.java
Index: Handle.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/Handle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Handle.java 14 Aug 2003 16:14:31 -0000 1.1
+++ Handle.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -58,12 +58,16 @@
* ====================================================================
*/
package javax.ejb;
-
import java.io.Serializable;
import java.rmi.RemoteException;
-
/**
+
+import java.io.Serializable;
+import java.rmi.RemoteException;
+
+/**
*
*
*
* @version $Revision$ $Date$
*/
public interface Handle extends Serializable {
- EJBObject getEJBObject() throws RemoteException;
}
+ EJBObject getEJBObject() throws RemoteException;
+}
1.2 +6 -3
incubator-geronimo/specs/j2ee/src/java/javax/ejb/HomeHandle.java
Index: HomeHandle.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/HomeHandle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HomeHandle.java 14 Aug 2003 16:14:31 -0000 1.1
+++ HomeHandle.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -58,8 +58,11 @@
* ====================================================================
*/
package javax.ejb;
-
import java.io.Serializable;
import java.rmi.RemoteException;
-
/**
+
+import java.io.Serializable;
+import java.rmi.RemoteException;
+
+/**
*
*
*
1.2 +6 -3
incubator-geronimo/specs/j2ee/src/java/javax/ejb/MessageDrivenBean.java
Index: MessageDrivenBean.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/MessageDrivenBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MessageDrivenBean.java 14 Aug 2003 16:14:31 -0000 1.1
+++ MessageDrivenBean.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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;
+}
1.2 +3 -2
incubator-geronimo/specs/j2ee/src/java/javax/ejb/MessageDrivenContext.java
Index: MessageDrivenContext.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/MessageDrivenContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MessageDrivenContext.java 14 Aug 2003 16:14:31 -0000 1.1
+++ MessageDrivenContext.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
1.2 +9 -6
incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchEntityException.java
Index: NoSuchEntityException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchEntityException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NoSuchEntityException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ NoSuchEntityException.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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);
}
}
1.2 +11 -7
incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchObjectLocalException.java
Index: NoSuchObjectLocalException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/NoSuchObjectLocalException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NoSuchObjectLocalException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ NoSuchObjectLocalException.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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);
+ }
+}
1.2 +6 -4
incubator-geronimo/specs/j2ee/src/java/javax/ejb/ObjectNotFoundException.java
Index: ObjectNotFoundException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/ObjectNotFoundException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectNotFoundException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ ObjectNotFoundException.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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);
}
}
1.2 +6 -4
incubator-geronimo/specs/j2ee/src/java/javax/ejb/RemoveException.java
Index: RemoveException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/RemoveException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoveException.java 14 Aug 2003 16:14:31 -0000 1.1
+++ RemoveException.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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);
}
}
1.2 +11 -6
incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionBean.java
Index: SessionBean.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionBean.java 14 Aug 2003 16:14:31 -0000 1.1
+++ SessionBean.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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;
}
1.2 +9 -5
incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionContext.java
Index: SessionContext.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionContext.java 14 Aug 2003 16:14:31 -0000 1.1
+++ SessionContext.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.ejb;
-
import javax.xml.rpc.handler.MessageContext;
-
/**
+
+import javax.xml.rpc.handler.MessageContext;
+
+/**
*
*
*
@@ -67,6 +69,8 @@
*/
public interface SessionContext extends EJBContext {
EJBLocalObject getEJBLocalObject() throws IllegalStateException;
-
EJBObject getEJBObject() throws IllegalStateException;
-
MessageContext getMessageContext() throws IllegalStateException;
+
+ EJBObject getEJBObject() throws IllegalStateException;
+
+ MessageContext getMessageContext() throws IllegalStateException;
}
1.2 +9 -5
incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionSynchronization.java
Index: SessionSynchronization.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/SessionSynchronization.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SessionSynchronization.java 14 Aug 2003 16:14:31 -0000 1.1
+++ SessionSynchronization.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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;
}
1.2 +3 -2
incubator-geronimo/specs/j2ee/src/java/javax/ejb/TimedObject.java
Index: TimedObject.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/TimedObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimedObject.java 14 Aug 2003 16:14:31 -0000 1.1
+++ TimedObject.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.ejb;
-
/**
+
+/**
*
*
*
1.2 +14 -7
incubator-geronimo/specs/j2ee/src/java/javax/ejb/Timer.java
Index: Timer.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/Timer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Timer.java 14 Aug 2003 16:14:31 -0000 1.1
+++ Timer.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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;
}
1.2 +5 -3
incubator-geronimo/specs/j2ee/src/java/javax/ejb/TimerHandle.java
Index: TimerHandle.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/TimerHandle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimerHandle.java 14 Aug 2003 16:14:31 -0000 1.1
+++ TimerHandle.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.ejb;
-
import java.io.Serializable;
-
/**
+
+import java.io.Serializable;
+
+/**
*
*
*
1.2 +16 -8
incubator-geronimo/specs/j2ee/src/java/javax/ejb/TimerService.java
Index: TimerService.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/TimerService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TimerService.java 14 Aug 2003 16:14:31 -0000 1.1
+++ TimerService.java 15 Aug 2003 23:46:08 -0000 1.2
@@ -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$ $Date$
*/
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;
}
1.2 +8 -5
incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRequiredLocalException.java
Index: TransactionRequiredLocalException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRequiredLocalException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransactionRequiredLocalException.java 14 Aug 2003 16:14:31 -0000
1.1
+++ TransactionRequiredLocalException.java 15 Aug 2003 23:46:08 -0000
1.2
@@ -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);
+ }
+}
1.2 +9 -6
incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRolledbackLocalException.java
Index: TransactionRolledbackLocalException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/TransactionRolledbackLocalException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransactionRolledbackLocalException.java 14 Aug 2003 16:14:31 -0000
1.1
+++ TransactionRolledbackLocalException.java 15 Aug 2003 23:46:08 -0000
1.2
@@ -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);
}
}
1.2 +16 -7
incubator-geronimo/specs/j2ee/src/java/javax/ejb/spi/HandleDelegate.java
Index: HandleDelegate.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/ejb/spi/HandleDelegate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HandleDelegate.java 14 Aug 2003 16:14:32 -0000 1.1
+++ HandleDelegate.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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$ $Date$
*/
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;
}
1.2 +8 -5
incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicCommitException.java
Index: HeuristicCommitException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicCommitException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeuristicCommitException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ HeuristicCommitException.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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);
+ }
+}
1.2 +6 -4
incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicMixedException.java
Index: HeuristicMixedException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicMixedException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeuristicMixedException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ HeuristicMixedException.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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);
}
}
1.2 +6 -4
incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicRollbackException.java
Index: HeuristicRollbackException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/HeuristicRollbackException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HeuristicRollbackException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ HeuristicRollbackException.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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);
}
}
1.2 +10 -6
incubator-geronimo/specs/j2ee/src/java/javax/transaction/InvalidTransactionException.java
Index: InvalidTransactionException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/InvalidTransactionException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InvalidTransactionException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ InvalidTransactionException.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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);
+ }
+}
1.2 +6 -4
incubator-geronimo/specs/j2ee/src/java/javax/transaction/NotSupportedException.java
Index: NotSupportedException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/NotSupportedException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NotSupportedException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ NotSupportedException.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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);
}
}
1.2 +6 -4
incubator-geronimo/specs/j2ee/src/java/javax/transaction/RollbackException.java
Index: RollbackException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/RollbackException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RollbackException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ RollbackException.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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);
}
}
1.2 +3 -2
incubator-geronimo/specs/j2ee/src/java/javax/transaction/Status.java
Index: Status.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/Status.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Status.java 14 Aug 2003 16:14:32 -0000 1.1
+++ Status.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
1.2 +6 -3
incubator-geronimo/specs/j2ee/src/java/javax/transaction/Synchronization.java
Index: Synchronization.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/Synchronization.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Synchronization.java 14 Aug 2003 16:14:32 -0000 1.1
+++ Synchronization.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction;
-
/**
+
+/**
*
*
*
@@ -66,4 +67,6 @@
*/
public interface Synchronization {
void beforeCompletion();
-
void afterCompletion(int i);
}
+
+ void afterCompletion(int status);
+}
1.2 +12 -7
incubator-geronimo/specs/j2ee/src/java/javax/transaction/SystemException.java
Index: SystemException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/SystemException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SystemException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ SystemException.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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;
- }
}
+ }
+}
1.2 +17 -9
incubator-geronimo/specs/j2ee/src/java/javax/transaction/Transaction.java
Index: Transaction.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/Transaction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Transaction.java 14 Aug 2003 16:14:32 -0000 1.1
+++ Transaction.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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;
}
1.2 +20 -10
incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionManager.java
Index: TransactionManager.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransactionManager.java 14 Aug 2003 16:14:32 -0000 1.1
+++ TransactionManager.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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;
+}
1.2 +10 -6
incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRequiredException.java
Index: TransactionRequiredException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRequiredException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransactionRequiredException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ TransactionRequiredException.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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);
+ }
+}
1.2 +8 -5
incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRolledbackException.java
Index: TransactionRolledbackException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/TransactionRolledbackException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransactionRolledbackException.java 14 Aug 2003 16:14:32 -0000
1.1
+++ TransactionRolledbackException.java 15 Aug 2003 23:46:09 -0000
1.2
@@ -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);
}
}
1.2 +13 -7
incubator-geronimo/specs/j2ee/src/java/javax/transaction/UserTransaction.java
Index: UserTransaction.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/UserTransaction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserTransaction.java 14 Aug 2003 16:14:32 -0000 1.1
+++ UserTransaction.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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;
}
1.2 +12 -7
incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAException.java
Index: XAException.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XAException.java 14 Aug 2003 16:14:32 -0000 1.1
+++ XAException.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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;
}
1.2 +24 -12
incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAResource.java
Index: XAResource.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/XAResource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XAResource.java 14 Aug 2003 16:14:32 -0000 1.1
+++ XAResource.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -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;
+}
1.2 +9 -5
incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/Xid.java
Index: Xid.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/transaction/xa/Xid.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Xid.java 14 Aug 2003 16:14:32 -0000 1.1
+++ Xid.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -58,7 +58,8 @@
* ====================================================================
*/
package javax.transaction.xa;
-
/**
+
+/**
*
*
*
@@ -67,7 +68,10 @@
public interface Xid {
int MAXGTRIDSIZE = 64;
int MAXBQUALSIZE = 64;
-
byte[] getBranchQualifier();
-
int getFormatId();
-
byte[] getGlobalTransactionId();
+
+ byte[] getBranchQualifier();
+
+ int getFormatId();
+
+ byte[] getGlobalTransactionId();
}
1.2 +13 -7
incubator-geronimo/specs/j2ee/src/java/javax/xml/rpc/handler/MessageContext.java
Index: MessageContext.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/specs/j2ee/src/java/javax/xml/rpc/handler/MessageContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MessageContext.java 14 Aug 2003 16:14:32 -0000 1.1
+++ MessageContext.java 15 Aug 2003 23:46:09 -0000 1.2
@@ -58,8 +58,10 @@
* ====================================================================
*/
package javax.xml.rpc.handler;
-
import java.util.Iterator;
-
/**
+
+import java.util.Iterator;
+
+/**
*
*
*
@@ -67,8 +69,12 @@
*/
public interface MessageContext {
boolean containsProperty(String name);
-
Object getProperty(String name);
-
Iterator getPropertyNames();
-
void removeProperty(String name);
-
void setProperty(String name, Object value);
+
+ Object getProperty(String name);
+
+ Iterator getPropertyNames();
+
+ void removeProperty(String name);
+
+ void setProperty(String name, Object value);
}
