You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/04/16 03:00:51 UTC

svn commit: r529111 - in /incubator/tuscany/java/sca/samples/das-service: service/ service/src/main/java/das/ service/src/main/java/org/apache/tuscany/samples/das/service/ service/src/main/java/org/apache/tuscany/samples/das/service/client/ service/src...

Author: lresende
Date: Sun Apr 15 18:00:49 2007
New Revision: 529111

URL: http://svn.apache.org/viewvc?view=rev&rev=529111
Log:
[work in progress] Bringing up sample das service

Added:
    incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/
    incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASService.java
      - copied, changed from r529033, incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASService.java
    incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASServiceException.java
      - copied, changed from r529033, incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASServiceException.java
    incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASServiceImpl.java
      - copied, changed from r529033, incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASServiceImpl.java
    incubator/tuscany/java/sca/samples/das-service/service/src/main/resources/dasservice.composite
    incubator/tuscany/java/sca/samples/das-service/service/src/test/
    incubator/tuscany/java/sca/samples/das-service/service/src/test/java/
    incubator/tuscany/java/sca/samples/das-service/service/src/test/java/das/
    incubator/tuscany/java/sca/samples/das-service/service/src/test/resources/
Removed:
    incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASService.java
    incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASServiceException.java
    incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASServiceImpl.java
    incubator/tuscany/java/sca/samples/das-service/service/src/main/resources/META-INF/sca/
Modified:
    incubator/tuscany/java/sca/samples/das-service/service/pom.xml
    incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/client/DASServiceClient.java
    incubator/tuscany/java/sca/samples/das-service/webclient/pom.xml

Modified: incubator/tuscany/java/sca/samples/das-service/service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/das-service/service/pom.xml?view=diff&rev=529111&r1=529110&r2=529111
==============================================================================
--- incubator/tuscany/java/sca/samples/das-service/service/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/das-service/service/pom.xml Sun Apr 15 18:00:49 2007
@@ -54,14 +54,14 @@
 		<dependency>
 			<groupId>org.apache.tuscany.sdo</groupId>
 			<artifactId>tuscany-sdo-impl</artifactId>
-			<version>1.0-incubator-SNAPSHOT</version>
+			<version>1.0-incubating-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.tuscany.das</groupId>
 			<artifactId>tuscany-das-rdb</artifactId>
-			<version>1.0-incubator-SNAPSHOT</version>
+			<version>1.0-incubating-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 

Copied: incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASService.java (from r529033, incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASService.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASService.java?view=diff&rev=529111&p1=incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASService.java&r1=529033&p2=incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASService.java&r2=529111
==============================================================================
--- incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASService.java (original)
+++ incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASService.java Sun Apr 15 18:00:49 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.samples.das.service;
+package das;
 
 import java.io.InputStream;
 import java.util.Vector;

Copied: incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASServiceException.java (from r529033, incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASServiceException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASServiceException.java?view=diff&rev=529111&p1=incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASServiceException.java&r1=529033&p2=incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASServiceException.java&r2=529111
==============================================================================
--- incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASServiceException.java (original)
+++ incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASServiceException.java Sun Apr 15 18:00:49 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.samples.das.service;
+package das;
 
 public class DASServiceException extends Exception {
 

Copied: incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASServiceImpl.java (from r529033, incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASServiceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASServiceImpl.java?view=diff&rev=529111&p1=incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASServiceImpl.java&r1=529033&p2=incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASServiceImpl.java&r2=529111
==============================================================================
--- incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/DASServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/das-service/service/src/main/java/das/DASServiceImpl.java Sun Apr 15 18:00:49 2007
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.tuscany.samples.das.service;
+package das;
 
 import java.io.InputStream;
 import java.util.Vector;

Modified: incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/client/DASServiceClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/client/DASServiceClient.java?view=diff&rev=529111&r1=529110&r2=529111
==============================================================================
--- incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/client/DASServiceClient.java (original)
+++ incubator/tuscany/java/sca/samples/das-service/service/src/main/java/org/apache/tuscany/samples/das/service/client/DASServiceClient.java Sun Apr 15 18:00:49 2007
@@ -18,8 +18,9 @@
  */
 package org.apache.tuscany.samples.das.service.client;
 
-import org.apache.tuscany.samples.das.service.DASService;
 import org.osoa.sca.annotations.Reference;
+
+import das.DASService;
 
 public class DASServiceClient {
 

Added: incubator/tuscany/java/sca/samples/das-service/service/src/main/resources/dasservice.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/das-service/service/src/main/resources/dasservice.composite?view=auto&rev=529111
==============================================================================
--- incubator/tuscany/java/sca/samples/das-service/service/src/main/resources/dasservice.composite (added)
+++ incubator/tuscany/java/sca/samples/das-service/service/src/main/resources/dasservice.composite Sun Apr 15 18:00:49 2007
@@ -0,0 +1,33 @@
+<?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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           	targetNamespace="http://DASService"
+            name="DASService">
+
+    <service name="DASService"  promote="DASComponent">
+        <interface.java interface="org.apache.tuscany.samples.das.service.DASService"/>
+        <reference>DASComponent</reference>
+    </service>
+    
+    <component name="DASComponent">
+	    <implementation.java class="org.apache.tuscany.samples.das.service.DASServiceImpl"/>
+    </component>
+
+</composite>

Modified: incubator/tuscany/java/sca/samples/das-service/webclient/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/das-service/webclient/pom.xml?view=diff&rev=529111&r1=529110&r2=529111
==============================================================================
--- incubator/tuscany/java/sca/samples/das-service/webclient/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/das-service/webclient/pom.xml Sun Apr 15 18:00:49 2007
@@ -34,10 +34,16 @@
     
         <!-- runtime is need for webapp integration to include jar -->
         <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-api</artifactId>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
-            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
         
         <!--  das service -->
@@ -50,14 +56,14 @@
         <dependency>
             <groupId>org.apache.tuscany.das</groupId>
             <artifactId>tuscany-das-rdb</artifactId>
-            <version>1.0-incubator-SNAPSHOT</version>
+            <version>1.0-incubating-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>        
             
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
-            <version>1.0-incubator-SNAPSHOT</version>
+            <version>1.0-incubating-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 
@@ -66,7 +72,7 @@
     <!-- this will place the java source files inside the war -->
     <build>
        <!-- <finalName>companyweb-service-client</finalName> -->
-       <plugins>
+       <!-- plugins>
     	<plugin>
     	    <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
     	    <artifactId>tuscany-war-plugin</artifactId>
@@ -79,7 +85,7 @@
     		</execution>
     	    </executions>
     	</plugin>
-       </plugins>
+       </plugins -->
 
     
     



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org