[wsas-java-dev] svn commit r689 - in wsas/java/trunk/modules/distribution: . webapp webapp/src/assemble

[svn at wso2.com]

Author: azeez
Date: Fri Feb  2 09:42:28 2007
New Revision: 689

Modified:
   wsas/java/trunk/modules/distribution/pom.xml
   wsas/java/trunk/modules/distribution/webapp/pom.xml
   wsas/java/trunk/modules/distribution/webapp/src/assemble/dist-webapp-assembly.xml
Log:
Fixed the release

Modified: wsas/java/trunk/modules/distribution/pom.xml
==============================================================================
--- wsas/java/trunk/modules/distribution/pom.xml	(original)
+++ wsas/java/trunk/modules/distribution/pom.xml	Fri Feb  2 09:42:28 2007
@@ -97,8 +97,8 @@
     <modules>
         <module>common</module>
         <module>standalone</module>
-        <!--<module>webapp</module>-->
-        <!--<module>release</module>-->
+        <module>webapp</module>
+        <module>release</module>
     </modules>
 
 </project>
\ No newline at end of file

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	Fri Feb  2 09:42:28 2007
@@ -22,7 +22,22 @@
                     <name>release</name>
                 </property>
             </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk13</artifactId>
+                    <version>${bcprov.jdk13.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15</artifactId>
+                    <version>${bcprov.jdk15.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
             <build>
+
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -39,7 +54,6 @@
                                     <descriptors>
                                         <descriptor>
                                             src/assemble/dist-webapp-assembly.xml</descriptor>
-                                        <!--<descriptor>src/main/assembly/src.xml</descriptor>-->
                                     </descriptors>
                                     <finalName>webapp</finalName>
                                 </configuration>
@@ -162,7 +176,7 @@
                                                 value="${server.short.name}"/>
                                         <filter token="wso2wsas_version"
                                                 value="${wso2wsas.version}"/>
-                                        
+
                                         <mkdir dir="${dist.dir.temp.war.www}"/>
                                         <unzip src="target/zips/wso2adminui-${wso2.adminui.version}.zip"
                                                dest="${dist.dir.temp.war.www}"/>
@@ -288,16 +302,19 @@
 
                                         <echo message="#### Copy Sample EPR properties files ###"/>
                                         <copy tofile="${dist.temp.dir}/samples/CommodityQuote/conf/default_epr.properties"
-                                                overwrite="true">
-                                            <fileset file="../../samples/CommodityQuote/conf/default_epr_web.properties"/>
+                                              overwrite="true">
+                                            <fileset
+                                                    file="../../samples/CommodityQuote/conf/default_epr_web.properties"/>
                                         </copy>
                                         <copy tofile="${dist.temp.dir}/samples/Trader/conf/default_epr.properties"
-                                                overwrite="true">
-                                            <fileset file="../../samples/Trader/conf/default_epr_web.properties"/>
+                                              overwrite="true">
+                                            <fileset
+                                                    file="../../samples/Trader/conf/default_epr_web.properties"/>
                                         </copy>
                                         <copy tofile="${dist.temp.dir}/samples/JavascriptService/conf/default_epr.properties"
-                                                overwrite="true">
-                                            <fileset file="../../samples/JavascriptService/conf/default_epr_web.properties"/>
+                                              overwrite="true">
+                                            <fileset
+                                                    file="../../samples/JavascriptService/conf/default_epr_web.properties"/>
                                         </copy>
                                         <echo message="################ END ####################"/>
 

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	Fri Feb  2 09:42:28 2007
@@ -77,8 +77,8 @@
                 <exclude>org.slf4j:slf4j-log4j12:jar</exclude>
                 <exclude>org.apache.derby:derby:jar</exclude>
                 <exclude>log4j:log4j:jar</exclude>
-                <include>bouncycastle:bcprov-jdk13:jar</include>
-                <include>bouncycastle:bcprov-jdk15:jar</include>
+                <!--<include>bouncycastle:bcprov-jdk13:jar</include>-->
+                <!--<include>bouncycastle:bcprov-jdk15:jar</include>-->
             </excludes>
         </dependencySet>
     </dependencySets>