You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/02/28 20:32:57 UTC
svn commit: r512919 - in /incubator/tuscany/java/sca:
extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/
services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/
services/persistence/datasource/src/main/java/org/a...
Author: jmarino
Date: Wed Feb 28 11:32:56 2007
New Revision: 512919
URL: http://svn.apache.org/viewvc?view=rev&rev=512919
Log:
remove use of @Autowire in idl extensions
Modified:
incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java
incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringXMLComponentTypeLoader.java
incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java
incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java
incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLContributionProcessor.java
incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java
incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XSDContributionProcessor.java
incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DSComponentTypeLoader.java
incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceImplementationLoader.java
Modified: incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java?view=diff&rev=512919&r1=512918&r2=512919
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringImplementationLoader.java Wed Feb 28 11:32:56 2007
@@ -35,8 +35,8 @@
import javax.xml.stream.XMLStreamReader;
import org.osoa.sca.Constants;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -67,7 +67,7 @@
private final RuntimeInfo runtimeInfo;
- public SpringImplementationLoader(@Autowire LoaderRegistry registry, @Autowire RuntimeInfo runtimeInfo) {
+ public SpringImplementationLoader(@Reference LoaderRegistry registry, @Reference RuntimeInfo runtimeInfo) {
super(registry);
this.runtimeInfo = runtimeInfo;
}
Modified: incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringXMLComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringXMLComponentTypeLoader.java?view=diff&rev=512919&r1=512918&r2=512919
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringXMLComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/extensions/spring/container/src/main/java/org/apache/tuscany/container/spring/loader/SpringXMLComponentTypeLoader.java Wed Feb 28 11:32:56 2007
@@ -26,7 +26,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -52,7 +53,7 @@
private static final QName REFERENCE_ELEMENT = new QName(SCA_NS, "reference");
private static final QName BEANS_ELEMENT = new QName("http://www.springframework.org/schema/beans", "beans");
- public SpringXMLComponentTypeLoader(@Autowire LoaderRegistry loaderRegistry) {
+ public SpringXMLComponentTypeLoader(@Reference LoaderRegistry loaderRegistry) {
super(loaderRegistry);
}
Modified: incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java?view=diff&rev=512919&r1=512918&r2=512919
==============================================================================
--- incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java (original)
+++ incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLIntrospectorImpl.java Wed Feb 28 11:32:56 2007
@@ -26,8 +26,8 @@
import javax.xml.namespace.QName;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
/**
@@ -41,8 +41,8 @@
/**
* @param wsdlDefinitionRegistry
*/
- @Constructor("wsdlDefinitionRegistry")
- public InterfaceWSDLIntrospectorImpl(@Autowire WSDLDefinitionRegistry wsdlDefinitionRegistry) {
+ @Constructor
+ public InterfaceWSDLIntrospectorImpl(@Reference WSDLDefinitionRegistry wsdlDefinitionRegistry) {
super();
this.wsdlDefinitionRegistry = wsdlDefinitionRegistry;
}
Modified: incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java?view=diff&rev=512919&r1=512918&r2=512919
==============================================================================
--- incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java (original)
+++ incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/InterfaceWSDLLoader.java Wed Feb 28 11:32:56 2007
@@ -30,8 +30,8 @@
import static org.osoa.sca.Constants.SCA_NS;
import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
@@ -58,10 +58,10 @@
private InterfaceWSDLIntrospector introspector;
- @Constructor({"registry", "wsdlRegistry", "introspector"})
- public InterfaceWSDLLoader(@Autowire LoaderRegistry registry,
- @Autowire WSDLDefinitionRegistry wsdlRegistry,
- @Autowire InterfaceWSDLIntrospector introspector) {
+ @Constructor
+ public InterfaceWSDLLoader(@Reference LoaderRegistry registry,
+ @Reference WSDLDefinitionRegistry wsdlRegistry,
+ @Reference InterfaceWSDLIntrospector introspector) {
super(registry);
this.wsdlRegistry = wsdlRegistry;
this.introspector = introspector;
Modified: incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLContributionProcessor.java?view=diff&rev=512919&r1=512918&r2=512919
==============================================================================
--- incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLContributionProcessor.java Wed Feb 28 11:32:56 2007
@@ -27,7 +27,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.wsdl.Definition;
import javax.wsdl.Import;
import javax.wsdl.PortType;
@@ -39,16 +38,19 @@
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
-import org.apache.tuscany.host.deployment.DeploymentException;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.xml.sax.InputSource;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.ArtifactResolverRegistry;
import org.apache.tuscany.spi.extension.ContributionProcessorExtension;
import org.apache.tuscany.spi.model.Contribution;
import org.apache.tuscany.spi.model.DeployedArtifact;
-import org.xml.sax.InputSource;
+
+import org.apache.tuscany.host.deployment.DeploymentException;
/**
* The WSDL processor
+ *
* @version $Rev$ $Date$
*/
public class WSDLContributionProcessor extends ContributionProcessorExtension {
@@ -70,7 +72,7 @@
extensionRegistry = wsdlFactory.newPopulatedExtensionRegistry();
}
- @Autowire
+ @Reference
public void setSchemaRegistry(XMLSchemaRegistry schemaRegistry) {
this.schemaRegistry = schemaRegistry;
}
@@ -106,12 +108,13 @@
// Load inline schemas
registry.processModel(contribution, location, definition);
for (Object i : definition.getImports().values()) {
- List<Import> imps = (List<Import>)i;
+ List<Import> imps = (List<Import>) i;
for (Import imp : imps) {
Definition imported = imp.getDefinition();
if (imported != null) {
// TODO:
- registry.processModel(contribution, URI.create(imp.getDefinition().getDocumentBaseURI()), definition);
+ registry
+ .processModel(contribution, URI.create(imp.getDefinition().getDocumentBaseURI()), definition);
}
}
}
@@ -164,22 +167,19 @@
public static interface Monitor {
/**
- * Monitor event emitted immediately before an attempt is made to read
- * WSDL for the supplied namespace from the supplied location.
- *
- * @param namespace the target namespace expected in the WSDL; may be
- * null
- * @param location the location where we will attempt to read the WSDL
- * definition from
+ * Monitor event emitted immediately before an attempt is made to read WSDL for the supplied namespace from the
+ * supplied location.
+ *
+ * @param namespace the target namespace expected in the WSDL; may be null
+ * @param location the location where we will attempt to read the WSDL definition from
*/
void readingWSDL(String namespace, URI location);
/**
- * Monitor event emitted immediately before registering a WSDL
- * definition in the cache.
- *
+ * Monitor event emitted immediately before registering a WSDL definition in the cache.
+ *
* @param namespace the target namespace for the WSDL
- * @param location the location where the WSDL definition was read from
+ * @param location the location where the WSDL definition was read from
*/
void cachingDefinition(String namespace, URI location);
}
@@ -240,7 +240,7 @@
/**
* @param artifactResolverRegistry the artifactResolverRegistry to set
*/
- @Autowire
+ @Reference
public void setArtifactResolverRegistry(ArtifactResolverRegistry artifactResolverRegistry) {
this.artifactResolverRegistry = artifactResolverRegistry;
}
@@ -252,11 +252,11 @@
} catch (WSDLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- }
+ }
}
public void processModel(Contribution contribution, URI source, Object modelObject) throws DeploymentException,
- IOException {
+ IOException {
// TODO Auto-generated method stub
}
Modified: incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java?view=diff&rev=512919&r1=512918&r2=512919
==============================================================================
--- incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java Wed Feb 28 11:32:56 2007
@@ -36,11 +36,11 @@
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
/**
* The default implementation of the runtime WSDL registry
- *
+ *
* @version $Rev$ $Date$
*/
public class WSDLDefinitionRegistryImpl implements WSDLDefinitionRegistry {
@@ -61,7 +61,7 @@
registry = wsdlFactory.newPopulatedExtensionRegistry();
}
- @Autowire
+ @Reference
public void setSchemaRegistry(XMLSchemaRegistry schemaRegistry) {
this.schemaRegistry = schemaRegistry;
}
@@ -117,7 +117,7 @@
String definitionNamespace = definition.getTargetNamespace();
if (namespace != null && !namespace.equals(definitionNamespace)) {
throw new WSDLException(WSDLException.CONFIGURATION_ERROR, namespace + " != "
- + definition.getTargetNamespace());
+ + definition.getTargetNamespace());
}
// Load inline schemas
@@ -178,17 +178,17 @@
/**
* Monitor event emitted immediately before an attempt is made to read WSDL for the supplied namespace from the
* supplied location.
- *
+ *
* @param namespace the target namespace expected in the WSDL; may be null
- * @param location the location where we will attempt to read the WSDL definition from
+ * @param location the location where we will attempt to read the WSDL definition from
*/
void readingWSDL(String namespace, URL location);
/**
* Monitor event emitted immediately before registering a WSDL definition in the cache.
- *
+ *
* @param namespace the target namespace for the WSDL
- * @param location the location where the WSDL definition was read from
+ * @param location the location where the WSDL definition was read from
*/
void cachingDefinition(String namespace, URL location);
}
Modified: incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XSDContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XSDContributionProcessor.java?view=diff&rev=512919&r1=512918&r2=512919
==============================================================================
--- incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XSDContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/services/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/XSDContributionProcessor.java Wed Feb 28 11:32:56 2007
@@ -24,28 +24,29 @@
import java.io.InputStreamReader;
import java.net.URI;
import java.net.URL;
-
import javax.wsdl.Definition;
import javax.wsdl.Types;
import javax.wsdl.WSDLException;
import javax.wsdl.extensions.schema.Schema;
-import org.apache.tuscany.host.deployment.DeploymentException;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.ArtifactResolverRegistry;
import org.apache.tuscany.spi.extension.ContributionProcessorExtension;
import org.apache.tuscany.spi.model.Contribution;
import org.apache.tuscany.spi.model.DeployedArtifact;
+
+import org.apache.tuscany.host.deployment.DeploymentException;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
import org.apache.ws.commons.schema.XmlSchemaException;
import org.apache.ws.commons.schema.resolver.URIResolver;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
/**
* The XSD processor
- *
+ *
* @version $Rev$ $Date$
*/
public class XSDContributionProcessor extends ContributionProcessorExtension {
@@ -101,7 +102,7 @@
XmlSchemaCollection collection = new XmlSchemaCollection();
for (Object ext : types.getExtensibilityElements()) {
if (ext instanceof Schema) {
- Element element = ((Schema)ext).getElement();
+ Element element = ((Schema) ext).getElement();
XmlSchema s = collection.read(element, element.getBaseURI());
artifact.addModelObject(XmlSchema.class, s.getTargetNamespace(), s);
}
@@ -116,7 +117,7 @@
/**
* @param artifactResolverRegistry the artifactResolverRegistry to set
*/
- @Autowire
+ @Reference
public void setArtifactResolverRegistry(ArtifactResolverRegistry artifactResolverRegistry) {
this.artifactResolverRegistry = artifactResolverRegistry;
}
@@ -127,9 +128,9 @@
}
public void processModel(Contribution contribution, URI source, Object modelObject) throws DeploymentException,
- IOException {
+ IOException {
if (modelObject instanceof Definition) {
- loadSchemas(contribution, source, (Definition)modelObject);
+ loadSchemas(contribution, source, (Definition) modelObject);
}
}
Modified: incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DSComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DSComponentTypeLoader.java?view=diff&rev=512919&r1=512918&r2=512919
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DSComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DSComponentTypeLoader.java Wed Feb 28 11:32:56 2007
@@ -23,7 +23,8 @@
import java.net.URI;
import javax.sql.DataSource;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
@@ -47,7 +48,7 @@
public class DSComponentTypeLoader extends ComponentTypeLoaderExtension<DataSourceImplementation> {
private SimpleTypeMapperExtension extension = new SimpleTypeMapperExtension();
- public DSComponentTypeLoader(@Autowire LoaderRegistry loaderRegistry) {
+ public DSComponentTypeLoader(@Reference LoaderRegistry loaderRegistry) {
super(loaderRegistry);
}
Modified: incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceImplementationLoader.java?view=diff&rev=512919&r1=512918&r2=512919
==============================================================================
--- incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/services/persistence/datasource/src/main/java/org/apache/tuscany/persistence/datasource/DataSourceImplementationLoader.java Wed Feb 28 11:32:56 2007
@@ -22,7 +22,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
+
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
@@ -59,7 +60,7 @@
new QName("http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT", "implementation.ds");
private static final String PROVIDER = "provider";
- public DataSourceImplementationLoader(@Autowire LoaderRegistry registry) {
+ public DataSourceImplementationLoader(@Reference LoaderRegistry registry) {
super(registry);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org