Author: boisvert
Date: Mon Sep 18 16:13:42 2006
New Revision: 447628

URL: http://svn.apache.org/viewvc?view=rev&rev=447628
Log:
Remove/comment deadwood code

Modified:
    
incubator/ode/trunk/bpel-el-xpath10/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java
    
incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
    
incubator/ode/trunk/bpel-ql/src/main/java/org/apache/ode/ql/jcc/TreeBuilder.java
    
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
    
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
    
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DocumentInfoGenerator.java
    
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
    
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
    
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/DeploymentManagerImpl.java
    
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
    
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/HibernateInstancesQueryCompiler.java
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java
    incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java
    
incubator/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java
    
incubator/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/OdeManagedConnectionImpl.java

Modified: 
incubator/ode/trunk/bpel-el-xpath10/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-el-xpath10/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/bpel-el-xpath10/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java
 (original)
+++ 
incubator/ode/trunk/bpel-el-xpath10/src/main/java/org/apache/ode/bpel/elang/xpath10/compiler/XPath10ExpressionCompilerImpl.java
 Mon Sep 18 16:13:42 2006
@@ -18,6 +18,11 @@
  */
 package org.apache.ode.bpel.elang.xpath10.compiler;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
 import org.apache.ode.bom.api.Expression;
 import org.apache.ode.bpel.capi.CompilationException;
 import org.apache.ode.bpel.capi.CompilerContext;
@@ -26,16 +31,11 @@
 import org.apache.ode.bpel.elang.xpath10.runtime.XPath10ExpressionRuntime;
 import org.apache.ode.utils.DOMUtils;
 import org.apache.ode.utils.msg.MessageBundle;
-import org.jaxen.Function;
 import org.jaxen.saxpath.SAXPathException;
 import org.jaxen.saxpath.XPathReader;
 import org.jaxen.saxpath.helpers.XPathReaderFactory;
 import org.w3c.dom.Node;
 
-import javax.xml.namespace.QName;
-import java.util.HashMap;
-import java.util.Map;
-
 
 /**
  * XPath compiler based on the JAXEN implementation. Supports both 2.0 and 1.1 
BPEL.
@@ -44,7 +44,7 @@
 
   private static final XPathMessages __msgs = 
MessageBundle.getMessages(XPathMessages.class);
 
-  private HashMap<String,Function> _extensionFunctions = new 
HashMap<String,Function>();
+  // private HashMap<String,Function> _extensionFunctions = new 
HashMap<String,Function>();
   protected CompilerContext _compilerContext;
 
   /** Namespace of the BPEL functions (for v2 to v1 compatibility) . */
@@ -83,7 +83,8 @@
     return _properties;
   }
 
-  // TODO is this dead or just unfinished?
+  // Dead code
+  /*
   private void registerExtensionFunction(String name, Class function) {
     try {
       Function jaxenFunction = (Function)function.newInstance();
@@ -99,6 +100,7 @@
                                  + Function.class.getName());
     }
   }
+  */
 
   /**
    * Verifies validity of a xpath expression.

Modified: 
incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
 (original)
+++ 
incubator/ode/trunk/bpel-el-xpath20/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
 Mon Sep 18 16:13:42 2006
@@ -29,7 +29,6 @@
 import javax.xml.xpath.XPathExpression;
 import javax.xml.xpath.XPathExpressionException;
 
-import net.sf.saxon.Configuration;
 import net.sf.saxon.xpath.XPathEvaluator;
 
 import org.apache.commons.logging.Log;
@@ -68,14 +67,7 @@
     /** Class-level logger. */
     private static final Log __log = 
LogFactory.getLog(XPath20ExpressionRuntime.class);
 
-    /** Registered extension functions. */
-    // TODO unused as of now
-    // private final HashMap _extensionFunctions  = new HashMap();
-
-    private Configuration _config;
-
     public XPath20ExpressionRuntime(){
-        _config = new Configuration();
     }
 
     public void initialize(Map properties) throws ConfigurationException {

Modified: 
incubator/ode/trunk/bpel-ql/src/main/java/org/apache/ode/ql/jcc/TreeBuilder.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-ql/src/main/java/org/apache/ode/ql/jcc/TreeBuilder.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/bpel-ql/src/main/java/org/apache/ode/ql/jcc/TreeBuilder.java
 (original)
+++ 
incubator/ode/trunk/bpel-ql/src/main/java/org/apache/ode/ql/jcc/TreeBuilder.java
 Mon Sep 18 16:13:42 2006
@@ -188,18 +188,11 @@
         //TODO

         throw new IllegalArgumentException("");

     }

-    private ASTProperty extractProperty(Node parentNode, int index) {

-        return (ASTProperty)extractChildNode(parentNode, index, 
ASTProperty.class);

-    }

-    

-    private ASTField extractField(Node parentNode, int index) {

-        return (ASTField)extractChildNode(parentNode, index, ASTField.class);

-    }

-    

     private ASTValue extractValue(Node parentNode, int index) {

         return (ASTValue)extractChildNode(parentNode, index, ASTValue.class);

     }

     

+    @SuppressWarnings("unchecked")

     private Node extractChildNode(Node parentNode, int index, Class expected) {

         Node node = extractChildNode(parentNode, index);

         if(!(expected.isAssignableFrom(node.getClass()))) {


Modified: 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
 (original)
+++ 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
 Mon Sep 18 16:13:42 2006
@@ -18,6 +18,17 @@
  */
 package org.apache.ode.bpel.engine;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.wsdl.Operation;
+import javax.xml.namespace.QName;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ode.bpel.common.CorrelationKey;
@@ -46,11 +57,10 @@
 import org.apache.ode.bpel.iapi.MessageExchange.FailureType;
 import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
 import org.apache.ode.bpel.o.OMessageVarType;
-import org.apache.ode.bpel.o.OMessageVarType.Part;
 import org.apache.ode.bpel.o.OPartnerLink;
 import org.apache.ode.bpel.o.OProcess;
 import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.o.OVarType;
+import org.apache.ode.bpel.o.OMessageVarType.Part;
 import org.apache.ode.bpel.runtime.BpelJacobRunnable;
 import org.apache.ode.bpel.runtime.BpelRuntimeContext;
 import org.apache.ode.bpel.runtime.CorrelationSetInstance;
@@ -74,16 +84,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import javax.wsdl.Operation;
-import javax.xml.namespace.QName;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
 class BpelRuntimeContextImpl implements BpelRuntimeContext {
 
     private static final Log __log = LogFactory
@@ -408,13 +408,11 @@
     public Node fetchVariableData(VariableInstance var,
                                   OMessageVarType.Part part, boolean 
forWriting) throws FaultException {
         Node container = fetchVariableData(var, forWriting);
-        OVarType varType = var.declaration.type;
 
         // If we want a specific part, we will need to navigate through the
         // message/part structure
         if (var.declaration.type instanceof OMessageVarType && part != null) {
             container = getPartData((Element) container, part);
-            varType = part.type;
         }
         return container;
     }

Modified: 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
 (original)
+++ 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelServerImpl.java
 Mon Sep 18 16:13:42 2006
@@ -110,12 +110,6 @@
     /** Object that keeps track (persistently) of the deployment units */
     private DeploymentManager _deploymentManager = null;
 
-    private ThreadLocal<Boolean> _associated = new ThreadLocal<Boolean>() {
-        public Boolean initialValue() {
-            return Boolean.FALSE;
-        }
-    };
-
     /** Directory where we keep track of deployments. */
     private String _deployDir = null;
 

Modified: 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DocumentInfoGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DocumentInfoGenerator.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DocumentInfoGenerator.java
 (original)
+++ 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/DocumentInfoGenerator.java
 Mon Sep 18 16:13:42 2006
@@ -30,7 +30,6 @@
  * Class for generating information about a document resource.  
  */
 class DocumentInfoGenerator {
-  private final File _baseDir;
   private final File _file;
   private String _type;
   
@@ -48,7 +47,6 @@
   
   
   DocumentInfoGenerator(File baseDir, File f) {
-    _baseDir = baseDir;
     _file = f;
     
     recognize();

Modified: 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
 (original)
+++ 
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
 Mon Sep 18 16:13:42 2006
@@ -128,7 +128,6 @@
     private FaultData _fault;
     private long _startTime;
     private final HashSet<CompensationHandler> _compensations = new 
HashSet<CompensationHandler>();
-    private boolean _childCompleted;
     private boolean _childTermRequested;
 
     ACTIVE() {

Modified: 
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
 (original)
+++ 
incubator/ode/trunk/bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/MockBpelServer.java
 Mon Sep 18 16:13:42 2006
@@ -87,7 +87,7 @@
   EndpointReferenceContext  _eprContext;
   MessageExchangeContext    _mexContext;
   BindingContext            _bindContext;
-  HashMap                   _activated = new HashMap();
+  HashMap<String, QName>    _activated = new HashMap();
   HashMap                   _endpoints = new HashMap();
 
 
@@ -253,8 +253,6 @@
         String service = DOMUtils.getChildCharacterData(element);
         return (EndpointReference)_endpoints.get(service);
       }
-      public EndpointReference activateEndpoint(QName qName, QName qName1, 
Element element) { return null; }
-      public void deactivateEndpoint(EndpointReference endpointReference) { }
       public EndpointReference convertEndpoint(QName qName, Element element) { 
return null; }
     };
     return _eprContext;

Modified: 
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/DeploymentManagerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/DeploymentManagerImpl.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/DeploymentManagerImpl.java
 (original)
+++ 
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/DeploymentManagerImpl.java
 Mon Sep 18 16:13:42 2006
@@ -22,8 +22,6 @@
 import java.util.ArrayList;

 import java.util.Collection;

 

-import org.apache.commons.logging.Log;

-import org.apache.commons.logging.LogFactory;

 import org.apache.ode.bpel.deploy.DeploymentManager;

 import org.apache.ode.bpel.deploy.DeploymentUnitImpl;

 

@@ -34,7 +32,6 @@
 

 public class DeploymentManagerImpl implements DeploymentManager {

        

-    private static final Log __log = 
LogFactory.getLog(DeploymentManagerImpl.class);

     private ArrayList<DeploymentUnitImpl> _knownDeployments = new 
ArrayList<DeploymentUnitImpl>();

 

     


Modified: 
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
 (original)
+++ 
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ScopeDaoImpl.java
 Mon Sep 18 16:13:42 2006
@@ -18,30 +18,41 @@
  */
 package org.apache.ode.daohib.bpel;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
 import org.apache.ode.bpel.common.BpelEventFilter;
-import org.apache.ode.bpel.dao.*;
+import org.apache.ode.bpel.dao.CorrelationSetDAO;
+import org.apache.ode.bpel.dao.PartnerLinkDAO;
+import org.apache.ode.bpel.dao.ProcessInstanceDAO;
+import org.apache.ode.bpel.dao.ScopeDAO;
+import org.apache.ode.bpel.dao.ScopeStateEnum;
+import org.apache.ode.bpel.dao.XmlDataDAO;
 import org.apache.ode.bpel.evt.BpelEvent;
 import org.apache.ode.daohib.SessionManager;
-import org.apache.ode.daohib.bpel.hobj.*;
+import org.apache.ode.daohib.bpel.hobj.HBpelEvent;
+import org.apache.ode.daohib.bpel.hobj.HCorrelationSet;
+import org.apache.ode.daohib.bpel.hobj.HPartnerLink;
+import org.apache.ode.daohib.bpel.hobj.HScope;
+import org.apache.ode.daohib.bpel.hobj.HXmlData;
 import org.apache.ode.utils.SerializableUtils;
 import org.apache.ode.utils.stl.CollectionsX;
 import org.apache.ode.utils.stl.UnaryFunction;
 import org.apache.ode.utils.stl.UnaryFunctionEx;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.Criteria;
 import org.hibernate.Hibernate;
 import org.hibernate.Query;
 import org.hibernate.criterion.Restrictions;
 
-import java.util.*;
-
 /**
  * Hibernate-based [EMAIL PROTECTED] ScopeDAO} implementation.
  */
 class ScopeDaoImpl extends HibernateDao implements ScopeDAO {
-
-  private static final Log __log = LogFactory.getLog(ScopeDaoImpl.class);
 
   private static final String QRY_VARIABLE = "from " + 
HXmlData.class.getName() +
           " as x where x.name = ? and x.scope.id = ?";

Modified: 
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/HibernateInstancesQueryCompiler.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/HibernateInstancesQueryCompiler.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/HibernateInstancesQueryCompiler.java
 (original)
+++ 
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/ql/instances/HibernateInstancesQueryCompiler.java
 Mon Sep 18 16:13:42 2006
@@ -170,10 +170,6 @@
     return dbField;

   }

 

-  private static Long getLong(Value<String> value) {

-    return Long.parseLong(value.getValue());

-  }

-

   private void init() {

     propertyInQuery = false;

     orderByStatus = false;


Modified: 
incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java 
(original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeComponent.java 
Mon Sep 18 16:13:42 2006
@@ -24,8 +24,6 @@
 import javax.jbi.messaging.MessageExchange;
 import javax.jbi.servicedesc.ServiceEndpoint;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
 

Modified: 
incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java 
(original)
+++ incubator/ode/trunk/jbi/src/main/java/org/apache/ode/jbi/OdeService.java 
Mon Sep 18 16:13:42 2006
@@ -18,23 +18,27 @@
  */
 package org.apache.ode.jbi;
 
-import org.apache.ode.bpel.iapi.Endpoint;
-import org.apache.ode.bpel.iapi.Message;
-import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
-import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
-import org.apache.ode.bpel.iapi.MessageExchange.Status;
-import org.apache.ode.jbi.msgmap.Mapper;
-import org.apache.ode.jbi.msgmap.MessageTranslationException;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.jbi.JBIException;
-import javax.jbi.messaging.*;
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.Fault;
+import javax.jbi.messaging.InOnly;
+import javax.jbi.messaging.InOut;
+import javax.jbi.messaging.MessagingException;
+import javax.jbi.messaging.NormalizedMessage;
 import javax.jbi.servicedesc.ServiceEndpoint;
-import javax.xml.namespace.QName;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.ode.bpel.iapi.Endpoint;
+import org.apache.ode.bpel.iapi.Message;
+import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
+import org.apache.ode.bpel.iapi.MessageExchange.Status;
+import org.apache.ode.jbi.msgmap.Mapper;
+import org.apache.ode.jbi.msgmap.MessageTranslationException;
 import org.w3c.dom.Element;
 
 /**
@@ -196,8 +200,6 @@
       return;
     }
     
-    QName serviceName = jbiMex.getEndpoint().getServiceName();
-
     _ode.getTransactionManager().begin();
 
     boolean success = false;

Modified: 
incubator/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java
 (original)
+++ 
incubator/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/OdeConnectionImpl.java
 Mon Sep 18 16:13:42 2006
@@ -40,18 +40,12 @@
  */
 class OdeConnectionImpl implements InvocationHandler, Connection {
 
-  private final Subject _subject;
-
-  private final ConnectionRequestInfo _cri;
-
   private OdeManagedConnectionImpl _managedConnection;
 
   private HashSet<Method> _myMethods = new HashSet<Method>();
 
   public OdeConnectionImpl(Subject subject,
       ConnectionRequestInfo connectionRequestInfo) {
-    _subject = subject;
-    _cri = connectionRequestInfo;
     for (Method m : Connection.class.getMethods())
       _myMethods.add(m);
   }

Modified: 
incubator/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/OdeManagedConnectionImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/OdeManagedConnectionImpl.java?view=diff&rev=447628&r1=447627&r2=447628
==============================================================================
--- 
incubator/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/OdeManagedConnectionImpl.java
 (original)
+++ 
incubator/ode/trunk/jca-ra/src/main/java/org/apache/ode/ra/OdeManagedConnectionImpl.java
 Mon Sep 18 16:13:42 2006
@@ -40,8 +40,6 @@
 
   private OdeConnectionImpl _activeConnection;
   private PrintWriter _logWriter;
-  private ConnectionRequestInfo _cri;
-  private Subject _subject;
 
   /** Physical communication pipe. */
   private OdeTransportPipe _transportPipe;
@@ -52,8 +50,6 @@
   public OdeManagedConnectionImpl(OdeTransportPipe pipe, Subject subject, 
ConnectionRequestInfo connectionRequestInfo) 
   throws ResourceException {
     _transportPipe = pipe;
-    _subject = subject;
-    _cri = connectionRequestInfo;
     String[] classNames;
     try {
       classNames = _transportPipe.getConnectionClassNames();


Reply via email to