You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/03/02 09:10:30 UTC
svn commit: r513654 [1/3] - in
/incubator/tuscany/branches/sca-java-integration: ./ buildtools/
pom/parent/ samples/ samples/sca/ samples/sca/calculator/
samples/sca/calculator/src/test/java/calculator/
samples/sca/composite-impl/ samples/sca/composite...
Author: jsdelfino
Date: Fri Mar 2 00:10:27 2007
New Revision: 513654
URL: http://svn.apache.org/viewvc?view=rev&rev=513654
Log:
Cleaned up and reorganized the samples. Renamed them with a consistent naming convention, adjusted their poms. Adjusted base poms inherited by the samples to get a clean build.
Added:
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/CompositeClient.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Source.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceCallback.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceImpl.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Target.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/TargetImpl.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/META-INF/LICENSE.txt (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/META-INF/NOTICE (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/test/java/composite/
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/test/java/composite/CompositeTestCase.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/echo-binding/src/test/java/echo/EchoBindingTestCase.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/echo-binding/src/test/resources/EchoBinding.composite (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/EchoDataBindingTestCase.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/EchoDataBinding.composite (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplication.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClient.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClientImpl.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanService.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/resources/loanapplication.composite (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/test/java/loanapplication/
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java (with props)
incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/resources/simplecallback.composite (with props)
Removed:
incubator/tuscany/branches/sca-java-integration/samples/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/innercomposite/
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/test/java/innercomposite/
incubator/tuscany/branches/sca-java-integration/samples/sca/echo-binding/src/main/resources/echo.composite
incubator/tuscany/branches/sca-java-integration/samples/sca/echo-binding/src/test/java/echo/BootstrapTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/src/test/java/echo/DataBindingIntegrationTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanappconversation/
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/test/java/loanappconversation/
incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/resources/META-INF/
Modified:
incubator/tuscany/branches/sca-java-integration/buildtools/pom.xml
incubator/tuscany/branches/sca-java-integration/pom.xml
incubator/tuscany/branches/sca-java-integration/pom/parent/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/InnerComposite.composite
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/InnerComposite2.composite
incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/OuterComposite.composite
incubator/tuscany/branches/sca-java-integration/samples/sca/echo-binding/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/simple-bigbank/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/pom.xml
incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
incubator/tuscany/branches/sca-java-integration/samples/sca/webapp/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-async-ws/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-async-wsclient/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-om-ws/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-om-wsclient/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-oneway-ws/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-oneway-wsclient/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-ws/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-wsclient/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-ws/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/samples/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/extensions/pom.xml
incubator/tuscany/branches/sca-java-integration/sca/pom.xml
incubator/tuscany/branches/sca-java-integration/spec/commonj/pom.xml
incubator/tuscany/branches/sca-java-integration/spec/sca-api-r0.95/pom.xml
incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/pom.xml
incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml
Modified: incubator/tuscany/branches/sca-java-integration/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/buildtools/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/buildtools/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/buildtools/pom.xml Fri Mar 2 00:10:27 2007
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>parent</artifactId>
- <version>2-incubator-SNAPSHOT</version>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
</parent>
<artifactId>buildtools</artifactId>
<packaging>jar</packaging>
Modified: incubator/tuscany/branches/sca-java-integration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/pom.xml Fri Mar 2 00:10:27 2007
@@ -49,7 +49,7 @@
<module>spec</module>
<module>sca</module>
<module>testing/sca</module>
- <module>samples</module>
+ <module>samples/sca</module>
</modules>
</profile>
@@ -61,7 +61,7 @@
<module>spec</module>
<module>sca</module>
<module>testing/sca</module>
- <module>samples</module>
+ <module>samples/sca</module>
</modules>
</profile>
@@ -73,7 +73,7 @@
<module>spec</module>
<module>sca</module>
<module>testing/sca</module>
- <module>samples</module>
+ <module>samples/sca</module>
</modules>
</profile>
Modified: incubator/tuscany/branches/sca-java-integration/pom/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/pom/parent/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/pom/parent/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/pom/parent/pom.xml Fri Mar 2 00:10:27 2007
@@ -29,7 +29,7 @@
<packaging>pom</packaging>
<name>Apache Tuscany Project Parent</name>
<description>Parent POM defining settings that can be used across Tuscany</description>
- <version>2-incubator-SNAPSHOT</version>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
<prerequisites>
<maven>2.0.4</maven>
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/pom.xml Fri Mar 2 00:10:27 2007
@@ -26,24 +26,29 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tuscany-sample-calculator</artifactId>
<packaging>jar</packaging>
- <name>Tuscany Calculator Sample</name>
+ <name>Apache Tuscany Calculator Sample</name>
<description>A sample Calculator made of several SCA components wired together.</description>
<dependencies>
<dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r1.0</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-api</artifactId>
- <scope>compile</scope>
<version>0.1-integration-incubating-SNAPSHOT</version>
+ <scope>compile</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-test</artifactId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-core</artifactId>
<version>0.1-integration-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java Fri Mar 2 00:10:27 2007
@@ -18,24 +18,28 @@
*/
package calculator;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.api.SCAContainer;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
-import org.apache.tuscany.test.SCATestCase;
-
/**
* This shows how to test the Calculator service component.
*/
-public class CalculatorTestCase extends SCATestCase {
+public class CalculatorTestCase extends TestCase {
private CalculatorService calculatorService;
protected void setUp() throws Exception {
- super.setApplicationSCDL("Calculator.composite");
- super.setUp();
+ SCAContainer.start("Calculator.composite");
CompositeContext context = CurrentCompositeContext.getContext();
calculatorService = context.locateService(CalculatorService.class, "CalculatorServiceComponent");
+ }
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
public void testCalculator() throws Exception {
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/pom.xml Fri Mar 2 00:10:27 2007
@@ -22,41 +22,54 @@
<groupId>org.apache.tuscany.samples.sca</groupId>
<artifactId>parent</artifactId>
<version>0.1-integration-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-sample-innercomposite</artifactId>
+ <artifactId>tuscany-sample-composite-impl</artifactId>
<packaging>jar</packaging>
- <name>Tuscany Inner Composite Sample</name>
- <description>A sample implementation showing local wiring of an inner composite.</description>
+ <name>Apache Tuscany Composite Implementation Sample</name>
+ <description>A sample showing local wiring of a component implemented by a composite.</description>
<dependencies>
<dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r1.0</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
<artifactId>tuscany-api</artifactId>
<version>0.1-integration-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-test</artifactId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-core</artifactId>
<version>0.1-integration-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
- <mainClass>innercomposite.InnerCompositeClient</mainClass>
+ <mainClass>composite.CompositeClient</mainClass>
</manifest>
</archive>
</configuration>
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/CompositeClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/CompositeClient.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/CompositeClient.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/CompositeClient.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,26 @@
+package composite;
+
+import org.apache.tuscany.api.SCAContainer;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
+
+/**
+ * Simple client program that invokes the components that we wired together.
+ *
+ * @version $Rev$ $Date$
+ */
+public class CompositeClient {
+
+ public static void main(String[] args) throws Exception {
+ SCAContainer.start("OuterComposite.composite");
+
+ CompositeContext context = CurrentCompositeContext.getContext();
+
+ Source source = context.locateService(Source.class, "SourceComponent/InnerSourceService");
+ System.out.println("Main thread " + Thread.currentThread());
+ source.clientMethod("Client.main");
+ Thread.sleep(500);
+
+ SCAContainer.stop();
+ }
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/CompositeClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/CompositeClient.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Source.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Source.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Source.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Source.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package composite;
+
+public interface Source {
+
+ void clientMethod(String arg);
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Source.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Source.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceCallback.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceCallback.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceCallback.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceCallback.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package composite;
+
+public interface SourceCallback {
+
+ void receiveResult(String result);
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceCallback.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceCallback.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceImpl.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceImpl.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceImpl.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package composite;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+
+@Service(Source.class)
+@Scope("COMPOSITE")
+public class SourceImpl implements Source, SourceCallback {
+
+ private Target targetReference;
+ private Target targetReference2;
+
+ @Reference
+ public void setTargetReference(Target target) {
+ this.targetReference = target;
+ }
+
+ @Reference
+ public void setTargetReference2(Target target) {
+ this.targetReference2 = target;
+ }
+
+ public void clientMethod(String arg) {
+ System.out.println("Source: " + arg + " -> Source.clientMethod");
+ targetReference.someMethod(arg + " -> Source.clientMethod");
+
+ System.out.println("Source: " + arg + " => Source.clientMethod2");
+ targetReference2.someMethod(arg + " => Source.clientMethod2");
+ }
+
+ public void receiveResult(String result) {
+ System.out.println("Work thread " + Thread.currentThread());
+ System.out.println("Result: " + result);
+ }
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/SourceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Target.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Target.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Target.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Target.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package composite;
+
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.OneWay;
+
+
+@Callback(SourceCallback.class)
+public interface Target {
+
+ @OneWay
+ void someMethod(String arg);
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Target.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/Target.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/TargetImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/TargetImpl.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/TargetImpl.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/TargetImpl.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package composite;
+
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+
+@Service(Target.class)
+@Scope("COMPOSITE")
+public class TargetImpl implements Target {
+
+ private SourceCallback sourceCallback;
+
+ @Callback
+ public void setSourceCallback(SourceCallback sourceCallback) {
+ this.sourceCallback = sourceCallback;
+ }
+
+ public void someMethod(String arg) {
+ System.out.println("Target: " + arg);
+ sourceCallback.receiveResult(arg + " -> Target.someMethod");
+ }
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/TargetImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/java/composite/TargetImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/InnerComposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/InnerComposite.composite?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/InnerComposite.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/InnerComposite.composite Fri Mar 2 00:10:27 2007
@@ -21,24 +21,24 @@
name="InnerComposite">
<service name="InnerSourceService" target="InnerSourceComponent">
- <interface.java interface="innercomposite.Source"/>
+ <interface.java interface="composite.Source"/>
<reference name="innerSource">InnerSourceComponent</reference>
</service>
<component name="InnerSourceComponent">
- <implementation.java class="innercomposite.SourceImpl"/>
+ <implementation.java class="composite.SourceImpl"/>
<reference name="targetReference">TargetComponentRef</reference>
<reference name="targetReference2">TargetComponentRef2</reference>
</component>
<reference name="TargetComponentRef">
- <interface.java interface="innercomposite.Target"
- callbackInterface="innercomposite.SourceCallback"/>
+ <interface.java interface="composite.Target"
+ callbackInterface="composite.SourceCallback"/>
</reference>
<reference name="TargetComponentRef2">
- <interface.java interface="innercomposite.Target"
- callbackInterface="innercomposite.SourceCallback"/>
+ <interface.java interface="composite.Target"
+ callbackInterface="composite.SourceCallback"/>
</reference>
</composite>
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/InnerComposite2.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/InnerComposite2.composite?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/InnerComposite2.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/composite-impl/src/main/resources/InnerComposite2.composite Fri Mar 2 00:10:27 2007
@@ -21,13 +21,13 @@
name="InnerComposite2">
<service name="InnerTargetService" target="InnerTargetComponent">
- <interface.java interface="innercomposite.Target"
- callbackInterface="innercomposite.SourceCallback"/>
+ <interface.java interface="composite.Target"
+ callbackInterface="composite.SourceCallback"/>
<reference name="innerSource">InnerTargetComponent</reference>
</service>
<component name="InnerTargetComponent">
- <implementation.java class="innercomposite.TargetImpl"/>
+ <implementation.java class="composite.TargetImpl"/>
</component>
</composite>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org