diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-04 16:43:19 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-04 16:43:19 +0000 |
| commit | 292f4bbb201e20c025426b310ed62e306bd96210 (patch) | |
| tree | 237cb620f803374c2834c39e1f3d5ac5ca775d81 /sca-java-2.x/trunk/distribution/all/pom.xml | |
| parent | 3ec81c5828e707ae52a283f285e83889b82fb989 (diff) | |
Move the runtime over to use Axis2 1.5.1. Three main parts to this 1) replace binding-ws-axis2 and binding binding-ws-axis2-policy with binding-ws-runtime-axis which is still very much a work in progress 2) correct the axis/axiom version references across the project and make the various OSGi environments work 3) start fixing policy provides to allow the ws binding to exploit the binding wire.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@906557 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | sca-java-2.x/trunk/distribution/all/pom.xml | 43 |
1 files changed, 38 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/pom.xml b/sca-java-2.x/trunk/distribution/all/pom.xml index 41e31f8d1b..2b49fe47e1 100644 --- a/sca-java-2.x/trunk/distribution/all/pom.xml +++ b/sca-java-2.x/trunk/distribution/all/pom.xml @@ -132,7 +132,7 @@ <plugin> <groupId>org.apache.tuscany.maven.plugins</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>1.0.5</version> + <version>1.0.6-SNAPSHOT</version> <executions> <execution> <id>distribution-modules</id> @@ -145,24 +145,57 @@ <useDistributionName>false</useDistributionName> <generateManifestJar>true</generateManifestJar> <artifactManifests> - <artifactManifest> + <!--artifactManifest> <groupId>org.apache.ws.commons.axiom</groupId> <artifactId>axiom-api</artifactId> - <version>1.2.7</version> - <manifestFile>${basedir}/manifests/axiom-api-1.2.7.MF</manifestFile> - </artifactManifest> + <version>1.2.8</version> + <manifestFile>${basedir}/manifests/axiom-api-1.2.8.MF</manifestFile> + </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> + <!-- 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 --> + <artifactManifest> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-kernel</artifactId> + <version>1.5.1</version> + <manifestFile>${basedir}/manifests/axis2-kernel-1.5.1.MF</manifestFile> + </artifactManifest> + <artifactManifest> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-http</artifactId> + <version>1.5.1</version> + <manifestFile>${basedir}/manifests/axis2-transport-http-1.5.1.MF</manifestFile> + </artifactManifest> <artifactManifest> <groupId>org.apache.axis2</groupId> <artifactId>*</artifactId> <version>*</version> </artifactManifest> </artifactManifests> + <!--artifactAggregations> + <artifactAggregation> + <symbolicName>org.apache.tuscany.sca.axis2-kernel</symbolicName> + <version>1.5.1</version> + <artifactMembers> + <artifactMember> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-kernel</artifactId> + <version>1.5.1</version> + </artifactMember> + <artifactMember> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-http</artifactId> + <version>1.5.1</version> + </artifactMember> + </artifactMembers> + </artifactAggregation> + </artifactAggregations--> </configuration> </execution> </executions> |