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 18:52:29 UTC
svn commit: r512872 - in
/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main:
java/org/apache/tuscany/runtime/webapp/
java/org/apache/tuscany/runtime/webapp/implementation/webapp/
resources/META-INF/tuscany/
Author: jmarino
Date: Wed Feb 28 09:52:29 2007
New Revision: 512872
URL: http://svn.apache.org/viewvc?view=rev&rev=512872
Log:
change webapp to remove autowire
Modified:
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebResourceScanExtender.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponentTypeLoader.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappLoader.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebResourceScanExtender.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebResourceScanExtender.java?view=diff&rev=512872&r1=512871&r2=512872
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebResourceScanExtender.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebResourceScanExtender.java Wed Feb 28 09:52:29 2007
@@ -25,8 +25,7 @@
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
-
-import org.apache.tuscany.spi.annotation.Autowire;
+import org.osoa.sca.annotations.Reference;
import org.apache.tuscany.core.services.extension.AbstractExtensionDeployer;
@@ -37,8 +36,8 @@
private final WebappRuntimeInfo runtimeInfo;
private final String path;
- public WebResourceScanExtender(@Autowire WebappRuntimeInfo runtimeInfo,
- @Property(name = "path") String path) {
+ public WebResourceScanExtender(@Reference WebappRuntimeInfo runtimeInfo,
+ @Property(name = "path")String path) {
this.runtimeInfo = runtimeInfo;
this.path = path;
}
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponentTypeLoader.java?view=diff&rev=512872&r1=512871&r2=512872
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappComponentTypeLoader.java Wed Feb 28 09:52:29 2007
@@ -18,7 +18,8 @@
*/
package org.apache.tuscany.runtime.webapp.implementation.webapp;
-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;
@@ -29,7 +30,7 @@
*/
public class WebappComponentTypeLoader extends ComponentTypeLoaderExtension<WebappImplementation> {
- public WebappComponentTypeLoader(@Autowire LoaderRegistry loaderRegistry) {
+ public WebappComponentTypeLoader(@Reference LoaderRegistry loaderRegistry) {
super(loaderRegistry);
}
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappLoader.java?view=diff&rev=512872&r1=512871&r2=512872
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappLoader.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/implementation/webapp/WebappLoader.java Wed Feb 28 09:52:29 2007
@@ -26,20 +26,21 @@
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.idl.java.InterfaceJavaIntrospector;
import org.apache.tuscany.spi.idl.InvalidServiceContractException;
+import org.apache.tuscany.spi.idl.java.InterfaceJavaIntrospector;
+import org.apache.tuscany.spi.implementation.java.ProcessingException;
+import org.apache.tuscany.spi.loader.IllegalSCDLNameException;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.loader.UnrecognizedElementException;
import org.apache.tuscany.spi.loader.MissingResourceException;
-import org.apache.tuscany.spi.loader.IllegalSCDLNameException;
+import org.apache.tuscany.spi.loader.UnrecognizedElementException;
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
/**
* @version $Rev$ $Date$
@@ -49,8 +50,8 @@
private final InterfaceJavaIntrospector introspector;
- public WebappLoader(@Autowire LoaderRegistry registry,
- @Autowire InterfaceJavaIntrospector introspector) {
+ public WebappLoader(@Reference LoaderRegistry registry,
+ @Reference InterfaceJavaIntrospector introspector) {
super(registry);
this.introspector = introspector;
}
@@ -71,17 +72,17 @@
while (true) {
switch (reader.next()) {
- case START_ELEMENT:
- QName qname = reader.getName();
- if ("reference".equals(qname.getLocalPart())) {
- defineReference(componentType, reader, deploymentContext);
- } else {
- throw new UnrecognizedElementException(qname);
- }
- reader.next();
- break;
- case END_ELEMENT:
- return impl;
+ case START_ELEMENT:
+ QName qname = reader.getName();
+ if ("reference".equals(qname.getLocalPart())) {
+ defineReference(componentType, reader, deploymentContext);
+ } else {
+ throw new UnrecognizedElementException(qname);
+ }
+ reader.next();
+ break;
+ case END_ELEMENT:
+ return impl;
}
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl?view=diff&rev=512872&r1=512871&r2=512872
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl Wed Feb 28 09:52:29 2007
@@ -24,7 +24,8 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
- name="org.apache.tuscany.runtime.webapp.System">
+ name="org.apache.tuscany.runtime.webapp.System"
+ autowire="true">
<!-- Component that provides the Deployer service -->
<component name="deployer">
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org