You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rs...@apache.org on 2008/07/10 23:23:38 UTC
svn commit: r675762 - in /tuscany/java/sca:
itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/
itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/
itest/osgi-tuscany/tuscany-osgi-installer/ module...
Author: rsivaram
Date: Thu Jul 10 14:23:38 2008
New Revision: 675762
URL: http://svn.apache.org/viewvc?rev=675762&view=rev
Log:
Fixes for itest/osgi-tuscany
Modified:
tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java
tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java
tuscany/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
tuscany/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
tuscany/java/sca/modules/binding-jms-runtime/pom.xml
tuscany/java/sca/modules/extensibility-osgi/pom.xml
Modified: tuscany/java/sca/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/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java?rev=675762&r1=675761&r2=675762&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java (original)
+++ tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/EquinoxTestRuntime.java Thu Jul 10 14:23:38 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/java/sca/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/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java?rev=675762&r1=675761&r2=675762&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java (original)
+++ tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java Thu Jul 10 14:23:38 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/java/sca/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/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java?rev=675762&r1=675761&r2=675762&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java (original)
+++ tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java Thu Jul 10 14:23:38 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/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf?rev=675762&r1=675761&r2=675762&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf (original)
+++ tuscany/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChain.mf Thu Jul 10 14:23:38 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/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf?rev=675762&r1=675761&r2=675762&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf (original)
+++ tuscany/java/sca/itest/osgi-tuscany/test-bundles/src/main/resources/META-INF/SupplyChainClient.mf Thu Jul 10 14:23:38 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
Modified: tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml?rev=675762&r1=675761&r2=675762&view=diff
==============================================================================
--- tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml (original)
+++ tuscany/java/sca/itest/osgi-tuscany/tuscany-osgi-installer/pom.xml Thu Jul 10 14:23:38 2008
@@ -35,6 +35,11 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-monitor-logging</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-assembly</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: tuscany/java/sca/modules/binding-jms-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-jms-runtime/pom.xml?rev=675762&r1=675761&r2=675762&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-jms-runtime/pom.xml (original)
+++ tuscany/java/sca/modules/binding-jms-runtime/pom.xml Thu Jul 10 14:23:38 2008
@@ -105,7 +105,7 @@
<configuration>
<instructions>
<Bundle-Version>${tuscany.version}</Bundle-Version>
- <Bundle-SymbolicName>org.apache.tuscany.sca.binding.jms</Bundle-SymbolicName>
+ <Bundle-SymbolicName>org.apache.tuscany.sca.binding.jms.runtime</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.binding.jms.provider*</Export-Package>
</instructions>
Modified: tuscany/java/sca/modules/extensibility-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-osgi/pom.xml?rev=675762&r1=675761&r2=675762&view=diff
==============================================================================
--- tuscany/java/sca/modules/extensibility-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/extensibility-osgi/pom.xml Thu Jul 10 14:23:38 2008
@@ -54,7 +54,7 @@
<instructions>
<Bundle-Version>${tuscany.version}
</Bundle-Version>
- <Bundle-SymbolicName>org.apache.tuscany.sca.extensibility
+ <Bundle-SymbolicName>org.apache.tuscany.sca.extensibility.osgi
</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.extensibility.osgi*</Export-Package>
@@ -63,4 +63,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>