diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2011-09-06 10:29:31 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2011-09-06 10:29:31 +0000 |
| commit | fc55e1ced3cb5be7b5732757b2f8e861f0e1d98b (patch) | |
| tree | 471436abde941aa11218c881804a5862b2c0acf1 /sca-java-2.x/trunk/distribution | |
| parent | c298b01922ab03d078f33ec1ceb3e7471277f48c (diff) | |
TUSCANY-3938 - Correct various manifest mistakes to bring runtime up in OSGi again.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1165594 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/distribution')
| -rw-r--r-- | sca-java-2.x/trunk/distribution/all/manifests/axiom-impl-1.2.10.MF | 1 | ||||
| -rw-r--r-- | sca-java-2.x/trunk/distribution/all/pom.xml | 24 |
2 files changed, 19 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/manifests/axiom-impl-1.2.10.MF b/sca-java-2.x/trunk/distribution/all/manifests/axiom-impl-1.2.10.MF index 7e2c6db434..59d6196eb8 100644 --- a/sca-java-2.x/trunk/distribution/all/manifests/axiom-impl-1.2.10.MF +++ b/sca-java-2.x/trunk/distribution/all/manifests/axiom-impl-1.2.10.MF @@ -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 diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml index a5d39f76ad..51c9bb564d 100644 --- a/sca-java-2.x/trunk/distribution/all/pom.xml +++ b/sca-java-2.x/trunk/distribution/all/pom.xml @@ -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> |