summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite2
5 files changed, 8 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml
index 4ceebd71f7..3adfca89f4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml
@@ -2,7 +2,7 @@
<target name="init"/>
<target name="copy-resources" depends="init">
<copy todir="target/classes/META-INF" filtering="true">
- <fileset dir="." includes="LICENSE|NOTICE"/>
+ <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/>
</copy>
</target>
</project> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
index c0aac2e426..303122f92d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
@@ -22,9 +22,9 @@
<parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-policy-client</artifactId>
<name>Apache Tuscany SCA Tours Policy Client Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
index b1858782cf..2f69f4d6a0 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
@@ -19,8 +19,8 @@
package scatours.client;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
import com.tuscanyscatours.payment.Payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
index 3ccb9da245..583bda3361 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:client="http://client.scatours/">
- <import.java package="payment" />
<deployable composite="client:Client" />
+ <import.java package="payment" />
</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
index 788dd81a92..6971c8d423 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
targetNamespace="http://client.scatours/"
name="Client">