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/05/07 21:53:48 UTC
svn commit: r654236 [1/4] - in /incubator/tuscany/java/sca:
itest/osgi-tuscany/
itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/
itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/...
Author: rsivaram
Date: Wed May 7 12:53:35 2008
New Revision: 654236
URL: http://svn.apache.org/viewvc?rev=654236&view=rev
Log:
Add OSGi manifest headers to modules
Added:
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty-manifest/
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty-manifest/pom.xml (with props)
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/pom.xml (with props)
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/src/
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/src/main/
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/src/main/java/
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/src/main/java/org/
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/src/main/java/org/apache/
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/src/main/java/org/apache/tuscany/sca/manifest/
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-manifest/src/main/java/org/apache/tuscany/sca/manifest/ManifestBundleActivator.java (with props)
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/spi/
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/spi/SCADomainAPIService.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/spi/SCADomainEventService.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/spi/SCADomainSPI.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/spi/
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/spi/ComponentInfo.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/spi/ComponentListener.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/spi/ComponentManager.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/spi/ComponentManagerService.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/spi/NodeFactory.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/spi/NodeFactoryImpl.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/spi/SCADomainProxySPI.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/spi/SCANodeSPI.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/ws/WSPolicyProcessor.java
- copied, changed from r652565, incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java
Removed:
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainAPIService.java
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainEventService.java
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/SCADomainSPI.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentInfo.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentListener.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManager.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/ComponentManagerService.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/NodeFactoryImpl.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/SCADomainProxySPI.java
incubator/tuscany/java/sca/modules/node/src/main/java/org/apache/tuscany/sca/node/SCANodeSPI.java
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessor.java
Modified:
incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java
incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
incubator/tuscany/java/sca/itest/osgi-tuscany/pom.xml
incubator/tuscany/java/sca/itest/osgi-tuscany/sca-api/pom.xml
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-runtime/pom.xml
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-spi/pom.xml
incubator/tuscany/java/sca/modules/assembly-java-dsl/pom.xml
incubator/tuscany/java/sca/modules/assembly-xml/pom.xml
incubator/tuscany/java/sca/modules/assembly-xsd/pom.xml
incubator/tuscany/java/sca/modules/assembly/pom.xml
incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml
incubator/tuscany/java/sca/modules/binding-atom/pom.xml
incubator/tuscany/java/sca/modules/binding-corba/pom.xml
incubator/tuscany/java/sca/modules/binding-dwr/pom.xml
incubator/tuscany/java/sca/modules/binding-ejb/pom.xml
incubator/tuscany/java/sca/modules/binding-feed/pom.xml
incubator/tuscany/java/sca/modules/binding-http/pom.xml
incubator/tuscany/java/sca/modules/binding-jms/pom.xml
incubator/tuscany/java/sca/modules/binding-jsonrpc/pom.xml
incubator/tuscany/java/sca/modules/binding-notification/pom.xml
incubator/tuscany/java/sca/modules/binding-rmi/pom.xml
incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml
incubator/tuscany/java/sca/modules/binding-rss/pom.xml
incubator/tuscany/java/sca/modules/binding-sca-axis2/pom.xml
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
incubator/tuscany/java/sca/modules/binding-sca-xml/pom.xml
incubator/tuscany/java/sca/modules/binding-sca/pom.xml
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
incubator/tuscany/java/sca/modules/binding-ws-xml/pom.xml
incubator/tuscany/java/sca/modules/binding-ws/pom.xml
incubator/tuscany/java/sca/modules/contribution-groovy/pom.xml
incubator/tuscany/java/sca/modules/contribution-impl/pom.xml
incubator/tuscany/java/sca/modules/contribution-java/pom.xml
incubator/tuscany/java/sca/modules/contribution-namespace/pom.xml
incubator/tuscany/java/sca/modules/contribution-osgi/pom.xml
incubator/tuscany/java/sca/modules/contribution-resource/pom.xml
incubator/tuscany/java/sca/modules/contribution-updater-impl/pom.xml
incubator/tuscany/java/sca/modules/contribution-updater/pom.xml
incubator/tuscany/java/sca/modules/contribution-xml/pom.xml
incubator/tuscany/java/sca/modules/contribution/pom.xml
incubator/tuscany/java/sca/modules/core-databinding/pom.xml
incubator/tuscany/java/sca/modules/core-spi/pom.xml
incubator/tuscany/java/sca/modules/core-spring/pom.xml
incubator/tuscany/java/sca/modules/core/pom.xml
incubator/tuscany/java/sca/modules/data-engine-helper/pom.xml
incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml
incubator/tuscany/java/sca/modules/databinding-fastinfoset/pom.xml
incubator/tuscany/java/sca/modules/databinding-jaxb/pom.xml
incubator/tuscany/java/sca/modules/databinding-job/pom.xml
incubator/tuscany/java/sca/modules/databinding-json/pom.xml
incubator/tuscany/java/sca/modules/databinding-saxon/pom.xml
incubator/tuscany/java/sca/modules/databinding-sdo-axiom/pom.xml
incubator/tuscany/java/sca/modules/databinding-sdo/pom.xml
incubator/tuscany/java/sca/modules/databinding-xmlbeans/pom.xml
incubator/tuscany/java/sca/modules/databinding-xstream/pom.xml
incubator/tuscany/java/sca/modules/databinding/pom.xml
incubator/tuscany/java/sca/modules/definitions-xml/pom.xml
incubator/tuscany/java/sca/modules/definitions/pom.xml
incubator/tuscany/java/sca/modules/domain-api/pom.xml
incubator/tuscany/java/sca/modules/domain-impl/pom.xml
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/impl/SCADomainImpl.java
incubator/tuscany/java/sca/modules/domain-impl/src/main/java/org/apache/tuscany/sca/domain/management/impl/SCADomainManagerServiceImpl.java
incubator/tuscany/java/sca/modules/domain-impl/src/main/resources/domain.composite
incubator/tuscany/java/sca/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCaseOFF.java
incubator/tuscany/java/sca/modules/domain-manager/pom.xml
incubator/tuscany/java/sca/modules/domain/pom.xml
incubator/tuscany/java/sca/modules/domain/src/main/java/org/apache/tuscany/sca/domain/management/SCADomainManagerInitService.java
incubator/tuscany/java/sca/modules/extensibility/pom.xml
incubator/tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ServiceDiscovery.java
incubator/tuscany/java/sca/modules/extension-helper/pom.xml
incubator/tuscany/java/sca/modules/host-embedded/pom.xml
incubator/tuscany/java/sca/modules/host-embedded/src/main/java/org/apache/tuscany/sca/host/embedded/impl/ReallySmallRuntimeBuilder.java
incubator/tuscany/java/sca/modules/host-http/pom.xml
incubator/tuscany/java/sca/modules/host-jetty/pom.xml
incubator/tuscany/java/sca/modules/host-osgi/pom.xml
incubator/tuscany/java/sca/modules/host-rmi/pom.xml
incubator/tuscany/java/sca/modules/host-tomcat/pom.xml
incubator/tuscany/java/sca/modules/host-webapp-junit/pom.xml
incubator/tuscany/java/sca/modules/host-webapp/pom.xml
incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
incubator/tuscany/java/sca/modules/implementation-das/pom.xml
incubator/tuscany/java/sca/modules/implementation-data-api/pom.xml
incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml
incubator/tuscany/java/sca/modules/implementation-ejb-xml/pom.xml
incubator/tuscany/java/sca/modules/implementation-ejb/pom.xml
incubator/tuscany/java/sca/modules/implementation-java-runtime/pom.xml
incubator/tuscany/java/sca/modules/implementation-java-xml/pom.xml
incubator/tuscany/java/sca/modules/implementation-java/pom.xml
incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml
incubator/tuscany/java/sca/modules/implementation-node-xml/pom.xml
incubator/tuscany/java/sca/modules/implementation-node/pom.xml
incubator/tuscany/java/sca/modules/implementation-notification/pom.xml
incubator/tuscany/java/sca/modules/implementation-openjpa/pom.xml
incubator/tuscany/java/sca/modules/implementation-osgi/pom.xml
incubator/tuscany/java/sca/modules/implementation-resource/pom.xml
incubator/tuscany/java/sca/modules/implementation-script/pom.xml
incubator/tuscany/java/sca/modules/implementation-spring/pom.xml
incubator/tuscany/java/sca/modules/implementation-web/pom.xml
incubator/tuscany/java/sca/modules/implementation-widget/pom.xml
incubator/tuscany/java/sca/modules/implementation-xquery/pom.xml
incubator/tuscany/java/sca/modules/interface-java-jaxws/pom.xml
incubator/tuscany/java/sca/modules/interface-java-xml/pom.xml
incubator/tuscany/java/sca/modules/interface-java/pom.xml
incubator/tuscany/java/sca/modules/interface-wsdl-java2wsdl/pom.xml
incubator/tuscany/java/sca/modules/interface-wsdl-xml/pom.xml
incubator/tuscany/java/sca/modules/interface-wsdl/pom.xml
incubator/tuscany/java/sca/modules/interface/pom.xml
incubator/tuscany/java/sca/modules/monitor-logging/pom.xml
incubator/tuscany/java/sca/modules/monitor/pom.xml
incubator/tuscany/java/sca/modules/node-api/pom.xml
incubator/tuscany/java/sca/modules/node-impl/pom.xml
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentInfoImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/ComponentManagerServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainAPIServiceProxyImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainEventServiceProxyImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCADomainProxyImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/SCANodeImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/management/impl/SCANodeManagerServiceImpl.java
incubator/tuscany/java/sca/modules/node-impl/src/main/resources/node.composite
incubator/tuscany/java/sca/modules/node/pom.xml
incubator/tuscany/java/sca/modules/node2-api/pom.xml
incubator/tuscany/java/sca/modules/node2-impl/pom.xml
incubator/tuscany/java/sca/modules/node2-launcher-webapp/pom.xml
incubator/tuscany/java/sca/modules/node2-launcher/pom.xml
incubator/tuscany/java/sca/modules/osgi-runtime/pom.xml
incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiBundleActivator.java
incubator/tuscany/java/sca/modules/policy-logging/pom.xml
incubator/tuscany/java/sca/modules/policy-security-ws/pom.xml
incubator/tuscany/java/sca/modules/policy-security/pom.xml
incubator/tuscany/java/sca/modules/policy-transaction/pom.xml
incubator/tuscany/java/sca/modules/policy-xml-ws/pom.xml
incubator/tuscany/java/sca/modules/policy-xml-ws/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
incubator/tuscany/java/sca/modules/policy-xml-ws/src/test/java/org/apache/tuscany/sca/policy/xml/WSPolicyProcessorTestCase.java
incubator/tuscany/java/sca/modules/policy-xml/pom.xml
incubator/tuscany/java/sca/modules/policy/pom.xml
incubator/tuscany/java/sca/modules/pom.xml
incubator/tuscany/java/sca/modules/runtime-standalone/pom.xml
incubator/tuscany/java/sca/modules/runtime-tomcat/pom.xml
incubator/tuscany/java/sca/modules/sca-api/pom.xml
incubator/tuscany/java/sca/modules/workspace-impl/pom.xml
incubator/tuscany/java/sca/modules/workspace-xml/pom.xml
incubator/tuscany/java/sca/modules/workspace/pom.xml
Modified: incubator/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/incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java?rev=654236&r1=654235&r2=654236&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java (original)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java Wed May 7 12:53:35 2008
@@ -49,18 +49,18 @@
}
- private void deleteDirectory(File dir) {
- File[] files = dir.listFiles();
- for (int i = 0; i < files.length; i++) {
- if (files[i].isDirectory())
- deleteDirectory(files[i]);
- else {
- files[i].delete();
- }
- }
- dir.delete();
-
- }
+// private void deleteDirectory(File dir) {
+// File[] files = dir.listFiles();
+// for (int i = 0; i < files.length; i++) {
+// if (files[i].isDirectory())
+// deleteDirectory(files[i]);
+// else {
+// files[i].delete();
+// }
+// }
+// dir.delete();
+//
+// }
// private void deleteProfile() {
// String profileDirName = System.getProperty("felix.cache.profiledir");
@@ -95,7 +95,7 @@
"org.osgi.service.url; version=1.0.0, " +
"org.osgi.util.tracker; version=1.3.2, " +
"javax.xml, " +
- "javax.xml.datatype, " +
+ "javax.xml.datatype, " +
"javax.xml.namespace, " +
"javax.xml.parsers, " +
"javax.xml.transform, " +
@@ -119,6 +119,10 @@
"sun.misc, " +
"javax.net, " +
"javax.crypto, " +
+ "javax.rmi, " +
+ "javax.transaction, " +
+ "javax.transaction.xa, " +
+
"org.apache.felix.main";
Modified: incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java?rev=654236&r1=654235&r2=654236&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java (original)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java Wed May 7 12:53:35 2008
@@ -4,6 +4,7 @@
import java.io.File;
import java.io.FilenameFilter;
import java.lang.reflect.Method;
+import java.util.HashSet;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -15,21 +16,64 @@
*/
public class TuscanyLoader {
- private static final String scaApiDir = "sca-api";
- private static final String tuscanySpiDir = "tuscany-spi";
- private static final String tuscanyRuntimeDir = "tuscany-runtime";
- private static final String tuscanyExtensionsDir = "tuscany-extensions";
- private static final String thirdPartyDir = "tuscany-3rdparty";
+ public enum TuscanyRuntimeBundleType {
+ ITEST_4_BUNDLES,
+ MODULE_BUNDLES
+ };
+
+ public enum Tuscany3rdPartyBundleType {
+ ITEST_SINGLE_BUNDLE,
+ VIRTUAL_BUNDLES
+ };
+
+ private static final String scaApiDir = "../sca-api";
+ private static final String tuscanySpiDir = "../tuscany-spi";
+ private static final String tuscanyRuntimeDir = "../tuscany-runtime";
+ private static final String tuscanyExtensionsDir = "../tuscany-extensions";
+ private static final String thirdPartyDir = "../tuscany-3rdparty";
+
+ private static final String tuscanyManifestDir = "../tuscany-manifest";
+ private static final String tuscanyManifestJar = "tuscany-sca-manifest.jar";
+
+ private static final String tuscanyModulesDir = "../../../modules";
+ private static final String[] tuscanyModulesToIgnore = {
+ "node2-api",
+ "node2-impl",
+ "node2-launcher",
+ "node2-launcher-webapp",
+ "implementation-node-runtime", // uses node2
+ "saxon",
+ "runtime",
+ "runtime-webapp",
+ "runtime-tomcat",
+ "runtime-war",
+ "host-webapp",
+ "host-tomcat",
+ "policy-transaction",
+ "implementation-bpel",
+ "binding-ejb",
+ "implementation-ejb",
+ "implementation-ejb-xml",
+
+ };
+
+ private static final HashSet<String> ignoreTuscanyModules = new HashSet<String>();
+
+ static {
+ for (String ignoreModule : tuscanyModulesToIgnore) {
+ ignoreTuscanyModules.add(ignoreModule);
+ }
+ }
- private static String findBundle(String subDirName) throws Exception {
+ private static String findBundle(String subDirName, final String jarPrefix) throws Exception {
- File dir = new File("../" + subDirName + "/target");
+ File dir = new File(subDirName + "/target");
if (dir.exists() && dir.isDirectory()) {
File[] files = dir.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
- return name.endsWith(".jar");
+ return name.endsWith(".jar") && (jarPrefix == null || name.startsWith(jarPrefix));
}
});
@@ -40,44 +84,110 @@
return null;
}
+ public static Bundle loadTuscanyIntoOSGi(BundleContext bundleContext) throws Exception {
+ return loadTuscanyIntoOSGi(bundleContext, TuscanyRuntimeBundleType.MODULE_BUNDLES, Tuscany3rdPartyBundleType.VIRTUAL_BUNDLES);
+ }
+
+ public static Bundle loadTuscanyIntoOSGi(BundleContext bundleContext,
+ TuscanyRuntimeBundleType runtimeBundleType,
+ Tuscany3rdPartyBundleType thirdPartyBundleType)
+ throws Exception {
+
+
+ if (thirdPartyBundleType == Tuscany3rdPartyBundleType.ITEST_SINGLE_BUNDLE)
+ loadCombinedThirdPartyBundle(bundleContext);
+ else
+ loadVirtualThirdPartyBundles(bundleContext);
+
+ if (runtimeBundleType == TuscanyRuntimeBundleType.ITEST_4_BUNDLES)
+ return load4BundleTuscanyRuntime(bundleContext);
+ else
+ return loadTuscanyModules(bundleContext);
+
+ }
+
+ public static void loadCombinedThirdPartyBundle(BundleContext bundleContext) throws Exception {
+
+ String thirdPartyBundleName = findBundle(thirdPartyDir, null);
+ Bundle thirdPartyBundle = bundleContext.installBundle(thirdPartyBundleName);
+ thirdPartyBundle.start();
+ }
+
+
+ public static void loadVirtualThirdPartyBundles(BundleContext bundleContext) throws Exception {
+
+ String tuscanyManifestBundleName = new File(tuscanyManifestDir + "/target/" + tuscanyManifestJar).toURI().toURL().toString();
+ Bundle tuscanyManifestBundle = bundleContext.installBundle(tuscanyManifestBundleName);
+ tuscanyManifestBundle.start();
+ }
+
/**
- * Load four Tuscany bundles (API, Core-SPI, Runtime, Extensions) and
- * one 3rd party bundle
+ * Load Tuscany module bundles
*
* @param bundleContext
*/
- public static Bundle loadTuscanyIntoOSGi(BundleContext bundleContext) throws Exception {
-
- long startTime = System.currentTimeMillis();
+ public static Bundle loadTuscanyModules(BundleContext bundleContext) throws Exception {
+
+
+ Bundle tuscanyRuntimeBundle = null;
- String thirdPartyBundleName = findBundle(thirdPartyDir);
- Bundle thirdPartyBundle = bundleContext.installBundle(thirdPartyBundleName);
- thirdPartyBundle.start();
+ File dir = new File(tuscanyModulesDir);
+ if (dir.exists() && dir.isDirectory()) {
+ File[] files = dir.listFiles(new FilenameFilter() {
+
+ public boolean accept(File dir, String name) {
+ return true;
+ }
+
+ });
+ if (files != null && files.length > 0) {
+ for (File file : files) {
+ if (ignoreTuscanyModules.contains(file.getName()))
+ continue;
+ String bundleURL = findBundle(file.toString(), "tuscany");
+ if (bundleURL != null) {
+ Bundle bundle = bundleContext.installBundle(bundleURL);
+ if (bundle != null && file.getName().equals("osgi-runtime")) {
+ tuscanyRuntimeBundle = bundle;
+ }
+ }
+ }
+ }
+ }
+
+ return tuscanyRuntimeBundle;
+
+ }
+
+
+
+ /**
+ * Load four Tuscany bundles (API, Core-SPI, Runtime, Extensions)
+ *
+ * @param bundleContext
+ */
+ public static Bundle load4BundleTuscanyRuntime(BundleContext bundleContext) throws Exception {
+
- String scaApiBundleName = findBundle(scaApiDir);
+ String scaApiBundleName = findBundle(scaApiDir, null);
Bundle scaApiBundle = bundleContext.installBundle(scaApiBundleName);
scaApiBundle.start();
- String tuscanySpiBundleName = findBundle(tuscanySpiDir);
+ String tuscanySpiBundleName = findBundle(tuscanySpiDir, null);
Bundle tuscanySpiBundle = bundleContext.installBundle(tuscanySpiBundleName);
- String tuscanyRuntimeBundleName = findBundle(tuscanyRuntimeDir);
+ String tuscanyRuntimeBundleName = findBundle(tuscanyRuntimeDir, null);
Bundle tuscanyRuntimeBundle = bundleContext.installBundle(tuscanyRuntimeBundleName);
- String tuscanyExtensionsBundleName = findBundle(tuscanyExtensionsDir);
+ String tuscanyExtensionsBundleName = findBundle(tuscanyExtensionsDir, null);
Bundle tuscanyExtensionsBundle = bundleContext.installBundle(tuscanyExtensionsBundleName);
tuscanySpiBundle.start();
tuscanyExtensionsBundle.start();
-
- long endTime = System.currentTimeMillis();
-
- System.out.println("Loaded Tuscany, time taken = " + (endTime-startTime) + " ms" );
-
return tuscanyRuntimeBundle;
}
Modified: incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java?rev=654236&r1=654235&r2=654236&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java (original)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java Wed May 7 12:53:35 2008
@@ -94,6 +94,8 @@
System.out.println("Run tests from : " + mainTestDir);
+ long startTime = System.currentTimeMillis();
+
tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(bundleContext);
String[] dirs = new String[testDirs.length + 2];
@@ -115,6 +117,11 @@
TuscanyLoader.startTuscany(tuscanyRuntime);
+
+ long endTime = System.currentTimeMillis();
+
+ System.out.println("Loaded Tuscany, time taken = " + (endTime-startTime) + " ms" );
+
testBundle.start();
Class<?> testClass = testBundle.loadClass(this.getClass().getName());
@@ -136,6 +143,7 @@
File manifestFile = new File(manifestFileName);
Manifest manifest = new Manifest();
manifest.read(new FileInputStream(manifestFile));
+ manifest.getMainAttributes().putValue("Bundle-Version", (String)tuscanyRuntime.getHeaders().get("Bundle-Version"));
JarOutputStream jarOut = new JarOutputStream(out, manifest);
Modified: incubator/tuscany/java/sca/itest/osgi-tuscany/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/pom.xml?rev=654236&r1=654235&r2=654236&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/pom.xml Wed May 7 12:53:35 2008
@@ -30,11 +30,19 @@
<name>Apache Tuscany OSGi-based Tuscany Runtime Integration Tests</name>
<modules>
+
+<!--
<module>sca-api</module>
<module>tuscany-spi</module>
<module>tuscany-runtime</module>
<module>tuscany-extensions</module>
<module>tuscany-3rdparty</module>
+-->
+
+ <module>tuscany-3rdparty-manifest</module>
+ <module>tuscany-manifest</module>
+
+
<module>test-bundles</module>
<module>osgi-tuscany-test</module>
</modules>
Modified: incubator/tuscany/java/sca/itest/osgi-tuscany/sca-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/sca-api/pom.xml?rev=654236&r1=654235&r2=654236&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/sca-api/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/sca-api/pom.xml Wed May 7 12:53:35 2008
@@ -47,10 +47,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.2.0</Bundle-Version>
+ <Bundle-Version>2.0</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.api</Bundle-SymbolicName>
<Bundle-Description>Apache Tuscany SCA API Bundle</Bundle-Description>
- <Export-Package>org.osoa.sca*</Export-Package>
+ <Export-Package>org.osoa.sca*;version="2.0"</Export-Package>
</instructions>
</configuration>
</plugin>
Added: incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty-manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty-manifest/pom.xml?rev=654236&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty-manifest/pom.xml (added)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty-manifest/pom.xml Wed May 7 12:53:35 2008
@@ -0,0 +1,669 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <artifactId>itest-osgi-tuscany-3rdparty-manifest</artifactId>
+ <name>Apache Tuscany OSGi - Tuscany 3rdParty Manifest Bundle</name>
+ <packaging>jar</packaging>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ <tuscany.version>${pom.version}</tuscany.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-assembly</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-assembly-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-dwr</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-ejb</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-atom</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-atom-abdera</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+-->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-feed</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-rss</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-rss-rome</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-http</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-jms</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apache-activemq</artifactId>
+ <version>4.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-console</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-optional</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-web-demo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jaas</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activesoap</groupId>
+ <artifactId>jaxp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activemq</groupId>
+ <artifactId>jmdns</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jrms</groupId>
+ <artifactId>jrms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlpull</groupId>
+ <artifactId>xmlpull</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-jsonrpc</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-notification</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-rmi</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-sca</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-sca-axis2</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-sca-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-ws</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-ws-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-contribution</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-contribution-groovy</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-contribution-impl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-contribution-java</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-contribution-namespace</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-core-databinding</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-core-spi</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-databinding</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-databinding-axiom</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-databinding-fastinfoset</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-databinding-jaxb</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-databinding-sdo-axiom</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-databinding-xmlbeans</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-databinding-xstream</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-domain</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-domain-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-domain-impl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-host-http</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-host-rmi</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-host-webapp</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-interface</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-interface-java</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-interface-java-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-interface-wsdl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-interface-wsdl-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-bpel</artifactId>
+ <version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+-->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-das</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-ejb</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-ejb-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-java</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-java-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-node</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-node-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-node-runtime</artifactId>
+ <version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-host-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-osgi</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-resource</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-script</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-spring</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-xquery</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-widget</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node2-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node2-impl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-node2-launcher</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+-->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-policy</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-policy-logging</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-policy-security</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-policy-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-definitions</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-workspace</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-domain-manager</artifactId>
+ <version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-host-tomcat</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-workspace-impl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-workspace-xml</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+<!--
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-java2wsdl</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-wsdl2java</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+-->
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-sca-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>1.1-incubating</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-tools</artifactId>
+ <version>1.1-incubating</version>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.2.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>
+ ${project.build.outputDirectory}/org/apache/tuscany/sca/manifest
+ </manifestLocation>
+ <instructions>
+ <Bundle-Version>2.0</Bundle-Version>
+ <Bundle-SymbolicName>org.apache.tuscany.sca.3rdparty</Bundle-SymbolicName>
+ <Bundle-Description>Apache Tuscany SCA 3rd party Bundle</Bundle-Description>
+ <Embed-StripVersion>true</Embed-StripVersion>
+ <Embed-StripGroup>true</Embed-StripGroup>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Embed-Dependency>
+ tuscany-sdo*,
+ tuscany-das*,
+ !tuscany*
+ </Embed-Dependency>
+ <_exportcontents>
+ !org.apache.tuscany.sca*,
+ !org.osoa.sca*,
+ org.mortbay*;version="6.1.7",
+ commonj.sdo*;version="2.1.0",
+ *
+ </_exportcontents>
+ <Import-Package>*;resolution:=optional</Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>create-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
Propchange: incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty-manifest/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty-manifest/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml?rev=654236&r1=654235&r2=654236&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-3rdparty/pom.xml Wed May 7 12:53:35 2008
@@ -305,7 +305,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.2.0</Bundle-Version>
+ <Bundle-Version>2.0</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.3rdparty</Bundle-SymbolicName>
<Bundle-Description>Apache Tuscany SCA 3rd party Bundle</Bundle-Description>
<Embed-StripVersion>true</Embed-StripVersion>
@@ -319,6 +319,8 @@
<_exportcontents>
!org.apache.tuscany.sca*,
!org.osoa.sca*,
+ org.mortbay*;version="6.1.7",
+ commonj.sdo*;version="2.1.0",
*
</_exportcontents>
<Import-Package>*;resolution:=optional</Import-Package>
Modified: incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml?rev=654236&r1=654235&r2=654236&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml Wed May 7 12:53:35 2008
@@ -307,6 +307,12 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-policy-security-ws</artifactId>
+ <version>2.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-monitor-logging</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
@@ -322,14 +328,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Version>1.2.0</Bundle-Version>
+ <Bundle-Version>2.0</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.extensions</Bundle-SymbolicName>
<Bundle-Description>Apache Tuscany SCA Extensions Bundle</Bundle-Description>
<Embed-StripVersion>true</Embed-StripVersion>
<Embed-StripGroup>true</Embed-StripGroup>
<Embed-Dependency>tuscany*</Embed-Dependency>
<_exportcontents>
- org.apache.tuscany.sca.*,
+ org.apache.tuscany.sca.*;version="2.0"
</_exportcontents>
<Import-Package>*;version="0"</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>