summaryrefslogtreecommitdiffstats
path: root/sandbox/travelsample/contributions/car
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sandbox/travelsample/contributions/car/pom.xml (renamed from sandbox/travelsample/contributions/car-contribution/pom.xml)4
-rw-r--r--sandbox/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java (renamed from sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarImpl.java)14
-rw-r--r--sandbox/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarInfo.java (renamed from sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarInfo.java)2
-rw-r--r--sandbox/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/flight-contribution/src/main/resources/META-INF/sca-contribution.xml)6
-rw-r--r--sandbox/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/car-contribution/src/main/resources/META-INF/sca-contribution.xml)6
5 files changed, 16 insertions, 16 deletions
diff --git a/sandbox/travelsample/contributions/car-contribution/pom.xml b/sandbox/travelsample/contributions/car/pom.xml
index 2db056b0df..1995972cf2 100644
--- a/sandbox/travelsample/contributions/car-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/car/pom.xml
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-car-contribution</artifactId>
+ <artifactId>scatours-contribution-car</artifactId>
<name>Apache Tuscany SCA Tours Car Contribution</name>
<dependencies>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-common-contribution</artifactId>
+ <artifactId>scatours-contribution-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
diff --git a/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarImpl.java b/sandbox/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
index 04742446ed..23834a7909 100644
--- a/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarImpl.java
+++ b/sandbox/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package scatours.car;
+package com.tuscanyscatours.car.impl;
import java.util.ArrayList;
import java.util.List;
@@ -26,14 +26,14 @@ import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-import scatours.common.Book;
-import scatours.common.Search;
-import scatours.common.SearchCallback;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.Search;
+import com.tuscanyscatours.common.SearchCallback;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
/**
- * An implementation of the Hotel service
+ * An implementation of the Car service
*/
@Scope("STATELESS")
@Service(interfaces={Search.class, Book.class})
diff --git a/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarInfo.java b/sandbox/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarInfo.java
index ebddf61a5d..88226f4b1a 100644
--- a/sandbox/travelsample/contributions/car-contribution/src/main/java/scatours/car/CarInfo.java
+++ b/sandbox/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarInfo.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package scatours.car;
+package com.tuscanyscatours.car.impl;
public class CarInfo {
diff --git a/sandbox/travelsample/contributions/flight-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
index bce42b050c..eb9ffba20d 100644
--- a/sandbox/travelsample/contributions/flight-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <import.java package="scatours.common"/>
- <export.java package="scatours.flight"/>
-</contribution> \ No newline at end of file
+ <import.java package="com.tuscanyscatours.common"/>
+ <export.java package="com.tuscanyscatours.car.impl"/>
+</contribution>
diff --git a/sandbox/travelsample/contributions/car-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml
index 783027831d..1e539bf13b 100644
--- a/sandbox/travelsample/contributions/car-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <import.java package="scatours.common"/>
- <export.java package="scatours.car"/>
-</contribution> \ No newline at end of file
+ <import.java package="com.tuscanyscatours.common"/>
+ <export.java package="com.tuscanyscatours.flight.impl"/>
+</contribution>