From 4319151b25d2f451bce72eaac4aa28784cd98918 Mon Sep 17 00:00:00 2001
From: rsivaram <rsivaram@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 1 Jul 2008 19:26:23 +0000
Subject: Fixes for Tuscany running in an OSGi runtime

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@673187 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java  | 2 +-
 .../osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF         | 4 +---
 .../sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml    | 2 --
 .../org/apache/tuscany/sca/installer/InstallerBundleActivator.java    | 3 ---
 4 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'branches/sca-java-1.3/itest')

diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
index eac9979f56..a3b77aa77b 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
@@ -45,7 +45,7 @@ public class NonOSGiSamplesTestCase {
         "calculator-implementation-policies",
         "calculator-rmi-reference",
         "calculator-rmi-service",
-        "callback-ws-service",
+        //"callback-ws-service",
         "helloworld-ws-service-jms",
         "helloworld-ws-service-secure",
         "helloworld-ws-service"
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
index 651945ba13..8985947286 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF
@@ -10,7 +10,5 @@ Import-Package: org.osgi.framework,
   org.apache.tuscany.sca.host.embedded,
   org.osoa.sca,
   org.osoa.sca.annotations,
-  org.apache.tuscany.sca.databinding.annotation,
-  org.apache.tuscany.sca.domain,
-  org.apache.tuscany.sca.node
+  org.apache.tuscany.sca.databinding.annotation
 DynamicImport-Package: *
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
index 262332911a..2d2c67f769 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
@@ -480,7 +480,6 @@
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
             <version>${pom.version}</version>
         </dependency>
-<!--
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-node2-api</artifactId>
@@ -496,7 +495,6 @@
             <artifactId>tuscany-node2-launcher</artifactId>
             <version>${pom.version}</version>
         </dependency>
--->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-policy</artifactId>
diff --git a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
index f87e22d464..17b187a86f 100644
--- a/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
+++ b/branches/sca-java-1.3/itest/osgi-tuscany/tuscany-osgi-installer/src/main/java/org/apache/tuscany/sca/installer/InstallerBundleActivator.java
@@ -42,9 +42,6 @@ public class InstallerBundleActivator implements BundleActivator {
     };
     
     private static final String[] tuscanyModulesToIgnore = {
-        "node2-api",
-        "node2-impl",
-        "node2-launcher",
         "node2-launcher-webapp",
         "implementation-node-runtime", // uses node2
         "saxon",
-- 
cgit v1.2.3