You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/02/25 11:07:58 UTC
svn commit: r916213 - in /tuscany/sca-java-1.x/trunk/tutorials/travelsample:
contributions/ contributions/payment-bpel-process/
contributions/payment-bpel-process/src/
contributions/payment-bpel-process/src/main/
contributions/payment-bpel-process/src/...
Author: nash
Date: Thu Feb 25 10:07:57 2010
New Revision: 916213
URL: http://svn.apache.org/viewvc?rev=916213&view=rev
Log:
Refactor payment-bpel contribution by moving some files into a new contribution payment-bpel-process (TUSCANY-3461)
Added:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/ (with props)
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/CreditCardPayment.wsdl
- copied unchanged from r911700, tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/CreditCardPayment.wsdl
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/EmailGateway.wsdl
- copied unchanged from r911700, tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/EmailGateway.wsdl
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/Payment.wsdl
- copied unchanged from r911700, tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/Payment.wsdl
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/payment.bpel
- copied unchanged from r911700, tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.bpel
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java
tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/build.xml?rev=916213&r1=916212&r2=916213&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/build.xml Thu Feb 25 10:07:57 2010
@@ -81,6 +81,7 @@
<ant dir="notification-rmi" target="${target}"/>
<ant dir="notification-ws" target="${target}"/>
<ant dir="payment-java-policy" target="${target}"/>
+ <ant dir="payment-bpel-process" target="${target}"/> <!--needed by payment-bpel-->
<ant dir="payment-bpel" target="${target}"/>
<ant dir="payment-groovy" target="${target}"/>
<ant dir="payment-spring" target="${target}"/>
Propchange: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 10:07:57 2010
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml?rev=916213&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml Thu Feb 25 10:07:57 2010
@@ -0,0 +1,23 @@
+<!--
+ * 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.
+-->
+
+<project name="scatours-contribution-payment-bpel-process" default="compile">
+ <import file="../../antdefs.xml"/>
+ <target name="wsdljava"/>
+</project>
Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml?rev=916213&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml Thu Feb 25 10:07:57 2010
@@ -0,0 +1,35 @@
+<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <version>1.0-SNAPSHOT</version>
+ <artifactId>scatours-contribution-payment-bpel-process</artifactId>
+ <name>Apache Tuscany SCA Tours Payment BPEL Process Contribution</name>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+ </build>
+</project>
Added: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml?rev=916213&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml Thu Feb 25 10:07:57 2010
@@ -0,0 +1,22 @@
+<?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.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+ <export namespace="http://www.tuscanyscatours.com/Payment"/>
+</contribution>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml?rev=916213&r1=916212&r2=916213&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml Thu Feb 25 10:07:57 2010
@@ -18,8 +18,7 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:pp="http://www.tuscanyscatours.com/Payment" >
- <export namespace="http://www.tuscanyscatours.com/Payment"/>
- <export namespace="http://www.tuscanyscatours.com/Payment/"/>
- <deployable composite="pp:payment" />
-</contribution>
\ No newline at end of file
+ xmlns:pp="http://www.tuscanyscatours.com/Payment">
+ <import namespace="http://www.tuscanyscatours.com/Payment"/>
+ <deployable composite="pp:payment"/>
+</contribution>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java?rev=916213&r1=916212&r2=916213&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java Thu Feb 25 10:07:57 2010
@@ -58,6 +58,8 @@
paymentNode =
SCANodeFactory.newInstance()
.createSCANode(null,
+ new SCAContribution("payment-bpel-process",
+ "../payment-bpel-process/target/classes"),
new SCAContribution("payment-bpel", "./target/classes"),
new SCAContribution("payment-bpel-test", "./target/test-classes"));
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/pom.xml?rev=916213&r1=916212&r2=916213&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/pom.xml Thu Feb 25 10:07:57 2010
@@ -87,6 +87,7 @@
<module>payment-spring</module>
<module>payment-spring-policy</module>
<module>payment-spring-scatag</module>
+ <module>payment-bpel-process</module>
<module>payment-bpel</module>
<module>payment-groovy</module>
<module>policy-client</module>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml?rev=916213&r1=916212&r2=916213&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml Thu Feb 25 10:07:57 2010
@@ -265,6 +265,11 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>scatours-contribution-payment-bpel-process</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-payment-groovy</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml?rev=916213&r1=916212&r2=916213&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml Thu Feb 25 10:07:57 2010
@@ -56,6 +56,19 @@
<includes>
<include>org.apache.tuscany.sca:scatours-contribution-*</include>
</includes>
+ <excludes>
+ <exclude>org.apache.tuscany.sca:scatours-contribution-payment-bpel-process</exclude>
+ </excludes>
+ <scope>runtime</scope>
+ </dependencySet>
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>contributions/scatours-contribution-payment-bpel-process</outputDirectory>
+ <unpack>true</unpack>
+ <includes>
+ <include>org.apache.tuscany.sca:scatours-contribution-payment-bpel-process</include>
+ </includes>
<scope>runtime</scope>
</dependencySet>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java?rev=916213&r1=916212&r2=916213&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java Thu Feb 25 10:07:57 2010
@@ -31,6 +31,7 @@
public static void main(String[] args) throws Exception {
SCANode node = SCANodeFactory.newInstance().createSCANode(null,
+ locate("payment-bpel-process"),
locate("payment-bpel"),
locate("creditcard-payment-jaxb"),
locate("emailgateway"));
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java?rev=916213&r1=916212&r2=916213&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java Thu Feb 25 10:07:57 2010
@@ -46,7 +46,11 @@
// Try to use the contribution jar under the contributions folder of the distribution
file = new File("../contributions/scatours-contribution-" + name + ".jar");
if (!file.exists()) {
- throw new IllegalArgumentException("Contribution " + name + " cannot be located.");
+ // Try to use the contribution subfolder under the contributions folder of the distribution
+ file = new File("../contributions/scatours-contribution-" + name);
+ if (!file.exists()) {
+ throw new IllegalArgumentException("Contribution " + name + " cannot be located.");
+ }
}
}
}