Start to fix the MANIFEST.MF and rename split packages

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@810317 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 45 insertions, 10 deletions

diff --git a/java/sca/modules/domain-node/META-INF/MANIFEST.MF b/java/sca/modules/domain-node/META-INF/MANIFEST.MF
index ef676509b6..89432db62f 100644
--- a/java/sca/modules/domain-node/META-INF/MANIFEST.MF
+++ b/java/sca/modules/domain-node/META-INF/MANIFEST.MF
@@ -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-ManifestVersion: 2
 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
diff --git a/java/sca/modules/domain-node/pom.xml b/java/sca/modules/domain-node/pom.xml
index 4cf6e4e279..0a2d3c274c 100644
--- a/java/sca/modules/domain-node/pom.xml
+++ b/java/sca/modules/domain-node/pom.xml
@@ -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>

diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java
index c38c59f0ba..9a10cbd306 100644
--- a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/ConfigAttributesImpl.java
+++ b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/ConfigAttributesImpl.java
@@ -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;

diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
index 39f60c4a1d..761e9d25a7 100644
--- a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNode.java
+++ b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNode.java
@@ -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 {

diff --git a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
index aaf1c6ca5e..2d8d15342a 100644
--- a/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/node/DomainNodeMain.java
+++ b/java/sca/modules/domain-node/src/main/java/org/apache/tuscany/sca/domain/node/DomainNodeMain.java
@@ -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;

diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java
index 4ca8f180bb..1d31a5467f 100644
--- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/ConfigTestCase.java
+++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/ConfigTestCase.java
@@ -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;

 

 /**

diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
index 95e470bb28..20d7470a66 100644
--- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/MultipleNodesPerJVMTestCase.java
+++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/MultipleNodesPerJVMTestCase.java
@@ -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;

diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
index d14dfd4a02..a5c829b87f 100644
--- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/OneNodeTestCase.java
+++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/OneNodeTestCase.java
@@ -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;

diff --git a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
index db2e5590a1..52093129a8 100644
--- a/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/node/StopStartNodesTestCase.java
+++ b/java/sca/modules/domain-node/src/test/java/org/apache/tuscany/sca/domain/node/StopStartNodesTestCase.java
@@ -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;

diff --git a/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF b/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF
index d5213a0116..d8d1594c02 100644
--- a/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF
+++ b/java/sca/modules/endpoint-tribes/META-INF/MANIFEST.MF
@@ -21,5 +21,6 @@ Import-Package: org.apache.catalina.tribes,
  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"

diff --git a/java/sca/modules/endpoint-wrapper/pom.xml b/java/sca/modules/endpoint-wrapper/pom.xml
index dbdda7384e..e1142c7d60 100644
--- a/java/sca/modules/endpoint-wrapper/pom.xml
+++ b/java/sca/modules/endpoint-wrapper/pom.xml
@@ -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>

diff --git a/java/sca/modules/node-impl/META-INF/MANIFEST.MF b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
index bb4dc4f5e5..11f988243c 100644
--- a/java/sca/modules/node-impl/META-INF/MANIFEST.MF
+++ b/java/sca/modules/node-impl/META-INF/MANIFEST.MF
@@ -35,6 +35,7 @@ Import-Package: javax.management,
  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",