Author: veithen
Date: Sun Aug 27 11:48:58 2017
New Revision: 1806353
URL: http://svn.apache.org/viewvc?rev=1806353&view=rev
Log:
AXIS2-5865: Merge r1806349 and r1806350 (with changes) to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml
axis/axis2/java/core/branches/1_7/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml
axis/axis2/java/core/branches/1_7/modules/webapp/pom.xml
axis/axis2/java/core/branches/1_7/modules/webapp/scripts/build.xml
axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 27 11:48:58 2017
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1800495,1
803414,1805563,1806088,1806292,1806303-1806305,1806309,1806319,1806344
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1735801,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1779069,1779074,1780290,1787632,1787676,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728,1794114,1794192,1797821,1797823,1799068,1800495,1
803414,1805563,1806088,1806292,1806303-1806305,1806309,1806319,1806344,1806349-1806350
Modified: axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml?rev=1806353&r1=1806352&r2=1806353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml Sun Aug 27
11:48:58 2017
@@ -186,6 +186,12 @@
<version>${project.version}</version>
<type>mar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws-mar</artifactId>
+ <version>${project.version}</version>
+ <type>mar</type>
+ </dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -323,6 +329,28 @@
<build>
<plugins>
<plugin>
+ <groupId>com.github.veithen.alta</groupId>
+ <artifactId>alta-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>war-location</id>
+ <goals>
+ <goal>generate-properties</goal>
+ </goals>
+ <configuration>
+ <name>webapp</name>
+ <value>%file%</value>
+ <dependencySet>
+ <scope>test</scope>
+ <includes>
+ <include>*:axis2-webapp:war:*</include>
+ </includes>
+ </dependencySet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<executions>
@@ -343,6 +371,39 @@
</scripts>
</configuration>
</execution>
+ <execution>
+ <id>check-webapp-content</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <scripts>
+ <script>
+ import java.util.jar.*
+
+ def jar = new JarInputStream(new
FileInputStream("${webapp}"))
+ def expected = new HashSet()
+ def entry
+ while(entry = jar.nextJarEntry) {
+ expected.add(entry.name)
+ }
+ jar.close()
+
+ jar = new JarInputStream(new
FileInputStream("${project.build.directory}/axis2-${project.version}/dist/axis2.war"))
+ while(entry = jar.nextJarEntry) {
+ if (!expected.remove(entry.name)) {
+ throw new Error("Unexpected entry
in Web app: " + entry.name)
+ }
+ }
+ if (!expected.empty) {
+ throw new Error("Missing entries in
Web app: " + expected)
+ }
+ jar.close()
+ </script>
+ </scripts>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -355,6 +416,7 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/tmp-repository</outputDirectory>
+ <stripServiceVersion>false</stripServiceVersion>
<generateFileLists>true</generateFileLists>
</configuration>
</execution>
@@ -429,6 +491,9 @@
<tasks>
<unzip
src="${project.build.directory}/axis2-${project.version}-bin.zip"
dest="${project.build.directory}" />
+ <!-- Build the web app -->
+ <ant
dir="${project.build.directory}/axis2-${project.version}/webapp"
useNativeBasedir="true" />
+
<!-- Test of the databinding sample -->
<ant
dir="${project.build.directory}/axis2-${project.version}/samples/databinding" />
Modified:
axis/axis2/java/core/branches/1_7/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1806353&r1=1806352&r2=1806353&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_7/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/branches/1_7/modules/distribution/src/main/assembly/bin-assembly.xml
Sun Aug 27 11:48:58 2017
@@ -215,15 +215,17 @@
<outputDirectory>webapp</outputDirectory>
<unpackOptions>
<includes>
- <include>WEB-INF/**/*</include>
+ <include>org/apache/axis2/soapmonitor/applet/**/*</include>
+ <include>WEB-INF/classes/**/*</include>
+ <include>WEB-INF/include/**/*</include>
+ <include>WEB-INF/lib/taglibs-standard-impl-*.jar</include>
+ <include>WEB-INF/lib/taglibs-standard-spec-*.jar</include>
+
<include>WEB-INF/lib/axis2-soapmonitor-servlet-*.jar</include>
+ <include>WEB-INF/tags/**/*</include>
+ <include>WEB-INF/views/**/*</include>
+ <include>WEB-INF/web.xml</include>
<include>axis2-web/**/*</include>
</includes>
- <excludes>
- <exclude>WEB-INF/conf/**/*</exclude>
- <exclude>WEB-INF/lib/**/*</exclude>
- <exclude>WEB-INF/services/**/*</exclude>
- <exclude>WEB-INF/modules/**/*</exclude>
- </excludes>
</unpackOptions>
</dependencySet>
</dependencySets>
Modified: axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml?rev=1806353&r1=1806352&r2=1806353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/fastinfoset/pom.xml Sun Aug 27
11:48:58 2017
@@ -74,11 +74,7 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-codegen</artifactId>
- <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.neethi</groupId>
@@ -215,7 +211,7 @@
<mkdir
dir="${wsdl.output.base.dir}/simpleAddService" />
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <classpath refid="maven.runtime.classpath"
/>
+ <classpath refid="maven.test.classpath" />
<classpath
location="${compiled.classes.dir}" />
<arg line="-uri
target/test-classes/SimpleAddService.wsdl -o target/wsdl/simpleAddService -S .
-or" />
</java>
Modified: axis/axis2/java/core/branches/1_7/modules/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/webapp/pom.xml?rev=1806353&r1=1806352&r2=1806353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/webapp/pom.xml Sun Aug 27
11:48:58 2017
@@ -39,6 +39,16 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jibx</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>bcel-findbugs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -143,6 +153,55 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-jms</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-mail</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-tcp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-udp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-xmpp</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jivesoftware</groupId>
+ <artifactId>smack</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jivesoftware</groupId>
+ <artifactId>smackx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>mex</artifactId>
<version>${project.version}</version>
Modified: axis/axis2/java/core/branches/1_7/modules/webapp/scripts/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/webapp/scripts/build.xml?rev=1806353&r1=1806352&r2=1806353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/webapp/scripts/build.xml
(original)
+++ axis/axis2/java/core/branches/1_7/modules/webapp/scripts/build.xml Sun Aug
27 11:48:58 2017
@@ -72,15 +72,21 @@
<war destfile="dist/axis2.war" webxml="webapp/WEB-INF/web.xml">
<lib dir="lib">
<include name="**" />
+ <exclude name="endorsed/**" />
<exclude name="**servlet**" />
- <exclude name="ant*.jar" />
- <exclude name="axis2-adb-codegen*.jar"/>
+ <exclude name="axis2-ant-plugin-*.jar" />
+ <exclude name="axis2-*-codegen-*.jar"/>
<!-- codegen is required for Rampart because of
AXIS2-4265 -->
<!-- exclude name="axis2-codegen*.jar"/ -->
- <exclude name="jibx-bind*.jar"/>
+ <exclude name="commons-cli-*.jar" />
+ <exclude name="jalopy-*.jar" />
+ <exclude name="jibx-bind-*.jar" />
+ <exclude name="bcel-*.jar" />
+ <exclude name="qdox-*.jar" />
</lib>
<webinf dir="${temp}/WEB-INF" />
<fileset dir="${temp}">
+ <include
name="org/apache/axis2/soapmonitor/applet/**/*" />
<include name="**/axis2-web/**" />
</fileset>
</war>
Modified: axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml?rev=1806353&r1=1806352&r2=1806353&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/systests/webapp-tests/pom.xml Sun Aug 27
11:48:58 2017
@@ -83,13 +83,12 @@
<configuration>
<name>webapp</name>
<value>%file%</value>
- <artifacts>
- <artifact>
- <groupId>${project.groupId}</groupId>
- <artifactId>axis2-webapp</artifactId>
- <type>war</type>
- </artifact>
- </artifacts>
+ <dependencySet>
+ <scope>test</scope>
+ <includes>
+ <include>*:axis2-webapp:war:*</include>
+ </includes>
+ </dependencySet>
</configuration>
</execution>
<execution>
