Author: veithen
Date: Sun Aug 27 11:10:51 2017
New Revision: 1806350
URL: http://svn.apache.org/viewvc?rev=1806350&view=rev
Log:
AXIS2-5865: Ensure that the Web app produced by webapp/build.xml contains the
same files as the Web app built by Maven.
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/trunk/modules/webapp/pom.xml
axis/axis2/java/core/trunk/modules/webapp/scripts/build.xml
axis/axis2/java/core/trunk/systests/webapp-tests/pom.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1806350&r1=1806349&r2=1806350&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Aug 27 11:10:51
2017
@@ -191,6 +191,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>
@@ -320,6 +326,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>
@@ -340,6 +368,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>
@@ -352,6 +413,7 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/tmp-repository</outputDirectory>
+ <stripServiceVersion>false</stripServiceVersion>
<generateFileLists>true</generateFileLists>
</configuration>
</execution>
@@ -426,6 +488,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/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1806350&r1=1806349&r2=1806350&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
Sun Aug 27 11:10:51 2017
@@ -213,15 +213,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/trunk/modules/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=1806350&r1=1806349&r2=1806350&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Sun Aug 27 11:10:51 2017
@@ -143,6 +143,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/trunk/modules/webapp/scripts/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/scripts/build.xml?rev=1806350&r1=1806349&r2=1806350&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/scripts/build.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/scripts/build.xml Sun Aug 27
11:10:51 2017
@@ -72,15 +72,20 @@
<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="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/trunk/systests/webapp-tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/systests/webapp-tests/pom.xml?rev=1806350&r1=1806349&r2=1806350&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/systests/webapp-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/systests/webapp-tests/pom.xml Sun Aug 27
11:10:51 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>
