Build break, was: svn commit: r561190 - in /incubator/tuscany/java/sca/itest/contribution-import-export

Mon, 30 Jul 2007 18:02:34 -0700

This broke the build for me, as the case was passing an incorrect contribution URI to remove(...). I fixed it for you under revision r561201, as I need to be able build. 

[EMAIL PROTECTED] wrote:

Author: lresende
Date: Mon Jul 30 17:07:24 2007
New Revision: 561190

URL: http://svn.apache.org/viewvc?view=rev&rev=561190
Log:
Simplifying import/export itest ids

Added:
    
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/
      - copied from r561163, 
incubator/tuscany/java/sca/itest/contribution-import-export/contrib-composite/
    incubator/tuscany/java/sca/itest/contribution-import-export/export-java/
      - copied from r561163, 
incubator/tuscany/java/sca/itest/contribution-import-export/contrib-java/
    incubator/tuscany/java/sca/itest/contribution-import-export/export-wsdl/
      - copied from r561163, 
incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/
    
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/
      - copied from r561163, 
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/
    incubator/tuscany/java/sca/itest/contribution-import-export/import-java/
      - copied from r561163, 
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-java/
    incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/
      - copied from r561163, 
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/
Removed:
    
incubator/tuscany/java/sca/itest/contribution-import-export/contrib-composite/
    incubator/tuscany/java/sca/itest/contribution-import-export/contrib-java/
    incubator/tuscany/java/sca/itest/contribution-import-export/contrib-wsdl/
    
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-composite/
    
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-java/
    
incubator/tuscany/java/sca/itest/contribution-import-export/test-import-wsdl/
Modified:
    
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/pom.xml
    
incubator/tuscany/java/sca/itest/contribution-import-export/export-java/pom.xml
    
incubator/tuscany/java/sca/itest/contribution-import-export/export-wsdl/pom.xml
    
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/pom.xml
    
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java
    
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/pom.xml
    
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/helloworld/HelloWorldServerTestCase.java
    
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/pom.xml
    
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
    
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java
    incubator/tuscany/java/sca/itest/contribution-import-export/pom.xml

Modified: 
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/pom.xml?view=diff&rev=561190&r1=561163&r2=561190
==============================================================================
--- 
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/pom.xml
 (original)
+++ 
incubator/tuscany/java/sca/itest/contribution-import-export/export-composite/pom.xml
 Mon Jul 30 17:07:24 2007
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
<artifactId>tuscany-itest-contribution-import-export-contrib-composite</artifactId>
-    <name>Apache Tuscany Contribution Import/Export - Composite 
contribution</name>
+    <name>Apache Tuscany Contribution Export Composite</name>

 
 <dependencies>

         <dependency>

Modified: 
incubator/tuscany/java/sca/itest/contribution-import-export/export-java/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/export-java/pom.xml?view=diff&rev=561190&r1=561163&r2=561190
==============================================================================
--- 
incubator/tuscany/java/sca/itest/contribution-import-export/export-java/pom.xml 
(original)
+++ 
incubator/tuscany/java/sca/itest/contribution-import-export/export-java/pom.xml 
Mon Jul 30 17:07:24 2007
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
<artifactId>tuscany-itest-contribution-import-export-contrib-java</artifactId>
-    <name>Apache Tuscany Contribution Import/Export - Java contribution</name>
+    <name>Apache Tuscany Contribution Export Java</name>

 
 <dependencies>

         <dependency>

Modified: 
incubator/tuscany/java/sca/itest/contribution-import-export/export-wsdl/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/export-wsdl/pom.xml?view=diff&rev=561190&r1=561163&r2=561190
==============================================================================
--- 
incubator/tuscany/java/sca/itest/contribution-import-export/export-wsdl/pom.xml 
(original)
+++ 
incubator/tuscany/java/sca/itest/contribution-import-export/export-wsdl/pom.xml 
Mon Jul 30 17:07:24 2007
@@ -26,6 +26,6 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
<artifactId>tuscany-itest-contribution-import-export-contrib-wsdl</artifactId>
-    <name>Apache Tuscany Contribution Import/Export - WSDL contribution</name>
+    <name>Apache Tuscany Contribution Export WSDL</name>

 
 </project>


Modified: 
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/pom.xml?view=diff&rev=561190&r1=561163&r2=561190
==============================================================================
--- 
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/pom.xml
 (original)
+++ 
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/pom.xml
 Mon Jul 30 17:07:24 2007
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
<artifactId>tuscany-itest-contribution-import-export-test-import-composite</artifactId>
-    <name>Apache Tuscany Contribution Import/Export - Composite Import 
Test</name>
+    <name>Apache Tuscany Contribution Import Composite Test</name>

 
 <dependencies>

         <dependency>

Modified: 
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java?view=diff&rev=561190&r1=561163&r2=561190
==============================================================================
--- 
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/itest/contribution-import-export/import-composite/src/test/java/helloworld/HelloWorldServerTestCase.java
 Mon Jul 30 17:07:24 2007
@@ -44,33 +44,33 @@

 
         //Start the domain

         domain.start();

-        
+

         // Contribute the SCA contribution
         ContributionService contributionService = 
domain.getContributionService();

-        
-        File compositeContribLocation = new File("../contrib-composite/target/classes");

+
+        File compositeContribLocation = new 
File("../export-composite/target/classes");
         URL compositeContribURL = compositeContribLocation.toURL();
-        Contribution compositeContribution = 
contributionService.contribute("http://import-export/contrib-composite";, 
compositeContribURL, false);
+        Contribution compositeContribution = 
contributionService.contribute("http://import-export/export-composite";, 
compositeContribURL, false);
         for (Composite deployable : compositeContribution.getDeployables() ) {
             domain.getDomainCompositeHelper().addComposite(deployable);
         }

-        
+

         File helloWorldContribLocation = new File("./target/classes/");
         URL helloWorldContribURL = helloWorldContribLocation.toURL();
         Contribution helloWorldContribution = 
contributionService.contribute("http://import-export/helloworld";, 
helloWorldContribURL, false);
         for (Composite deployable : helloWorldContribution.getDeployables() ) {
             domain.getDomainCompositeHelper().addComposite(deployable);
         }

-        
+

         //activate SCA Domain
         domain.getDomainCompositeHelper().activateDomain();

-        
+

         //Start Components from my composite
         
domain.getDomainCompositeHelper().startComponent(domain.getDomainCompositeHelper().getComponent("HelloServiceComponent"));
         
domain.getDomainCompositeHelper().startComponent(domain.getDomainCompositeHelper().getComponent("SourceHelloServiceComponent"));
         
domain.getDomainCompositeHelper().startComponent(domain.getDomainCompositeHelper().getComponent("HelloWorldServiceComponent"));
     }

-    
+

        public void testPing() throws IOException {
                new Socket("127.0.0.1", 8085);
        }
@@ -78,22 +78,22 @@
     public void testServiceCall() throws IOException {
         HelloWorldService helloWorldService = domain.getService(HelloWorldService.class, 
"HelloWorldServiceComponent/HelloWorldService");
         assertNotNull(helloWorldService);

-        
+

         assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
     }

 
-    
+

        public void tearDown() throws Exception {
         ContributionService contributionService = 
domain.getContributionService();

 
         // Remove the contribution from the in-memory repository

-        contributionService.remove("http://import-export/contrib-composite";);
         contributionService.remove("http://import-export/helloworld";);

-        
+        contributionService.remove("http://import-export/import-composite";);

+
         //Stop Components from my composite
         
domain.getDomainCompositeHelper().stopComponent(domain.getDomainCompositeHelper().getComponent("HelloWorldServiceComponent"));

 
-        domain.stop();        
+        domain.stop();

             domain.close();
        }

 


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?view=diff&rev=561190&r1=561163&r2=561190
==============================================================================
--- 
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 
Mon Jul 30 17:07:24 2007
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
<artifactId>tuscany-itest-contribution-import-export-test-import-java</artifactId>
-    <name>Apache Tuscany Contribution Import/Export - Java Import Test</name>
+    <name>Apache Tuscany Contribution Import Java Test</name>

 
 <dependencies>

         <dependency>

Modified: 
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/helloworld/HelloWorldServerTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/helloworld/HelloWorldServerTestCase.java?view=diff&rev=561190&r1=561163&r2=561190
==============================================================================
--- 
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/helloworld/HelloWorldServerTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/itest/contribution-import-export/import-java/src/test/java/helloworld/HelloWorldServerTestCase.java
 Mon Jul 30 17:07:24 2007
@@ -43,56 +43,56 @@

 
         //Start the domain

         domain.start();

-        
+

         // Contribute the SCA contribution
         ContributionService contributionService = 
domain.getContributionService();

-        
-        File javaContribLocation = new File("../contrib-java/target/classes");

+
+        File javaContribLocation = new File("../export-java/target/classes");
         URL javaContribURL = javaContribLocation.toURL();
-        Contribution javaContribution = 
contributionService.contribute("http://import-export/contrib-java";, 
javaContribURL, false);
+        Contribution javaContribution = 
contributionService.contribute("http://import-export/export-java";, 
javaContribURL, false);
         for (Composite deployable : javaContribution.getDeployables() ) {
             domain.getDomainCompositeHelper().addComposite(deployable);
         }

-        
+

         File helloWorldContribLocation = new File("./target/classes/");
         URL helloWorldContribURL = helloWorldContribLocation.toURL();
         Contribution helloWorldContribution = 
contributionService.contribute("http://import-export/helloworld";, 
helloWorldContribURL, false);
         for (Composite deployable : helloWorldContribution.getDeployables() ) {
             domain.getDomainCompositeHelper().addComposite(deployable);
         }

-        
+

         //activate SCA Domain
         domain.getDomainCompositeHelper().activateDomain();

-        
+

         //Start Components from my composite
         
domain.getDomainCompositeHelper().startComponent(domain.getDomainCompositeHelper().getComponent("HelloWorldServiceComponent"));
     }

-    
+

        public void testPing() throws IOException {
                HelloWorldService helloWorldService = 
domain.getService(HelloWorldService.class, 
"HelloWorldServiceComponent/HelloWorldService");
         assertNotNull(helloWorldService);
         assertEquals("Hello test", helloWorldService.getGreetings("test"));
        }

-    
+

     public void testServiceCall() throws IOException {
         HelloWorldService helloWorldService = domain.getService(HelloWorldService.class, 
"HelloWorldServiceComponent/HelloWorldService");
         assertNotNull(helloWorldService);

-        
+

         assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

-    }    
+    }
 
 	public void tearDown() throws Exception {

         ContributionService contributionService = 
domain.getContributionService();

 
         // Remove the contribution from the in-memory repository

         contributionService.remove("http://import-export/helloworld";);
-        contributionService.remove("http://import-export/contrib-java";);

-        
+        contributionService.remove("http://import-export/import-java";);

+
         //Stop Components from my composite
         
domain.getDomainCompositeHelper().stopComponent(domain.getDomainCompositeHelper().getComponent("HelloWorldServiceComponent"));

 
         domain.stop();
-        
+

         domain.close();
        }

 


Modified: 
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/pom.xml?view=diff&rev=561190&r1=561163&r2=561190
==============================================================================
--- 
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/pom.xml 
(original)
+++ 
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/pom.xml 
Mon Jul 30 17:07:24 2007
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     
<artifactId>tuscany-itest-contribution-import-export-test-import-wsdl</artifactId>
-    <name>Apache Tuscany Contribution Import/Export - WSDL import test</name>
+    <name>Apache Tuscany Contribution Import WSDL test</name>

 
 <dependencies>

         <dependency>

Modified: 
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml?view=diff&rev=561190&r1=561163&r2=561190
==============================================================================
--- 
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
 (original)
+++ 
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
 Mon Jul 30 17:07:24 2007
@@ -21,5 +21,5 @@
                  targetNamespace="http://helloworld";
               xmlns:helloworld="http://helloworld";>
    <deployable composite="helloworld:helloworldws"/>
-   <import namespace="http://helloworld"; 
location="http://import-export/contrib-wsdl"/>
+   <import namespace="http://helloworld"; 
location="http://import-export/export-wsdl"/>
 </contribution>

Modified: 
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java?view=diff&rev=561190&r1=561163&r2=561190
==============================================================================
--- 
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/itest/contribution-import-export/import-wsdl/src/test/java/helloworld/HelloWorldServerTestCase.java
 Mon Jul 30 17:07:24 2007
@@ -44,31 +44,31 @@

 
         //Start the domain

         domain.start();

-        
+

         // Contribute the SCA contribution
         ContributionService contributionService = 
domain.getContributionService();

-        
-        File wsdlContribLocation = new File("../contrib-wsdl/target/classes");

+
+        File wsdlContribLocation = new File("../export-wsdl/target/classes");
         URL wsdlContribURL = wsdlContribLocation.toURL();
-        Contribution wsdlContribution = 
contributionService.contribute("http://import-export/contrib-wsdl";, 
wsdlContribURL, false);
+        Contribution wsdlContribution = 
contributionService.contribute("http://import-export/export-wsdl";, 
wsdlContribURL, false);
         for (Composite deployable : wsdlContribution.getDeployables() ) {
             domain.getDomainCompositeHelper().addComposite(deployable);
         }

-        
+

         File helloWorldContribLocation = new File("./target/classes/");
         URL helloWorldContribURL = helloWorldContribLocation.toURL();
         Contribution consumerContribution = 
contributionService.contribute("http://import-export/helloworld";, 
helloWorldContribURL, false);
         for (Composite deployable : consumerContribution.getDeployables() ) {
             domain.getDomainCompositeHelper().addComposite(deployable);
         }

-        
+

         //activate SCA Domain
         domain.getDomainCompositeHelper().activateDomain();

 
         //Start Components from my composite

         
domain.getDomainCompositeHelper().startComponent(domain.getDomainCompositeHelper().getComponent("HelloWorldServiceComponent"));
     }

-    
+

        public void testPing() throws IOException {
                new Socket("127.0.0.1", 8085);
        }
@@ -76,7 +76,7 @@
     public void testServiceCall() throws IOException {
         HelloWorldService helloWorldService = domain.getService(HelloWorldService.class, 
"HelloWorldServiceComponent/HelloWorldService");
         assertNotNull(helloWorldService);

-        
+

         assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
     }

 
@@ -85,13 +85,13 @@
 
         // Remove the contribution from the in-memory repository

         contributionService.remove("http://import-export/helloworld";);
-        contributionService.remove("http://import-export/contrib-wsdl";);

-        
+        contributionService.remove("http://import-export/import-wsdl";);

+
         //Stop Components from my composite
         
domain.getDomainCompositeHelper().stopComponent(domain.getDomainCompositeHelper().getComponent("HelloWorldServiceComponent"));

 
         domain.stop();
-        
+

         domain.close();
     }

 


Modified: incubator/tuscany/java/sca/itest/contribution-import-export/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/contribution-import-export/pom.xml?view=diff&rev=561190&r1=561189&r2=561190
==============================================================================
--- incubator/tuscany/java/sca/itest/contribution-import-export/pom.xml 
(original)
+++ incubator/tuscany/java/sca/itest/contribution-import-export/pom.xml Mon Jul 
30 17:07:24 2007
@@ -30,12 +30,12 @@
     <name>Apache Tuscany Contribution Import/Export</name>

 
     <modules>

-        <module>contrib-wsdl</module>
-        <module>test-import-wsdl</module>
-        <module>contrib-composite</module>
-        <module>test-import-composite</module>
-        <module>contrib-java</module>
-        <module>test-import-java</module>
+        <module>export-wsdl</module>
+        <module>import-wsdl</module>
+        <module>export-composite</module>
+        <module>import-composite</module>
+        <module>export-java</module>
+        <module>import-java</module>
     </modules>

     
     <dependencies>




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



  



--
Jean-Sebastien


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]























					Reply via email to