geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r704729 - in /geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec: ./ src/main/java/javax/resource/ src/main/java/javax/resource/cci/ src/main/java/javax/resource/spi/ src/main/java/javax/resource/spi/endpoint/ src/main/java/javax/resourc...
Date Tue, 14 Oct 2008 22:59:52 GMT
Author: djencks
Date: Tue Oct 14 15:59:51 2008
New Revision: 704729

URL: http://svn.apache.org/viewvc?rev=704729&view=rev
Log:
GERONIMO-4358 Implement new connector 1.6 spec stuff.  Update interfaces to not redundantly declare methods public

Added:
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/TransactionSupport.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java   (with props)
Modified:
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/Referenceable.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Connection.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ConnectionFactory.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ConnectionMetaData.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Interaction.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/InteractionSpec.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/LocalTransaction.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/MessageListener.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Record.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/RecordFactory.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResourceAdapterMetaData.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResultSetInfo.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Streamable.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ActivationSpec.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/BootstrapContext.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionEventListener.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionManager.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionRequestInfo.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/DissociatableManagedConnection.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyAssociatableConnectionManager.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyEnlistableConnectionManager.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LocalTransaction.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnection.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnectionFactory.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnectionMetaData.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ResourceAdapter.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ResourceAdapterAssociation.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ValidatingManagedConnectionFactory.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/XATerminator.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/endpoint/MessageEndpoint.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/endpoint/MessageEndpointFactory.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/security/GenericCredential.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/Work.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkListener.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkManager.java

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/pom.xml Tue Oct 14 15:59:51 2008
@@ -33,7 +33,7 @@
     <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
     <packaging>jar</packaging>
     <name>J2EE Connector 1.6</name>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-EA-SNAPSHOT</version>
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
     <distributionManagement>

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/Referenceable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/Referenceable.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/Referenceable.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/Referenceable.java Tue Oct 14 15:59:51 2008
@@ -31,5 +31,5 @@
  * @version $Rev$ $Date$
  */
 public interface Referenceable extends javax.naming.Referenceable {
-    public void setReference(Reference reference);
+    void setReference(Reference reference);
 }

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Connection.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Connection.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Connection.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Connection.java Tue Oct 14 15:59:51 2008
@@ -31,13 +31,13 @@
  * @version $Rev$ $Date$
  */
 public interface Connection {
-    public Interaction createInteraction() throws ResourceException;
+    Interaction createInteraction() throws ResourceException;
 
-    public LocalTransaction getLocalTransaction() throws ResourceException;
+    LocalTransaction getLocalTransaction() throws ResourceException;
 
-    public ConnectionMetaData getMetaData() throws ResourceException;
+    ConnectionMetaData getMetaData() throws ResourceException;
 
-    public ResultSetInfo getResultSetInfo() throws ResourceException;
+    ResultSetInfo getResultSetInfo() throws ResourceException;
 
-    public void close() throws ResourceException;
+    void close() throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ConnectionFactory.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ConnectionFactory.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ConnectionFactory.java Tue Oct 14 15:59:51 2008
@@ -33,11 +33,11 @@
  * @version $Rev$ $Date$
  */
 public interface ConnectionFactory extends Serializable, Referenceable {
-    public Connection getConnection() throws ResourceException;
+    Connection getConnection() throws ResourceException;
 
-    public Connection getConnection(ConnectionSpec properties) throws ResourceException;
+    Connection getConnection(ConnectionSpec properties) throws ResourceException;
 
-    public RecordFactory getRecordFactory() throws ResourceException;
+    RecordFactory getRecordFactory() throws ResourceException;
 
-    public ResourceAdapterMetaData getMetaData() throws ResourceException;
+    ResourceAdapterMetaData getMetaData() throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ConnectionMetaData.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ConnectionMetaData.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ConnectionMetaData.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ConnectionMetaData.java Tue Oct 14 15:59:51 2008
@@ -31,9 +31,9 @@
  * @version $Rev$ $Date$
  */
 public interface ConnectionMetaData {
-    public String getEISProductName() throws ResourceException;
+    String getEISProductName() throws ResourceException;
 
-    public String getEISProductVersion() throws ResourceException;
+    String getEISProductVersion() throws ResourceException;
 
-    public String getUserName() throws ResourceException;
+    String getUserName() throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Interaction.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Interaction.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Interaction.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Interaction.java Tue Oct 14 15:59:51 2008
@@ -31,15 +31,15 @@
  * @version $Rev$ $Date$
  */
 public interface Interaction {
-    public void close() throws ResourceException;
+    void close() throws ResourceException;
 
-    public Connection getConnection();
+    Connection getConnection();
 
-    public boolean execute(InteractionSpec ispec, Record input, Record output) throws ResourceException;
+    boolean execute(InteractionSpec ispec, Record input, Record output) throws ResourceException;
 
-    public Record execute(InteractionSpec ispec, Record input) throws ResourceException;
+    Record execute(InteractionSpec ispec, Record input) throws ResourceException;
 
-    public ResourceWarning getWarnings() throws ResourceException;
+    ResourceWarning getWarnings() throws ResourceException;
 
-    public void clearWarnings() throws ResourceException;
+    void clearWarnings() throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/InteractionSpec.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/InteractionSpec.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/InteractionSpec.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/InteractionSpec.java Tue Oct 14 15:59:51 2008
@@ -31,7 +31,7 @@
  * @version $Rev$ $Date$
  */
 public interface InteractionSpec extends Serializable {
-    public static final int SYNC_SEND = 0;
-    public static final int SYNC_SEND_RECEIVE = 1;
-    public static final int SYNC_RECEIVE = 2;
+    static final int SYNC_SEND = 0;
+    static final int SYNC_SEND_RECEIVE = 1;
+    static final int SYNC_RECEIVE = 2;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/LocalTransaction.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/LocalTransaction.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/LocalTransaction.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/LocalTransaction.java Tue Oct 14 15:59:51 2008
@@ -31,9 +31,9 @@
  * @version $Rev$ $Date$
  */
 public interface LocalTransaction {
-    public void begin() throws ResourceException;
+    void begin() throws ResourceException;
 
-    public void commit() throws ResourceException;
+    void commit() throws ResourceException;
 
-    public void rollback() throws ResourceException;
+    void rollback() throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/MessageListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/MessageListener.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/MessageListener.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/MessageListener.java Tue Oct 14 15:59:51 2008
@@ -31,5 +31,5 @@
  * @version $Rev$ $Date$
  */
 public interface MessageListener {
-    public Record onMessage(Record inputData) throws ResourceException;
+    Record onMessage(Record inputData) throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Record.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Record.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Record.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Record.java Tue Oct 14 15:59:51 2008
@@ -31,17 +31,17 @@
  * @version $Rev$ $Date$
  */
 public interface Record extends Cloneable, Serializable {
-    public String getRecordName();
+    String getRecordName();
 
-    public void setRecordName(String name);
+    void setRecordName(String name);
 
-    public void setRecordShortDescription(String description);
+    void setRecordShortDescription(String description);
 
-    public String getRecordShortDescription();
+    String getRecordShortDescription();
 
-    public boolean equals(Object other);
+    boolean equals(Object other);
 
-    public int hashCode();
+    int hashCode();
 
-    public Object clone() throws CloneNotSupportedException;
+    Object clone() throws CloneNotSupportedException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/RecordFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/RecordFactory.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/RecordFactory.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/RecordFactory.java Tue Oct 14 15:59:51 2008
@@ -31,7 +31,7 @@
  * @version $Rev$ $Date$
  */
 public interface RecordFactory {
-    public MappedRecord createMappedRecord(String recordName) throws ResourceException;
+    MappedRecord createMappedRecord(String recordName) throws ResourceException;
 
-    public IndexedRecord createIndexedRecord(String recordName) throws ResourceException;
+    IndexedRecord createIndexedRecord(String recordName) throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResourceAdapterMetaData.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResourceAdapterMetaData.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResourceAdapterMetaData.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResourceAdapterMetaData.java Tue Oct 14 15:59:51 2008
@@ -29,21 +29,21 @@
  * @version $Rev$ $Date$
  */
 public interface ResourceAdapterMetaData {
-    public String getAdapterVersion();
+    String getAdapterVersion();
 
-    public String getAdapterVendorName();
+    String getAdapterVendorName();
 
-    public String getAdapterName();
+    String getAdapterName();
 
-    public String getAdapterShortDescription();
+    String getAdapterShortDescription();
 
-    public String getSpecVersion();
+    String getSpecVersion();
 
-    public String[] getInteractionSpecsSupported();
+    String[] getInteractionSpecsSupported();
 
-    public boolean supportsExecuteWithInputAndOutputRecord();
+    boolean supportsExecuteWithInputAndOutputRecord();
 
-    public boolean supportsExecuteWithInputRecordOnly();
+    boolean supportsExecuteWithInputRecordOnly();
 
-    public boolean supportsLocalTransactionDemarcation();
+    boolean supportsLocalTransactionDemarcation();
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResultSetInfo.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResultSetInfo.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResultSetInfo.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/ResultSetInfo.java Tue Oct 14 15:59:51 2008
@@ -31,25 +31,25 @@
  * @version $Rev$ $Date$
  */
 public interface ResultSetInfo {
-    public boolean updatesAreDetected(int type) throws ResourceException;
+    boolean updatesAreDetected(int type) throws ResourceException;
 
-    public boolean insertsAreDetected(int type) throws ResourceException;
+    boolean insertsAreDetected(int type) throws ResourceException;
 
-    public boolean deletesAreDetected(int type) throws ResourceException;
+    boolean deletesAreDetected(int type) throws ResourceException;
 
-    public boolean supportsResultSetType(int type) throws ResourceException;
+    boolean supportsResultSetType(int type) throws ResourceException;
 
-    public boolean supportsResultTypeConcurrency(int type, int concurrency) throws ResourceException;
+    boolean supportsResultTypeConcurrency(int type, int concurrency) throws ResourceException;
 
-    public boolean othersUpdatesAreVisible(int type) throws ResourceException;
+    boolean othersUpdatesAreVisible(int type) throws ResourceException;
 
-    public boolean othersDeletesAreVisible(int type) throws ResourceException;
+    boolean othersDeletesAreVisible(int type) throws ResourceException;
 
-    public boolean othersInsertsAreVisible(int type) throws ResourceException;
+    boolean othersInsertsAreVisible(int type) throws ResourceException;
 
-    public boolean ownUpdatesAreVisible(int type) throws ResourceException;
+    boolean ownUpdatesAreVisible(int type) throws ResourceException;
 
-    public boolean ownInsertsAreVisible(int type) throws ResourceException;
+    boolean ownInsertsAreVisible(int type) throws ResourceException;
 
-    public boolean ownDeletesAreVisible(int type) throws ResourceException;
+    boolean ownDeletesAreVisible(int type) throws ResourceException;
 }

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Streamable.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Streamable.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Streamable.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/cci/Streamable.java Tue Oct 14 15:59:51 2008
@@ -33,7 +33,7 @@
  * @version $Rev$ $Date$
  */
 public interface Streamable {
-    public void read(InputStream istream) throws IOException;
+    void read(InputStream istream) throws IOException;
 
-    public void write(OutputStream ostream) throws IOException;
+    void write(OutputStream ostream) throws IOException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ActivationSpec.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ActivationSpec.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ActivationSpec.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ActivationSpec.java Tue Oct 14 15:59:51 2008
@@ -29,5 +29,5 @@
  * @version $Rev$ $Date$
  */
 public interface ActivationSpec extends ResourceAdapterAssociation {
-    public void validate() throws InvalidPropertyException;
+    void validate() throws InvalidPropertyException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/BootstrapContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/BootstrapContext.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/BootstrapContext.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/BootstrapContext.java Tue Oct 14 15:59:51 2008
@@ -31,9 +31,9 @@
  * @version $Rev$ $Date$
  */
 public interface BootstrapContext {
-    public WorkManager getWorkManager();
+    WorkManager getWorkManager();
 
-    public XATerminator getXATerminator();
+    XATerminator getXATerminator();
 
-    public java.util.Timer createTimer() throws UnavailableException;
+    java.util.Timer createTimer() throws UnavailableException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionEventListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionEventListener.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionEventListener.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionEventListener.java Tue Oct 14 15:59:51 2008
@@ -31,13 +31,13 @@
  * @version $Rev$ $Date$
  */
 public interface ConnectionEventListener extends EventListener {
-    public void connectionClosed(ConnectionEvent event);
+    void connectionClosed(ConnectionEvent event);
 
-    public void localTransactionStarted(ConnectionEvent event);
+    void localTransactionStarted(ConnectionEvent event);
 
-    public void localTransactionCommitted(ConnectionEvent event);
+    void localTransactionCommitted(ConnectionEvent event);
 
-    public void localTransactionRolledback(ConnectionEvent event);
+    void localTransactionRolledback(ConnectionEvent event);
 
-    public void connectionErrorOccurred(ConnectionEvent event);
+    void connectionErrorOccurred(ConnectionEvent event);
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionManager.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionManager.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionManager.java Tue Oct 14 15:59:51 2008
@@ -32,5 +32,5 @@
  * @version $Rev$ $Date$
  */
 public interface ConnectionManager extends Serializable {
-    public Object allocateConnection(ManagedConnectionFactory mcf, ConnectionRequestInfo cxRequestInfo) throws ResourceException;
+    Object allocateConnection(ManagedConnectionFactory mcf, ConnectionRequestInfo cxRequestInfo) throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionRequestInfo.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionRequestInfo.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionRequestInfo.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionRequestInfo.java Tue Oct 14 15:59:51 2008
@@ -29,7 +29,7 @@
  * @version $Rev$ $Date$
  */
 public interface ConnectionRequestInfo {
-    public boolean equals(Object other);
+    boolean equals(Object other);
 
-    public int hashCode();
+    int hashCode();
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/DissociatableManagedConnection.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/DissociatableManagedConnection.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/DissociatableManagedConnection.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/DissociatableManagedConnection.java Tue Oct 14 15:59:51 2008
@@ -31,5 +31,5 @@
  * @version $Rev$ $Date$
  */
 public interface DissociatableManagedConnection {
-    public void dissociateConnections() throws ResourceException;
+    void dissociateConnections() throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyAssociatableConnectionManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyAssociatableConnectionManager.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyAssociatableConnectionManager.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyAssociatableConnectionManager.java Tue Oct 14 15:59:51 2008
@@ -31,5 +31,21 @@
  * @version $Rev$ $Date$
  */
 public interface LazyAssociatableConnectionManager {
-    public void associateConnection(Object connection, ManagedConnectionFactory mcf, ConnectionRequestInfo cxReqInfo) throws ResourceException;
+
+    /**
+     * request the connection be associated with an appropriate ManagedConnection
+     * @param connection connection that needs MC backup
+     * @param mcf managed connection factory to use, if necessary, to get the MC
+     * @param cxReqInfo more info on what MC to get
+     * @throws ResourceException on error
+     */
+    void associateConnection(Object connection, ManagedConnectionFactory mcf, ConnectionRequestInfo cxReqInfo) throws ResourceException;
+
+    /**
+     * To be called by the resource adapter
+     * @param connection connection the RA closed
+     * @param managedConnectionFactory MCF that connection is associated with
+     * @since 1.6
+     */
+    void inactiveConnectionClosed(Object connection, ManagedConnectionFactory managedConnectionFactory);
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyEnlistableConnectionManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyEnlistableConnectionManager.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyEnlistableConnectionManager.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyEnlistableConnectionManager.java Tue Oct 14 15:59:51 2008
@@ -31,5 +31,5 @@
  * @version $Rev$ $Date$
  */
 public interface LazyEnlistableConnectionManager {
-    public void lazyEnlist(ManagedConnection mc) throws ResourceException;
+    void lazyEnlist(ManagedConnection mc) throws ResourceException;
 }

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LocalTransaction.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LocalTransaction.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LocalTransaction.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LocalTransaction.java Tue Oct 14 15:59:51 2008
@@ -31,9 +31,9 @@
  * @version $Rev$ $Date$
  */
 public interface LocalTransaction {
-    public void begin() throws ResourceException;
+    void begin() throws ResourceException;
 
-    public void commit() throws ResourceException;
+    void commit() throws ResourceException;
 
-    public void rollback() throws ResourceException;
+    void rollback() throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnection.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnection.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnection.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnection.java Tue Oct 14 15:59:51 2008
@@ -34,25 +34,25 @@
  * @version $Rev$ $Date$
  */
 public interface ManagedConnection {
-    public Object getConnection(Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException;
+    Object getConnection(Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException;
 
-    public void destroy() throws ResourceException;
+    void destroy() throws ResourceException;
 
-    public void cleanup() throws ResourceException;
+    void cleanup() throws ResourceException;
 
-    public void associateConnection(Object connection) throws ResourceException;
+    void associateConnection(Object connection) throws ResourceException;
 
-    public void addConnectionEventListener(ConnectionEventListener listener);
+    void addConnectionEventListener(ConnectionEventListener listener);
 
-    public void removeConnectionEventListener(ConnectionEventListener listener);
+    void removeConnectionEventListener(ConnectionEventListener listener);
 
-    public XAResource getXAResource() throws ResourceException;
+    XAResource getXAResource() throws ResourceException;
 
-    public LocalTransaction getLocalTransaction() throws ResourceException;
+    LocalTransaction getLocalTransaction() throws ResourceException;
 
-    public ManagedConnectionMetaData getMetaData() throws ResourceException;
+    ManagedConnectionMetaData getMetaData() throws ResourceException;
 
-    public void setLogWriter(PrintWriter out) throws ResourceException;
+    void setLogWriter(PrintWriter out) throws ResourceException;
 
-    public PrintWriter getLogWriter() throws ResourceException;
+    PrintWriter getLogWriter() throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnectionFactory.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnectionFactory.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnectionFactory.java Tue Oct 14 15:59:51 2008
@@ -36,19 +36,19 @@
  */
 public interface ManagedConnectionFactory extends Serializable {
 
-    public Object createConnectionFactory(ConnectionManager cxManager) throws ResourceException;
+    Object createConnectionFactory(ConnectionManager cxManager) throws ResourceException;
 
-    public Object createConnectionFactory() throws ResourceException;
+    Object createConnectionFactory() throws ResourceException;
 
-    public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException;
+    ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException;
 
-    public ManagedConnection matchManagedConnections(Set connectionSet, Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException;
+    ManagedConnection matchManagedConnections(Set connectionSet, Subject subject, ConnectionRequestInfo cxRequestInfo) throws ResourceException;
 
-    public void setLogWriter(PrintWriter out) throws ResourceException;
+    void setLogWriter(PrintWriter out) throws ResourceException;
 
-    public PrintWriter getLogWriter() throws ResourceException;
+    PrintWriter getLogWriter() throws ResourceException;
 
-    public int hashCode();
+    int hashCode();
 
-    public boolean equals(Object other);
+    boolean equals(Object other);
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnectionMetaData.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnectionMetaData.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnectionMetaData.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ManagedConnectionMetaData.java Tue Oct 14 15:59:51 2008
@@ -31,11 +31,11 @@
  * @version $Rev$ $Date$
  */
 public interface ManagedConnectionMetaData {
-    public String getEISProductName() throws ResourceException;
+    String getEISProductName() throws ResourceException;
 
-    public String getEISProductVersion() throws ResourceException;
+    String getEISProductVersion() throws ResourceException;
 
-    public int getMaxConnections() throws ResourceException;
+    int getMaxConnections() throws ResourceException;
 
-    public String getUserName() throws ResourceException;
+    String getUserName() throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ResourceAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ResourceAdapter.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ResourceAdapter.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ResourceAdapter.java Tue Oct 14 15:59:51 2008
@@ -33,13 +33,13 @@
  * @version $Rev$ $Date$
  */
 public interface ResourceAdapter {
-    public void start(BootstrapContext ctx) throws ResourceAdapterInternalException;
+    void start(BootstrapContext ctx) throws ResourceAdapterInternalException;
 
-    public void stop();
+    void stop();
 
-    public void endpointActivation(MessageEndpointFactory endpointFactory, ActivationSpec spec) throws ResourceException;
+    void endpointActivation(MessageEndpointFactory endpointFactory, ActivationSpec spec) throws ResourceException;
 
-    public void endpointDeactivation(MessageEndpointFactory endpointFactory, ActivationSpec spec);
+    void endpointDeactivation(MessageEndpointFactory endpointFactory, ActivationSpec spec);
 
-    public XAResource[] getXAResources(ActivationSpec[] specs) throws ResourceException;
+    XAResource[] getXAResources(ActivationSpec[] specs) throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ResourceAdapterAssociation.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ResourceAdapterAssociation.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ResourceAdapterAssociation.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ResourceAdapterAssociation.java Tue Oct 14 15:59:51 2008
@@ -31,7 +31,7 @@
  * @version $Rev$ $Date$
  */
 public interface ResourceAdapterAssociation {
-    public ResourceAdapter getResourceAdapter();
+    ResourceAdapter getResourceAdapter();
 
-    public void setResourceAdapter(ResourceAdapter ra) throws ResourceException;
+    void setResourceAdapter(ResourceAdapter ra) throws ResourceException;
 }
\ No newline at end of file

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/TransactionSupport.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/TransactionSupport.java?rev=704729&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/TransactionSupport.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/TransactionSupport.java Tue Oct 14 15:59:51 2008
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.resource.spi;
+
+/**
+ * Runtime transaction support level available fom a ManagedConnectionFactory
+ * @since 1.6
+ * @version $Rev:$ $Date:$
+ */
+public interface TransactionSupport {
+
+    TransactionSupportLevel getTransactionSupport();
+
+    enum TransactionSupportLevel {
+
+        NoTransaction, LocalTransaction, XATransaction
+
+    }
+    
+}

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/TransactionSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/TransactionSupport.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/TransactionSupport.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ValidatingManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ValidatingManagedConnectionFactory.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ValidatingManagedConnectionFactory.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ValidatingManagedConnectionFactory.java Tue Oct 14 15:59:51 2008
@@ -32,5 +32,5 @@
  * @version $Rev$ $Date$
  */
 public interface ValidatingManagedConnectionFactory {
-    public Set getInvalidConnections(Set connectionSet) throws ResourceException;
+    Set getInvalidConnections(Set connectionSet) throws ResourceException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/XATerminator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/XATerminator.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/XATerminator.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/XATerminator.java Tue Oct 14 15:59:51 2008
@@ -32,13 +32,13 @@
  * @version $Rev$ $Date$
  */
 public interface XATerminator {
-    public void commit(Xid xid, boolean onePhase) throws XAException;
+    void commit(Xid xid, boolean onePhase) throws XAException;
 
-    public void forget(Xid xid) throws XAException;
+    void forget(Xid xid) throws XAException;
 
-    public int prepare(Xid xid) throws XAException;
+    int prepare(Xid xid) throws XAException;
 
-    public Xid[] recover(int flag) throws XAException;
+    Xid[] recover(int flag) throws XAException;
 
-    public void rollback(Xid xid) throws XAException;
+    void rollback(Xid xid) throws XAException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/endpoint/MessageEndpoint.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/endpoint/MessageEndpoint.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/endpoint/MessageEndpoint.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/endpoint/MessageEndpoint.java Tue Oct 14 15:59:51 2008
@@ -32,9 +32,9 @@
  * @version $Rev$ $Date$
  */
 public interface MessageEndpoint {
-    public void beforeDelivery(Method method) throws NoSuchMethodException, ResourceException;
+    void beforeDelivery(Method method) throws NoSuchMethodException, ResourceException;
 
-    public void afterDelivery() throws ResourceException;
+    void afterDelivery() throws ResourceException;
 
-    public void release();
+    void release();
 }

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/endpoint/MessageEndpointFactory.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/endpoint/MessageEndpointFactory.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/endpoint/MessageEndpointFactory.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/endpoint/MessageEndpointFactory.java Tue Oct 14 15:59:51 2008
@@ -33,7 +33,7 @@
  * @version $Rev$ $Date$
  */
 public interface MessageEndpointFactory {
-    public MessageEndpoint createEndpoint(XAResource xaResource) throws UnavailableException;
+    MessageEndpoint createEndpoint(XAResource xaResource) throws UnavailableException;
 
-    public boolean isDeliveryTransacted(Method method) throws NoSuchMethodException;
+    boolean isDeliveryTransacted(Method method) throws NoSuchMethodException;
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/security/GenericCredential.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/security/GenericCredential.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/security/GenericCredential.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/security/GenericCredential.java Tue Oct 14 15:59:51 2008
@@ -30,13 +30,13 @@
  * @version $Rev$ $Date$
  */
 public interface GenericCredential {
-    public String getName();
+    String getName();
 
-    public String getMechType();
+    String getMechType();
 
-    public byte[] getCredentialData() throws javax.resource.spi.SecurityException;
+    byte[] getCredentialData() throws javax.resource.spi.SecurityException;
 
-    public boolean equals(Object another);
+    boolean equals(Object another);
 
-    public int hashCode();
+    int hashCode();
 }
\ No newline at end of file

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java?rev=704729&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java Tue Oct 14 15:59:51 2008
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+
+package javax.resource.spi.work;
+
+/**
+ * @since 1.6
+ * @version $Rev:$ $Date:$
+ */
+public interface InflowContext {
+
+    /**
+     * Human readable name of the inflow context
+     * @return human readable name of the inflow context
+     */
+    String getName();
+
+    /**
+     * Human readable description of the inflow context
+     * @return human-readable description of the inflow context
+     */
+    String getDescription();
+}

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java?rev=704729&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java Tue Oct 14 15:59:51 2008
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+
+package javax.resource.spi.work;
+
+/**
+ * @since 1.6
+ * @version $Rev:$ $Date:$
+ */
+public class InflowContextErrorCodes {
+
+    public static final String UNSUPPORTED_CONTEXT_TYPE = "1";
+    public static final String DUPLICATE_CONTEXTS = "2";
+    public static final String CONTEXT_SETUP_FAILED = "3";
+    public static final String CONTEXT_SETUP_UNSUPPORTED = "4";
+
+    private InflowContextErrorCodes() {
+    }
+    
+}

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java?rev=704729&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java Tue Oct 14 15:59:51 2008
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+
+package javax.resource.spi.work;
+
+/**
+ * @since 1.6
+ * @version $Rev:$ $Date:$
+ */
+public interface InflowContextLifecycleListener {
+
+    void contextSetupComplete();
+
+    void contextSetupFailed(String errorCode);
+
+}

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java?rev=704729&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java Tue Oct 14 15:59:51 2008
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+
+package javax.resource.spi.work;
+
+import java.util.List;
+
+/**
+ *
+ * Implemented by a Work instance that supplies InflowContexts for context setup.
+ * 
+ * @since 1.6
+ * @version $Rev:$ $Date:$
+ */
+public interface InflowContextProvider {
+
+    List<InflowContext> getInflowContexts();
+}

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java?rev=704729&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java Tue Oct 14 15:59:51 2008
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+
+package javax.resource.spi.work;
+
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.Subject;
+
+/**
+ * @since 1.6
+ * @version $Rev:$ $Date:$
+ */
+public abstract class SecurityInflowContext implements InflowContext {
+
+    private static final String NAME = "SecurityInflowContext";
+    private static final String DESCRIPTION = "SecurityInflowContext";
+    /**
+     * Human readable name of the inflow context
+     *
+     * @return human readable name of the inflow context
+     */
+    public String getName() {
+        return NAME;
+    }
+
+    /**
+     * Human readable description of the inflow context
+     *
+     * @return human-readable description of the inflow context
+     */
+    public String getDescription() {
+        return DESCRIPTION;
+    }
+
+    /**
+     * Use the info supplied by the container to set up the security context in the work instance.
+     * @param callbackHandler CallbackHandler that can handle the jaspi callbacks 
+     * @param executionSubject non-null client subject to be filled in by the inflow context
+     * @param serviceSubject non-null service subject that identifies the app server container
+     */
+    public abstract void setupSecurityContext(CallbackHandler callbackHandler,
+                                              Subject executionSubject,
+                                              Subject serviceSubject);
+}

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java?rev=704729&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java Tue Oct 14 15:59:51 2008
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+
+package javax.resource.spi.work;
+
+/**
+ * @since 1.6
+ * @version $Rev:$ $Date:$
+ */
+public class TransactionInflowContext extends ExecutionContext implements InflowContext {
+
+    private static final String NAME = "TransactionInflowContext";
+    private static final String DESCRIPTION = "TransactionInflowContext";
+    /**
+     * Human readable name of the inflow context
+     *
+     * @return human readable name of the inflow context
+     */
+    public String getName() {
+        return NAME;
+    }
+
+    /**
+     * Human readable description of the inflow context
+     *
+     * @return human-readable description of the inflow context
+     */
+    public String getDescription() {
+        return DESCRIPTION;
+    }
+}

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/Work.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/Work.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/Work.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/Work.java Tue Oct 14 15:59:51 2008
@@ -29,5 +29,5 @@
  * @version $Rev$ $Date$
  */
 public interface Work extends Runnable {
-    public void release();
+    void release();
 }

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkListener.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkListener.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkListener.java Tue Oct 14 15:59:51 2008
@@ -31,11 +31,11 @@
  * @version $Rev$ $Date$
  */
 public interface WorkListener extends EventListener {
-    public void workAccepted(WorkEvent e);
+    void workAccepted(WorkEvent e);
 
-    public void workRejected(WorkEvent e);
+    void workRejected(WorkEvent e);
 
-    public void workStarted(WorkEvent e);
+    void workStarted(WorkEvent e);
 
-    public void workCompleted(WorkEvent e);
+    void workCompleted(WorkEvent e);
 }
\ No newline at end of file

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkManager.java?rev=704729&r1=704728&r2=704729&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkManager.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkManager.java Tue Oct 14 15:59:51 2008
@@ -29,19 +29,19 @@
  * @version $Rev$ $Date$
  */
 public interface WorkManager {
-    public static final long IMMEDIATE = 0L;
-    public static final long INDEFINITE = Long.MAX_VALUE;
-    public static final long UNKNOWN = -1;
+    static final long IMMEDIATE = 0L;
+    static final long INDEFINITE = Long.MAX_VALUE;
+    static final long UNKNOWN = -1;
 
-    public void doWork(Work work) throws WorkException;
+    void doWork(Work work) throws WorkException;
 
-    public void doWork(Work work, long startTimeout, ExecutionContext execContext, WorkListener workListener) throws WorkException;
+    void doWork(Work work, long startTimeout, ExecutionContext execContext, WorkListener workListener) throws WorkException;
 
-    public long startWork(Work work) throws WorkException;
+    long startWork(Work work) throws WorkException;
 
-    public long startWork(Work work, long startTimeout, ExecutionContext execContext, WorkListener workListener) throws WorkException;
+    long startWork(Work work, long startTimeout, ExecutionContext execContext, WorkListener workListener) throws WorkException;
 
-    public void scheduleWork(Work work) throws WorkException;
+    void scheduleWork(Work work) throws WorkException;
 
-    public void scheduleWork(Work work, long startTimeout, ExecutionContext execContext, WorkListener workListener) throws WorkException;
+    void scheduleWork(Work work, long startTimeout, ExecutionContext execContext, WorkListener workListener) throws WorkException;
 }
\ No newline at end of file



Mime
View raw message