summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/tutorials/travelsample/contributions/common
diff options
context:
space:
mode:
authorrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2010-03-16 18:08:46 +0000
committerrfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>2010-03-16 18:08:46 +0000
commit3b191c283307dc68e2aaa6faea58f4b3b717e35c (patch)
tree9f5742cb5dd7be684c73a606077b106e8d23a700 /sca-java-2.x/trunk/tutorials/travelsample/contributions/common
parentf31b8fa6a3b9d9d356212670296c60beb468c8e5 (diff)
Update the travelsample with 2.x namespace/api/dependency (not completed yet)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@923913 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml4
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java7
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java2
-rw-r--r--sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml2
5 files changed, 8 insertions, 9 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml
index 48d83ceba8..2a8e684d5d 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/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-common</artifactId>
<name>Apache Tuscany SCA Tours Common Artefacts Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java
index 47b6f50bec..797957250a 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.common;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface Book {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
index 1611c11792..f304141a06 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
@@ -19,10 +19,9 @@
package com.tuscanyscatours.common;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
@Callback(SearchCallback.class)
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
index ad13d0d352..2a527d0461 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
@@ -19,7 +19,7 @@
package com.tuscanyscatours.common;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface SearchCallback {
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
index d7ada5afe7..cebda8d6d6 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
@@ -17,6 +17,6 @@
* 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">
<export.java package="com.tuscanyscatours.common" />
</contribution>