tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r810317 - in /tuscany/java/sca/modules: domain-node/ domain-node/META-INF/ domain-node/src/main/java/org/apache/tuscany/sca/domain/ domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ domain-node/src/main/java/org/apache/tuscany/s...
Date Wed, 02 Sep 2009 00:10:34 GMT
Author: rfeng
Date: Wed Sep  2 00:10:33 2009
New Revision: 810317

URL: http://svn.apache.org/viewvc?rev=810317&view=rev
Log:
Start to fix the MANIFEST.MF and rename split packages

Added:
    tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/
    tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/
    tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java
      - copied, changed from r810105, tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java
    tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
      - copied, changed from r810105, tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java
    tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
      - copied, changed from r810105, tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java
    tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/
    tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/
    tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java
      - copied, changed from r810105, tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java
    tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
      - copied, changed from r810105, tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java
    tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
      - copied, changed from r810105, tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java
    tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
      - copied, changed from r810105, tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java
Removed:
    tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/
    tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/
Modified:
    tuscany/java/sca/modules/domain-node/META-INF/MANIFEST.MF
    tuscany/java/sca/modules/domain-node/pom.xml
    tuscany/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF
    tuscany/java/sca/modules/endpoint-wrapper/pom.xml
    tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF

Modified: tuscany/java/sca/modules/domain-node/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-node/META-INF/MANIFEST.MF?rev=810317&r1=810316&r2=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-node/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/domain-node/META-INF/MANIFEST.MF Wed Sep  2 00:10:33 2009
@@ -1,6 +1,4 @@
 Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.node;uses:="org.apache.tuscany.
- sca.node";version="2.0.0"
 Tool: Bnd-0.0.255
 Bundle-Name: Apache Tuscany SCA Domain Node
 Created-By: 1.6.0_07 (Sun Microsystems Inc.)
@@ -11,7 +9,9 @@
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Domain Node
 Import-Package: 
- org.apache.tuscany.sca.node;version="2.0.0"
+ org.apache.tuscany.sca.management;version="2.0.0",
+ org.apache.tuscany.sca.node;version="2.0.0",
+ org.apache.tuscany.sca.node.impl;version="2.0.0"
 Bundle-SymbolicName: org.apache.tuscany.sca.domain.node
 Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6

Modified: tuscany/java/sca/modules/domain-node/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-node/pom.xml?rev=810317&r1=810316&r2=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-node/pom.xml (original)
+++ tuscany/java/sca/modules/domain-node/pom.xml Wed Sep  2 00:10:33 2009
@@ -40,8 +40,16 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
             <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
         </dependency>
 
          <dependency>

Copied: tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java
(from r810105, tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java?p2=tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java&p1=tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java&r1=810105&r2=810317&rev=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java
(original)
+++ tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java
Wed Sep  2 00:10:33 2009
@@ -17,7 +17,7 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.node;
+package org.apache.tuscany.sca.domain.node;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
(from r810105, tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java?p2=tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java&p1=tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java&r1=810105&r2=810317&rev=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java
(original)
+++ tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
Wed Sep  2 00:10:33 2009
@@ -17,13 +17,16 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.node;
+package org.apache.tuscany.sca.domain.node;
 
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.tuscany.sca.management.ConfigAttributes;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
 import org.apache.tuscany.sca.node.impl.NodeFactoryImpl;
 
 public class DomainNode {

Copied: tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
(from r810105, tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java?p2=tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java&p1=tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java&r1=810105&r2=810317&rev=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java
(original)
+++ tuscany/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
Wed Sep  2 00:10:33 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.tuscany.sca.node;
+package org.apache.tuscany.sca.domain.node;
 
 import java.io.File;
 import java.util.ArrayList;

Copied: tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java
(from r810105, tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java?p2=tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java&p1=tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java&r1=810105&r2=810317&rev=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java
(original)
+++ tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java
Wed Sep  2 00:10:33 2009
@@ -17,10 +17,11 @@
  * under the License.
  */
 
-package org.apache.tuscany.sca.node;
+package org.apache.tuscany.sca.domain.node;
 
 import static org.junit.Assert.assertEquals;
 
+import org.apache.tuscany.sca.domain.node.DomainNode;
 import org.junit.Test;
 
 /**

Copied: tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
(from r810105, tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java?p2=tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java&p1=tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java&r1=810105&r2=810317&rev=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java
(original)
+++ tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
Wed Sep  2 00:10:33 2009
@@ -17,13 +17,14 @@
  * under the License.
  */
 
-package org.apache.tuscany.sca.node;
+package org.apache.tuscany.sca.domain.node;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import itest.nodes.Helloworld;
 import static org.junit.Assert.fail;
 
+import org.apache.tuscany.sca.domain.node.DomainNode;
 import org.junit.After;
 import org.junit.Test;
 import org.oasisopen.sca.SCARuntimeException;

Copied: tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
(from r810105, tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java?p2=tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java&p1=tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java&r1=810105&r2=810317&rev=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java
(original)
+++ tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
Wed Sep  2 00:10:33 2009
@@ -17,13 +17,14 @@
  * under the License.
  */
 
-package org.apache.tuscany.sca.node;
+package org.apache.tuscany.sca.domain.node;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 import itest.nodes.Helloworld;
 
+import org.apache.tuscany.sca.domain.node.DomainNode;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

Copied: tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
(from r810105, tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java?p2=tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java&p1=tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java&r1=810105&r2=810317&rev=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java
(original)
+++ tuscany/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
Wed Sep  2 00:10:33 2009
@@ -17,13 +17,14 @@
  * under the License.
  */
 
-package org.apache.tuscany.sca.node;
+package org.apache.tuscany.sca.domain.node;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 import itest.nodes.Helloworld;
 
+import org.apache.tuscany.sca.domain.node.DomainNode;
 import org.junit.After;
 import org.junit.Test;
 import org.oasisopen.sca.client.SCAClient;

Modified: tuscany/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF?rev=810317&r1=810316&r2=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF Wed Sep  2 00:10:33 2009
@@ -21,5 +21,6 @@
  org.apache.juli.logging;resolution:=optional,
  org.apache.tuscany.sca.assembly;version="2.0.0",
  org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.management;version="2.0.0",
  org.apache.tuscany.sca.policy;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0"

Modified: tuscany/java/sca/modules/endpoint-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/endpoint-wrapper/pom.xml?rev=810317&r1=810316&r2=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/endpoint-wrapper/pom.xml (original)
+++ tuscany/java/sca/modules/endpoint-wrapper/pom.xml Wed Sep  2 00:10:33 2009
@@ -44,5 +44,23 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>  
         
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>          
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>                  
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>                  
     </dependencies>
 </project>

Modified: tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF?rev=810317&r1=810316&r2=810317&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF (original)
+++ tuscany/java/sca/modules/node-impl/META-INF/MANIFEST.MF Wed Sep  2 00:10:33 2009
@@ -35,6 +35,7 @@
  org.apache.tuscany.sca.definitions.util;version="2.0.0",
  org.apache.tuscany.sca.definitions.xml;version="2.0.0",
  org.apache.tuscany.sca.extensibility;version="2.0.0",
+ org.apache.tuscany.sca.management;version="2.0.0",
  org.apache.tuscany.sca.monitor;version="2.0.0",
  org.apache.tuscany.sca.node;version="2.0.0",
  org.apache.tuscany.sca.node.configuration;version="2.0.0",



Mime
View raw message