diff options
Diffstat (limited to '')
7 files changed, 49 insertions, 59 deletions
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index d392a94fbe..0000000000 --- a/sandbox/travelsample/contributions/scatours-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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">
- <import.java package="scatours.common"/>
- <import.java package="scatours.travelcatalog"/>
- <import.java package="scatours.tripbooking"/>
- <import.java package="scatours.shoppingcart"/>
- <export.java package="scatours"/>
-</contribution>
\ No newline at end of file diff --git a/sandbox/travelsample/contributions/scatours-contribution/pom.xml b/sandbox/travelsample/contributions/scatours/pom.xml index 12fa6f8325..fc900d2a27 100644 --- a/sandbox/travelsample/contributions/scatours-contribution/pom.xml +++ b/sandbox/travelsample/contributions/scatours/pom.xml @@ -25,7 +25,7 @@ <version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-scatours-contribution</artifactId>
+ <artifactId>scatours-contribution-scatours</artifactId>
<name>Apache Tuscany SCA Tours SCATours Contribution</name>
<dependencies>
@@ -43,43 +43,29 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-common-contribution</artifactId>
+ <artifactId>scatours-contribution-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-currency-contribution</artifactId>
+ <artifactId>scatours-contribution-travelcatalog</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-travelcatalog-contribution</artifactId>
+ <artifactId>scatours-contribution-tripbooking</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-tripbooking-contribution</artifactId>
+ <artifactId>scatours-contribution-shoppingcart</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-shoppingcart-contribution</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
-
- <!--
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-paymentprocess-contribution</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- -->
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java index 771f4f5ff9..605745e0c8 100644 --- a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursBooking.java +++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations
* under the License.
*/
-package scatours;
+package com.tuscanyscatours;
import org.osoa.sca.annotations.Remotable;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
/**
* The SCA Tours trip booking service interface
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java index 47fd658ef6..67764e1c0d 100644 --- a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursCart.java +++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations
* under the License.
*/
-package scatours;
+package com.tuscanyscatours;
import org.osoa.sca.annotations.Remotable;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.TripItem;
/**
* The ShoppingCart service interface
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java index eeddc62f73..6ce03fbb86 100644 --- a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursSearch.java +++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations
* under the License.
*/
-package scatours;
+package com.tuscanyscatours;
import org.osoa.sca.annotations.Remotable;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
/**
- * The Trip service interface
+ * The Search service interface
*/
@Remotable
public interface SCAToursSearch {
diff --git a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java index 2ac1e00f5f..a39e6a5623 100644 --- a/sandbox/travelsample/contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java +++ b/sandbox/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations
* under the License.
*/
-package scatours;
+package com.tuscanyscatours.impl;
import java.util.HashMap;
import java.util.Map;
@@ -29,11 +29,14 @@ import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
-import scatours.common.TripItem;
-import scatours.common.TripLeg;
-import scatours.shoppingcart.ShoppingCart;
-import scatours.travelcatalog.TravelCatalogSearch;
-import scatours.tripbooking.TripBooking;
+import com.tuscanyscatours.SCAToursBooking;
+import com.tuscanyscatours.SCAToursCart;
+import com.tuscanyscatours.SCAToursSearch;
+import com.tuscanyscatours.common.TripItem;
+import com.tuscanyscatours.common.TripLeg;
+import com.tuscanyscatours.shoppingcart.ShoppingCart;
+import com.tuscanyscatours.travelcatalog.TravelCatalogSearch;
+import com.tuscanyscatours.tripbooking.TripBooking;
/**
* An implementation of the SCA tours component. it's just a pass through and allows
diff --git a/sandbox/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..2728a88840 --- /dev/null +++ b/sandbox/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,27 @@ +<?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">
+ <import.java package="com.tuscanyscatours.common" />
+ <import.java package="com.tuscanyscatours.travelcatalog" />
+ <import.java package="com.tuscanyscatours.tripbooking" />
+ <import.java package="com.tuscanyscatours.shoppingcart" />
+ <export.java package="com.tuscanyscatours" />
+ <export.java package="com.tuscanyscatours.impl" />
+</contribution>
|