[wsas-java-dev] svn commit r254 - in wsas/java/trunk: . modules/admin modules/core modules/distribution modules/integration modules/samples modules/servlet-edition

[svn at wso2.com]

Author: saminda
Date: Tue Dec 19 01:18:07 2006
New Revision: 254

Removed:
   wsas/java/trunk/modules/distribution/
Modified:
   wsas/java/trunk/modules/admin/pom.xml
   wsas/java/trunk/modules/core/pom.xml
   wsas/java/trunk/modules/integration/pom.xml
   wsas/java/trunk/modules/samples/pom.xml
   wsas/java/trunk/modules/servlet-edition/pom.xml
   wsas/java/trunk/pom.xml
Log:
fix for bouncycastle 


Modified: wsas/java/trunk/modules/admin/pom.xml
==============================================================================
--- wsas/java/trunk/modules/admin/pom.xml	(original)
+++ wsas/java/trunk/modules/admin/pom.xml	Tue Dec 19 01:18:07 2006
@@ -195,14 +195,14 @@
             <groupId>xml-security</groupId>
             <artifactId>xmlsec</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk13</artifactId>
         </dependency>
         <dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk15</artifactId>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: wsas/java/trunk/modules/core/pom.xml
==============================================================================
--- wsas/java/trunk/modules/core/pom.xml	(original)
+++ wsas/java/trunk/modules/core/pom.xml	Tue Dec 19 01:18:07 2006
@@ -187,14 +187,14 @@
             <groupId>xml-security</groupId>
             <artifactId>xmlsec</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk13</artifactId>
         </dependency>
         <dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk15</artifactId>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: wsas/java/trunk/modules/integration/pom.xml
==============================================================================
--- wsas/java/trunk/modules/integration/pom.xml	(original)
+++ wsas/java/trunk/modules/integration/pom.xml	Tue Dec 19 01:18:07 2006
@@ -244,14 +244,14 @@
             <groupId>xml-security</groupId>
             <artifactId>xmlsec</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk13</artifactId>
         </dependency>
         <dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk15</artifactId>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: wsas/java/trunk/modules/samples/pom.xml
==============================================================================
--- wsas/java/trunk/modules/samples/pom.xml	(original)
+++ wsas/java/trunk/modules/samples/pom.xml	Tue Dec 19 01:18:07 2006
@@ -195,14 +195,14 @@
             <groupId>xml-security</groupId>
             <artifactId>xmlsec</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk13</artifactId>
         </dependency>
         <dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk15</artifactId>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: wsas/java/trunk/modules/servlet-edition/pom.xml
==============================================================================
--- wsas/java/trunk/modules/servlet-edition/pom.xml	(original)
+++ wsas/java/trunk/modules/servlet-edition/pom.xml	Tue Dec 19 01:18:07 2006
@@ -195,14 +195,14 @@
             <groupId>xml-security</groupId>
             <artifactId>xmlsec</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk13</artifactId>
         </dependency>
         <dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk15</artifactId>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: wsas/java/trunk/pom.xml
==============================================================================
--- wsas/java/trunk/pom.xml	(original)
+++ wsas/java/trunk/pom.xml	Tue Dec 19 01:18:07 2006
@@ -377,16 +377,7 @@
                 <artifactId>xmlsec</artifactId>
                 <version>${xmlsec.version}</version>
             </dependency>
-            <dependency>
-                <groupId>bouncycastle</groupId>
-                <artifactId>bcprov-jdk13</artifactId>
-                <version>${bcprov.jdk13.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>bouncycastle</groupId>
-                <artifactId>bcprov-jdk15</artifactId>
-                <version>${bcprov.jdk15.version}</version>
-            </dependency>
+
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -536,21 +527,6 @@
                 <artifactId>js</artifactId>
                 <version>${rhino.js.version}</version>
             </dependency>
-            <!--<dependency>
-                <groupId>jalopy</groupId>
-                <artifactId>jalopy</artifactId>
-                <version>${jalopy.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>jakarta-oro</groupId>
-                <artifactId>jakarta-oro</artifactId>
-                <version>${jakarta.oro.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>jdom</groupId>
-                <artifactId>jdom</artifactId>
-                <version>${jdom.version}</version>
-            </dependency>-->
             <dependency>
                 <groupId>httpcomponents-httpcore</groupId>
                 <artifactId>jakarta-httpcore</artifactId>
@@ -580,9 +556,42 @@
                 <version>${spring.version}</version>
             </dependency>
 
+
         </dependencies>
     </dependencyManagement>
 
+    <profiles>
+        <profile>
+            <id>jdk14</id>
+            <activation>
+                <jdk>1.4</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk13</artifactId>
+                    <version>${bcprov.jdk13.version}</version>
+                </dependency>
+            </dependencies>
+
+        </profile>
+
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk15</artifactId>
+                    <version>${bcprov.jdk15.version}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
+    </profiles>
+
     <modules>
         <module>modules/core</module>
         <module>modules/admin</module>
@@ -686,6 +695,8 @@
 
         <wso2.adminui.version>1.1</wso2.adminui.version>
 
+        <server.short.name>WSO2 WSAS</server.short.name>
+
 
     </properties>