From 168b2438a26be57a759ab2e0a7c77f078d8d6c0a Mon Sep 17 00:00:00 2001 From: kelvingoodson Date: Tue, 27 Apr 2010 12:28:09 +0000 Subject: mark additional classes as extension spi according to use indicated binding-ws* + minor cleanup of imports within binding-ws* git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@938419 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tuscany/sca/assembly/AbstractContract.java | 1 + .../org/apache/tuscany/sca/assembly/CompositeService.java | 1 + .../main/java/org/apache/tuscany/sca/assembly/Extension.java | 1 + .../apache/tuscany/sca/assembly/builder/BindingBuilder.java | 1 + .../java/org/apache/tuscany/sca/policy/util/PolicyHelper.java | 1 + .../basic/BasicAuthenticationReferencePolicyProvider.java | 1 - .../ws/axis2/provider/Axis2BindingProviderFactory.java | 2 -- .../sca/binding/ws/axis2/provider/Axis2ServiceServlet.java | 11 ----------- .../sca/binding/ws/axis2/provider/TuscanyListingAgent.java | 1 - .../tuscany/sca/contribution/resolver/ResolverExtension.java | 1 + .../tuscany/sca/core/assembly/RuntimeAssemblyFactory.java | 1 + .../java/org/apache/tuscany/sca/databinding/DataBinding.java | 1 + .../org/apache/tuscany/sca/databinding/XMLTypeHelper.java | 1 + .../apache/tuscany/sca/extensibility/ServiceDiscovery.java | 1 + 14 files changed, 10 insertions(+), 15 deletions(-) diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java index 30e2592008..dca1decb76 100644 --- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java +++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java @@ -26,6 +26,7 @@ import org.apache.tuscany.sca.policy.PolicySubject; * functions are provided by services and are used by references. * * @version $Rev$ $Date$ + * @tuscany.spi.extension.asclient */ public interface AbstractContract extends Base, Extensible, PolicySubject { diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java index 690316aca4..575d0784ce 100644 --- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java +++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java @@ -22,6 +22,7 @@ package org.apache.tuscany.sca.assembly; * Represents a composite service. * * @version $Rev$ $Date$ + * @tuscany.spi.extension.asclient */ public interface CompositeService extends Service { diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java index 4d5b1a2ecd..d179ce7b3b 100644 --- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java +++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java @@ -24,6 +24,7 @@ import javax.xml.namespace.QName; * Base interface for storing contents of extensible assembly model objects. * * @version $Rev$ $Date$ + * @tuscany.spi.extension.asclient */ public interface Extension { diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java index 973bc987c7..7be207cdd2 100644 --- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java +++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java @@ -29,6 +29,7 @@ import org.apache.tuscany.sca.assembly.Contract; * A builder that handles any build-time configuration needed by bindings. * * @version $Rev$ $Date$ + * @tuscany.spi.extension.inheritfrom */ public interface BindingBuilder { diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java index 1ff7280d07..8a4adb3d7f 100644 --- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java +++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java @@ -34,6 +34,7 @@ import org.apache.tuscany.sca.policy.PolicySubject; /** * A utility that helps to navigate the policy model + * @tuscany.spi.extension.asclient */ public class PolicyHelper { public PolicySet getPolicySet(PolicySubject subject, QName policySetName) { diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java index a59f7e5791..d4b3851d97 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/authentication/basic/BasicAuthenticationReferencePolicyProvider.java @@ -20,7 +20,6 @@ package org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.basic; import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.PhasedInterceptor; import org.apache.tuscany.sca.policy.PolicySet; import org.apache.tuscany.sca.policy.authentication.basic.BasicAuthenticationPolicy; diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BindingProviderFactory.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BindingProviderFactory.java index a79d1ffe81..bd9b177c39 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BindingProviderFactory.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2BindingProviderFactory.java @@ -23,8 +23,6 @@ import javax.xml.namespace.QName; import org.apache.tuscany.sca.assembly.xml.Constants; import org.apache.tuscany.sca.binding.ws.WebServiceBinding; import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint; import org.apache.tuscany.sca.host.http.ServletHost; import org.apache.tuscany.sca.host.http.ServletHostHelper; import org.apache.tuscany.sca.provider.BindingProviderFactory; diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceServlet.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceServlet.java index e7944c44d8..2f6b396786 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceServlet.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceServlet.java @@ -20,17 +20,13 @@ package org.apache.tuscany.sca.binding.ws.axis2.provider; import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.Field; import java.net.MalformedURLException; -import java.net.SocketException; -import java.net.URI; import java.net.URL; import java.util.Collections; import java.util.Enumeration; import java.util.Set; import java.util.Vector; -import javax.servlet.GenericServlet; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletConfig; @@ -39,15 +35,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.axis2.AxisFault; -import org.apache.axis2.Constants; -import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.context.ConfigurationContext; -import org.apache.axis2.description.TransportInDescription; -import org.apache.axis2.engine.ListenerManager; import org.apache.axis2.transport.http.AxisServlet; -import org.apache.axis2.transport.http.ListingAgent; -import org.apache.axis2.transport.http.server.HttpUtils; /** * This overrides the Servlet init of the AxisServlet so Tuscany can use diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyListingAgent.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyListingAgent.java index fd3bd18c34..c44454196d 100644 --- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyListingAgent.java +++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/TuscanyListingAgent.java @@ -38,7 +38,6 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.description.AxisService; import org.apache.axis2.description.Parameter; import org.apache.axis2.transport.http.ListingAgent; -import org.apache.axis2.transport.http.server.HttpUtils; import org.apache.ws.commons.schema.XmlSchema; import org.apache.ws.commons.schema.XmlSchemaExternal; diff --git a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java index 74f0f2d71d..bcf146cbfe 100644 --- a/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java +++ b/sca-java-2.x/trunk/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ResolverExtension.java @@ -23,6 +23,7 @@ package org.apache.tuscany.sca.contribution.resolver; * Extension to assembly model implementations to provide a model resolver. * * @version $Rev$ $Date$ + * @tuscany.spi.extension.asclient */ public interface ResolverExtension { diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java index 8c84a9e399..790cc6ec98 100644 --- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java +++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java @@ -37,6 +37,7 @@ import org.apache.tuscany.sca.core.assembly.impl.RuntimeEndpointReferenceImpl; /** * The runtime version of assembly factory * @version $Rev$ $Date$ + * @tuscany.spi.extension.asclient */ public class RuntimeAssemblyFactory extends DefaultAssemblyFactory implements AssemblyFactory { diff --git a/sca-java-2.x/trunk/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java b/sca-java-2.x/trunk/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java index 76eac31faa..fd5cf4ac1d 100644 --- a/sca-java-2.x/trunk/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java +++ b/sca-java-2.x/trunk/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/DataBinding.java @@ -27,6 +27,7 @@ import org.apache.tuscany.sca.interfacedef.Operation; * DataBinding represents a data representation, for example, SDO, JAXB and AXIOM * * @version $Rev$ $Date$ + * @tuscany.spi.extension.asclient */ public interface DataBinding { /** diff --git a/sca-java-2.x/trunk/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java b/sca-java-2.x/trunk/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java index e940f8675f..05f50a7267 100644 --- a/sca-java-2.x/trunk/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java +++ b/sca-java-2.x/trunk/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/XMLTypeHelper.java @@ -30,6 +30,7 @@ import org.apache.tuscany.sca.xsd.XSDefinition; /** * XML and schema helper for Java types + * @tuscany.spi.extension.asclient */ public interface XMLTypeHelper { diff --git a/sca-java-2.x/trunk/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java b/sca-java-2.x/trunk/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java index 6c3fcc7f17..f99f682e07 100644 --- a/sca-java-2.x/trunk/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java +++ b/sca-java-2.x/trunk/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java @@ -43,6 +43,7 @@ import org.apache.tuscany.sca.extensibility.impl.LDAPFilter; * old values * * @version $Rev$ $Date$ + * @tuscany.spi.extension.asclient */ public final class ServiceDiscovery implements ServiceDiscoverer { private final static Logger logger = Logger.getLogger(ServiceDiscovery.class.getName()); -- cgit v1.2.3