geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r806898 - in /geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi: ./ endpoint/ work/
Date Sat, 22 Aug 2009 22:11:28 GMT
Author: djencks
Date: Sat Aug 22 22:11:25 2009
New Revision: 806898

URL: http://svn.apache.org/viewvc?rev=806898&view=rev
Log:
Update to pass sig tests

Added:
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Activation.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AdministeredObject.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AuthenticationMechanism.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConfigProperty.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionDefinition.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionDefinitions.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Connector.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/RetryableException.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/RetryableUnavailableException.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/SecurityPermission.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/DistributableWork.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/DistributableWorkManager.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/HintsContext.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/RetryableWorkRejectedException.java   (with props)
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityContext.java   (contents, props changed)
      - copied, changed from r786616, geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionContext.java   (contents, props changed)
      - copied, changed from r786616, geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContext.java   (contents, props changed)
      - copied, changed from r786616, geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextErrorCodes.java   (contents, props changed)
      - copied, changed from r786616, geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextLifecycleListener.java   (contents, props changed)
      - copied, changed from r786616, geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextProvider.java   (contents, props changed)
      - copied, changed from r786616, geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java
Removed:
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java
Modified:
    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/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/LazyEnlistableManagedConnection.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/TransactionSupport.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/endpoint/MessageEndpointFactory.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/ExecutionContext.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/WorkAdapter.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkCompletedException.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkEvent.java
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkException.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
    geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkRejectedException.java

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Activation.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Activation.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Activation.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Activation.java Sat Aug 22 22:11:25 2009
@@ -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;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+
+/**
+ * @since 1.6
+ * @version $Rev$ $Date$
+ */
+@Documented
+@Retention(value= RetentionPolicy.RUNTIME)
+@Target(value= ElementType.TYPE)
+public @interface Activation {
+    Class[] messageListeners() default {};
+}

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

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

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

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -26,6 +26,7 @@
 package javax.resource.spi;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface ActivationSpec extends ResourceAdapterAssociation {

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AdministeredObject.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AdministeredObject.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AdministeredObject.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AdministeredObject.java Sat Aug 22 22:11:25 2009
@@ -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;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+
+/**
+ * @since 1.6
+ * @version $Rev$ $Date$
+ */
+@Documented
+@Retention(value= RetentionPolicy.RUNTIME)
+@Target(value= ElementType.TYPE)
+public @interface AdministeredObject {
+    Class[] adminObjectInterfaces() default {};
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AuthenticationMechanism.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AuthenticationMechanism.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AuthenticationMechanism.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/AuthenticationMechanism.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,49 @@
+/*
+ * 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;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+
+/**
+ * @since 1.6
+ * @version $Rev$ $Date$
+ */
+
+@Documented
+@Retention(value= RetentionPolicy.RUNTIME)
+@Target(value= ElementType.TYPE)
+public @interface AuthenticationMechanism {
+
+    public enum CredentialInterface {
+        GenericCredential, GSSCredential, PasswordCredential
+    }
+
+    String authMechanism() default "BasicPassword";
+
+    CredentialInterface credentialInterface() default CredentialInterface.PasswordCredential;
+
+    String description() default "";
+    
+}

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

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

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

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -26,8 +26,11 @@
 package javax.resource.spi;
 
 import javax.resource.spi.work.WorkManager;
+import javax.resource.spi.work.WorkContext;
+import javax.transaction.TransactionSynchronizationRegistry;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface BootstrapContext {
@@ -36,4 +39,8 @@
     XATerminator getXATerminator();
 
     java.util.Timer createTimer() throws UnavailableException;
+
+    boolean isContextSupported(Class<? extends WorkContext> workContextClass);
+
+    TransactionSynchronizationRegistry getTransactionSynchronizationRegistry();
 }
\ No newline at end of file

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConfigProperty.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConfigProperty.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConfigProperty.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConfigProperty.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,49 @@
+/*
+ * 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;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+
+/**
+ * @since 1.6
+ * @version $Rev$ $Date$
+ */
+@Documented
+@Retention(value= RetentionPolicy.RUNTIME)
+@Target(value= {ElementType.FIELD, ElementType.METHOD})
+public @interface ConfigProperty {
+
+    boolean confidential() default false;
+
+    String defaultValue() default "";
+
+    String description() default "";
+
+    boolean ignore() default false;
+
+    boolean supportsDynamicUpdates() default false;
+
+    Class type() default Object.class;
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionDefinition.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionDefinition.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionDefinition.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionDefinition.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,51 @@
+/*
+ * 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;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+
+/**
+ * @since 1.6
+ * @version $Rev$ $Date$
+ */
+@Documented
+@Retention(value= RetentionPolicy.RUNTIME)
+@Target(value= ElementType.TYPE)
+public @interface ConnectionDefinition {
+
+    /**
+     * Connection interface
+     * @return class of connection interface
+     */
+    Class connection();
+
+    Class connectionFactory();
+    
+    Class connectionImpl();
+
+    Class connectionFactoryImpl();
+
+    
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionDefinitions.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionDefinitions.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionDefinitions.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/ConnectionDefinitions.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,40 @@
+/*
+ * 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;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+
+/**
+ * @since 1.6
+ * @version $Rev$ $Date$
+ */
+@Documented
+@Retention(value= RetentionPolicy.RUNTIME)
+@Target(value= ElementType.TYPE)
+public @interface ConnectionDefinitions {
+
+    ConnectionDefinition[] value();
+    
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Connector.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Connector.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Connector.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/Connector.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,70 @@
+/*
+ * 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;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+
+import javax.resource.spi.work.WorkContext;
+
+/**
+ * @since 1.6
+ * @version $Rev$ $Date$
+ */
+@Documented
+@Retention(value= RetentionPolicy.RUNTIME)
+@Target(value= ElementType.TYPE)
+public @interface Connector {
+
+    AuthenticationMechanism[] authMechanisms() default {};
+
+    String[] description() default {};
+
+    String[] displayName() default {};
+
+    String eisType() default "";
+
+    String[] largeIcon() default {};
+
+    String[] licenseDescription() default {};
+
+    boolean licenseRequired() default false;
+
+    boolean reauthenticationSupport() default false;
+
+    Class<? extends WorkContext>[] requiredWorkContexts() default {};
+
+    SecurityPermission[] securityPermissions() default {};
+
+    String[] smallIcon() default {};
+
+    String specVersion() default "1.6";
+
+    TransactionSupport.TransactionSupportLevel transactionSupport() default TransactionSupport.TransactionSupportLevel.NoTransaction;
+
+    String vendorName() default "";
+
+    String version() default "";
+
+}

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

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

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

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -28,6 +28,7 @@
 import javax.resource.ResourceException;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface DissociatableManagedConnection {

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -28,6 +28,7 @@
 import javax.resource.ResourceException;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface LazyAssociatableConnectionManager {

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -28,6 +28,7 @@
 import javax.resource.ResourceException;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface LazyEnlistableConnectionManager {

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyEnlistableManagedConnection.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyEnlistableManagedConnection.java?rev=806898&r1=806897&r2=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyEnlistableManagedConnection.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/LazyEnlistableManagedConnection.java Sat Aug 22 22:11:25 2009
@@ -26,6 +26,7 @@
 package javax.resource.spi;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface LazyEnlistableManagedConnection {

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -30,6 +30,7 @@
 import javax.transaction.xa.XAResource;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface ResourceAdapter {

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -28,6 +28,7 @@
 import javax.resource.ResourceException;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface ResourceAdapterAssociation {

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/RetryableException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/RetryableException.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/RetryableException.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/RetryableException.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,30 @@
+/*
+ * 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;
+
+import java.io.Serializable;
+
+/**
+ * @since 1.6
+ * @version $Rev$ $Date$
+ */
+public interface RetryableException extends Serializable {
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/RetryableUnavailableException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/RetryableUnavailableException.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/RetryableUnavailableException.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/RetryableUnavailableException.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,47 @@
+/*
+ * 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;
+
+/**
+ * @since 1.6
+ * @version $Rev$ $Date$
+ */
+public class RetryableUnavailableException extends UnavailableException implements RetryableException {
+
+    public RetryableUnavailableException() {
+    }
+
+    public RetryableUnavailableException(String message) {
+        super(message);
+    }
+
+    public RetryableUnavailableException(Throwable cause) {
+        super(cause);
+    }
+
+    public RetryableUnavailableException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public RetryableUnavailableException(String message, String errorCode) {
+        super(message, errorCode);
+    }
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/SecurityPermission.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/SecurityPermission.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/SecurityPermission.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/SecurityPermission.java Sat Aug 22 22:11:25 2009
@@ -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.
+ */
+
+
+package javax.resource.spi;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Documented;
+
+/**
+ * @since 1.6
+ * @version $Rev$ $Date$
+ */
+@Documented
+@Retention(value= RetentionPolicy.RUNTIME)
+@Target(value= ElementType.TYPE)
+public @interface SecurityPermission {
+
+    String description() default "";
+
+    String permissionSpec() default "";
+    
+}

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

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

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

Modified: 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=806898&r1=806897&r2=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/TransactionSupport.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/TransactionSupport.java Sat Aug 22 22:11:25 2009
@@ -20,12 +20,14 @@
 
 package javax.resource.spi;
 
+import java.io.Serializable;
+
 /**
  * Runtime transaction support level available fom a ManagedConnectionFactory
  * @since 1.6
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
-public interface TransactionSupport {
+public interface TransactionSupport extends Serializable {
 
     TransactionSupportLevel getTransactionSupport();
 

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -29,6 +29,7 @@
 import javax.resource.ResourceException;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface ValidatingManagedConnectionFactory {

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -35,5 +35,14 @@
 public interface MessageEndpointFactory {
     MessageEndpoint createEndpoint(XAResource xaResource) throws UnavailableException;
 
+    /**
+     * @since 1.6
+     * @param xaResource XAResource endpoint can use
+     * @param timeout timeout
+     * @return MessageEndpoint
+     * @throws UnavailableException if endpoint cannot be created right now.
+     */
+    MessageEndpoint createEndpoint(XAResource xaResource, long timeout) throws UnavailableException;
+
     boolean isDeliveryTransacted(Method method) throws NoSuchMethodException;
 }
\ No newline at end of file

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/DistributableWork.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/DistributableWork.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/DistributableWork.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/DistributableWork.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,30 @@
+/*
+ * 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.work;
+
+import java.io.Serializable;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 1.6
+ */
+public interface DistributableWork extends Work, Serializable {
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/DistributableWorkManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/DistributableWorkManager.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/DistributableWorkManager.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/DistributableWorkManager.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,28 @@
+/*
+ * 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.work;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 1.6
+ */
+public interface DistributableWorkManager extends WorkManager {
+}

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

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

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

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/ExecutionContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/ExecutionContext.java?rev=806898&r1=806897&r2=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/ExecutionContext.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/ExecutionContext.java Sat Aug 22 22:11:25 2009
@@ -30,6 +30,7 @@
 
 /**
  * @version $Rev$ $Date$
+ * @since 1.5
  */
 public class ExecutionContext {
     private Xid xid;

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/HintsContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/HintsContext.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/HintsContext.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/HintsContext.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,65 @@
+/*
+ * 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.work;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 1.6
+ */
+public class HintsContext implements WorkContext {
+
+    public static final String LONGRUNNING_HINT = "javax.resource.LongRunning";
+    public static final String NAME_HINT = "javax.resource.Name";
+
+    protected String description;
+
+    protected String name;
+
+    private final Map<String, Serializable> hints = new HashMap<String, Serializable>();
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Map<String, Serializable> getHints() {
+        return hints;
+    }
+
+    public void setHint(String name, Serializable hint) {
+        hints.put(name, hint);
+    }
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/RetryableWorkRejectedException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/RetryableWorkRejectedException.java?rev=806898&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/RetryableWorkRejectedException.java (added)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/RetryableWorkRejectedException.java Sat Aug 22 22:11:25 2009
@@ -0,0 +1,49 @@
+/*
+ * 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.work;
+
+import javax.resource.spi.RetryableException;
+
+/**
+ * @version $Rev$ $Date$
+ * @since 1.6
+ */
+public class RetryableWorkRejectedException extends WorkRejectedException implements RetryableException {
+
+    public RetryableWorkRejectedException() {
+    }
+
+    public RetryableWorkRejectedException(String message) {
+        super(message);
+    }
+
+    public RetryableWorkRejectedException(Throwable cause) {
+        super(cause);
+    }
+
+    public RetryableWorkRejectedException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public RetryableWorkRejectedException(String message, String errorCode) {
+        super(message, errorCode);
+    }
+}

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

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

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

Copied: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityContext.java (from r786616, 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/SecurityContext.java?p2=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityContext.java&p1=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java&r1=786616&r2=806898&rev=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityInflowContext.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/SecurityContext.java Sat Aug 22 22:11:25 2009
@@ -30,12 +30,12 @@
 
 /**
  * @since 1.6
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
-public abstract class SecurityInflowContext implements InflowContext {
+public abstract class SecurityContext implements WorkContext {
 
-    private static final String NAME = "SecurityInflowContext";
-    private static final String DESCRIPTION = "SecurityInflowContext";
+    private static final String NAME = "SecurityContext";
+    private static final String DESCRIPTION = "SecurityContext";
     /**
      * Human readable name of the inflow context
      *

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

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

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

Copied: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionContext.java (from r786616, 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/TransactionContext.java?p2=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionContext.java&p1=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java&r1=786616&r2=806898&rev=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionInflowContext.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionContext.java Sat Aug 22 22:11:25 2009
@@ -27,12 +27,12 @@
 
 /**
  * @since 1.6
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
-public class TransactionInflowContext extends ExecutionContext implements InflowContext {
+public class TransactionContext extends ExecutionContext implements WorkContext {
 
-    private static final String NAME = "TransactionInflowContext";
-    private static final String DESCRIPTION = "TransactionInflowContext";
+    private static final String NAME = "TransactionContext";
+    private static final String DESCRIPTION = "TransactionContext";
     /**
      * Human readable name of the inflow context
      *

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

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

Propchange: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/TransactionContext.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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -27,6 +27,7 @@
 
 /**
  * @version $Rev$ $Date$
+ * @since 1.5
  */
 public interface Work extends Runnable {
     void release();

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkAdapter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkAdapter.java?rev=806898&r1=806897&r2=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkAdapter.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkAdapter.java Sat Aug 22 22:11:25 2009
@@ -27,6 +27,7 @@
 
 /**
  * @version $Rev$ $Date$
+ * @since 1.5
  */
 public class WorkAdapter implements WorkListener {
     public WorkAdapter() {

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkCompletedException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkCompletedException.java?rev=806898&r1=806897&r2=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkCompletedException.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkCompletedException.java Sat Aug 22 22:11:25 2009
@@ -27,6 +27,7 @@
 
 /**
  * @version $Rev$ $Date$
+ * @since 1.5
  */
 public class WorkCompletedException extends WorkException {
     public WorkCompletedException() {

Copied: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContext.java (from r786616, 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/WorkContext.java?p2=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContext.java&p1=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java&r1=786616&r2=806898&rev=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContext.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContext.java Sat Aug 22 22:11:25 2009
@@ -25,11 +25,13 @@
 
 package javax.resource.spi.work;
 
+import java.io.Serializable;
+
 /**
  * @since 1.6
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
-public interface InflowContext {
+public interface WorkContext extends Serializable {
 
     /**
      * Human readable name of the inflow context

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

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

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

Copied: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextErrorCodes.java (from r786616, 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/WorkContextErrorCodes.java?p2=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextErrorCodes.java&p1=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java&r1=786616&r2=806898&rev=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextErrorCodes.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextErrorCodes.java Sat Aug 22 22:11:25 2009
@@ -27,16 +27,16 @@
 
 /**
  * @since 1.6
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
-public class InflowContextErrorCodes {
+public class WorkContextErrorCodes {
 
     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() {
+    public WorkContextErrorCodes() {
     }
-    
+
 }

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

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

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

Copied: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextLifecycleListener.java (from r786616, 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/WorkContextLifecycleListener.java?p2=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextLifecycleListener.java&p1=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java&r1=786616&r2=806898&rev=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextLifecycleListener.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextLifecycleListener.java Sat Aug 22 22:11:25 2009
@@ -27,9 +27,9 @@
 
 /**
  * @since 1.6
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
-public interface InflowContextLifecycleListener {
+public interface WorkContextLifecycleListener {
 
     void contextSetupComplete();
 

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

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

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

Copied: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextProvider.java (from r786616, 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/WorkContextProvider.java?p2=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextProvider.java&p1=geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java&r1=786616&r2=806898&rev=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/InflowContextProvider.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkContextProvider.java Sat Aug 22 22:11:25 2009
@@ -27,15 +27,16 @@
 package javax.resource.spi.work;
 
 import java.util.List;
+import java.io.Serializable;
 
 /**
  *
  * Implemented by a Work instance that supplies InflowContexts for context setup.
  * 
  * @since 1.6
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
-public interface InflowContextProvider {
+public interface WorkContextProvider extends Serializable {
 
-    List<InflowContext> getInflowContexts();
+    List<WorkContext> getWorkContexts();
 }

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

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

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

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkEvent.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkEvent.java?rev=806898&r1=806897&r2=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkEvent.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkEvent.java Sat Aug 22 22:11:25 2009
@@ -28,6 +28,7 @@
 import java.util.EventObject;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public class WorkEvent extends EventObject {

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkException.java?rev=806898&r1=806897&r2=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkException.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkException.java Sat Aug 22 22:11:25 2009
@@ -28,6 +28,7 @@
 import javax.resource.ResourceException;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public class WorkException extends ResourceException {

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -28,6 +28,7 @@
 import java.util.EventListener;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface WorkListener extends EventListener {

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=806898&r1=806897&r2=806898&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 Sat Aug 22 22:11:25 2009
@@ -26,6 +26,7 @@
 package javax.resource.spi.work;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public interface WorkManager {

Modified: geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkRejectedException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkRejectedException.java?rev=806898&r1=806897&r2=806898&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkRejectedException.java (original)
+++ geronimo/specs/trunk/geronimo-j2ee-connector_1.6_spec/src/main/java/javax/resource/spi/work/WorkRejectedException.java Sat Aug 22 22:11:25 2009
@@ -26,6 +26,7 @@
 package javax.resource.spi.work;
 
 /**
+ * @since 1.5
  * @version $Rev$ $Date$
  */
 public class WorkRejectedException extends WorkException {



Mime
View raw message