summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/distribution
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/trunk/distribution')
-rw-r--r--sca-java-2.x/trunk/distribution/all/pom.xml43
-rw-r--r--sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE28
-rw-r--r--sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE25
3 files changed, 72 insertions, 24 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>
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
index af574e4fa6..a4561ef047 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
+++ b/sca-java-2.x/trunk/distribution/all/src/main/release/bin/LICENSE
@@ -226,13 +226,17 @@ The following components come under Apache Software License 2.0
addressing-1.3.mar
aopalliance-1.0.jar
annogen-0.1.0.jar
- axiom-api-1.2.7.jar
- axiom-dom-1.2.7.jar
- axiom-impl-1.2.7.jar
- axis2-codegen-1.4.1.jar
- axis2-kernel-1.4.1.jar
- axis2-java2wsdl-1.4.1.jar
- axis2-mtompolicy-1.4.1.jar
+ axiom-api-1.2.8.jar
+ axiom-dom-1.2.8.jar
+ axiom-impl-1.2.8.jar
+ axis2-codegen-1.5.1.jar
+ axis2-kernel-1.5.1.jar
+ axis2-java2wsdl-1.5.1.jar
+ axis2-mtompolicy-1.5.1.jar
+ axis2-transport-base-1.0.0.jar
+ axis2-transport-jms-1.0.0.jar
+ axis2-transport-local-1.5.1.jar
+ axis2-transport-http-1.5.1.jar
axis-ant-1.4.jar
cglib-2.2.jar
commons-beanutils-1.7.0.jar
@@ -253,15 +257,17 @@ The following components come under Apache Software License 2.0
geronimo-connector-2.0.1.jar
geronimo-ejb_3.0_spec-1.0.1.jar
geronimo-el_1.0_spec-1.0.1.jar
- geronimo-javamail_1.4_spec-1.2.jar
+ geronimo-javamail_1.4_spec-1.6.jar
geronimo-jms_1.1_spec-1.1.1.jar
geronimo-jpa_3.0_spec-1.1.1.jar
geronimo-jsp_2.1_spec-1.0.1.jar
+ geronimo-jta_1.0.1B_spec-1.0.jar
geronimo-jta_1.1_spec-1.1.1.jar
geronimo-j2ee-connector_1.5_spec-2.0.0.jar
geronimo-kernel-2.0.1.jar
geronimo-stax-api_1.0_spec-1.0.1.jar
geronimo-transaction-2.0.1.jar
+ geronimo-ws-metadata_2.0_spec-1.1.2.jar
hazelcast-1.8.jar
hazelcast-client-1.8.jar
httpclient-4.0.jar
@@ -275,7 +281,7 @@ The following components come under Apache Software License 2.0
jetty-util-6.1.19.jar
juli-6.0.18.jar
log4j-1.2.15.jar
- mex-1.41-impl.jar
+ mex-1.5.1-impl.jar
myfaces-api-1.2.2.jar
myfaces-impl-1.2.2.jar
neethi-2.0.4.jar
@@ -311,9 +317,11 @@ The following components come under Apache Software License 2.0
wstx-asl-3.2.4.jar
xalan-2.7.0.jar
xercesImpl-2.8.1.jar
+ xml-apis-1.3.04.jar
xmlbeans-2.3.0.jar
- xmlsec-1.4.2.jar
+ xmlsec-1.4.3.jar
XmlSchema-1.4.2.jar
+ XmlSchema-1.4.3.jar
===============================================================================
The serp-1.13.1.jar is distributed under the BSD license with the following copyright:
diff --git a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
index de01f39373..22ac5f47eb 100644
--- a/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
+++ b/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
@@ -217,14 +217,18 @@ The following components come under Apache Software License 2.0
addressing-1.3.mar
annogen-0.1.0.jar
- axiom-api-1.2.7.jar
- axiom-dom-1.2.7.jar
- axiom-impl-1.2.7.jar
+ axiom-api-1.2.8.jar
+ axiom-dom-1.2.8.jar
+ axiom-impl-1.2.8.jar
axis2-adb-1.4.jar
axis2-codegen-1.4.jar
- axis2-kernel-1.4.1.jar
- axis2-java2wsdl-1.4.1.jar
- axis2-mtompolicy-1.4.1.jar
+ axis2-kernel-1.5.1.jar
+ axis2-java2wsdl-1.5.1.jar
+ axis2-mtompolicy-1.5.1.jar
+ axis2-transport-base-1.0.0.jar
+ axis2-transport-local-1.5.1.jar
+ axis2-transport-http-1.5.1.jar
+ axis2-transport-jms-1.0.0.jar
axis-ant-1.4.jar
cglib-2.2.jar
commons-codec-1.2.jar
@@ -235,14 +239,17 @@ The following components come under Apache Software License 2.0
commons-io-1.4.jar
commons-logging-1.1.1.jar
geronimo-activation_1.1_spec-1.0.1.jar
- geronimo-javamail_1.4_spec-1.2.jar
+ geronimo-javamail_1.4_spec-1.6.jar
geronimo-jms_1.1_spec-1.1.jar
+ geronimo-jta_1.0.1B_spec-1.0.jar
+ geronimo-jta_1.1_spec-1.1.jar
geronimo-stax-api_1.0_spec-1.0.1.jar
+ geronimo-ws-metadata_2.0_spec-1.1.2.jar
hazelcast-1.8.jar
hazelcast-client-1.8.jar
httpcore-4.0.1.jar
httpcore-nio-4.0.1.jar
- mex-1.41-impl.jar
+ mex-1.5.1-impl.jar
neethi-2.0.4.jar
rampart-core-1.4.jar
rampart-policy-1.4.jar
@@ -250,7 +257,7 @@ The following components come under Apache Software License 2.0
woden-api-1.0M8.jar
woden-impl-dom-1.0M8.jar
wss4j-1.5.4.jar
- xmlsec-1.4.2.jar
+ xmlsec-1.4.3.jar
XmlSchema-1.4.2.jar
===============================================================================