diff options
Diffstat (limited to '')
-rw-r--r-- | sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java (renamed from sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java) | 14 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java (renamed from sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java) | 2 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml) | 5 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java (renamed from sandbox/travelsample/contributions/trip-contribution/src/test/java/scatours/trip/TripTestCase.java) | 6 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml (renamed from sandbox/travelsample/contributions/trip-contribution/src/test/resources/definitions.xml) | 5 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/trip/src/test/resources/trip.composite (renamed from sandbox/travelsample/contributions/trip-contribution/src/test/resources/trip.composite) | 5 |
6 files changed, 18 insertions, 19 deletions
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java index 224065876f..c4fd0df05d 100644 --- a/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripImpl.java +++ b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations
* under the License.
*/
-package scatours.trip;
+package com.tuscanyscatours.trip.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 Trip service
*/
@Scope("STATELESS")
@Service(interfaces={Search.class, Book.class})
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java index 13a352ec9b..d236c1243f 100644 --- a/sandbox/travelsample/contributions/trip-contribution/src/main/java/scatours/trip/TripInfo.java +++ b/sandbox/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java @@ -17,7 +17,7 @@ * under the License.
*/
-package scatours.trip;
+package com.tuscanyscatours.trip.impl;
public class TripInfo {
diff --git a/sandbox/travelsample/contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml index 51540f80a2..7f2efe2de7 100644 --- a/sandbox/travelsample/contributions/common-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml @@ -18,5 +18,6 @@ * under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <export.java package="scatours.common"/>
-</contribution>
\ No newline at end of file + <import.java package="com.tuscanyscatours.common"/>
+ <export.java package="com.tuscanyscatours.trip.impl"/>
+</contribution>
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/test/java/scatours/trip/TripTestCase.java b/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java index e5116fd0d4..88df6f4c2e 100644 --- a/sandbox/travelsample/contributions/trip-contribution/src/test/java/scatours/trip/TripTestCase.java +++ b/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java @@ -27,8 +27,8 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import scatours.common.Book; -import scatours.common.TripItem; +import com.tuscanyscatours.common.Book; +import com.tuscanyscatours.common.TripItem; /** * @@ -53,7 +53,7 @@ public class TripTestCase { @Test public void testPayment() { SCAClient client = (SCAClient) tripNode; - Book booking = client.getService(Book.class, "TripComponent/Book"); + Book booking = client.getService(Book.class, "Trip/Book"); TripItem tripItem = new TripItem("1234", "5678", TripItem.TRIP, diff --git a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/definitions.xml b/sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml index 61fe02ca86..8d7ff59b0c 100644 --- a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/definitions.xml +++ b/sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml @@ -20,8 +20,7 @@ <definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:scatours="http://scatours"> + xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"> <!-- PolicySets --> <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java" @@ -30,4 +29,4 @@ <logLevel>FINER</logLevel> </tuscany:jdkLogger> </policySet> -</definitions>
\ No newline at end of file +</definitions> diff --git a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/trip.composite b/sandbox/travelsample/contributions/trip/src/test/resources/trip.composite index e7f0df3cee..06c449633c 100644 --- a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/trip.composite +++ b/sandbox/travelsample/contributions/trip/src/test/resources/trip.composite @@ -19,12 +19,11 @@ --> <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://scatours" - xmlns:scatours="http://scatours" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" name="packagedtrip"> - <component name="TripComponent"> - <implementation.java class="scatours.trip.TripImpl" requires="tuscany:logging"/> + <component name="Trip"> + <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl" requires="tuscany:logging"/> <service name="Search"/> <service name="Book"/> </component> |