[wsas-java-dev] svn commit r353 - in wsas/java/trunk/modules: core/bin distribution/webapp distribution/webapp/src/assemble wsf-common-tools/bin

[svn at wso2.com]

Author: saminda
Date: Mon Jan  8 01:54:47 2007
New Revision: 353

Added:
   wsas/java/trunk/modules/core/bin/chpasswd.bat
      - copied unchanged from r347, wsas/java/trunk/modules/wsf-common-tools/bin/chpasswd.bat
   wsas/java/trunk/modules/core/bin/chpasswd.sh
      - copied unchanged from r347, wsas/java/trunk/modules/wsf-common-tools/bin/chpasswd.sh
Removed:
   wsas/java/trunk/modules/wsf-common-tools/bin/chpasswd.bat
   wsas/java/trunk/modules/wsf-common-tools/bin/chpasswd.sh
Modified:
   wsas/java/trunk/modules/distribution/webapp/pom.xml
   wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
Log:
changes to build the servlet distribution


Modified: wsas/java/trunk/modules/distribution/webapp/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/webapp/pom.xml	(original)
+++ wsas/java/trunk/modules/distribution/webapp/pom.xml	Mon Jan  8 01:54:47 2007
@@ -105,6 +105,15 @@
                                             <overWrite>true</overWrite>
                                             <outputDirectory>${war.temp.dir}/WEB-INF/lib</outputDirectory>
                                         </artifactItem>
+
+                                        <artifactItem>
+                                            <groupId>org.wso2.wsas</groupId>
+                                            <artifactId>wso2wsas-servlet-edition</artifactId>
+                                            <version>${pom.version}</version>
+                                            <type>jar</type>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${war.temp.dir}/WEB-INF/lib</outputDirectory>
+                                        </artifactItem>
                                     </artifactItems>
                                 </configuration>
                             </execution>

Modified: wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml	(original)
+++ wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml	Mon Jan  8 01:54:47 2007
@@ -19,14 +19,6 @@
             </excludes>
         </fileSet>
         <fileSet>
-            <directory>../../wsf-common-tools/bin</directory>
-            <outputDirectory>${war.temp.assembly.dir}/bin</outputDirectory>
-            <includes>
-                <include>chpasswd.sh</include>
-                <include>chpasswd.bat</include>
-            </includes>
-        </fileSet>
-        <fileSet>
             <directory>../../servlet-edition/bin</directory>
             <outputDirectory>${war.temp.assembly.dir}/bin</outputDirectory>
             <includes>