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 [3/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...
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/EchoDataBinding.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/EchoDataBinding.composite?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/EchoDataBinding.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/EchoDataBinding.composite Fri Mar 2 00:10:27 2007
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:f="http://foo"
+ xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" name="EchoDataBinding">
+
+ <service name="EchoService">
+ <interface.java class="echo.Interface1" />
+ <binding.echo />
+ <reference>ComponentB</reference>
+ </service>
+
+ <component name="ComponentA">
+ <implementation.java class="echo.ComponentAImpl" />
+ <reference name="componentBReference">ComponentB</reference>
+ <property name="prefix">ABC</property>
+ <property name="prefix1" source="$messagePrefix"></property>
+ <property name="bar" source="$complexProperty/*[local-name()='foo']/*[local-name()='bar']"></property>
+ <property name="omProperty"><a><b>XYZ</b></a></property>
+ </component>
+
+ <component name="ComponentB">
+ <implementation.java class="echo.ComponentBImpl" />
+ <reference name="echoReference">EchoReference</reference>
+ </component>
+
+ <reference name="EchoReference">
+ <!--
+ <interface.java interface="echo.Echo"/>
+ -->
+ <interface.wsdl interface="http://example.com/echo.wsdl#wsdl.interface(EchoPortType)" wsdli:wsdlLocation="http://example.com/echo.wsdl wsdl/echo.wsdl">
+ <db:databinding xmlns:db="http://tuscany.apache.org/xmlns/sca/databinding/1.0" name="org.apache.axiom.om.OMElement"/>
+ </interface.wsdl>
+ <binding.echo />
+ </reference>
+
+ <property name="messagePrefix" type="xsd:string">ABC</property>
+ <property name="complexProperty" type="f:FooType">
+ <foo>
+ <bar attr="barAttr">BAR</bar>
+ </foo>
+ </property>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/EchoDataBinding.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/echo-databinding/src/test/resources/EchoDataBinding.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/pom.xml Fri Mar 2 00:10:27 2007
@@ -22,28 +22,33 @@
<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-loanappconversation</artifactId>
+ <artifactId>tuscany-sample-loanapplication</artifactId>
<packaging>jar</packaging>
- <name>Tuscany Loan App Conversation Sample</name>
+ <name>Apache Tuscany Loan Application Conversation Sample</name>
<description>A sample implementation of a loan application conversation.</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>
@@ -56,7 +61,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>loanappconversation.LoanAppConversationClient</mainClass>
+ <mainClass>loanapplication.LoanApplicationClient</mainClass>
</manifest>
</archive>
</configuration>
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplication.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplication.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplication.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplication.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,35 @@
+/*
+ * 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 loanapplication;
+
+public class LoanApplication {
+
+ private String customerName;
+ private float loanAmount;
+
+ public LoanApplication(String customerName, float loanAmount) {
+ this.customerName = customerName;
+ this.loanAmount = loanAmount;
+ }
+
+ public String toString() {
+ return "[Customer: " + customerName + ", loan amount: "
+ + loanAmount + "]";
+ }
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplication.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplication.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplicationClient.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 loanapplication;
+
+
+import org.apache.tuscany.api.SCAContainer;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
+
+public class LoanApplicationClient {
+
+ public static void main(String[] args) throws Exception {
+ SCAContainer.start("loanapplication.composite");
+
+ // Locate the MyClient component and invoke it
+ CompositeContext context = CurrentCompositeContext.getContext();
+
+ LoanClient loanClient = context.locateService(LoanClient.class, "LoanClientComponent");
+ loanClient.applyForLoan("John Doe", 1000.0f);
+ System.out.println(loanClient.displayLoan());
+ System.out.println("Loan approved: " + loanClient.isApproved());
+
+ SCAContainer.stop();
+ }
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanApplicationClient.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClient.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClient.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClient.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,29 @@
+/*
+ * 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 loanapplication;
+
+public interface LoanClient {
+
+ void applyForLoan(String customerName, float amount);
+ boolean isApproved();
+ boolean isCancelled();
+ String displayLoan();
+ void cancelLoan();
+ void closeLoan();
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClient.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClientImpl.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClientImpl.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClientImpl.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,64 @@
+/*
+ * 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 loanapplication;
+
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+
+@Scope("COMPOSITE")
+public class LoanClientImpl implements LoanClient {
+
+ private LoanService loanService;
+
+ @Reference
+ public void setLoanService(LoanService loanService) {
+ this.loanService = loanService;
+ }
+
+ public void applyForLoan(String customerName, float amount) {
+ loanService.apply(new LoanApplication(customerName, amount));
+ }
+
+ public boolean isApproved() {
+ if (loanService.getLoanStatus() == null) {
+ return false;
+ }
+ return loanService.getLoanStatus().equals("approved");
+ }
+
+ public boolean isCancelled() {
+ if (loanService.getLoanStatus() == null) {
+ return false;
+ }
+ return loanService.getLoanStatus().equals("cancelled");
+ }
+
+ public String displayLoan() {
+ return loanService.display();
+ }
+
+ public void cancelLoan() {
+ loanService.cancelApplication();
+ }
+
+ public void closeLoan() {
+ loanService.close();
+ }
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanClientImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanService.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanService.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanService.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,37 @@
+/*
+ * 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 loanapplication;
+
+import org.osoa.sca.annotations.EndsConversation;
+import org.osoa.sca.annotations.OneWay;
+import org.osoa.sca.annotations.Remotable;
+import org.osoa.sca.annotations.Scope;
+
+@Scope("CONVERSATION")
+@Remotable
+public interface LoanService {
+ void apply(LoanApplication application);
+ void lockCurrentRate(int termInYears);
+ @OneWay
+ void cancelApplication();
+ String getLoanStatus();
+ String display();
+ @EndsConversation
+ void close();
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,63 @@
+/*
+ * 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 loanapplication;
+
+import org.osoa.sca.annotations.AllowsPassByReference;
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Scope;
+
+@Scope("CONVERSATION")
+@AllowsPassByReference
+public class LoanServiceImpl implements LoanService {
+
+ private LoanApplication application;
+ private String status;
+ private int termLocked = 0;
+ @ConversationID
+ protected String conversationID;
+
+ public void apply(LoanApplication application) {
+ this.application = application;
+ status = "open";
+ }
+
+ public void lockCurrentRate(int termInYears) {
+ termLocked = termInYears;
+ status = "locked";
+ }
+
+ public void cancelApplication() {
+ status = "cancelled";
+ }
+
+ public String getLoanStatus() {
+ return status;
+ }
+
+ public String display() {
+ return "Loan application: " + application + ", term: "
+ + termLocked + ", status: " + status
+ + ", conversationID: " + conversationID;
+ }
+
+ public void close() {
+ this.application = null;
+ this.status = "closed";
+ }
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/java/loanapplication/LoanServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/resources/loanapplication.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/resources/loanapplication.composite?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/resources/loanapplication.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/resources/loanapplication.composite Fri Mar 2 00:10:27 2007
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="loanapplication">
+
+ <component name="LoanClientComponent">
+ <implementation.java class="loanapplication.LoanClientImpl"/>
+ <reference name="loanService">LoanServiceComponent</reference>
+ </component>
+
+ <component name="LoanServiceComponent">
+ <implementation.java class="loanapplication.LoanServiceImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/resources/loanapplication.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/main/resources/loanapplication.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java Fri Mar 2 00:10:27 2007
@@ -0,0 +1,83 @@
+/*
+ * 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 loanapplication;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.api.SCAContainer;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
+
+public class LoanApplicationTestCase extends TestCase {
+
+ private LoanClient loanClient;
+
+ protected void setUp() throws Exception {
+ SCAContainer.start("loanapplication.composite");
+
+ CompositeContext context = CurrentCompositeContext.getContext();
+ loanClient = context.locateService(LoanClient.class, "LoanClientComponent");
+ }
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
+ }
+
+ public void test() throws Exception {
+ try {
+ loanClient.applyForLoan("John Doe", 1000.0f);
+ System.out.println("Applied: " + loanClient.displayLoan());
+ System.out.println("Loan approved: " + loanClient.isApproved());
+ loanClient.cancelLoan();
+ System.out.println("Sleeping to let cancel complete ...");
+ Thread.sleep(500);
+ if (!loanClient.isCancelled()) {
+ fail("Loan should be cancelled");
+ }
+ System.out.println("Cancelled: " + loanClient.displayLoan());
+ loanClient.closeLoan();
+
+ /* This is a mistake, after @EndsConversation, a new conversation is
+ * started automatically, so we should not get TargetNotFoundException.
+ * Keep this for the timeout case, where we should get the exception
+ try {
+ System.out.println("Trying to use the closed loan in the ended conversation ...");
+ System.out.println("Closed: " + loanClient.displayLoan());
+ fail("Target should not be found");
+ } catch(TargetNotFoundException e) {
+ System.out.println("Target not found as expected");
+ }
+ */
+
+ // Now check that a new conversation's loan is not cancelled
+
+ if (loanClient.isCancelled()) {
+ fail("Loan should not be cancelled");
+ }
+ } catch(Throwable e) {
+ e.printStackTrace();
+ if (e instanceof Exception) {
+ throw (Exception)e;
+ }
+ if (e instanceof Error) {
+ throw (Error)e;
+ }
+ }
+ }
+}
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/loanapplication/src/test/java/loanapplication/LoanApplicationTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/pom.xml Fri Mar 2 00:10:27 2007
@@ -19,7 +19,7 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.samples</groupId>
+ <groupId>org.apache.tuscany</groupId>
<artifactId>parent</artifactId>
<version>0.1-integration-incubating-SNAPSHOT</version>
</parent>
@@ -30,16 +30,6 @@
<packaging>pom</packaging>
<name>Apache Tuscany SCA Samples</name>
- <properties>
- <tuscanyVersion>0.1-integration-incubating-SNAPSHOT</tuscanyVersion>
- <specVersion>1.0</specVersion>
-
- <scaVersion>0.1-integration-incubating-SNAPSHOT</scaVersion>
- <scaImplVersion>0.1-integration-incubating-SNAPSHOT</scaImplVersion>
- <sdoVersion>0.1-integration-incubating-SNAPSHOT</sdoVersion>
- <dasVersion>0.1-integration-incubating-SNAPSHOT</dasVersion>
- </properties>
-
<!-- definition of repositories where the parent pom can be found -->
<repositories>
<repository>
@@ -70,41 +60,20 @@
<module>calculator</module>
<module>composite-impl</module>
<module>loanapplication</module>
- <module>supplychain</module>
<module>simple-bigbank</module>
+ <module>simple-callback</module>
+ <module>supplychain</module>
<module>echo-binding</module>
<module>echo-databinding</module>
</modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r${specVersion}</artifactId>
- <version>${scaVersion}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-api</artifactId>
- <scope>compile</scope>
- <version>${scaImplVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-test</artifactId>
- <version>${tuscanyVersion}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -113,4 +82,5 @@
</plugins>
</pluginManagement>
</build>
+
</project>
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/simple-bigbank/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/simple-bigbank/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/simple-bigbank/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/simple-bigbank/pom.xml Fri Mar 2 00:10:27 2007
@@ -22,22 +22,33 @@
<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-bigbank</artifactId>
+ <artifactId>tuscany-sample-simple-bigbank</artifactId>
<packaging>jar</packaging>
- <name>Tuscany BigBank Sample</name>
- <description>Simplified Big Bank</description>
+ <name>Apache Tuscany Simplified BigBank Sample</name>
+ <description>Simplified Big Bank Sample</description>
<dependencies>
<dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r1.0</artifactId>
+ <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.kernel</groupId>
+ <artifactId>tuscany-core</artifactId>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-test</artifactId>
- <version>${tuscanyVersion}</version>
+ <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/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/simple-bigbank/src/test/java/bigbank/BigBankTestCase.java Fri Mar 2 00:10:27 2007
@@ -18,22 +18,27 @@
*/
package bigbank;
+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;
import bigbank.account.AccountService;
-public class BigBankTestCase extends SCATestCase {
+public class BigBankTestCase extends TestCase {
AccountService accountService;
protected void setUp() throws Exception {
- super.setApplicationSCDL("BigBank.composite");
- super.setUp();
+ SCAContainer.start("BigBank.composite");
CompositeContext context = CurrentCompositeContext.getContext();
accountService = context.locateService(AccountService.class, "AccountServiceComponent");
+ }
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
public void test() throws Exception {
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/pom.xml Fri Mar 2 00:10:27 2007
@@ -22,22 +22,33 @@
<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-simplecallback</artifactId>
+ <artifactId>tuscany-sample-simple-callback</artifactId>
<packaging>jar</packaging>
- <name>Tuscany Simple Callback Sample</name>
+ <name>Apache Tuscany Simple Callback Sample</name>
<description>A sample implementation of a simple callback application.</description>
<dependencies>
<dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r1.0</artifactId>
+ <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>
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/java/simplecallback/SimpleCallbackClient.java Fri Mar 2 00:10:27 2007
@@ -18,6 +18,7 @@
*/
package simplecallback;
+import org.apache.tuscany.api.SCAContainer;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
@@ -27,11 +28,15 @@
public class SimpleCallbackClient {
public static void main(String[] args) throws Exception {
+ SCAContainer.start("simplecallback.composite");
+
// Locate the MyClient component and invoke it
CompositeContext context = CurrentCompositeContext.getContext();
MyClient myClient = context.locateService(MyClient.class, "MyClientComponent");
System.out.println("Main thread " + Thread.currentThread());
myClient.aClientMethod();
Thread.sleep(500);
+
+ SCAContainer.stop();
}
}
Added: incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/resources/simplecallback.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/resources/simplecallback.composite?view=auto&rev=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/resources/simplecallback.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/resources/simplecallback.composite Fri Mar 2 00:10:27 2007
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="simplecallback">
+
+ <component name="MyClientComponent">
+ <implementation.java class="simplecallback.MyClientImpl"/>
+ <reference name="myService">MyServiceComponent</reference>
+ </component>
+
+ <component name="MyServiceComponent">
+ <implementation.java class="simplecallback.MyServiceImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/resources/simplecallback.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/main/resources/simplecallback.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/simple-callback/src/test/java/simplecallback/SimpleCallbackTestCase.java Fri Mar 2 00:10:27 2007
@@ -18,24 +18,28 @@
*/
package simplecallback;
+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;
-
/**
* A testcase that demonstrates resolving the client service and initiating the callback sequence
*/
-public class SimpleCallbackTestCase extends SCATestCase {
+public class SimpleCallbackTestCase extends TestCase {
private MyClient myClient;
protected void setUp() throws Exception {
- setApplicationSCDL(MyClient.class, "META-INF/sca/default.scdl");
- super.setUp();
+ SCAContainer.start("simplecallback.composite");
CompositeContext context = CurrentCompositeContext.getContext();
myClient = context.locateService(MyClient.class, "MyClientComponent");
+ }
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
public void test() throws Exception {
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/pom.xml Fri Mar 2 00:10:27 2007
@@ -22,28 +22,33 @@
<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-supplychain</artifactId>
<packaging>jar</packaging>
- <name>Tuscany Supply Chain Sample</name>
+ <name>Apache Tuscany Supply Chain Sample</name>
<description>A sample implementation of an asynchronous supply chain application.</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>
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/supplychain/src/test/java/supplychain/SupplyChainClientTestCase.java Fri Mar 2 00:10:27 2007
@@ -18,25 +18,29 @@
*/
package supplychain;
+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 client program shows how to create an SCA runtime, start it, locate a simple HelloWorld service component and
* invoke it.
*/
-public class SupplyChainClientTestCase extends SCATestCase {
+public class SupplyChainClientTestCase extends TestCase {
private Customer customer;
protected void setUp() throws Exception {
- super.setApplicationSCDL("supplychain.composite");
- super.setUp();
+ SCAContainer.start("supplychain.composite");
CompositeContext context = CurrentCompositeContext.getContext();
customer = context.locateService(Customer.class, "CustomerComponent");
+ }
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
public void test() throws Exception {
Modified: incubator/tuscany/branches/sca-java-integration/samples/sca/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/samples/sca/webapp/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/samples/sca/webapp/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/samples/sca/webapp/pom.xml Fri Mar 2 00:10:27 2007
@@ -22,41 +22,28 @@
<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-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany Simple WebApp Sample</name>
- <description>A sample WebApplication showing how to include a Tuscany runtime.</description>
+ <description>A sample Web Application showing how to use SCA from a JSP.</description>
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-sample-calculator</artifactId>
- <version>${tuscanyVersion}</version>
+ <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.runtime.webapp</groupId>
- <artifactId>webapp-api</artifactId>
- <version>${tuscanyVersion}</version>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-core</artifactId>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
- <build>
- <finalName>sample-webapp</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
- <artifactId>tuscany-war-plugin</artifactId>
- <executions>
- <execution>
- <id>tuscany-war</id>
- <goals>
- <goal>tuscany-war</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+
</project>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-async-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-async-ws/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-async-ws/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-async-ws/pom.xml Fri Mar 2 00:10:27 2007
@@ -24,7 +24,7 @@
<version>0.1-integration-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>sample-helloworldws-async</artifactId>
+ <artifactId>tuscany-sample-helloworld-async-ws</artifactId>
<packaging>war</packaging>
<name>Tuscany HelloWorld Web Service Sample</name>
<description>A sample HelloWorld Async Web Service.</description>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-async-wsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-async-wsclient/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-async-wsclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-async-wsclient/pom.xml Fri Mar 2 00:10:27 2007
@@ -24,7 +24,7 @@
<version>0.1-integration-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>sample-helloworldwsclient-async</artifactId>
+ <artifactId>tuscany-sample-helloworld-async-wsclient</artifactId>
<packaging>jar</packaging>
<name>Tuscany HelloWorld Web Service Async Client Sample</name>
<description>A sample client for a HelloWorld Web Service.</description>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-om-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-om-ws/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-om-ws/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-om-ws/pom.xml Fri Mar 2 00:10:27 2007
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-sample-helloworldws-om</artifactId>
+ <artifactId>tuscany-sample-helloworld-om-ws</artifactId>
<packaging>jar</packaging>
<name>Tuscany HelloWorld Axiom Web Service Sample</name>
<description>A sample HelloWorld Web Service using Axiom OM.</description>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-om-wsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-om-wsclient/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-om-wsclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-om-wsclient/pom.xml Fri Mar 2 00:10:27 2007
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-sample-helloworldwsclient-om</artifactId>
+ <artifactId>tuscany-sample-helloworld-om-wsclient</artifactId>
<packaging>jar</packaging>
<name>Tuscany HelloWorld Axiom Web Service Client Sample</name>
<description>A sample client for a HelloWorld Web Service using Axiom.</description>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-oneway-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-oneway-ws/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-oneway-ws/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-oneway-ws/pom.xml Fri Mar 2 00:10:27 2007
@@ -24,7 +24,7 @@
<version>0.1-integration-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>sample-greeterws-oneway</artifactId>
+ <artifactId>tuscany-sample-helloworld-oneway-ws</artifactId>
<packaging>war</packaging>
<name>Tuscany Greeter Web Service Sample</name>
<description>A sample Greeter OneWay Web Service.</description>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-oneway-wsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-oneway-wsclient/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-oneway-wsclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-oneway-wsclient/pom.xml Fri Mar 2 00:10:27 2007
@@ -24,7 +24,7 @@
<version>0.1-integration-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>sample-greeterwsclient-oneway</artifactId>
+ <artifactId>tuscany-sample-helloworld-oneway-wsclient</artifactId>
<packaging>jar</packaging>
<name>Tuscany HelloWorld Web Service Async Client Sample</name>
<description>A sample client for a HelloWorld Web Service.</description>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-ws/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-ws/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-ws/pom.xml Fri Mar 2 00:10:27 2007
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-sample-helloworldws</artifactId>
+ <artifactId>tuscany-sample-helloworld-ws</artifactId>
<packaging>jar</packaging>
<name>Tuscany HelloWorld Web Service Sample</name>
<description>A sample HelloWorld Web Service.</description>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-wsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-wsclient/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-wsclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/helloworld-wsclient/pom.xml Fri Mar 2 00:10:27 2007
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-sample-helloworldwsclient</artifactId>
+ <artifactId>tuscany-sample-helloworld-wsclient</artifactId>
<packaging>jar</packaging>
<name>Tuscany HelloWorld Web Service Client Sample</name>
<description>A sample client for a HelloWorld Web Service.</description>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-ws/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-ws/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-ws/pom.xml Fri Mar 2 00:10:27 2007
@@ -24,7 +24,7 @@
<version>0.1-integration-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-sample-loanappconversationWS</artifactId>
+ <artifactId>tuscany-sample-loanapplication-ws</artifactId>
<packaging>war</packaging>
<name>Tuscany Loan App Conversation Web Service Sample</name>
<description>A sample implementation of a loan application conversation web service.</description>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/axis2/samples/loanapplication-wsclient/pom.xml Fri Mar 2 00:10:27 2007
@@ -24,7 +24,7 @@
<version>0.1-integration-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>tuscany-sample-loanappconversationWSClient</artifactId>
+ <artifactId>tuscany-sample-loanapplication-wsclient</artifactId>
<packaging>jar</packaging>
<name>Tuscany Loan App Conversation WS Client</name>
<description>A sample implementation conversation WS client.</description>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jms/samples/pom.xml Fri Mar 2 00:10:27 2007
@@ -87,8 +87,8 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r${specVersion}</artifactId>
- <version>${scaVersion}</version>
+ <artifactId>sca-api-r1.0</artifactId>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/samples/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/samples/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/jsonrpc/samples/pom.xml Fri Mar 2 00:10:27 2007
@@ -86,8 +86,8 @@
<dependencies>
<dependency>
<groupId>org.osoa</groupId>
- <artifactId>sca-api-r${specVersion}</artifactId>
- <version>${scaVersion}</version>
+ <artifactId>sca-api-r1.0</artifactId>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/pom.xml Fri Mar 2 00:10:27 2007
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r1.0</artifactId>
- <version>${scaVersion}</version>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/branches/sca-java-integration/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/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>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>parent</artifactId>
Modified: incubator/tuscany/branches/sca-java-integration/spec/commonj/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/commonj/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/commonj/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/commonj/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>
<groupId>org.apache.tuscany</groupId>
<artifactId>commonj-api_r${specVersion}</artifactId>
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r0.95/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r0.95/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r0.95/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r0.95/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>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r${specVersion}</artifactId>
Modified: incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/spec/sca-api-r1.0/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>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r${specVersion}</artifactId>
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml?view=diff&rev=513654&r1=513653&r2=513654
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/pom.xml Fri Mar 2 00:10:27 2007
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tuscany</groupId>
<artifactId>parent</artifactId>
- <version>2-incubator-SNAPSHOT</version>
+ <version>0.1-integration-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tuscany.testing</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org