Author: ataylor Date: 2011-04-12 15:33:16 -0400 (Tue, 12 Apr 2011) New Revision: 10495 Added: trunk/examples/src/main/resources/common/ trunk/examples/src/main/resources/core/ trunk/examples/src/main/resources/javaee/ trunk/examples/src/main/resources/jms/ trunk/examples/src/main/resources/soak/ Removed: trunk/examples/common/ trunk/examples/core/ trunk/examples/javaee/ trunk/examples/jms/ trunk/examples/soak/ Modified: trunk/examples/src/main/resources/common/build.xml trunk/examples/src/main/resources/common/common.css trunk/examples/src/main/resources/common/src/org/hornetq/common/example/HornetQExample.java trunk/examples/src/main/resources/core/microcontainer/build.xml trunk/examples/src/main/resources/javaee/common/build.xml trunk/examples/src/main/resources/javaee/ejb-jms-transaction/readme.html trunk/examples/src/main/resources/javaee/servlet-ssl/readme.html trunk/examples/src/main/resources/jms/ssl-enabled/readme.html Log: mavenised examples part 2 Modified: trunk/examples/src/main/resources/common/build.xml =================================================================== --- trunk/examples/common/build.xml 2011-04-12 18:42:56 UTC (rev 10493) +++ trunk/examples/src/main/resources/common/build.xml 2011-04-12 19:33:16 UTC (rev 10495) @@ -14,7 +14,7 @@ ~ implied. See the License for the specific language governing ~ permissions and limitations under the License. --> -<project default="compile" name="example" basedir="."> +<project default="compile" name="example" basedir=""> <property name="hornetq.run_script" value="false" /> @@ -164,7 +164,7 @@ <target name="clean-all"> <subant target="clean" failonerror="true"> - <fileset dir=".." includes="*/build.xml" excludes="common/build.xml"/> + <fileset dir="../" includes="*/build.xml" excludes="common/build.xml"/> </subant> </target> @@ -188,7 +188,7 @@ <delete dir="./data" quiet="true"/> <!-- large-message creates huge .dat files --> <delete> - <fileset dir="."> + <fileset dir=""> <include name="*.dat"/> </fileset> </delete> @@ -196,7 +196,7 @@ <target name="all" description="Run all the examples"> <subant target="run" failonerror="true"> - <fileset dir=".."> + <fileset dir="../"> <include name="core/*/build.xml"/> <include name="jms/*/build.xml"/> <exclude name="common/build.xml"/> Modified: trunk/examples/src/main/resources/common/common.css =================================================================== --- trunk/examples/common/common.css 2011-04-12 18:42:56 UTC (rev 10493) +++ trunk/examples/src/main/resources/common/common.css 2011-04-12 19:33:16 UTC (rev 10495) @@ -1,5 +1,5 @@ body { - background: url(./images/hornetQ-banner_final.png) top left no-repeat; + background: url(images/hornetQ-banner_final.png) top left no-repeat; } h1 { Modified: trunk/examples/src/main/resources/common/src/org/hornetq/common/example/HornetQExample.java =================================================================== --- trunk/examples/common/src/org/hornetq/common/example/HornetQExample.java 2011-04-12 18:42:56 UTC (rev 10493) +++ trunk/examples/src/main/resources/common/src/org/hornetq/common/example/HornetQExample.java 2011-04-12 19:33:16 UTC (rev 10495) @@ -160,7 +160,7 @@ "FAILED::", config, debugServer, - "hornetq-beans.xml"); + "distribution/src/main/resources/config/stand-alone/non-clustered/hornetq-beans.xml"); } protected void reStartServer(final int index) throws Exception @@ -180,7 +180,7 @@ "FAILED::", config, debugServer, - "hornetq-beans.xml"); + "distribution/src/main/resources/config/stand-alone/non-clustered/hornetq-beans.xml"); } protected void startServers() throws Exception Modified: trunk/examples/src/main/resources/core/microcontainer/build.xml =================================================================== --- trunk/examples/core/microcontainer/build.xml 2011-04-12 18:42:56 UTC (rev 10493) +++ trunk/examples/src/main/resources/core/microcontainer/build.xml 2011-04-12 19:33:16 UTC (rev 10495) @@ -40,7 +40,7 @@ --> </fileset> <pathelement location="${classes.dir}"/> - <pathelement location="./server0"/> + <pathelement location="server0"/> </path> <target name="run" depends="compile"> Modified: trunk/examples/src/main/resources/javaee/common/build.xml =================================================================== --- trunk/examples/javaee/common/build.xml 2011-04-12 18:42:56 UTC (rev 10493) +++ trunk/examples/src/main/resources/javaee/common/build.xml 2011-04-12 19:33:16 UTC (rev 10495) @@ -11,7 +11,7 @@ ~ implied. See the License for the specific language governing ~ permissions and limitations under the License. --> -<project default="compile" name="javaeeexample" basedir="."> +<project default="compile" name="javaeeexample" basedir=""> <dirname property="imported.basedir" file="${ant.file.javaeeexample}"/> <property file="${imported.basedir}/config/ant.properties"/> <property name="example.config.dir" value="config"/> Modified: trunk/examples/src/main/resources/javaee/ejb-jms-transaction/readme.html =================================================================== --- trunk/examples/javaee/ejb-jms-transaction/readme.html 2011-04-12 18:42:56 UTC (rev 10493) +++ trunk/examples/src/main/resources/javaee/ejb-jms-transaction/readme.html 2011-04-12 19:33:16 UTC (rev 10495) @@ -42,7 +42,7 @@ <li>copy <a href="config/mysql-ds.xml"><code>mysql-ds.xml</a></code> to to the profile</li> </ul> - <p>MySQL is configured to connect to a <code>jbossdb</code> database using the <code>jboss</code>/<code>jboss</code> credentials<a href="#fn1" id="fnr1">¹</a>. + <p>MySQL is configured to connect to a <code>jbossdb</code> database using the <code>jboss</code>/<code>jboss</code> credentials<a href="readme.html#fn1" id="fnr1">¹</a>. <p>MySQL configuration file defines two DataSources:</p> <ul> <li><code>DefaultDS</code>, the default DataSource (used to create a table from the example)</li> @@ -229,7 +229,7 @@ <hr> <ol> - <li><a name="fn1">Steps to create the MySQL DB</a><a href="#fnr1">&#8617;</a> + <li><a name="fn1">Steps to create the MySQL DB</a><a href="readme.html#fnr1">&#8617;</a> <ul> <li>connect as root to MySQL: <code>mysql</code> <li>create database jbossdb: <code>create database jbossdb;</code> Modified: trunk/examples/src/main/resources/javaee/servlet-ssl/readme.html =================================================================== --- trunk/examples/javaee/servlet-ssl/readme.html 2011-04-12 18:42:56 UTC (rev 10493) +++ trunk/examples/src/main/resources/javaee/servlet-ssl/readme.html 2011-04-12 19:33:16 UTC (rev 10495) @@ -17,7 +17,7 @@ <h2>Example Configuration</h2> <p>In the configuration, the hornetq.example.keystore is the key store file holding client certificate. The hornetq.example.truststore - is the file for server to hold trusted client certificates. They are pre-generated for illustration purpose<a id="fnr1" href="#fn1">¹</a>.</p> + is the file for server to hold trusted client certificates. They are pre-generated for illustration purpose<a id="fnr1" href="readme.html#fn1">¹</a>.</p> <h2>Example step-by-step</h2> @@ -102,7 +102,7 @@ <hr> <ol> - <li><a id="fn1">The stores were generating using the following commands&nbsp;<a href="#fnr1">&#8617;</a>: + <li><a id="fn1">The stores were generating using the following commands&nbsp;<a href="readme.html#fnr1">&#8617;</a>: <ul> <li>create the keystore: <code>keytool -genkey -keystore hornetq.example.keystore -storepass hornetqexample</code> <li>export the certificate: <code>keytool -export -keystore hornetq.example.keystore -file hornetq.cer</code> Modified: trunk/examples/src/main/resources/jms/ssl-enabled/readme.html =================================================================== --- trunk/examples/jms/ssl-enabled/readme.html 2011-04-12 18:42:56 UTC (rev 10493) +++ trunk/examples/src/main/resources/jms/ssl-enabled/readme.html 2011-04-12 19:33:16 UTC (rev 10495) @@ -45,7 +45,7 @@ </p> <p>In the configuration, the hornetq.example.keystore is the key store file holding client certificate. The hornetq.example.truststore - is the file for server to hold trusted client certificates. They are pre-generated for illustration purpose<a id="fnr1" href="#fn1">¹</a>.</p> + is the file for server to hold trusted client certificates. They are pre-generated for illustration purpose<a id="fnr1" href="readme.html#fn1">¹</a>.</p> <h2>Example step-by-step</h2> @@ -127,7 +127,7 @@ <hr> <ol> - <li><a id="fn1">The stores were generating using the following commands&nbsp;<a href="#fnr1">&#8617;</a>: + <li><a id="fn1">The stores were generating using the following commands&nbsp;<a href="readme.html#fnr1">&#8617;</a>: <ul> <li>create the keystore: <code>keytool -genkey -keystore hornetq.example.keystore -storepass hornetqexample</code> <li>export the certificate: <code>keytool -export -keystore hornetq.example.keystore -file hornetq.cer</code>