[jboss-cvs] JBossAS SVN: r110424 - in projects/jboss-jca/branches/performance/jmeter: src/main/resources and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jan 21 15:21:47 EST 2011 

Author: whitingjr
Date: 2011-01-21 15:21:46 -0500 (Fri, 21 Jan 2011)
New Revision: 110424

Modified:
   projects/jboss-jca/branches/performance/jmeter/build.xml
   projects/jboss-jca/branches/performance/jmeter/src/main/resources/database.properties
   projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-local-h2-ds.xml
Log:
Updated server startup and shutdown to use hostname. Cleaned up database property names. Commented out connection validator class name.

Modified: projects/jboss-jca/branches/performance/jmeter/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/jmeter/build.xml	2011-01-21 18:38:28 UTC (rev 110423)
+++ projects/jboss-jca/branches/performance/jmeter/build.xml	2011-01-21 20:21:46 UTC (rev 110424)
@@ -35,12 +35,14 @@
   <property name="javac.deprecation" value="false" />
   <property name="javac.optimize" value="false" />
   <property name="target.dir" value="false" />
-  <property name="server-home" value="../root/servers/jbjca-${ironjacamar.version}/ironjacamar-${ironjacamar.version}" />
+  <!--property name="server-home" value="../root/servers/jbjca-${ironjacamar.version}/ironjacamar-${ironjacamar.version}" /-->
+  <property name="server-home" value="../../target/sjc" />
   <property name="jbjca.home" value="${build-root.root.dir}/servers/${jbjca.version}/ironjacamar-${jbjca.kit}"/>
   <property name="jmeter.tools.dir" value="../tools/jmeter" />
   <property name="hsqldb.tools.dir" value="../tools/hsqldb" />
   <property name="h2.tools.dir" value="../tools/h2" />
   <property name="byteman.tools.dir" value="${basedir}/../tools/byteman" />
+  <property environment="env"/>
   <loadproperties srcfile="src/main/resources/database.properties">
     <filterchain>
       <expandproperties/>
@@ -67,6 +69,7 @@
 
   <path id="src.compile.classpath">
     <fileset dir="../lib/common" includes="*.jar" />
+    <fileset dir="../lib/web" includes="*.jar" />
     <fileset dir="${jmeter.tools.dir}/lib">
       <include name="logkit-2.0.jar"/>
     </fileset>
@@ -190,7 +193,7 @@
   
   <target name="deploy" depends="wars">
     <copy file="${build.jmeter.dir}/wars/jbjca-web.war" todir="${server-home}/system" />
-    <copy file="src/main/resources/jca-local-h2-ds.xml" todir="${server-home}/deploy" />
+    <copy file="src/main/resources/jca-local-h2-ds.xml" todir="${server-home}/deploy" overwrite="yes"/>
     <copy file="${build.jmeter.dir}/jars/jmeter-jmx-extension.jar" todir="../tools/jmeter/lib/ext"/>
     <copy todir="../tools/jmeter/lib">
       <fileset dir="${hsqldb.tools.dir}/lib" >
@@ -282,7 +285,7 @@
   </target>
   
   <target name="server-sample-data">
-    <get src="http://localhost:8080/jbjca-web/load-data" dest="/tmp/"/>
+    <get src="http://${env.HOSTNAME}:8080/jbjca-web/load-data" dest="/tmp/"/>
   </target>
   
   <target name="database-sample-data">
@@ -320,34 +323,35 @@
     <echo message="Loaded Byteman Rules for tx monitoring." />
   </target>
   
-  <target name="server" unless="server.isAvailable" depends="deploy,check-server-isRunning,build-servers.os-check,rmiregistry">
-    <exec executable="${exec}" spawn="true" dir="${server-home}/bin">
-      <arg line="run.${ext}"/>
+  <target name="server" unless="server.isAvailable" depends="deploy,check-server-isRunning,build-servers.os-check">
+   <exec executable="${exec}" spawn="true" dir="${server-home}/bin">
+      <arg line="run.${ext} -b ${env.HOSTNAME}"/>
       <env key="JAVA_OPTS" value="-javaagent:${byteman.tools.dir}/lib/byteman.jar=listener:true  -Djdbc.url=${db-vendor.connectionURL}"/>
       <!-- -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000  -Dorg.jboss.byteman.verbose-->
     </exec>
   
     <parallel>
       <waitfor maxwait="1" maxwaitunit="minute" checkevery="1" checkeveryunit="second">
-        <http url="http://localhost:8080/" />
+        <!--http url="http://${env.HOSTNAME}:8080/" /-->
+        <socket server="${env.HOSTNAME}" port="8080" />
       </waitfor>
     </parallel>
     <antcall target="load-rules" />
     <echo message="Started server."/>
     <antcall target="server-sample-data" />
-    <get src="http://localhost:8080/jbjca-web/jcaconn" dest="/tmp/"/>
+    <get src="http://${env.HOSTNAME}:8080/jbjca-web/jcaconn" dest="/tmp/"/>
   </target>
   
   <target name="check-server-isRunning">
     <condition property="server.isAvailable">
-      <http url="http://localhost:8080/" />
+      <http url="http://${env.HOSTNAME}:8080/" />
     </condition>
     <echo message="Status of running server is [${server.isAvailable}]." />
   </target>
   
   <target name="check-rmiregistry-isRunning">
     <condition property="rmiregistry.isAvailable">
-      <socket server="localhost" port="1099" />
+      <socket server="${env.HOSTNAME}" port="1099" />
     </condition>
     <echo message="Status of running server is [${rmiregistry.isAvailable}]." />
   </target>
@@ -384,7 +388,7 @@
     </java>
      
     <java jar="${server-home}/lib/fungal-cli.jar" fork="true">
-      <arg value="shutdown"/>
+      <arg line="-h ${env.HOSTNAME} shutdown"/>
     </java>
   </target>
 
@@ -394,9 +398,14 @@
     </exec>
     <parallel>
       <waitfor maxwait="1" maxwaitunit="minute" checkevery="1" checkeveryunit="second">
-        <socket server="localhost" port="1099" />
+        <socket server="${env.HOSTNAME}" port="1099" />
       </waitfor>
     </parallel>
     <echo message="Started rmiregistry."/>
   </target>
-</project>
+  
+  <target name="hostinfo">
+    
+    <echo message="[${NAME}] [${DOMAIN}] [${ADDR4}] [${ADDR6}] [${env.HOSTNAME}]"/>
+  </target>
+</project>
\ No newline at end of file

Modified: projects/jboss-jca/branches/performance/jmeter/src/main/resources/database.properties
===================================================================
--- projects/jboss-jca/branches/performance/jmeter/src/main/resources/database.properties	2011-01-21 18:38:28 UTC (rev 110423)
+++ projects/jboss-jca/branches/performance/jmeter/src/main/resources/database.properties	2011-01-21 20:21:46 UTC (rev 110424)
@@ -6,7 +6,7 @@
 db-vendor.userName=sa
 db-vendor.password=
 
-db-vendor.serverName=localhost
+db-vendor.serverName=${env.HOSTNAME}
 db-vendor.serverPort=9001
 db-vendor.database=test
 
@@ -20,7 +20,7 @@
 #db-vendor.userName=sa
 #db-vendor.password=
 #
-#db-vendor.serverName=localhost
+#db-vendor.serverName=${env.HOSTNAME}
 #db-vendor.serverPort=9092
 #db-vendor.database=test
 #
@@ -28,13 +28,13 @@
 
 # Postgres
 
-#db-vendor.connectionURL=jdbc:postgresql://${db-vendor-jdbc-serverName.A}:${db-vendor-jdbc-serverPort.A}/${db-vendor-jdbc-database.A}
+#db-vendor.connectionURL=jdbc:postgresql://${db-vendor.serverName}:${db-vendor.serverPort}/${db-vendor.database}
 #db-vendor.shutdown.connectionURL=
 #
 #db-vendor.userName=sa
 #db-vendor.password=
 #
-#db-vendor.serverName=localhost
+#db-vendor.serverName=${env.HOSTNAME}
 #db-vendor.serverPort=
 #db-vendor.database=test
 

Modified: projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-local-h2-ds.xml
===================================================================
--- projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-local-h2-ds.xml	2011-01-21 18:38:28 UTC (rev 110423)
+++ projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-local-h2-ds.xml	2011-01-21 20:21:46 UTC (rev 110424)
@@ -38,7 +38,7 @@
       <password></password>
     </security>
     <validation>
-       <valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.ValidConnectionChecker</valid-connection-checker-class-name>
+       <!--valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.ValidConnectionChecker</valid-connection-checker-class-name-->
     </validation>
     <time-out>
       <!-- The time before an unused connection is destroyed -->

More information about the jboss-cvs-commits mailing list