Author: rsivaram
Date: Thu Jul 10 14:23:06 2008
New Revision: 675760
URL: http://svn.apache.org/viewvc?rev=675760&view=rev
Log:
Fixes for itest/osgi-tuscany
Modified:
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
Modified:
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java?rev=675760&r1=675759&r2=675760&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
(original)
+++
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
Thu Jul 10 14:23:06 2008
@@ -48,6 +48,7 @@
Method startupMethod = eclipseStarterClass.getMethod("startup", String
[].class, Runnable.class);
+ System.setProperty("org.osgi.framework.system.packages",
getSystemPackages());
// Equinox version 3.2 upwards have a startup method which returns
BundleContext
bundleContext = (BundleContext) startupMethod.invoke(null,
new String[] {/*"-clean", */"-console", "-configuration",
"target/configuration"},
Modified:
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java?rev=675760&r1=675759&r2=675760&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
(original)
+++
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
Thu Jul 10 14:23:06 2008
@@ -92,42 +92,8 @@
props.put("felix.cache.profiledir", profileDir.getAbsolutePath());
props.put("felix.embedded.execution", "true");
- String systemPackages =
- "org.osgi.framework; version=1.3.0," +
- "org.osgi.service.packageadmin; version=1.2.0, " +
- "org.osgi.service.startlevel; version=1.0.0, " +
- "org.osgi.service.url; version=1.0.0, " +
- "org.osgi.util.tracker; version=1.3.2, " +
- "javax.xml, " +
- "javax.xml.datatype, " +
- "javax.xml.namespace, " +
- "javax.xml.parsers, " +
- "javax.xml.transform, " +
- "javax.xml.transform.dom, " +
- "javax.xml.transform.sax, " +
- "javax.xml.transform.stream, " +
- "javax.xml.validation, " +
- "javax.xml.xpath, " +
- "javax.sql," +
- "org.w3c.dom, " +
- "org.xml.sax, " +
- "org.xml.sax.ext, " +
- "org.xml.sax.helpers, " +
- "javax.security.auth, " +
- "javax.security.auth.login, " +
- "javax.security.auth.callback, " +
- "javax.naming, " +
- "javax.naming.spi, " +
- "javax.naming.directory, " +
- "javax.management, " +
- "sun.misc, " +
- "javax.net, " +
- "javax.crypto, " +
- "javax.rmi, " +
- "javax.transaction, " +
- "javax.transaction.xa, " +
-
- "org.apache.felix.main";
+ String systemPackages = getSystemPackages() +
+ ", org.apache.felix.main";
props.put("org.osgi.framework.system.packages", systemPackages);
Modified:
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java?rev=675760&r1=675759&r2=675760&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
(original)
+++
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
Thu Jul 10 14:23:06 2008
@@ -110,5 +110,50 @@
instance = null;
}
}
+
+
+ /**
+ * @return the list of packages to be exported by the system bundle
+ */
+ protected String getSystemPackages() {
+ String systemPackages =
+ "org.osgi.framework; version=1.3.0," +
+ "org.osgi.service.packageadmin; version=1.2.0, " +
+ "org.osgi.service.startlevel; version=1.0.0, " +
+ "org.osgi.service.url; version=1.0.0, " +
+ "org.osgi.util.tracker; version=1.3.2, " +
+ "javax.xml, " +
+ "javax.xml.datatype, " +
+ "javax.xml.namespace, " +
+ "javax.xml.parsers, " +
+ "javax.xml.transform, " +
+ "javax.xml.transform.dom, " +
+ "javax.xml.transform.sax, " +
+ "javax.xml.transform.stream, " +
+ "javax.xml.validation, " +
+ "javax.xml.xpath, " +
+ "javax.sql," +
+ "org.w3c.dom, " +
+ "org.xml.sax, " +
+ "org.xml.sax.ext, " +
+ "org.xml.sax.helpers, " +
+ "javax.security.auth, " +
+ "javax.security.auth.login, " +
+ "javax.security.auth.callback, " +
+ "javax.naming, " +
+ "javax.naming.spi, " +
+ "javax.naming.directory, " +
+ "javax.management, " +
+ "javax.imageio, " +
+ "sun.misc, " +
+ "javax.net, " +
+ "javax.crypto, " +
+ "javax.rmi, " +
+ "javax.transaction, " +
+ "javax.transaction.xa";
+
+ return systemPackages;
+
+ }
}
Modified:
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java?rev=675760&r1=675759&r2=675760&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
(original)
+++
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java
Thu Jul 10 14:23:06 2008
@@ -23,7 +23,6 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.Ignore;
/*
* Test Tuscany running in an OSGi container
@@ -53,7 +52,6 @@
@Test
- @Ignore("TUSCANY-2409")
public void runTest() throws Exception {
testHarness.runTest("../../../samples/" + "callback-ws-client",
Modified:
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java?rev=675760&r1=675759&r2=675760&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
(original)
+++
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java
Thu Jul 10 14:23:06 2008
@@ -23,7 +23,6 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.Ignore;
/*
* Test Tuscany running in an OSGi container
@@ -53,7 +52,6 @@
@Test
- @Ignore("TUSCANY-2409")
public void runTest() throws Exception {
testHarness.runTest("../../../samples/" + "callback-ws-service");
Modified:
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java?rev=675760&r1=675759&r2=675760&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
(original)
+++
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/NonOSGiSamplesTestCase.java
Thu Jul 10 14:23:06 2008
@@ -45,7 +45,7 @@
"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"
Modified:
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf?rev=675760&r1=675759&r2=675760&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
(original)
+++
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
Thu Jul 10 14:23:06 2008
@@ -6,6 +6,7 @@
Bundle-Localization: plugin
Import-Package: org.osgi.framework,
org.osoa.sca,
- org.osoa.sca.annotations
+ org.osoa.sca.annotations,
+ javax.xml.bind.annotation
Export-Package: supplychain.customer, supplychain
Modified:
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf?rev=675760&r1=675759&r2=675760&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
(original)
+++
tuscany/branches/sca-java-1.3/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
Thu Jul 10 14:23:06 2008
@@ -14,7 +14,8 @@
org.apache.tuscany.sca.core.assembly,
org.apache.tuscany.sca.assembly.builder,
org.osoa.sca,
- org.osoa.sca.annotations
+ org.osoa.sca.annotations,
+ javax.xml.bind.annotation
Export-Package: supplychain.client
Bundle-Activator: supplychain.client.SupplyChainClient
