Author: antelder
Date: Wed Feb 18 09:28:04 2009
New Revision: 745450
URL: http://svn.apache.org/viewvc?rev=745450&view=rev
Log:
Start to bringup the implementation-web-runtime module (copied frm 1.x)
Added:
tuscany/java/sca/modules/implementation-web-runtime/ (props changed)
- copied from r745448,
tuscany/branches/sca-java-1.x/modules/implementation-web-runtime/
tuscany/java/sca/modules/implementation-web-runtime/META-INF/
tuscany/java/sca/modules/implementation-web-runtime/META-INF/MANIFEST.MF
Modified:
tuscany/java/sca/modules/implementation-web-runtime/pom.xml
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
Propchange: tuscany/java/sca/modules/implementation-web-runtime/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 18 09:28:04 2009
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/java/sca/modules/implementation-web-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 18 09:28:04 2009
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/modules/implementation-web-runtime:671193
Added: tuscany/java/sca/modules/implementation-web-runtime/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/META-INF/MANIFEST.MF?rev=745450&view=auto
==============================================================================
--- tuscany/java/sca/modules/implementation-web-runtime/META-INF/MANIFEST.MF
(added)
+++ tuscany/java/sca/modules/implementation-web-runtime/META-INF/MANIFEST.MF
Wed Feb 18 09:28:04 2009
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Tool: Bnd-0.0.255
+Bundle-Name: Apache Tuscany SCA Web Implementation Web Runtime
+Created-By: 1.6.0_07 (Sun Microsystems Inc.)
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0
+Bnd-LastModified: 1225397153500
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Implementation Web Runtime
+Bundle-SymbolicName: org.apache.tuscany.sca.implementation.web.runtime
+Bundle-DocURL: http://www.apache.org/
+
Modified: tuscany/java/sca/modules/implementation-web-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/pom.xml?rev=745450&r1=745448&r2=745450&view=diff
==============================================================================
--- tuscany/java/sca/modules/implementation-web-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/implementation-web-runtime/pom.xml Wed Feb 18
09:28:04 2009
@@ -18,36 +18,35 @@
* under the License.
-->
<project>
-
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-modules</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>tuscany-implementation-web-runtime</artifactId>
- <name>Apache Tuscany SCA implementation.web Extension</name>
+ <name>Apache Tuscany SCA Web Implementation Runtime</name>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-web</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-http</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -67,18 +66,11 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca-api</artifactId>
- <version>1.5-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api-extension</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
@@ -94,23 +86,4 @@
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-
- <configuration>
- <instructions>
- <Bundle-Version>${tuscany.version}</Bundle-Version>
-
<Bundle-SymbolicName>org.apache.tuscany.sca.implementation.web.runtime</Bundle-SymbolicName>
- <Bundle-Description>${pom.name}</Bundle-Description>
-
<Export-Package>org.apache.tuscany.sca.implementation.web.runtime*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified:
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java?rev=745450&r1=745448&r2=745450&view=diff
==============================================================================
---
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
(original)
+++
tuscany/java/sca/modules/implementation-web-runtime/src/main/java/org/apache/tuscany/sca/implementation/web/runtime/ComponentContextProxy.java
Wed Feb 18 09:28:04 2009
@@ -21,12 +21,11 @@
import java.util.Collection;
-import org.apache.tuscany.sca.api.ComponentContextExtension;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
+import org.oasisopen.sca.CallableReference;
+import org.oasisopen.sca.ComponentContext;
+import org.oasisopen.sca.RequestContext;
+import org.oasisopen.sca.ServiceReference;
/**
* Proxy ComponentContext wrappering a RuntimeComponent as the
@@ -78,11 +77,11 @@
}
public <B> Collection<ServiceReference<B>> getServiceReferences(Class<B>
businessInterface, String referenceName) {
- return
((ComponentContextExtension)getComponentContext()).getServiceReferences(businessInterface,
referenceName);
+ return
((ComponentContext)getComponentContext()).getServiceReferences(businessInterface,
referenceName);
}
public <B> Collection<B> getServices(Class<B> businessInterface, String
referenceName) {
- return
((ComponentContextExtension)getComponentContext()).getServices(businessInterface,
referenceName);
+ return
((ComponentContext)getComponentContext()).getServices(businessInterface,
referenceName);
}
}
