You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/04/27 15:53:11 UTC
svn commit: r533098 - in /webservices/synapse/trunk/java:
modules/samples/src/main/scripts/axis2server.bat
modules/samples/src/main/scripts/axis2server.sh pom.xml
src/main/bin/synapse.bat src/main/bin/synapse.sh
Author: asankha
Date: Fri Apr 27 06:53:11 2007
New Revision: 533098
URL: http://svn.apache.org/viewvc?view=rev&rev=533098
Log:
include bouncy castle jars for both JDK 1.4 and 1.5 and select correct one from the synapse and axis2server scripts
Modified:
webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.bat
webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh
webservices/synapse/trunk/java/pom.xml
webservices/synapse/trunk/java/src/main/bin/synapse.bat
webservices/synapse/trunk/java/src/main/bin/synapse.sh
Modified: webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.bat
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.bat?view=diff&rev=533098&r1=533097&r2=533098
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.bat (original)
+++ webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.bat Fri Apr 27 06:53:11 2007
@@ -98,6 +98,21 @@
set AXIS2_CLASS_PATH=%AXIS2_HOME%/../../lib;%AXIS2_HOME%/../../repository/conf
FOR %%c in ("%AXIS2_HOME%\..\..\lib\*.jar") DO set AXIS2_CLASS_PATH=!AXIS2_CLASS_PATH!;%%c
+rem use proper bouncy castle version for the JDK
+
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.4" >NUL
+IF ERRORLEVEL 1 goto checkJdk15
+echo Using Bouncy castle JAR for Java 1.4
+FOR %%C in ("%AXIS2_HOME%\lib\bcprov-jdk13*.jar") DO set AXIS2_CLASS_PATH="%%~fC";!AXIS2_CLASS_PATH!
+goto runServer
+
+:checkJdk15
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.5" >NUL
+IF ERRORLEVEL 1 goto runServer
+echo Using Bouncy castle JAR for Java 1.5
+FOR %%C in ("%AXIS2_HOME%\lib\bcprov-jdk15*.jar") DO set AXIS2_CLASS_PATH="%%~fC";!AXIS2_CLASS_PATH!
+
+:runServer
set AXIS2_ENDORSED=%AXIS2_HOME%\..\..\lib\endorsed
echo Using JAVA_HOME %JAVA_HOME%
echo Using AXIS2_HOME %AXIS2_HOME%
Modified: webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh?view=diff&rev=533098&r1=533097&r2=533098
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh (original)
+++ webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh Fri Apr 27 06:53:11 2007
@@ -87,6 +87,24 @@
done
AXIS2_CLASSPATH="$JAVA_HOME/lib/tools.jar":"$AXIS2_CLASSPATH":"$CLASSPATH"
+# use proper bouncy castle version for the JDK
+jdk_15=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.5`
+jdk_14=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.4`
+
+if [ "$jdk_15" ]; then
+ echo " Using Bouncy castle JAR for Java 1.5"
+ for f in $AXIS2_HOME/lib/bcprov-jdk15*.jar
+ do
+ AXIS2_CLASSPATH=$f:$AXIS2_CLASSPATH
+ done
+elif [ "$jdk_14" ]; then
+ echo " Using Bouncy castle JAR for Java 1.4"
+ for f in $AXIS2_HOME/lib/bcprov-jdk13*.jar
+ do
+ AXIS2_CLASSPATH=$f:$AXIS2_CLASSPATH
+ done
+fi
+
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
Modified: webservices/synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?view=diff&rev=533098&r1=533097&r2=533098
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Fri Apr 27 06:53:11 2007
@@ -531,6 +531,13 @@
</exclusions>
</dependency>
+ <!-- dependencies for Rampart -->
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk13</artifactId>
+ <version>${bcprov.jdk13.version}</version>
+ </dependency>
+
</dependencies>
<reporting>
@@ -633,6 +640,7 @@
<sandesha2.version>1.1</sandesha2.version>
<neethi.version>2.0.1</neethi.version>
<wss4j.version>SNAPSHOT</wss4j.version>
+ <bcprov.jdk13.version>132</bcprov.jdk13.version>
<xerces.version>2.8.1</xerces.version>
<xalan.version>2.7.0</xalan.version>
Modified: webservices/synapse/trunk/java/src/main/bin/synapse.bat
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/synapse.bat?view=diff&rev=533098&r1=533097&r2=533098
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/synapse.bat (original)
+++ webservices/synapse/trunk/java/src/main/bin/synapse.bat Fri Apr 27 06:53:11 2007
@@ -110,6 +110,21 @@
FOR %%C in ("%SYNAPSE_HOME%\lib\*.jar") DO set SYNAPSE_CLASS_PATH=!SYNAPSE_CLASS_PATH!;"%%~fC"
set SYNAPSE_CLASS_PATH="%SYNAPSE_HOME%\lib";%SYNAPSE_CLASS_PATH%
+rem use proper bouncy castle version for the JDK
+
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.4" >NUL
+IF ERRORLEVEL 1 goto checkJdk15
+echo Using Bouncy castle JAR for Java 1.4
+FOR %%C in ("%SYNAPSE_HOME%\lib\bcprov-jdk13*.jar") DO set SYNAPSE_CLASS_PATH="%%~fC";!SYNAPSE_CLASS_PATH!
+goto runServer
+
+:checkJdk15
+"%JAVA_HOME%\bin\java" -version 2>&1 | findstr "1.5" >NUL
+IF ERRORLEVEL 1 goto runServer
+echo Using Bouncy castle JAR for Java 1.5
+FOR %%C in ("%SYNAPSE_HOME%\lib\bcprov-jdk15*.jar") DO set SYNAPSE_CLASS_PATH="%%~fC";!SYNAPSE_CLASS_PATH!
+
+:runServer
rem if a sample configuration is not specified, use default
if "%_SYNAPSE_XML%" == "" set _SYNAPSE_XML=-Dsynapse.xml="%SYNAPSE_HOME%\repository\conf\synapse.xml"
Modified: webservices/synapse/trunk/java/src/main/bin/synapse.sh
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/bin/synapse.sh?view=diff&rev=533098&r1=533097&r2=533098
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/synapse.sh (original)
+++ webservices/synapse/trunk/java/src/main/bin/synapse.sh Fri Apr 27 06:53:11 2007
@@ -91,6 +91,24 @@
done
SYNAPSE_CLASSPATH=$JAVA_HOME/lib/tools.jar:$SYNAPSE_CLASSPATH:$CLASSPATH
+# use proper bouncy castle version for the JDK
+jdk_15=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.5`
+jdk_14=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.4`
+
+if [ "$jdk_15" ]; then
+ echo " Using Bouncy castle JAR for Java 1.5"
+ for f in $SYNAPSE_HOME/lib/bcprov-jdk15*.jar
+ do
+ SYNAPSE_CLASSPATH=$f:$SYNAPSE_CLASSPATH
+ done
+elif [ "$jdk_14" ]; then
+ echo " Using Bouncy castle JAR for Java 1.4"
+ for f in $SYNAPSE_HOME/lib/bcprov-jdk13*.jar
+ do
+ SYNAPSE_CLASSPATH=$f:$SYNAPSE_CLASSPATH
+ done
+fi
+
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org