geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r806901 - in /geronimo/server/trunk/plugins/connector-1_6: client-transaction-1_6/src/main/plan/ geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/ geronimo-connector-builder-1_6/src/test/resources/connector_1_5/ geron...
Date Sat, 22 Aug 2009 22:17:26 GMT
Author: djencks
Date: Sat Aug 22 22:17:26 2009
New Revision: 806901

URL: http://svn.apache.org/viewvc?rev=806901&view=rev
Log:
update to spec

Added:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityContextHandler.java
  (contents, props changed)
      - copied, changed from r806395, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityInflowContextHandler.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionContextHandlerGBean.java
  (contents, props changed)
      - copied, changed from r806395, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionInflowContextHandlerGBean.java
Removed:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityInflowContextHandler.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionInflowContextHandlerGBean.java
Modified:
    geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5/geronimo-ra.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_localtx/geronimo-ra.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_notx/geronimo-ra.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/external-application-plan.xml
    geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/plan/plan.xml

Modified: geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml?rev=806901&r1=806900&r2=806901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/client-transaction-1_6/src/main/plan/plan.xml
Sat Aug 22 22:17:26 2009
@@ -39,11 +39,11 @@
         <reference name="ScheduledPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="InflowContextHandler">
+        <reference name="WorkContextHandler">
         </reference>
     </gbean>
 
-    <gbean name="TransactionInflowContextHandler" class="org.apache.geronimo.connector.work.TransactionInflowContextHandlerGBean">
+    <gbean name="TransactionContextHandler" class="org.apache.geronimo.connector.work.TransactionContextHandlerGBean">
         <reference name="XAWork">
             <name>TransactionManager</name>
         </reference>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java?rev=806901&r1=806900&r2=806901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/GeronimoWorkManagerGBean.java
Sat Aug 22 22:17:26 2009
@@ -38,8 +38,8 @@
     public GeronimoWorkManagerGBean(@ParamReference(name="SyncPool") Executor sync,
                                     @ParamReference(name="StartPool")Executor start,
                                     @ParamReference(name="ScheduledPool") Executor sched,
-                                    @ParamReference(name="InflowContextHandler")Collection<InflowContextHandler>
inflowContextHandlers) {
-        super(sync, start, sched, inflowContextHandlers);
+                                    @ParamReference(name="WorkContextHandler")Collection<WorkContextHandler>
workContextHandlers) {
+        super(sync, start, sched, workContextHandlers);
     }
 
 }

Copied: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityContextHandler.java
(from r806395, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityInflowContextHandler.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityContextHandler.java?p2=geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityContextHandler.java&p1=geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityInflowContextHandler.java&r1=806395&r2=806901&rev=806901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityInflowContextHandler.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityContextHandler.java
Sat Aug 22 22:17:26 2009
@@ -23,7 +23,7 @@
 import java.util.Stack;
 
 import javax.resource.spi.work.WorkCompletedException;
-import javax.resource.spi.work.SecurityInflowContext;
+import javax.resource.spi.work.SecurityContext;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginException;
 
@@ -38,7 +38,7 @@
  * @version $Rev$ $Date$
  */
 @GBean
-public class SecurityInflowContextHandler implements InflowContextHandler<SecurityInflowContext>
{
+public class SecurityContextHandler implements WorkContextHandler<SecurityContext>
{
 
     private final String realm;
     private final Subject defaultSubject;
@@ -51,7 +51,7 @@
         }
     };
 
-    public SecurityInflowContextHandler(@ParamAttribute(name="realm") String realm,
+    public SecurityContextHandler(@ParamAttribute(name="realm") String realm,
                                         @ParamAttribute(name="defaultSubjectRealm")String
defaultSubjectRealm,
                                         @ParamAttribute(name="defaultSubjectId")String defaultSubjectId,
                                         @ParamReference(name="DefaultCredentialStore") CredentialStore
defaultCredentialStore,
@@ -71,28 +71,28 @@
         this.realm = realm;
     }
 
-    public void before(SecurityInflowContext securityInflowContext) throws WorkCompletedException
{
+    public void before(SecurityContext securityContext) throws WorkCompletedException {
         Subject clientSubject;
-        if (securityInflowContext == null) {
+        if (securityContext == null) {
             clientSubject = defaultSubject;
         } else {
             clientSubject = new Subject();
             ConnectorCallbackHandler callbackHandler = new ConnectorCallbackHandler(realm);
-            securityInflowContext.setupSecurityContext(callbackHandler, clientSubject, serviceSubject);
+            securityContext.setupSecurityContext(callbackHandler, clientSubject, serviceSubject);
             ContextManager.registerSubjectShort(clientSubject, callbackHandler.getCallerPrincipal(),
callbackHandler.getGroups());
         }
         callers.get().push(ContextManager.getCallers());
         ContextManager.setCallers(clientSubject, clientSubject);
     }
 
-    public void after(SecurityInflowContext securityInflowContext) throws WorkCompletedException
{
+    public void after(SecurityContext securityContext) throws WorkCompletedException {
         Subject clientSubject = ContextManager.getCurrentCaller();
         ContextManager.popCallers(callers.get().pop());
         ContextManager.unregisterSubject(clientSubject);
     }
 
-    public Class<SecurityInflowContext> getHandledClass() {
-        return SecurityInflowContext.class;
+    public Class<SecurityContext> getHandledClass() {
+        return SecurityContext.class;
     }
 
     public boolean required() {

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityContextHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityContextHandler.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/SecurityContextHandler.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionContextHandlerGBean.java
(from r806395, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionInflowContextHandlerGBean.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionContextHandlerGBean.java?p2=geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionContextHandlerGBean.java&p1=geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionInflowContextHandlerGBean.java&r1=806395&r2=806901&rev=806901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionInflowContextHandlerGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionContextHandlerGBean.java
Sat Aug 22 22:17:26 2009
@@ -26,11 +26,11 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 @GBean
-public class TransactionInflowContextHandlerGBean extends TransactionInflowContextHandler{
-    public TransactionInflowContextHandlerGBean(@ParamReference(name="XAWork", namingType
= NameFactory.JTA_RESOURCE)XAWork xaWork) {
+public class TransactionContextHandlerGBean extends TransactionContextHandler{
+    public TransactionContextHandlerGBean(@ParamReference(name="XAWork", namingType = NameFactory.JTA_RESOURCE)XAWork
xaWork) {
         super(xaWork);
     }
 }

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionContextHandlerGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionContextHandlerGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/work/TransactionContextHandlerGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5/geronimo-ra.xml?rev=806901&r1=806900&r2=806901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5/geronimo-ra.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5/geronimo-ra.xml
Sat Aug 22 22:17:26 2009
@@ -133,11 +133,11 @@
         <reference name="ScheduledPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="InflowContextHandler">
+        <reference name="WorkContextHandler">
         </reference>
     </gbean>
 
-    <gbean name="TransactionInflowContextHandler" class="org.apache.geronimo.connector.work.TransactionInflowContextHandlerGBean">
+    <gbean name="TransactionContextHandler" class="org.apache.geronimo.connector.work.TransactionContextHandlerGBean">
         <reference name="XAWork">
             <name>TransactionManager</name>
         </reference>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_localtx/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_localtx/geronimo-ra.xml?rev=806901&r1=806900&r2=806901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_localtx/geronimo-ra.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_localtx/geronimo-ra.xml
Sat Aug 22 22:17:26 2009
@@ -132,11 +132,11 @@
         <reference name="ScheduledPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="InflowContextHandler">
+        <reference name="WorkContextHandler">
         </reference>
     </gbean>
 
-    <gbean name="TransactionInflowContextHandler" class="org.apache.geronimo.connector.work.TransactionInflowContextHandlerGBean">
+    <gbean name="TransactionContextHandler" class="org.apache.geronimo.connector.work.TransactionContextHandlerGBean">
         <reference name="XAWork">
             <name>TransactionManager</name>
         </reference>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_notx/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_notx/geronimo-ra.xml?rev=806901&r1=806900&r2=806901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_notx/geronimo-ra.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/connector_1_5_notx/geronimo-ra.xml
Sat Aug 22 22:17:26 2009
@@ -118,11 +118,11 @@
         <attribute name="syncMaximumPoolSize">10</attribute>
         <attribute name="startMaximumPoolSize">10</attribute>
         <attribute name="scheduledMaximumPoolSize">10</attribute>
-        <reference name="InflowContextHandler">
+        <reference name="WorkContextHandler">
         </reference>
     </gbean>
 
-    <gbean name="TransactionInflowContextHandler" class="org.apache.geronimo.connector.work.TransactionInflowContextHandlerGBean">
+    <gbean name="TransactionContextHandler" class="org.apache.geronimo.connector.work.TransactionContextHandlerGBean">
         <reference name="XAWork">
             <name>TransactionManager</name>
         </reference>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/external-application-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/external-application-plan.xml?rev=806901&r1=806900&r2=806901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/external-application-plan.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/resources/data/external-application-plan.xml
Sat Aug 22 22:17:26 2009
@@ -211,11 +211,11 @@
         <reference name="ScheduledPool">
             <name>DefaultThreadPool</name>
         </reference>
-        <reference name="InflowContextHandler">
+        <reference name="WorkContextHandler">
         </reference>
     </gbean>
 
-    <gbean name="TransactionInflowContextHandler" class="org.apache.geronimo.connector.work.TransactionInflowContextHandlerGBean">
+    <gbean name="TransactionContextHandler" class="org.apache.geronimo.connector.work.TransactionContextHandlerGBean">
         <reference name="XAWork">
             <name>TransactionManager</name>
         </reference>

Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/plan/plan.xml?rev=806901&r1=806900&r2=806901&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/plan/plan.xml Sat
Aug 22 22:17:26 2009
@@ -44,17 +44,17 @@
         <reference name="ScheduledPool">
             <name>ConnectorThreadPool</name>
         </reference>
-        <reference name="InflowContextHandler">
+        <reference name="WorkContextHandler">
         </reference>
     </gbean>
 
-    <gbean name="TransactionInflowContextHandler" class="org.apache.geronimo.connector.work.TransactionInflowContextHandlerGBean">
+    <gbean name="TransactionContextHandler" class="org.apache.geronimo.connector.work.TransactionContextHandlerGBean">
         <reference name="XAWork">
             <name>TransactionManager</name>
         </reference>
     </gbean>
 
-    <gbean name="SecurityInflowContextHandler" class="org.apache.geronimo.connector.work.SecurityInflowContextHandler">
+    <gbean name="SecurityContextHandler" class="org.apache.geronimo.connector.work.SecurityContextHandler">
         <attribute name="realm">geronimo-admin</attribute>
         <!--<attribute name="defaultSubjectRealm">geronimo-admin</attribute>-->
         <!--<attribute name="defaultSubjectId">foo</attribute>-->



Mime
View raw message