diff options
5 files changed, 29 insertions, 26 deletions
diff --git a/sandbox/travelsample/clients/currency-converter-corba-client/pom.xml b/sandbox/travelsample/clients/currency-converter-corba-client/pom.xml index 8d5750704f..550bfa6f4b 100644 --- a/sandbox/travelsample/clients/currency-converter-corba-client/pom.xml +++ b/sandbox/travelsample/clients/currency-converter-corba-client/pom.xml @@ -22,7 +22,7 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.5</version>
+ <version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
<artifactId>currency-converter-corba-client</artifactId>
diff --git a/sandbox/travelsample/clients/currency-converter-rmi-client/pom.xml b/sandbox/travelsample/clients/currency-converter-rmi-client/pom.xml index a4ca74fa07..07f93a3b65 100644 --- a/sandbox/travelsample/clients/currency-converter-rmi-client/pom.xml +++ b/sandbox/travelsample/clients/currency-converter-rmi-client/pom.xml @@ -22,7 +22,7 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.5</version>
+ <version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
<artifactId>currency-converter-rmi-client</artifactId>
diff --git a/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/pom.xml b/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/pom.xml index 69960a6307..e79ed1cef0 100644 --- a/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/pom.xml +++ b/sandbox/travelsample/clients/currency-converter-ws-jaxws-client/pom.xml @@ -22,7 +22,7 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-sca</artifactId>
- <version>1.5</version>
+ <version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent>
<version>1.0-SNAPSHOT</version>
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/pom.xml b/sandbox/travelsample/contributions/payment-spring-contribution/pom.xml index 46b68c4fd0..b517da76c7 100644 --- a/sandbox/travelsample/contributions/payment-spring-contribution/pom.xml +++ b/sandbox/travelsample/contributions/payment-spring-contribution/pom.xml @@ -7,15 +7,15 @@ * 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. + * under the License. --> <project> <modelVersion>4.0.0</modelVersion> @@ -63,21 +63,24 @@ <version>1.6-SNAPSHOT</version> <scope>runtime</scope> </dependency> - + + <!-- + https://issues.apache.org/jira/browse/TUSCANY-3069 + --> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-spring</artifactId> <version>1.6-SNAPSHOT</version> <scope>runtime</scope> - </dependency> - + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-spring-runtime</artifactId> <version>1.6-SNAPSHOT</version> <scope>runtime</scope> - </dependency> - + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -138,11 +141,11 @@ <wsdlFile>Payment.wsdl</wsdlFile> </wsdlFiles> <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile> + <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile> <verbose>false</verbose> <xnocompile>true</xnocompile> </configuration> - </execution> + </execution> <execution> <id>payment.creditcard</id> <phase>process-sources</phase> @@ -160,7 +163,7 @@ <verbose>false</verbose> <xnocompile>true</xnocompile> </configuration> - </execution> + </execution> <execution> <id>scatours.emailgateway</id> <phase>process-sources</phase> @@ -178,9 +181,9 @@ <verbose>false</verbose> <xnocompile>true</xnocompile> </configuration> - </execution> + </execution> </executions> - </plugin> + </plugin> </plugins> </build> </project> diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite index 6f2c946281..8ac353904f 100644 --- a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite +++ b/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite @@ -7,24 +7,24 @@ * 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. + * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://scatours" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:c="http://scatours" + xmlns:c="http://scatours" name="payment"> - + <component name="PaymentComponent"> - <implementation.spring location="./Payment-context.xml"/> + <implementation.spring location="Payment-context.xml"/> <service name="Payment"> <binding.ws uri="http://localhost:8081/Payment"/> </service> @@ -33,7 +33,7 @@ </reference> <!--reference name="emailGateway"> <binding.ws uri="http://localhost:8088/EmailGateway"/> - </reference--> - </component> - + </reference--> + </component> + </composite> |