Merged some final fixes (r990398,990404) of the binary distribution to the 1.5 branch.
diff --git a/1_5/modules/distribution/src/main/assembly/bin-assembly.xml b/1_5/modules/distribution/src/main/assembly/bin-assembly.xml
index 4d16f9a..1996c6b 100755
--- a/1_5/modules/distribution/src/main/assembly/bin-assembly.xml
+++ b/1_5/modules/distribution/src/main/assembly/bin-assembly.xml
@@ -66,17 +66,6 @@
</fileSet>
<!--********************** creating the webappp ********************** -->
- <!-- copy the web.xml into webapp/WEB-INF directory -->
-
- <fileSet>
- <directory>../../modules/webapp/conf</directory>
- <outputDirectory>webapp/WEB-INF</outputDirectory>
- <includes>
- <include>web.xml</include>
- </includes>
- </fileSet>
-
-
<!-- copy the build.xml into webapp directory -->
<fileSet>
<directory>../../modules/webapp/scripts</directory>
@@ -86,38 +75,6 @@
</includes>
</fileSet>
- <!-- copy class files to webapp/WEB-INF/classes directory -->
- <fileSet>
- <directory>../../modules/webapp/target/classes</directory>
- <outputDirectory>webapp/WEB-INF/classes</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
-
- <!-- copy *.properties to webapp/WEB-INF/classes directory -->
- <fileSet>
- <directory>../../modules/kernel/conf</directory>
- <outputDirectory>webapp/WEB-INF/classes</outputDirectory>
- <includes>
- <include>*.properties</include>
- </includes>
- </fileSet>
-
- <!-- copy contents of the webapp module -->
-
- <fileSet>
- <directory>../../modules/webapp/src/main/webapp</directory>
- <outputDirectory>webapp</outputDirectory>
- <excludes>
- <exclude>project.xml</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/.*</exclude>
- <exclude>**/conf/**</exclude>
- <exclude>**/scripts/**</exclude>
- </excludes>
- </fileSet>
-
<fileSet>
<directory>../../legal</directory>
<outputDirectory>lib</outputDirectory>
@@ -197,6 +154,7 @@
<dependencySets>
<dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<includes>
<include>*:*:jar</include>
@@ -217,5 +175,20 @@
<exclude>javax.servlet:servlet-api</exclude>
</excludes>
</dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.apache.axis2:axis2-webapp</include>
+ </includes>
+ <unpack>true</unpack>
+ <outputDirectory>webapp</outputDirectory>
+ <unpackOptions>
+ <includes>
+ <include>WEB-INF/classes/**/*</include>
+ <include>WEB-INF/web.xml</include>
+ <include>axis2-web/**/*</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
</dependencySets>
</assembly>
