Author: asankha
Date: Thu May 10 10:19:34 2007
New Revision: 536943
URL: http://svn.apache.org/viewvc?view=rev&rev=536943
Log:
Cleanup and streamline use of certificates - no code changes
- create new demo cert to replace previous that would expire in a few days
- create two keystores identity.jks and trust.jks replacing the previous
ketstore.jks
- update sample client script to use the trust store
- move keystores to the lib directory as they are loaded from the classpath
under the JVM
Added:
webservices/synapse/trunk/java/modules/core/src/main/resources/axis2Identity.jks
webservices/synapse/trunk/java/modules/core/src/main/resources/axis2Trust.jks
webservices/synapse/trunk/java/modules/core/src/main/resources/identity.jks
(with props)
webservices/synapse/trunk/java/modules/core/src/main/resources/synapseIdentity.jks
webservices/synapse/trunk/java/modules/core/src/main/resources/synapseTrust.jks
webservices/synapse/trunk/java/modules/core/src/main/resources/trust.jks
(with props)
Removed:
webservices/synapse/trunk/java/repository/conf/axis2Identity.jks
webservices/synapse/trunk/java/repository/conf/axis2Trust.jks
webservices/synapse/trunk/java/repository/conf/keystore.jks
webservices/synapse/trunk/java/repository/conf/synapseIdentity.jks
webservices/synapse/trunk/java/repository/conf/synapseTrust.jks
Modified:
webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh
webservices/synapse/trunk/java/modules/samples/src/main/scripts/build.xml
webservices/synapse/trunk/java/repository/conf/axis2.xml
webservices/synapse/trunk/java/repository/conf/sample/resources/misc/server/axis2.xml
webservices/synapse/trunk/java/src/main/assembly/bin.xml
webservices/synapse/trunk/java/src/main/bin/synapse.bat
webservices/synapse/trunk/java/src/main/bin/synapse.sh
Added:
webservices/synapse/trunk/java/modules/core/src/main/resources/axis2Identity.jks
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/resources/axis2Identity.jks?view=auto&rev=536943
==============================================================================
Binary files /tmp/tmpoJOjWx and /tmp/tmpks3bNf differ
Added:
webservices/synapse/trunk/java/modules/core/src/main/resources/axis2Trust.jks
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/resources/axis2Trust.jks?view=auto&rev=536943
==============================================================================
Binary files /tmp/tmp_GCOEI and /tmp/tmppepCm7 differ
Added:
webservices/synapse/trunk/java/modules/core/src/main/resources/identity.jks
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/resources/identity.jks?view=auto&rev=536943
==============================================================================
Binary file - no diff available.
Propchange:
webservices/synapse/trunk/java/modules/core/src/main/resources/identity.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
webservices/synapse/trunk/java/modules/core/src/main/resources/synapseIdentity.jks
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/resources/synapseIdentity.jks?view=auto&rev=536943
==============================================================================
Binary files /tmp/tmpuWhsE- and /tmp/tmpnpC-yq differ
Added:
webservices/synapse/trunk/java/modules/core/src/main/resources/synapseTrust.jks
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/resources/synapseTrust.jks?view=auto&rev=536943
==============================================================================
Binary files /tmp/tmpZaqSFX and /tmp/tmp4xu-mU differ
Added: webservices/synapse/trunk/java/modules/core/src/main/resources/trust.jks
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/resources/trust.jks?view=auto&rev=536943
==============================================================================
Binary file - no diff available.
Propchange:
webservices/synapse/trunk/java/modules/core/src/main/resources/trust.jks
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=536943&r1=536942&r2=536943
==============================================================================
---
webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh
(original)
+++
webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh
Thu May 10 10:19:34 2007
@@ -80,7 +80,7 @@
fi
# update classpath
-AXIS2_CLASSPATH="$AXIS2_HOME/../../lib":"$AXIS2_HOME/../../repository/conf"
+AXIS2_CLASSPATH="$AXIS2_HOME/../../lib"
for f in "$AXIS2_HOME"/../../lib/*.jar
do
AXIS2_CLASSPATH="$AXIS2_CLASSPATH":$f
Modified:
webservices/synapse/trunk/java/modules/samples/src/main/scripts/build.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/scripts/build.xml?view=diff&rev=536943&r1=536942&r2=536943
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/src/main/scripts/build.xml
(original)
+++ webservices/synapse/trunk/java/modules/samples/src/main/scripts/build.xml
Thu May 10 10:19:34 2007
@@ -83,12 +83,6 @@
<property name="opt_file" value=""/>
<property name="class.dir" value="target/classes"/>
- <path id="axis.classpath">
- <fileset dir="../../lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
<target name="clean">
<delete dir="target" quiet="true"/>
<delete dir="${class.dir}" quiet="true"/>
@@ -106,6 +100,14 @@
<sysproperty key="policy" value="${policy}"/>
<sysproperty key="rest" value="${rest}"/>
<sysproperty key="wsrm" value="${wsrm}"/>
+ <sysproperty key="javax.net.ssl.trustStore"
value="./../../lib/trust.jks"/>
+ <sysproperty key="javax.net.ssl.trustStorePassword"
value="password"/>
+ <!--
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Djava.compiler=none"/>
+ <jvmarg
value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"/>
+ -->
</java>
</target>
@@ -135,7 +137,15 @@
<sysproperty key="opt_mode" value="${opt_mode}"/>
<sysproperty key="opt_url" value="${opt_url}"/>
<sysproperty key="opt_file" value="${opt_file}"/>
- </java>
+ <sysproperty key="javax.net.ssl.trustStore"
value="./../../lib/trust.jks"/>
+ <sysproperty key="javax.net.ssl.trustStorePassword"
value="password"/>
+ <!--
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Djava.compiler=none"/>
+ <jvmarg
value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"/>
+ -->
+ </java>
</target>
<target name="loadbalancefailover" depends="compile">
@@ -156,7 +166,7 @@
<sysproperty key="load" value="${load}"/>
<sysproperty key="msg" value="${msg}"/>
<sysproperty key="t" value="${t}"/>
- <sysproperty key="session" value="${session}"/>
+ <sysproperty key="session" value="${session}"/>
</java>
</target>
@@ -164,6 +174,7 @@
<mkdir dir="${class.dir}"/>
<path id="javac.classpath">
<pathelement path="${class.dir}"/>
+ <pathelement path="../../lib"/>
<fileset dir="../../lib">
<include name="**/*.jar"/>
</fileset>
@@ -176,4 +187,4 @@
</javac>
</target>
-</project>
+</project>
\ No newline at end of file
Modified: webservices/synapse/trunk/java/repository/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/axis2.xml?view=diff&rev=536943&r1=536942&r2=536943
==============================================================================
--- webservices/synapse/trunk/java/repository/conf/axis2.xml (original)
+++ webservices/synapse/trunk/java/repository/conf/axis2.xml Thu May 10
10:19:34 2007
@@ -139,7 +139,7 @@
<parameter name="non-blocking" locked="false">true</parameter>
<parameter name="keystore" locked="false">
<KeyStore>
- <Location>keystore.jks</Location>
+ <Location>identity.jks</Location>
<Type>JKS</Type>
<Password>password</Password>
<KeyPassword>password</KeyPassword>
@@ -147,7 +147,7 @@
</parameter>
<parameter name="truststore" locked="false">
<TrustStore>
- <Location>keystore.jks</Location>
+ <Location>trust.jks</Location>
<Type>JKS</Type>
<Password>password</Password>
</TrustStore>
@@ -190,7 +190,7 @@
<parameter name="non-blocking" locked="false">true</parameter>
<parameter name="keystore" locked="false">
<KeyStore>
- <Location>keystore.jks</Location>
+ <Location>identity.jks</Location>
<Type>JKS</Type>
<Password>password</Password>
<KeyPassword>password</KeyPassword>
@@ -198,7 +198,7 @@
</parameter>
<parameter name="truststore" locked="false">
<TrustStore>
- <Location>keystore.jks</Location>
+ <Location>trust.jks</Location>
<Type>JKS</Type>
<Password>password</Password>
</TrustStore>
Modified:
webservices/synapse/trunk/java/repository/conf/sample/resources/misc/server/axis2.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/resources/misc/server/axis2.xml?view=diff&rev=536943&r1=536942&r2=536943
==============================================================================
---
webservices/synapse/trunk/java/repository/conf/sample/resources/misc/server/axis2.xml
(original)
+++
webservices/synapse/trunk/java/repository/conf/sample/resources/misc/server/axis2.xml
Thu May 10 10:19:34 2007
@@ -139,7 +139,7 @@
<parameter name="non-blocking" locked="false">true</parameter>
<parameter name="keystore" locked="false">
<KeyStore>
- <Location>keystore.jks</Location>
+ <Location>identity.jks</Location>
<Type>JKS</Type>
<Password>password</Password>
<KeyPassword>password</KeyPassword>
@@ -147,7 +147,7 @@
</parameter>
<parameter name="truststore" locked="false">
<TrustStore>
- <Location>keystore.jks</Location>
+ <Location>trust.jks</Location>
<Type>JKS</Type>
<Password>password</Password>
</TrustStore>
@@ -190,7 +190,7 @@
<parameter name="non-blocking" locked="false">true</parameter>
<parameter name="keystore" locked="false">
<KeyStore>
- <Location>keystore.jks</Location>
+ <Location>identity.jks</Location>
<Type>JKS</Type>
<Password>password</Password>
<KeyPassword>password</KeyPassword>
@@ -198,7 +198,7 @@
</parameter>
<parameter name="truststore" locked="false">
<TrustStore>
- <Location>keystore.jks</Location>
+ <Location>trust.jks</Location>
<Type>JKS</Type>
<Password>password</Password>
</TrustStore>
Modified: webservices/synapse/trunk/java/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/assembly/bin.xml?view=diff&rev=536943&r1=536942&r2=536943
==============================================================================
--- webservices/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ webservices/synapse/trunk/java/src/main/assembly/bin.xml Thu May 10
10:19:34 2007
@@ -66,6 +66,8 @@
<outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
<includes>
<include>log4j.properties</include>
+ <include>identity.jks</include>
+ <include>trust.jks</include>
</includes>
</fileSet>
<fileSet>
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=536943&r1=536942&r2=536943
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/synapse.bat (original)
+++ webservices/synapse/trunk/java/src/main/bin/synapse.bat Thu May 10 10:19:34
2007
@@ -92,7 +92,7 @@
:runSynapse
rem set the classes by looping through the libs
setlocal EnableDelayedExpansion
-set SYNAPSE_CLASS_PATH="%SYNAPSE_HOME%/lib";"%SYNAPSE_HOME%/repository/conf"
+set SYNAPSE_CLASS_PATH="%SYNAPSE_HOME%/lib"
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%
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=536943&r1=536942&r2=536943
==============================================================================
--- webservices/synapse/trunk/java/src/main/bin/synapse.sh (original)
+++ webservices/synapse/trunk/java/src/main/bin/synapse.sh Thu May 10 10:19:34
2007
@@ -84,7 +84,7 @@
fi
# update classpath
-SYNAPSE_CLASSPATH="$SYNAPSE_HOME/lib":"$SYNAPSE_HOME/repository/conf"
+SYNAPSE_CLASSPATH="$SYNAPSE_HOME/lib"
for f in $SYNAPSE_HOME/lib/*.jar
do
SYNAPSE_CLASSPATH=$SYNAPSE_CLASSPATH:$f
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
