tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r1165594 - in /tuscany/sca-java-2.x/trunk: distribution/all/ distribution/all/manifests/ modules/binding-ws-runtime-axis2/META-INF/ modules/core-spi/META-INF/ modules/core/META-INF/ modules/domain-hazelcast/META-INF/ modules/domain-node/MET...
Date Tue, 06 Sep 2011 10:29:32 GMT
Author: slaws
Date: Tue Sep  6 10:29:31 2011
New Revision: 1165594

URL: http://svn.apache.org/viewvc?rev=1165594&view=rev
Log:
TUSCANY-3938 - Correct various manifest mistakes to bring runtime up in OSGi again. 

Modified:
    tuscany/sca-java-2.x/trunk/distribution/all/manifests/axiom-impl-1.2.10.MF
    tuscany/sca-java-2.x/trunk/distribution/all/pom.xml
    tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
    tuscany/sca-java-2.x/trunk/modules/core-spi/META-INF/MANIFEST.MF
    tuscany/sca-java-2.x/trunk/modules/core/META-INF/MANIFEST.MF
    tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF
    tuscany/sca-java-2.x/trunk/modules/domain-node/META-INF/MANIFEST.MF
    tuscany/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF
    tuscany/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF

Modified: tuscany/sca-java-2.x/trunk/distribution/all/manifests/axiom-impl-1.2.10.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/manifests/axiom-impl-1.2.10.MF?rev=1165594&r1=1165593&r2=1165594&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/manifests/axiom-impl-1.2.10.MF (original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/manifests/axiom-impl-1.2.10.MF Tue Sep  6
10:29:31 2011
@@ -34,3 +34,4 @@ Tool: Bnd-0.0.238
 Specification-Vendor: The Apache Software Foundation
 Implementation-Version: 1.2.10
 Implementation-Vendor: The Apache Software Foundation
+Bundle-ClassPath: axiom-impl-1.2.10.jar

Modified: tuscany/sca-java-2.x/trunk/distribution/all/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/all/pom.xml?rev=1165594&r1=1165593&r2=1165594&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/all/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/all/pom.xml Tue Sep  6 10:29:31 2011
@@ -209,7 +209,13 @@
                                  <groupId>org.apache.tuscany.sca.aggregation</groupId>
                              </excludeGroupIds>
                              <artifactManifests>
-                             <!--
+                                 <artifactManifest>
+                                     <groupId>org.apache.ws.commons.axiom</groupId>
+                                     <artifactId>axiom-impl</artifactId>
+                                     <version>1.2.10</version>
+                                     <manifestFile>${basedir}/manifests/axiom-impl-1.2.10.MF</manifestFile>
+                                 </artifactManifest>
+                                 <!--
                                  <artifactManifest>
                                      <groupId>org.apache.ws.commons.axiom</groupId>
                                      <artifactId>axiom-api</artifactId>
@@ -222,7 +228,7 @@
                                      <version>1.0M8</version>
                                      <manifestFile>${basedir}/manifests/woden-impl-dom-1.0M8.MF</manifestFile>
                                  </artifactManifest>
-                              -->
+                                 -->
                                  <!-- artifactAggregations (below) is the right approach
to solving the split 
                                       package between axis-kernel and axis2-transport-http
however the Tuscany 
                                       runtime doesn't take any notice of it so using a fragment
at the moment -->
@@ -267,7 +273,7 @@
                     <!-- 
                        The following execution must repeat the same set of artifact
                        manifests as the previous one so that the dependency set that 
-                       that th executions are working against is the same. 
+                       that the executions are working against is the same. 
                     -->
                     <execution>
                         <id>extensions-build</id>
@@ -401,20 +407,26 @@
                                  </extension>
                              </extensions>
                             <artifactManifests>
-                            <!--
+                                 <artifactManifest>
+                                     <groupId>org.apache.ws.commons.axiom</groupId>
+                                     <artifactId>axiom-impl</artifactId>
+                                     <version>1.2.10</version>
+                                     <manifestFile>${basedir}/manifests/axiom-impl-1.2.10.MF</manifestFile>
+                                 </artifactManifest>
+                                 <!--
                                  <artifactManifest>
                                      <groupId>org.apache.ws.commons.axiom</groupId>
                                      <artifactId>axiom-api</artifactId>
                                      <version>1.2.10</version>
                                      <manifestFile>${basedir}/manifests/axiom-api-1.2.10.MF</manifestFile>
-                                 </artifactManifest>
-                                 -->
+                                 </artifactManifest>          
                                  <artifactManifest>
                                      <groupId>org.apache.woden</groupId>
                                      <artifactId>woden-impl-dom</artifactId>
                                      <version>1.0M8</version>
                                      <manifestFile>${basedir}/manifests/woden-impl-dom-1.0M8.MF</manifestFile>
                                  </artifactManifest>
+                                 -->
                                  <artifactManifest>
                                      <groupId>org.apache.axis2</groupId>
                                      <artifactId>axis2-kernel</artifactId>

Modified: tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF?rev=1165594&r1=1165593&r2=1165594&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/META-INF/MANIFEST.MF Tue Sep
 6 10:29:31 2011
@@ -122,6 +122,7 @@ Import-Package: javax.servlet,
  org.apache.tuscany.sca.policy.security;version="2.0.0",
  org.apache.tuscany.sca.policy.security.http.ssl;version="2.0.0",
  org.apache.tuscany.sca.policy.util;version="2.0.0",
+ org.apache.tuscany.sca.policy.wspolicy;version="2.0.0",
  org.apache.tuscany.sca.provider;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
  org.apache.tuscany.sca.xsd;version="2.0.0",

Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/META-INF/MANIFEST.MF?rev=1165594&r1=1165593&r2=1165594&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/META-INF/MANIFEST.MF Tue Sep  6 10:29:31 2011
@@ -33,6 +33,9 @@ Bundle-Description: Apache Tuscany SCA C
 Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
  org.apache.tuscany.sca.assembly.builder;version="2.0.0",
  org.apache.tuscany.sca.context;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.java;version="2.0.0",
+ org.apache.tuscany.sca.contribution.namespace;version="2.0.0",
  org.apache.tuscany.sca.core;version="2.0.0",
  org.apache.tuscany.sca.definitions;version="2.0.0",
  org.apache.tuscany.sca.extensibility;version="2.0.0",

Modified: tuscany/sca-java-2.x/trunk/modules/core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/META-INF/MANIFEST.MF?rev=1165594&r1=1165593&r2=1165594&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/META-INF/MANIFEST.MF Tue Sep  6 10:29:31 2011
@@ -40,6 +40,7 @@ Import-Package: javax.security.auth,
  javax.xml.namespace,
  javax.xml.stream,
  javax.xml.transform,
+ javax.xml.ws,
  net.sf.cglib.proxy;resolution:=optional,
  org.apache.tuscany.sca.assembly;version="2.0.0",
  org.apache.tuscany.sca.assembly.builder;version="2.0.0",

Modified: tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF?rev=1165594&r1=1165593&r2=1165594&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-hazelcast/META-INF/MANIFEST.MF Tue Sep  6 10:29:31
2011
@@ -15,6 +15,7 @@ Import-Package: javax.wsdl,
  javax.wsdl.factory,
  javax.wsdl.xml,
  javax.xml.stream,
+ javax.xml.namespace,
  com.hazelcast.client,
  com.hazelcast.config,
  com.hazelcast.core,
@@ -39,6 +40,7 @@ Import-Package: javax.wsdl,
  org.oasisopen.sca.annotation,
  org.w3c.dom,
  org.xml.sax
-Export-Package: org.apache.tuscany.sca.registry.hazelcast;version="2.0.0";
- uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core"
+Export-Package: org.apache.tuscany.sca.binding.hazelcast;version="2.0.0",
+ org.apache.tuscany.sca.registry.hazelcast;version="2.0.0";
+   uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core"
 

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/META-INF/MANIFEST.MF?rev=1165594&r1=1165593&r2=1165594&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/META-INF/MANIFEST.MF Tue Sep  6 10:29:31
2011
@@ -8,14 +8,32 @@ Bundle-Version: 2.0.0
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-Description: Apache Tuscany SCA Domain Node
-Import-Package: 
+Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
+ org.apache.tuscany.sca.assembly.impl;version="2.0.0",
+ org.apache.tuscany.sca.assembly.builder;version="2.0.0",
+ org.apache.tuscany.sca.common.java.io;version="2.0.0",
+ org.apache.tuscany.sca.context;version="2.0.0",
+ org.apache.tuscany.sca.contribution;version="2.0.0",
+ org.apache.tuscany.sca.contribution.java;version="2.0.0",
+ org.apache.tuscany.sca.contribution.namespace;version="2.0.0",
+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",
+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",
+ org.apache.tuscany.sca.core;version="2.0.0",
+ org.apache.tuscany.sca.core.assembly;version="2.0.0",
+ org.apache.tuscany.sca.core.invocation;version="2.0.0",
+ org.apache.tuscany.sca.deployment;version="2.0.0",
+ org.apache.tuscany.sca.interfacedef;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",
  org.apache.tuscany.sca.node.impl;version="2.0.0",
+ org.apache.tuscany.sca.policy;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
- org.apache.tuscany.sca.context;version="2.0.0",
- org.apache.tuscany.sca.work;version="2.0.0"
+ org.apache.tuscany.sca.work;version="2.0.0",
+ org.oasisopen.sca;version="2.0.0",
+ org.oasisopen.sca.annotation;version="2.0.0",
+ javax.xml.stream
 Bundle-SymbolicName: org.apache.tuscany.sca.domain.node
 Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6

Modified: tuscany/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF?rev=1165594&r1=1165593&r2=1165594&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-wspolicy/META-INF/MANIFEST.MF Tue Sep  6 10:29:31
2011
@@ -23,7 +23,8 @@ Import-Package: javax.xml.namespace,
  org.apache.tuscany.sca.policy.xml;version="2.0.0";resolution:=optional
 Bundle-SymbolicName: org.apache.tuscany.sca.policy.wspolicy
 Bundle-DocURL: http://www.apache.org/
-Export-Package: org.apache.tuscany.sca.policy.wspolicy.xml;version="2.0.0";
+Export-Package: org.apache.tuscany.sca.policy.wspolicy;version="2.0.0",
+  org.apache.tuscany.sca.policy.wspolicy.xml;version="2.0.0";
   uses:="javax.xml.stream,
    junit.framework,
    org.apache.tuscany.sca.contribution.resolver,

Modified: tuscany/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF?rev=1165594&r1=1165593&r2=1165594&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF Tue Sep  6 10:29:31 2011
@@ -6,7 +6,7 @@ Bundle-Vendor: The Apache Software Found
 Bundle-Version: 2.0.0
 Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany SCA Domain Node
+Bundle-Description: Apache Tuscany SCA Shell
 Import-Package: 
  org.apache.tuscany.sca;version="2.0.0",
  org.apache.tuscany.sca.context;version="2.0.0",
@@ -17,6 +17,6 @@ Import-Package: 
  org.apache.tuscany.sca.node.impl;version="2.0.0",
  org.apache.tuscany.sca.runtime;version="2.0.0",
  org.apache.tuscany.sca.work;version="2.0.0"
-Bundle-SymbolicName: org.apache.tuscany.sca.domain.node
+Bundle-SymbolicName: org.apache.tuscany.sca.shell
 Bundle-DocURL: http://www.apache.org/
 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6



Mime
View raw message