[jboss-svn-commits] JBL Code SVN: r32888 - in labs/jbosstm/trunk/XTS: WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls and 5 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri May 14 08:17:53 EDT 2010


Author: adinn
Date: 2010-05-14 08:17:52 -0400 (Fri, 14 May 2010)
New Revision: 32888

Removed:
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/DeploymentContext.java
   labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/DeploymentContextFactory.java
   labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/at/context/DeploymentContextImple.java
   labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/ba/context/DeploymentContextImple.java
Modified:
   labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context1.java
   labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context2.java
   labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/ContextOutput.java
   labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscContext.java
   labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscNestedContext.java
   labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscTranslateContext.java
   labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/at/local/LocalContextFactoryImple.java
   labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/ba/local/LocalContextFactoryImple.java
Log:
removed more dead wood -- fixes for  	 JBTM-741

Deleted: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/DeploymentContext.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/DeploymentContext.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/DeploymentContext.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2002,
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: DeploymentContext.java,v 1.1 2002/11/25 10:51:42 nmcl Exp $
- */
-
-package com.arjuna.mw.wsas.context;
-
-/**
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: DeploymentContext.java,v 1.1 2002/11/25 10:51:42 nmcl Exp $
- * @since 1.0.
- */
-
-public interface DeploymentContext
-{
-
-    public Context context ();
-    
-}

Deleted: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/DeploymentContextFactory.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/DeploymentContextFactory.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/context/DeploymentContextFactory.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2002,
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: DeploymentContextFactory.java,v 1.4 2004/03/15 13:25:00 nmcl Exp $
- */
-
-package com.arjuna.mw.wsas.context;
-
-import com.arjuna.mw.wsas.common.Environment;
-
-/**
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: DeploymentContextFactory.java,v 1.4 2004/03/15 13:25:00 nmcl Exp $
- * @since 1.0.
- */
-
-/*
- * This is left over from an attempt at some fancy stuff in an early
- * version of the WS-AS spec. That is not gone and this class (and all of
- * its users) needs to go to. Braindead! Uggh!!
- */
-
-public class DeploymentContextFactory
-{
-    
-    public static DeploymentContext deploymentContext ()
-    {
-	return _deployContext;
-    }
-    
-    private static DeploymentContext _deployContext = null;
-
-    static
-    {
-	String contextImple = System.getProperty(Environment.DEPLOYMENT_CONTEXT);
-
-	try
-	{
-	    if (contextImple != null)
-	    {
-		Class c = Class.forName(contextImple);
-
-		_deployContext = (DeploymentContext) c.newInstance();
-	    }
-	}
-	catch (Exception ex)
-	{
-	    ex.printStackTrace();
-	}
-    }
-
-}

Modified: labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context1.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context1.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context1.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -39,8 +39,6 @@
 import com.arjuna.mw.wsas.UserActivityFactory;
 import com.arjuna.mw.wsas.activity.HLS;
 import com.arjuna.mw.wsas.context.Context;
-import com.arjuna.mw.wsas.context.DeploymentContext;
-import com.arjuna.mw.wsas.context.DeploymentContextFactory;
 import com.arjuna.mw.wsas.context.ContextManager;
 import com.arjuna.mw.wsas.context.soap.SOAPContext;
 import com.arjuna.mwlabs.wsas.util.XMLUtils;

Modified: labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context2.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context2.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSAS/tests/classes/com/arjuna/wsas/tests/junit/hls/Context2.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -39,8 +39,6 @@
 import com.arjuna.mw.wsas.UserActivityFactory;
 import com.arjuna.mw.wsas.activity.HLS;
 import com.arjuna.mw.wsas.context.Context;
-import com.arjuna.mw.wsas.context.DeploymentContext;
-import com.arjuna.mw.wsas.context.DeploymentContextFactory;
 import com.arjuna.mw.wsas.context.ContextManager;
 import com.arjuna.mw.wsas.context.soap.SOAPContext;
 import com.arjuna.mwlabs.wsas.util.XMLUtils;

Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/ContextOutput.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/ContextOutput.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/ContextOutput.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -35,8 +35,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import com.arjuna.mw.wsas.context.Context;
-import com.arjuna.mw.wsas.context.DeploymentContext;
-import com.arjuna.mw.wsas.context.DeploymentContextFactory;
+import com.arjuna.mw.wsas.context.ContextManager;
 import com.arjuna.mw.wsas.context.soap.SOAPContext;
 import com.arjuna.mw.wscf.model.twophase.UserCoordinatorFactory;
 import com.arjuna.mw.wscf.model.twophase.api.UserCoordinator;
@@ -69,21 +68,25 @@
 
 	    System.out.println("Started: "+ua.identifier()+"\n");
 
-	    DeploymentContext manager = DeploymentContextFactory.deploymentContext();
-	    Context theContext = manager.context();
+        ContextManager cxman = new ContextManager();
+        Context[] contexts = cxman.contexts();
+        for (int i = 0; i < contexts.length; i++)
+        {
+            SOAPContext theContext = (SOAPContext)contexts[i];
 
-	    DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-	    DocumentBuilder builder = factory.newDocumentBuilder();
-	    org.w3c.dom.Document doc = builder.newDocument();
-	    org.w3c.dom.Element root = doc.createElement("Context-test");
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            org.w3c.dom.Document doc = builder.newDocument();
+            org.w3c.dom.Element root = doc.createElement("Context-test");
 
-        // this fails because the documents are different -- need a better test than this
-        ((SOAPContext)theContext).serialiseToElement(root) ;
-	    doc.appendChild(root);
+            // this fails because the documents are different -- need a better test than this
+            ((SOAPContext)theContext).serialiseToElement(root) ;
+            doc.appendChild(root);
 
-        // this does not do a full recursive conversion to text format -- need a better test than this
-        System.out.println(com.arjuna.mw.wscf.utils.DomUtil.nodeAsString(doc));
+            // this does not do a full recursive conversion to text format -- need a better test than this
+            System.out.println(com.arjuna.mw.wscf.utils.DomUtil.nodeAsString(doc));
 	    
+        }
 	    ua.cancel();
 	}
 	catch (Exception ex)

Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscContext.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscContext.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscContext.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -32,8 +32,8 @@
 package com.arjuna.wscf.tests.junit.model.twophase;
 
 import com.arjuna.mw.wsas.context.Context;
-import com.arjuna.mw.wsas.context.DeploymentContext;
-import com.arjuna.mw.wsas.context.DeploymentContextFactory;
+import com.arjuna.mw.wsas.context.ContextManager;
+import com.arjuna.mw.wsas.context.soap.SOAPContext;
 import com.arjuna.mw.wscf.model.twophase.UserCoordinatorFactory;
 import com.arjuna.mw.wscf.model.twophase.api.UserCoordinator;
 import com.arjuna.wscf.tests.WSCFTestUtils;
@@ -65,11 +65,15 @@
 
 	    System.out.println("Started: "+ua.identifier()+"\n");
 
-	    DeploymentContext manager = DeploymentContextFactory.deploymentContext();
-	    Context theContext = manager.context();
+        ContextManager cxman = new ContextManager();
+        Context[] contexts = cxman.contexts();
+        for (int i = 0; i < contexts.length; i++)
+        {
+            // this fails because the context toString method gets a NPE -- need a better test
+            SOAPContext theContext = (SOAPContext)contexts[i];
+            System.out.println("" + i + " " + theContext);
+        }
 
-	    System.out.println(theContext);
-	    
 	    ua.cancel();
 	}
 	catch (Exception ex)

Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscNestedContext.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscNestedContext.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscNestedContext.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -32,8 +32,8 @@
 package com.arjuna.wscf.tests.junit.model.twophase;
 
 import com.arjuna.mw.wsas.context.Context;
-import com.arjuna.mw.wsas.context.DeploymentContext;
-import com.arjuna.mw.wsas.context.DeploymentContextFactory;
+import com.arjuna.mw.wsas.context.ContextManager;
+import com.arjuna.mw.wsas.context.soap.SOAPContext;
 import com.arjuna.mw.wscf.model.twophase.UserCoordinatorFactory;
 import com.arjuna.mw.wscf.model.twophase.api.UserCoordinator;
 import com.arjuna.wscf.tests.WSCFTestUtils;
@@ -73,23 +73,38 @@
 
 	    System.out.println("Started: "+ua.identifier()+"\n");
 
-	    DeploymentContext manager = DeploymentContextFactory.deploymentContext();
-	    Context theContext = manager.context();
+        ContextManager cxman = new ContextManager();
+        Context[] contexts = cxman.contexts();
+        for (int i = 0; i < contexts.length; i++)
+        {
+            SOAPContext theContext = (SOAPContext)contexts[i];
 
-	    System.out.println("Context: " + theContext);
+            // this fails because the context toString method gets a NPE -- need a better test
+            System.out.println("Context: " + theContext);
+        }
 	    
 	    ua.cancel();
 
         System.out.println("Cancelled");
 
-        System.out.println("Context: " + theContext);
+        for (int i = 0; i < contexts.length; i++)
+        {
+            SOAPContext theContext = (SOAPContext)contexts[i];
 
+            System.out.println("Context: " + theContext);
+        }
+
 	    ua.cancel();
 
         System.out.println("Cancelled");
 
-        System.out.println("Context: " + theContext);
+        for (int i = 0; i < contexts.length; i++)
+        {
+            SOAPContext theContext = (SOAPContext)contexts[i];
 
+            System.out.println("Context: " + theContext);
+        }
+
 	    ua.cancel();
 
         System.out.println("Cancelled");

Modified: labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscTranslateContext.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscTranslateContext.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSCF/tests/classes/com/arjuna/wscf/tests/junit/model/twophase/WscTranslateContext.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -34,10 +34,10 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import com.arjuna.mw.wsas.context.Context;
+import com.arjuna.mw.wsas.context.ContextManager;
 import org.w3c.dom.Element;
 
-import com.arjuna.mw.wsas.context.DeploymentContext;
-import com.arjuna.mw.wsas.context.DeploymentContextFactory;
 import com.arjuna.mw.wsas.context.soap.SOAPContext;
 import com.arjuna.mw.wscf.model.twophase.UserCoordinatorFactory;
 import com.arjuna.mw.wscf.model.twophase.api.UserCoordinator;
@@ -71,21 +71,25 @@
 
 	    System.out.println("Started: "+ua.identifier()+"\n");
 
-	    DeploymentContext manager = DeploymentContextFactory.deploymentContext();
-	    SOAPContext theContext = (SOAPContext) manager.context();
+        ContextManager cxman = new ContextManager();
+        Context[] contexts = cxman.contexts();
+        for (int i = 0; i < contexts.length; i++)
+        {
+            SOAPContext theContext = (SOAPContext)contexts[i];
+            // this fails because the context toString method gets a NPE -- need a better test
+            System.out.println("" + i + " " + theContext);
 
-	    System.out.println(theContext);
-
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder builder = factory.newDocumentBuilder();
-        org.w3c.dom.Document doc = builder.newDocument();
-        org.w3c.dom.Element ctx = doc.createElement("Context-test");
-        final Element context = ((SOAPContext)theContext).serialiseToElement(ctx) ;
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+            org.w3c.dom.Document doc = builder.newDocument();
+            org.w3c.dom.Element ctx = doc.createElement("Context-test");
+            final Element context = ((SOAPContext)theContext).serialiseToElement(ctx) ;
         
-        org.w3c.dom.Element wscCtx = translate(context);
+            org.w3c.dom.Element wscCtx = translate(context);
 	    
-	    System.out.println("\nNow got "+DomUtil.nodeAsString(wscCtx));
-
+            System.out.println("\nNow got "+DomUtil.nodeAsString(wscCtx));
+        }
+        
 	    ua.cancel();
 	}
 	catch (Exception ex)

Deleted: labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/at/context/DeploymentContextImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/at/context/DeploymentContextImple.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/at/context/DeploymentContextImple.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2002,
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: DeploymentContextImple.java,v 1.1.24.1 2005/11/22 10:36:15 kconner Exp $
- */
-
-package com.arjuna.mwlabs.wst.at.context;
-
-import com.arjuna.mw.wsas.context.*;
-
-/**
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: DeploymentContextImple.java,v 1.1.24.1 2005/11/22 10:36:15 kconner Exp $
- * @since 1.0.
- */
-
-public class DeploymentContextImple implements DeploymentContext
-{
-
-    public DeploymentContextImple ()
-    {
-    }
-    
-    public Context context ()
-    {
-        return ArjunaContextImple.getContext() ;
-    }
-
-}

Modified: labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/at/local/LocalContextFactoryImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/at/local/LocalContextFactoryImple.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/at/local/LocalContextFactoryImple.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -31,8 +31,6 @@
 
 package com.arjuna.mwlabs.wst.at.local;
 
-import com.arjuna.mw.wsas.context.DeploymentContext;
-import com.arjuna.mw.wsas.context.DeploymentContextFactory;
 import com.arjuna.mw.wscf.model.twophase.CoordinatorManagerFactory;
 import com.arjuna.mw.wscf.model.twophase.api.CoordinatorManager;
 import com.arjuna.mw.wstx.logging.wstxLogger;
@@ -113,8 +111,7 @@
 
 				_coordManager.begin();
 
-				DeploymentContext manager = DeploymentContextFactory.deploymentContext();
-				ArjunaContextImple arjunaContext = (ArjunaContextImple)manager.context();
+                final ArjunaContextImple arjunaContext = ArjunaContextImple.getContext() ;
 
                 final SoapRegistry soapRegistry = SoapRegistry.getRegistry() ;
                 final String registrationCoordinatorURI = soapRegistry.getServiceURI(CoordinationConstants.SERVICE_REGISTRATION_COORDINATOR) ;

Deleted: labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/ba/context/DeploymentContextImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/ba/context/DeploymentContextImple.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/ba/context/DeploymentContextImple.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. 
- * See the copyright.txt in the distribution for a full listing 
- * of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- * 
- * (C) 2005-2006,
- * @author JBoss Inc.
- */
-/*
- * Copyright (C) 2002,
- *
- * Arjuna Technologies Limited,
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: DeploymentContextImple.java,v 1.2.20.1 2005/11/22 10:36:15 kconner Exp $
- */
-
-package com.arjuna.mwlabs.wst.ba.context;
-
-import com.arjuna.mw.wsas.context.Context;
-import com.arjuna.mw.wsas.context.DeploymentContext;
-
-/**
- * @author Mark Little (mark at arjuna.com)
- * @version $Id: DeploymentContextImple.java,v 1.2.20.1 2005/11/22 10:36:15 kconner Exp $
- * @since 1.0.
- */
-
-public class DeploymentContextImple implements DeploymentContext
-{
-
-    public DeploymentContextImple ()
-    {
-    }
-    
-    public Context context ()
-    {
-        return ArjunaContextImple.getContext();
-    }
-
-}

Modified: labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/ba/local/LocalContextFactoryImple.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/ba/local/LocalContextFactoryImple.java	2010-05-14 12:10:12 UTC (rev 32887)
+++ labs/jbosstm/trunk/XTS/WSTX/classes10/com/arjuna/mwlabs/wst/ba/local/LocalContextFactoryImple.java	2010-05-14 12:17:52 UTC (rev 32888)
@@ -31,12 +31,10 @@
 
 package com.arjuna.mwlabs.wst.ba.local;
 
-import com.arjuna.mw.wsas.context.DeploymentContext;
-import com.arjuna.mw.wsas.context.DeploymentContextFactory;
 import com.arjuna.mw.wscf.model.sagas.CoordinatorManagerFactory;
 import com.arjuna.mw.wscf.model.sagas.api.CoordinatorManager;
 import com.arjuna.mw.wstx.logging.wstxLogger;
-import com.arjuna.mwlabs.wst.at.context.ArjunaContextImple;
+import com.arjuna.mwlabs.wst.ba.context.ArjunaContextImple;
 import com.arjuna.webservices.SoapRegistry;
 import com.arjuna.webservices.stax.URI;
 import com.arjuna.webservices.wsaddr.AttributedURIType;
@@ -104,8 +102,7 @@
         
         		_coordManager.begin();
         
-        		DeploymentContext manager = DeploymentContextFactory.deploymentContext();
-                ArjunaContextImple arjunaContext = (ArjunaContextImple)manager.context();
+                final ArjunaContextImple arjunaContext = ArjunaContextImple.getContext() ;
 
                 final SoapRegistry soapRegistry = SoapRegistry.getRegistry() ;
                 final String registrationCoordinatorURI = soapRegistry.getServiceURI(CoordinationConstants.SERVICE_REGISTRATION_COORDINATOR) ;



More information about the jboss-svn-commits mailing list