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 2008/03/01 01:48:49 UTC

svn commit: r632517 - in /incubator/tuscany/java/sca/itest/contribution-import-export/import-java: ./ src/main/resources/ src/main/resources/META-INF/ src/test/java/org/apache/tuscany/sca/test/contribution/

Author: lresende
Date: Fri Feb 29 16:48:48 2008
New Revision: 632517

URL: http://svn.apache.org/viewvc?rev=632517&view=rev
Log:
Service should be configured by componentType now + other small cleanups

Modified:
    incubator/tuscany/java/sca/itest/contribution-import-export/import-java/pom.xml
    incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
    incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java

Modified: incubator/tuscany/java/sca/itest/contribution-import-export/import-java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-java/pom.xml?rev=632517&r1=632516&r2=632517&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/import-java/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/import-java/pom.xml Fri Feb 29 16:48:48 2008
@@ -34,7 +34,7 @@
             <artifactId>itest-contribution-export-java</artifactId>
             <version>1.2-incubating-SNAPSHOT</version>
         </dependency>
-
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>

Modified: incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml?rev=632517&r1=632516&r2=632517&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml Fri Feb 29 16:48:48 2008
@@ -21,5 +21,5 @@
 	          targetNamespace="http://helloworld"
               xmlns:helloworld="http://helloworld">
    <deployable composite="helloworld:helloworldws"/>
-   <import.java package="helloworld"/>
+   <import.java package="helloworld"/>
 </contribution>

Modified: incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite?rev=632517&r1=632516&r2=632517&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite Fri Feb 29 16:48:48 2008
@@ -23,9 +23,6 @@
     name="helloworldws">
 
     <component name="HelloWorldServiceComponent">
-	    <service name="HelloWorldService">
-	        <interface.java interface="helloworld.HelloWorldService" />
-	    </service>
         <implementation.java class="helloworld.HelloWorldImpl" />
     </component>
 

Modified: incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java?rev=632517&r1=632516&r2=632517&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java Fri Feb 29 16:48:48 2008
@@ -52,9 +52,9 @@
 
         // Contribute the SCA contribution
         ContributionService contributionService = domain.getContributionService();
-
-//        File javaContribLocation = new File("../export-java/target/classes");
-//        URL javaContribURL = javaContribLocation.toURL();
+        
+        //File javaContribLocation = new File("../export-java/target/classes");
+        //URL javaContribURL = javaContribLocation.toURL();
         URL javaContribURL = getContributionURL(HelloWorldService.class);
         javaContribution = contributionService.contribute("http://import-export/export-java", javaContribURL, false);
         for (Composite deployable : javaContribution.getDeployables()) {
@@ -62,12 +62,10 @@
             domain.buildComposite(deployable);
         }
 
-//        File helloWorldContribLocation = new File("./target/classes/");
-//        URL helloWorldContribURL = helloWorldContribLocation.toURL();
+        //File helloWorldContribLocation = new File("./target/classes/");
+        //URL helloWorldContribURL = helloWorldContribLocation.toURL();
         URL helloWorldContribURL = getContributionURL(HelloWorldImpl.class);
-
-        helloWorldContribution =
-            contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);
+        helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);
         for (Composite deployable : helloWorldContribution.getDeployables()) {
             domain.getDomainComposite().getIncludes().add(deployable);
             domain.buildComposite(deployable);



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