[jboss-svn-commits] JBL Code SVN: r21022 - labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2008-07-14 06:14:06 -0400 (Mon, 14 Jul 2008)
New Revision: 21022

Modified:
   labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/HttpRouter-localhost-https-9433.properties
   labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/deployment.xml
Log:
Fix properties/dependencies: JBESB-1703

Modified: labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/HttpRouter-localhost-https-9433.properties
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/HttpRouter-localhost-https-9433.properties	2008-07-13 11:42:02 UTC (rev 21021)
+++ labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/HttpRouter-localhost-https-9433.properties	2008-07-14 10:14:06 UTC (rev 21022)
@@ -9,7 +9,7 @@
 protocol-socket-factory=org.apache.commons.httpclient.contrib.ssl.EasySSLProtocolSocketFactory
 #protocol-socket-factory=org.jboss.soa.esb.http.protocol.SelfSignedSSLProtocolSocketFactoryBuilder
 #protocol-socket-factory=org.jboss.soa.esb.http.protocol.AuthSSLProtocolSocketFactoryBuilder
-keystore=file:/@keystore@
+keystore=@keystore@
 keystore-passw=https_2way_ssl_pass
-truststore=file:/@keystore@
-truststore-passw=https_2way_ssl_pass
\ No newline at end of file
+truststore=@keystore@
+truststore-passw=https_2way_ssl_pass

Modified: labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/build.xml	2008-07-13 11:42:02 UTC (rev 21021)
+++ labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/build.xml	2008-07-14 10:14:06 UTC (rev 21022)
@@ -11,12 +11,8 @@
 	<import file="../conf/base-build.xml"/>
 
     <target name="quickstart-specific-assemblies">
-        <pathconvert targetos="unix" property="keystoredir">
-            <path><pathelement location="${org.jboss.esb.server.home}"/></path>
-        </pathconvert>
+        <property name="keystore" location="${build.dir}/https_2way_ssl.keystore" />
 
-        <property name="keystore" value="${keystoredir}/https_2way_ssl.keystore" />
-
         <delete file="${keystore}" failonerror="false"/>
         <genkey keystore="${keystore}" storepass="https_2way_ssl_pass" keypass="https_2way_ssl_pass" keyalg="DSA" alias="https_2way_ssl">
             <dname>
@@ -26,15 +22,19 @@
                 <param name="C" value="IE"/>
             </dname>
         </genkey>
+    	
+        <pathconvert targetos="unix" property="keystoredir">
+            <path><pathelement location="${keystore}"/></path>
+        </pathconvert>
 
-        <copy file="jboss-esb-template.xml" tofile="build/META-INF/jboss-esb.xml">
+        <copy file="jboss-esb-template.xml" tofile="${build.dir}/META-INF/jboss-esb.xml">
             <filterset>
-                <filter token="keystore" value="${keystore}" />
+                <filter token="keystore" value="${keystoredir}" />
             </filterset>
         </copy>
-        <copy file="HttpRouter-localhost-https-9433.properties" todir="build/META-INF">
+        <copy file="HttpRouter-localhost-https-9433.properties" todir="${build.dir}/META-INF">
             <filterset>
-                <filter token="keystore" value="${keystore}" />
+                <filter token="keystore" value="${keystoredir}" />
             </filterset>
         </copy>
     </target>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/deployment.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/deployment.xml	2008-07-13 11:42:02 UTC (rev 21021)
+++ labs/jbossesb/trunk/product/samples/quickstarts/https_2way_ssl/deployment.xml	2008-07-14 10:14:06 UTC (rev 21022)
@@ -1,4 +1,4 @@
 <jbossesb-deployment>
-    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_https_2way_ssl_esb</depends>
+    <depends>jboss.esb.quickstart.destination:service=Queue,name=quickstart_https_2way_ssl_esb_runtest_gw</depends>
     <!-- depends>jboss.remoting:service=ServerSocketFactory,type=SSL</depends -->
 </jbossesb-deployment>