Resolve a lot of OSGi access violations. More to be fixed.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@709339 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 79 insertions, 68 deletions

diff --git a/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF b/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
index 032e020b9d..a913a5ea84 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
+++ b/branches/sca-equinox/modules/binding-ws-axis2/META-INF/MANIFEST.MF
@@ -41,42 +41,76 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Axis2-based WS Binding Extensio

  n

-Import-Package: javax.servlet,javax.servlet.http,javax.wsdl,javax.wsdl

- .extensions,javax.wsdl.extensions.soap,javax.wsdl.extensions.soap12,j

- avax.xml.namespace;version="1.0",javax.xml.stream;version="1.0",javax

- .xml.transform,javax.xml.transform.dom,org.apache.axiom.om,org.apache

- .axiom.om.impl.builder,org.apache.axiom.om.util,org.apache.axiom.soap

- ,org.apache.axis2,org.apache.axis2.addressing,org.apache.axis2.client

- ,org.apache.axis2.context,org.apache.axis2.deployment,org.apache.axis

- 2.deployment.util,org.apache.axis2.description,org.apache.axis2.engin

- e,org.apache.axis2.i18n,org.apache.axis2.receivers,org.apache.axis2.t

- ransport,org.apache.axis2.transport.http,org.apache.axis2.transport.h

- ttp.server,org.apache.axis2.transport.jms,org.apache.axis2.util,org.a

- pache.axis2.util.threadpool,org.apache.commons.httpclient,org.apache.

- commons.httpclient.params,org.apache.commons.logging,org.apache.tusca

- ny.sca.assembly;version="1.4",org.apache.tuscany.sca.binding.ws;versi

- on="1.4",org.apache.tuscany.sca.binding.ws.axis2;version="1.4",org.ap

- ache.tuscany.sca.contribution.processor;version="1.4",org.apache.tusc

- any.sca.core;version="1.4",org.apache.tuscany.sca.core.assembly;versi

- on="1.4",org.apache.tuscany.sca.databinding;version="1.4",org.apache.

- tuscany.sca.definitions;version="1.4",org.apache.tuscany.sca.host.htt

- p;version="1.4",org.apache.tuscany.sca.interfacedef;version="1.4",org

- .apache.tuscany.sca.interfacedef.java;version="1.4",org.apache.tuscan

- y.sca.interfacedef.util;version="1.4",org.apache.tuscany.sca.interfac

- edef.wsdl;version="1.4",org.apache.tuscany.sca.invocation;version="1.

- 4",org.apache.tuscany.sca.policy;version="1.4",org.apache.tuscany.sca

- .policy.authentication.basic;version="1.4",org.apache.tuscany.sca.pol

- icy.security.ws;version="1.4",org.apache.tuscany.sca.policy.util;vers

- ion="1.4",org.apache.tuscany.sca.provider;version="1.4",org.apache.tu

- scany.sca.runtime;version="1.4",org.apache.tuscany.sca.xsd;version="1

- .4",org.apache.tuscany.sca.xsd.xml;version="1.4",org.apache.ws.common

- s.schema,org.apache.ws.commons.schema.resolver,org.apache.ws.security

- ,org.apache.ws.security.handler,org.osoa.sca;version="1.4",org.w3c.do

- m,org.xml.sax,javax.security.auth.callback;resolution:=optional,org.o

- soa.sca.annotations;version="1.4";resolution:=optional,javax.wsdl.fac

- tory;resolution:=optional,org.apache.tuscany.sca.node;resolution:=opt

- ional,org.junit;resolution:=optional,junit.framework;resolution:=opti

- onal,javax.wsdl.xml;resolution:=optional

+Import-Package: javax.security.auth.callback;resolution:=optional,

+ javax.servlet,

+ javax.servlet.http,

+ javax.wsdl,

+ javax.wsdl.extensions,

+ javax.wsdl.extensions.soap,

+ javax.wsdl.extensions.soap12,

+ javax.wsdl.factory;resolution:=optional,

+ javax.wsdl.xml;resolution:=optional,

+ javax.xml.namespace;version="1.0",

+ javax.xml.stream;version="1.0",

+ javax.xml.transform,

+ javax.xml.transform.dom,

+ junit.framework;resolution:=optional,

+ org.apache.axiom.om,

+ org.apache.axiom.om.impl.builder,

+ org.apache.axiom.om.util,

+ org.apache.axiom.soap,

+ org.apache.axis2,

+ org.apache.axis2.addressing,

+ org.apache.axis2.client,

+ org.apache.axis2.context,

+ org.apache.axis2.deployment,

+ org.apache.axis2.deployment.util,

+ org.apache.axis2.description,

+ org.apache.axis2.engine,

+ org.apache.axis2.i18n,

+ org.apache.axis2.receivers,

+ org.apache.axis2.transport,

+ org.apache.axis2.transport.http,

+ org.apache.axis2.transport.http.server,

+ org.apache.axis2.transport.jms,

+ org.apache.axis2.util,

+ org.apache.axis2.util.threadpool,

+ org.apache.commons.httpclient,

+ org.apache.commons.httpclient.params,

+ org.apache.commons.logging,

+ org.apache.neethi,

+ org.apache.tuscany.sca.assembly;version="1.4",

+ org.apache.tuscany.sca.binding.ws;version="1.4",

+ org.apache.tuscany.sca.binding.ws.axis2;version="1.4",

+ org.apache.tuscany.sca.contribution.processor;version="1.4",

+ org.apache.tuscany.sca.core;version="1.4",

+ org.apache.tuscany.sca.core.assembly;version="1.4",

+ org.apache.tuscany.sca.databinding;version="1.4",

+ org.apache.tuscany.sca.definitions;version="1.4",

+ org.apache.tuscany.sca.host.http;version="1.4",

+ org.apache.tuscany.sca.interfacedef;version="1.4",

+ org.apache.tuscany.sca.interfacedef.java;version="1.4",

+ org.apache.tuscany.sca.interfacedef.util;version="1.4",

+ org.apache.tuscany.sca.interfacedef.wsdl;version="1.4",

+ org.apache.tuscany.sca.invocation;version="1.4",

+ org.apache.tuscany.sca.node;resolution:=optional,

+ org.apache.tuscany.sca.policy;version="1.4",

+ org.apache.tuscany.sca.policy.authentication.basic;version="1.4",

+ org.apache.tuscany.sca.policy.security.ws;version="1.4",

+ org.apache.tuscany.sca.policy.util;version="1.4",

+ org.apache.tuscany.sca.provider;version="1.4",

+ org.apache.tuscany.sca.runtime;version="1.4",

+ org.apache.tuscany.sca.xsd;version="1.4",

+ org.apache.tuscany.sca.xsd.xml;version="1.4",

+ org.apache.ws.commons.schema,

+ org.apache.ws.commons.schema.resolver,

+ org.apache.ws.security,

+ org.apache.ws.security.handler,

+ org.junit;resolution:=optional,

+ org.osoa.sca;version="1.4",

+ org.osoa.sca.annotations;version="1.4";resolution:=optional,

+ org.w3c.dom,

+ org.xml.sax

 Bundle-SymbolicName: org.apache.tuscany.sca.binding.ws.axis2

 Bundle-DocURL: http://www.apache.org/

 

diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
index 81db43c701..b73725c2e2 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
+++ b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
@@ -38,8 +38,6 @@ import org.apache.axis2.client.OperationClient;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.basic.Axis2BasicAuthenticationReferenceBindingConfigurator;
 import org.apache.tuscany.sca.interfacedef.util.FaultException;
@@ -58,15 +56,16 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters;
  * @version $Rev$ $Date$
  */
 public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
+    private final static String SCA10_TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
 
     public static final QName QNAME_WSA_FROM =
         new QName(AddressingConstants.Final.WSA_NAMESPACE, AddressingConstants.WSA_FROM,
                   AddressingConstants.WSA_DEFAULT_PREFIX);
     public static final String TUSCANY_PREFIX = "tuscany";
     public static final QName CALLBACK_ID_REFPARM_QN =
-        new QName(Constants.SCA10_TUSCANY_NS, "CallbackID", TUSCANY_PREFIX);
+        new QName(SCA10_TUSCANY_NS, "CallbackID", TUSCANY_PREFIX);
     public static final QName CONVERSATION_ID_REFPARM_QN =
-        new QName(Constants.SCA10_TUSCANY_NS, "ConversationID", TUSCANY_PREFIX);
+        new QName(SCA10_TUSCANY_NS, "ConversationID", TUSCANY_PREFIX);
     
     private Axis2ServiceClient serviceClient;
     private QName wsdlOperationName;
@@ -130,7 +129,7 @@ public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
         final OperationClient operationClient = createOperationClient(msg);
 
         // ensure connections are tracked so that they can be closed by the reference binding
-        MessageContext requestMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+        MessageContext requestMC = operationClient.getMessageContext("Out");
         requestMC.getOptions().setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
         requestMC.getOptions().setTimeOutInMilliSeconds(240000L);
 
@@ -156,7 +155,7 @@ public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics {
             throw (AxisFault)e.getException();
         }
 
-        MessageContext responseMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+        MessageContext responseMC = operationClient.getMessageContext("In");
         
         for ( PolicyHandler policyHandler : policyHandlerList ) {
             policyHandler.afterInvoke(msg, responseMC, operationClient);
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
index f8d0cf55b0..97eb3949af 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
+++ b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2OneWayBindingInvoker.java
@@ -28,7 +28,6 @@ import org.apache.axis2.client.OperationClient;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.policy.util.PolicyHandler;
@@ -55,7 +54,7 @@ public class Axis2OneWayBindingInvoker extends Axis2BindingInvoker {
         OperationClient operationClient = createOperationClient(msg);
 
         // ensure connections are tracked so that they can be closed by the reference binding
-        MessageContext requestMC = operationClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
+        MessageContext requestMC = operationClient.getMessageContext("Out");
         //requestMC.getOptions().setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
         Options opt = requestMC.getOptions();
         opt.setProperty(HTTPConstants.REUSE_HTTP_CLIENT, Boolean.TRUE);
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
index 01eddb89d1..50164d4114 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
+++ b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
@@ -69,7 +69,6 @@ import org.apache.axis2.transport.jms.JMSConstants;
 import org.apache.axis2.transport.jms.JMSListener;
 import org.apache.axis2.transport.jms.JMSSender;
 import org.apache.axis2.transport.jms.JMSUtils;
-import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.tuscany.sca.assembly.AbstractContract;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
@@ -90,7 +89,6 @@ import org.apache.tuscany.sca.policy.security.ws.Axis2ConfigParamPolicy;
 import org.apache.tuscany.sca.policy.util.PolicyHandler;
 import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple;
 import org.apache.tuscany.sca.policy.util.PolicyHandlerUtils;
-import org.apache.tuscany.sca.provider.PolicyProvider;
 import org.apache.tuscany.sca.runtime.EndpointReference;
 import org.apache.tuscany.sca.runtime.ReferenceParameters;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -508,7 +506,7 @@ public class Axis2ServiceProvider {
         addSchemas(wsBinding.getWSDLDefinition(), axisService);
 
         // Use the existing WSDL
-        Parameter wsdlParam = new Parameter(WSDLConstants.WSDL_4_J_DEFINITION, null);
+        Parameter wsdlParam = new Parameter("wsdl4jDefinition", null);
         wsdlParam.setValue(definition);
         axisService.addParameter(wsdlParam);
         Parameter userWSDL = new Parameter("useOriginalwsdl", "true");
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
index 21fef3e5d8..ce3a0c33fb 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
+++ b/branches/sca-equinox/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyListingAgent.java
@@ -20,15 +20,12 @@
 package org.apache.tuscany.sca.binding.ws.axis2;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -36,29 +33,13 @@ import javax.servlet.http.HttpServletResponse;
 import javax.wsdl.Definition;
 import javax.wsdl.Port;
 import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.axiom.attachments.utils.IOUtils;
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
+
 import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.deployment.DeploymentConstants;
-import org.apache.axis2.description.AxisDescription;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.PolicyInclude;
 import org.apache.axis2.transport.http.ListingAgent;
 import org.apache.axis2.transport.http.server.HttpUtils;
-import org.apache.axis2.util.ExternalPolicySerializer;
 import org.apache.axis2.util.JavaUtils;
-import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.neethi.Policy;
-import org.apache.neethi.PolicyRegistry;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaExternal;
 
@@ -110,7 +91,7 @@ public class TuscanyListingAgent extends ListingAgent {
             HashMap services = configContext.getAxisConfiguration().getServices();
             if ((services != null) && !services.isEmpty()) {
                 AxisService axisService = (AxisService)services.get(serviceName);
-                Parameter wsld4jdefinition = axisService.getParameter(WSDLConstants.WSDL_4_J_DEFINITION);
+                Parameter wsld4jdefinition = axisService.getParameter("wsdl4jDefinition");
                 Definition definition = (Definition)wsld4jdefinition.getValue();
                 for (Object s : definition.getServices().values()) {
                     for (Object p : ((Service)s).getPorts().values()) {