[hornetq-commits] JBoss hornetq SVN: r7844 - in trunk: docs/quickstart-guide/en and 14 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Aug 20 14:06:54 EDT 2009
Author: timfox
Date: 2009-08-20 14:06:54 -0400 (Thu, 20 Aug 2009)
New Revision: 7844
Added:
trunk/tests/config/hornetq.keystore
trunk/tests/config/hornetq.truststore
Removed:
trunk/tests/config/messaging.keystore
trunk/tests/config/messaging.truststore
Modified:
trunk/docs/quickstart-guide/en/examples.xml
trunk/docs/user-manual/build.xml
trunk/docs/user-manual/en/appserver-integration.xml
trunk/docs/user-manual/en/clusters.xml
trunk/docs/user-manual/en/configuring-transports.xml
trunk/docs/user-manual/en/diverts.xml
trunk/docs/user-manual/en/embedding-jbm.xml
trunk/docs/user-manual/en/logging.xml
trunk/docs/user-manual/en/management.xml
trunk/examples/common/config/logging.properties
trunk/examples/javaee/common/build.xml
trunk/examples/javaee/hajndi/build.xml
trunk/examples/javaee/jca-config/build.xml
trunk/examples/javaee/jca-config/readme.html
trunk/examples/jms/jaas/src/org/hornetq/jms/example/JAASExample.java
trunk/hornetq.ipr
trunk/src/config/jboss-as/build.xml
trunk/src/main/org/hornetq/core/server/HornetQServer.java
trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java
trunk/tests/smoke/build.xml
trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
Log:
remove more messaging refs
Modified: trunk/docs/quickstart-guide/en/examples.xml
===================================================================
--- trunk/docs/quickstart-guide/en/examples.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/quickstart-guide/en/examples.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -146,9 +146,9 @@
deploy-resources:
[copy] Copying 1 file to /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA
- /server/default-with-hornetq/deploy/messaging.sar
+ /server/default-with-hornetq/deploy/hornetq.sar
[copy] Copying 1 file to /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA
- /server/default-with-hornetq/deploy/messaging.sar
+ /server/default-with-hornetq/deploy/hornetq.sar
init:
@@ -220,9 +220,9 @@
[delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA
/server/default-with-hornetq/deploy/mdb-example.ear
[delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA
- /server/default-with-hornetq/deploy/messaging.sar/hornetq-queues.xml
+ /server/default-with-hornetq/deploy/hornetq.sar/hornetq-queues.xml
[delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA
- /server/default-with-hornetq/deploy/messaging.sar/hornetq-jms.xml
+ /server/default-with-hornetq/deploy/hornetq.sar/hornetq-jms.xml
BUILD SUCCESSFUL
Total time: 1 second
Modified: trunk/docs/user-manual/build.xml
===================================================================
--- trunk/docs/user-manual/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -1,4 +1,4 @@
-<project name="jbmessaging.user-manual" default="all" basedir=".">
+<project name="hornetq.user-manual" default="all" basedir=".">
<property name="build.dir" value="build"/>
<property name="pdf.name" value="JBossMessaging_UserManual.pdf"/>
Modified: trunk/docs/user-manual/en/appserver-integration.xml
===================================================================
--- trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/appserver-integration.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -541,7 +541,7 @@
factories that are used by Java EE components. These Connection Factories can be
defined inside a configuration file that matches the name <literal
>*-ds.xml</literal>. You'll find a default <literal>jms-ds.xml</literal>
- configuration under the <literal>messaging.sar</literal> directory in the Jboss AS
+ configuration under the <literal>hornetq.sar</literal> directory in the Jboss AS
deployment. The connection factories defined in the config file inherit their
properties from the main <literal>ra.xml</literal> configuration but can also be
overridden, the following example show how to define one.</para>
Modified: trunk/docs/user-manual/en/clusters.xml
===================================================================
--- trunk/docs/user-manual/en/clusters.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/clusters.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -60,8 +60,7 @@
connection settings for a live and (optional) backup server and broadcasts them on
the network. It also defines the UDP address and port settings. </para>
<para>Broadcast groups are defined in the server configuration file <literal
- >hornetq-configuration.xml</literal>. There can be many broadcast groups per JBoss
- Messaging server. All broadcast groups must be defined in a <literal
+ >hornetq-configuration.xml</literal>. There can be many broadcast groups per HornetQ server. All broadcast groups must be defined in a <literal
>broadcast-groups</literal> element.</para>
<para>Let's take a look at an example broadcast group from <literal
>hornetq-configuration.xml</literal>:</para>
Modified: trunk/docs/user-manual/en/configuring-transports.xml
===================================================================
--- trunk/docs/user-manual/en/configuring-transports.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/configuring-transports.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -297,8 +297,7 @@
<title>Configuring Netty Servlet</title>
<para>We also provide a Netty servlet transport for use with HornetQ. The
servlet transport allows HornetQ traffic to be tunneled over HTTP to a
- servlet running in a servlet engine which then redirects it to an in-VM JBoss
- Messaging server.</para>
+ servlet running in a servlet engine which then redirects it to an in-VM HornetQ server.</para>
<para>The servlet transport differs from the Netty HTTP transport in that, with the HTTP
transport HornetQ effectively acts a web server listening for HTTP traffic
on, e.g. port 80 or 8080, whereas with the servlet transport JBM traffic is proxied
Modified: trunk/docs/user-manual/en/diverts.xml
===================================================================
--- trunk/docs/user-manual/en/diverts.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/diverts.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -63,8 +63,7 @@
change the messages body or properties before it is diverted. In this example the
transformer simply adds a header that records the time the divert happened.</para>
<para>This example is actually diverting messages to a local store and forward queue, which
- is configured with a bridge which forwards the message to an address on another JBoss
- Messaging server. Please see the example for more details.</para>
+ is configured with a bridge which forwards the message to an address on another HornetQ server. Please see the example for more details.</para>
</section>
<section>
<title>Non-exclusive Divert</title>
Modified: trunk/docs/user-manual/en/embedding-jbm.xml
===================================================================
--- trunk/docs/user-manual/en/embedding-jbm.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/embedding-jbm.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -17,8 +17,7 @@
<section>
<title>POJO instantiation</title>
<para>You can follow this step-by-step guide:</para>
- <para>Create the configuration object - this contains configuration information for a JBoss
- Messaging server. If you want to configure it from a file on the classpath, use <literal
+ <para>Create the configuration object - this contains configuration information for a HornetQ server. If you want to configure it from a file on the classpath, use <literal
>FileConfigurationImpl</literal></para>
<programlisting>import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.FileConfiguration;
Modified: trunk/docs/user-manual/en/logging.xml
===================================================================
--- trunk/docs/user-manual/en/logging.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/logging.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -13,7 +13,7 @@
>logging.properties</literal> file can be found under the <literal>config</literal>
directory of the JBM installation. </para>
<para>By default the standalone server is configured to use the standard console handler and a
- file handler that logs to <literal>bin/logs/messaging.log</literal>.</para>
+ file handler that logs to <literal>bin/logs/hornetq.log</literal>.</para>
<para>Because some of the third party components used to bootstrap HornetQ, i.e. the
Microcontainer, use the JBoss Logging framework we have supplied a plugin class that
redirects this to the JUL logger. This is set via a system property, <literal
Modified: trunk/docs/user-manual/en/management.xml
===================================================================
--- trunk/docs/user-manual/en/management.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/docs/user-manual/en/management.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -799,8 +799,7 @@
<title>Example</title>
<para>See <xref linkend="examples.management-notifications" /> for an example which
shows how to use a
- JMS <literal>MessageListener</literal> to receive management notifications from JBoss
- Messaging server.</para>
+ JMS <literal>MessageListener</literal> to receive management notifications from HornetQ server.</para>
</section>
</section>
<section id="management.message-counters">
Modified: trunk/examples/common/config/logging.properties
===================================================================
--- trunk/examples/common/config/logging.properties 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/common/config/logging.properties 2009-08-20 18:06:54 UTC (rev 7844)
@@ -20,7 +20,7 @@
java.util.logging.ConsoleHandler.formatter=org.hornetq.integration.logging.HornetQLoggerFormatter
java.util.logging.FileHandler.level=INFO
java.util.logging.FileHandler.formatter=org.hornetq.integration.logging.HornetQLoggerFormatter
-java.util.logging.FileHandler.pattern=logs/messaging.log
+java.util.logging.FileHandler.pattern=logs/hornetq.log
# Default global logging level.
# This specifies which kinds of events are logged across
# all loggers. For any given facility this global level
Modified: trunk/examples/javaee/common/build.xml
===================================================================
--- trunk/examples/javaee/common/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/javaee/common/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -112,7 +112,7 @@
<target name="deploy" depends="validate-jboss, copy-profile, copy-resources, ear">
<property name="example-profile" value="${jboss.home}/server/${example.name}-example-profile"/>
- <copy todir="${example-profile}/deploy/messaging.sar">
+ <copy todir="${example-profile}/deploy/hornetq.sar">
<fileset dir="${example.server.dir}"/>
</copy>
<copy todir="${example-profile}/deploy/">
Modified: trunk/examples/javaee/hajndi/build.xml
===================================================================
--- trunk/examples/javaee/hajndi/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/javaee/hajndi/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -20,12 +20,12 @@
<property name="deploy.dir2" value="${jboss.home}/server/all-with-hornetq_2/deploy/" />
<!-- copy 1st server resources configuration -->
- <copy file="${example.config.dir}/hornetq-queues.xml" todir="${deploy.dir}/messaging.sar/" overwrite="yes"/>
- <copy file="${example.config.dir}/hornetq-jms.xml" todir="${deploy.dir}/messaging.sar/" overwrite="yes"/>
+ <copy file="${example.config.dir}/hornetq-queues.xml" todir="${deploy.dir}/hornetq.sar/" overwrite="yes"/>
+ <copy file="${example.config.dir}/hornetq-jms.xml" todir="${deploy.dir}/hornetq.sar/" overwrite="yes"/>
<!-- copy 2nd server resources configuration -->
- <copy file="${example.config.dir}/hornetq-queues.xml" todir="${deploy.dir2}/messaging.sar/" overwrite="yes"/>
- <copy file="${example.config.dir}/hornetq-jms.xml" todir="${deploy.dir2}/messaging.sar/" overwrite="yes"/>
+ <copy file="${example.config.dir}/hornetq-queues.xml" todir="${deploy.dir2}/hornetq.sar/" overwrite="yes"/>
+ <copy file="${example.config.dir}/hornetq-jms.xml" todir="${deploy.dir2}/hornetq.sar/" overwrite="yes"/>
</target>
<target name="undeploy">
@@ -33,12 +33,12 @@
<property name="deploy.dir2" value="${jboss.home}/server/all-with-hornetq_2/deploy/" />
<!-- delete 1st server resources configuration -->
- <delete file="${deploy.dir}/messaging.sar/hornetq-queues.xml" failonerror="false"/>
- <delete file="${deploy.dir}/messaging.sar/hornetq-jms.xml" failonerror="false"/>
+ <delete file="${deploy.dir}/hornetq.sar/hornetq-queues.xml" failonerror="false"/>
+ <delete file="${deploy.dir}/hornetq.sar/hornetq-jms.xml" failonerror="false"/>
<!-- delete 2nd server resources configuration -->
- <delete file="${deploy.dir2}/messaging.sar/hornetq-queues.xml" failonerror="false"/>
- <delete file="${deploy.dir2}/messaging.sar/hornetq-jms.xml" failonerror="false"/>
+ <delete file="${deploy.dir2}/hornetq.sar/hornetq-queues.xml" failonerror="false"/>
+ <delete file="${deploy.dir2}/hornetq.sar/hornetq-jms.xml" failonerror="false"/>
</target>
<target name="run">
Modified: trunk/examples/javaee/jca-config/build.xml
===================================================================
--- trunk/examples/javaee/jca-config/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/javaee/jca-config/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -42,7 +42,7 @@
<exclude name="**/tmp/**"/>
</fileset>
</copy>
- <copy todir="${deploy.dir2}/deploy/messaging.sar">
+ <copy todir="${deploy.dir2}/deploy/hornetq.sar">
<fileset dir="server2">
<include name="jms-remote-ds.xml"/>
</fileset>
Modified: trunk/examples/javaee/jca-config/readme.html
===================================================================
--- trunk/examples/javaee/jca-config/readme.html 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/javaee/jca-config/readme.html 2009-08-20 18:06:54 UTC (rev 7844)
@@ -80,7 +80,7 @@
</pre>
<h2>Resource Adapter Global Properties</h2>
- <p>It is possible to also change global configuration at the JBossMessaging resource adapter. The default installation script will install jboss-messaging resource adapter at $JBOSS_HOME/server/<i>YOUR-SERVER</i>/deploy/jms-ra.rar.</p>
+ <p>It is possible to also change global configuration at the JBossMessaging resource adapter. The default installation script will install the HornetQ resource adapter at $JBOSS_HOME/server/<i>YOUR-SERVER</i>/deploy/hornetq-ra.rar.</p>
<p>To change these properties, open the ra.xml under jms-ra.rar/META-INF</p>
<p>Example for ra.xml:</p>
<pre>
Modified: trunk/examples/jms/jaas/src/org/hornetq/jms/example/JAASExample.java
===================================================================
--- trunk/examples/jms/jaas/src/org/hornetq/jms/example/JAASExample.java 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/examples/jms/jaas/src/org/hornetq/jms/example/JAASExample.java 2009-08-20 18:06:54 UTC (rev 7844)
@@ -25,7 +25,7 @@
/**
* A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message.
- * The messaging server is configured to use JAAS.
+ * The HornetQ server is configured to use JAAS.
*
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
*/
Modified: trunk/hornetq.ipr
===================================================================
--- trunk/hornetq.ipr 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/hornetq.ipr 2009-08-20 18:06:54 UTC (rev 7844)
@@ -2,7 +2,7 @@
<project relativePaths="false" version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
- <buildFile url="file://$PROJECT_DIR$/build-messaging.xml">
+ <buildFile url="file://$PROJECT_DIR$/build-hornetq.xml">
<additionalClassPath />
<antReference projectDefault="true" />
<customJdkName value="" />
Modified: trunk/src/config/jboss-as/build.xml
===================================================================
--- trunk/src/config/jboss-as/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/src/config/jboss-as/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -23,17 +23,17 @@
<!-- created from JBoss AS 5 default profile -->
<param name="jbossas.profile.source" value="default"/>
<!-- based on HornetQ jbossas/non-clustered config -->
- <param name="messaging.config.dir" value="./non-clustered"/>
+ <param name="hornetq.config.dir" value="./non-clustered"/>
<!-- new profile is named default-with-hornetq -->
- <param name="messaging.profile.target" value="default-with-hornetq"/>
+ <param name="hornetq.profile.target" value="default-with-hornetq"/>
</antcall>
<antcall target="create-profile">
<!-- created from JBoss AS 5 all profile -->
<param name="jbossas.profile.source" value="all"/>
<!-- based on HornetQ jbossas/clustered config -->
- <param name="messaging.config.dir" value="clustered"/>
+ <param name="hornetq.config.dir" value="clustered"/>
<!-- new profile is named all-with-hornetq -->
- <param name="messaging.profile.target" value="all-with-hornetq"/>
+ <param name="hornetq.profile.target" value="all-with-hornetq"/>
</antcall>
<mkdir dir="${dest.bin.dir}/META-INF/lib/linux2/x86"/>
<mkdir dir="${dest.bin.dir}/META-INF/lib/linux2/x64"/>
@@ -46,7 +46,7 @@
<target name="create-profile">
<antcall target="validate-jboss"/>
<property name="src.dir" value="${jboss.home}/server/${jbossas.profile.source}"/>
- <property name="dest.dir" value="${jboss.home}/server/${messaging.profile.target}"/>
+ <property name="dest.dir" value="${jboss.home}/server/${hornetq.profile.target}"/>
<mkdir dir="${dest.dir}"/>
<copy todir="${dest.dir}">
@@ -57,12 +57,12 @@
</fileset>
</copy>
<copy todir="${dest.dir}/conf">
- <fileset dir="${messaging.config.dir}">
+ <fileset dir="${hornetq.config.dir}">
<include name="login-config.xml"/>
</fileset>
</copy>
<copy todir="${dest.dir}/conf/props">
- <fileset dir="${messaging.config.dir}">
+ <fileset dir="${hornetq.config.dir}">
<include name="hornetq-users.properties"/>
<include name="hornetq-roles.properties"/>
</fileset>
@@ -73,10 +73,10 @@
<include name="netty*.jar"/>
</fileset>
</copy>
- <property name="messaging.sar.dir" value="${dest.dir}/deploy/messaging.sar"/>
- <mkdir dir="${messaging.sar.dir}"/>
- <copy todir="${messaging.sar.dir}">
- <fileset dir="${messaging.config.dir}" includes="*"/>
+ <property name="hornetq.sar.dir" value="${dest.dir}/deploy/hornetq.sar"/>
+ <mkdir dir="${hornetq.sar.dir}"/>
+ <copy todir="${hornetq.sar.dir}">
+ <fileset dir="${hornetq.config.dir}" includes="*"/>
</copy>
<unzip src="${lib.dir}/hornetq-ra.rar" dest="${dest.dir}/deploy/jms-ra.rar"/>
</target>
@@ -87,9 +87,9 @@
<fail unless="ENV.JBOSS_HOME" message="JBOSS_HOME environment variable not set! Set it and try again."/>
<available property="source-profile" type="dir" file="${jboss.home}/server/${jbossas.profile.source}"/>
<fail unless="source-profile" message="${jboss.home}/server/${jbossas.profile.source} profile not found!"/>
- <available property="target-profile" type="dir" file="${jboss.home}/server/${messaging.profile.target}"/>
+ <available property="target-profile" type="dir" file="${jboss.home}/server/${hornetq.profile.target}"/>
<fail if="target-profile"
- message="'${messaging.profile.target}' profile already exists! Delete it manually and try again."/>
+ message="'${hornetq.profile.target}' profile already exists! Delete it manually and try again."/>
</target>
</project>
Modified: trunk/src/main/org/hornetq/core/server/HornetQServer.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/HornetQServer.java 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/src/main/org/hornetq/core/server/HornetQServer.java 2009-08-20 18:06:54 UTC (rev 7844)
@@ -42,7 +42,7 @@
/**
* This interface defines the internal interface of the HornetQ Server exposed to other components of the server. The
* external management interface of the HornetQ Server is defined by the HornetQServerManagement interface This
- * interface is never exposed outside the messaging server, e.g. by JMX or other means
+ * interface is never exposed outside the HornetQ server, e.g. by JMX or other means
*
* @author <a href="tim.fox at jboss.com">Tim Fox</a>
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-08-20 18:06:54 UTC (rev 7844)
@@ -111,7 +111,7 @@
import org.hornetq.utils.VersionLoader;
/**
- * The messaging server implementation
+ * The HornetQ server implementation
*
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
* @author <a href="mailto:ataylor at redhat.com>Andy Taylor</a>
Modified: trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/src/main/org/hornetq/integration/transports/netty/TransportConstants.java 2009-08-20 18:06:54 UTC (rev 7844)
@@ -72,11 +72,11 @@
public static final int DEFAULT_PORT = 5445;
- public static final String DEFAULT_KEYSTORE_PATH = "messaging.keystore";
+ public static final String DEFAULT_KEYSTORE_PATH = "hornetq.keystore";
public static final String DEFAULT_KEYSTORE_PASSWORD = "secureexample";
- public static final String DEFAULT_TRUSTSTORE_PATH = "messaging.truststore";
+ public static final String DEFAULT_TRUSTSTORE_PATH = "hornetq.truststore";
public static final String DEFAULT_TRUSTSTORE_PASSWORD = "secureexample";
Copied: trunk/tests/config/hornetq.keystore (from rev 7838, trunk/tests/config/messaging.keystore)
===================================================================
(Binary files differ)
Copied: trunk/tests/config/hornetq.truststore (from rev 7838, trunk/tests/config/messaging.truststore)
===================================================================
(Binary files differ)
Deleted: trunk/tests/config/messaging.keystore
===================================================================
(Binary files differ)
Deleted: trunk/tests/config/messaging.truststore
===================================================================
(Binary files differ)
Modified: trunk/tests/smoke/build.xml
===================================================================
--- trunk/tests/smoke/build.xml 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/tests/smoke/build.xml 2009-08-20 18:06:54 UTC (rev 7844)
@@ -44,13 +44,13 @@
<property file="./smoke.properties"/>
<property name="sleep.interval" value="60"/>
<property name="jnpPort" value="1099"/>
- <property name="messaging.server.artifact.name" value="jboss-messaging.sar"/>
- <property name="messaging.server.artifact.path" value="../../output/lib"/>
+ <property name="hornetq.server.artifact.name" value="hornetq.sar"/>
+ <property name="hornetq.server.artifact.path" value="../../output/lib"/>
<property name="relative.client.jar.location" value="../../util"/>
- <property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
+ <property name="hornetq.client.jar.name" value="hornetq-client.jar"/>
<property name="release.admin.target" value="default"/>
<property name="jboss.configuration" value="messaging"/>
- <property name="messaging.client.jar.path" value="${basedir}/../../output/lib"/>
+ <property name="hornetq.client.jar.path" value="${basedir}/../../output/lib"/>
<property name="smoke.test.type" value="installation"/>
<property name="clustered" value="false"/>
@@ -523,31 +523,31 @@
<target name="old-server-compatibility-test" depends="check-jboss-availability">
<echo message="Checking current client's compatibility with a ${jboss.hornetq.version} server"/>
- <unzip src="${jboss.compatibility.home}/../jboss-messaging-${jboss.hornetq.version}.zip" dest="./output">
+ <unzip src="${jboss.compatibility.home}/../hornetq-${jboss.hornetq.version}.zip" dest="./output">
<patternset>
- <include name="jboss-messaging-${jboss.hornetq.version}/jboss-messaging.sar"/>
+ <include name="hornetq-${jboss.hornetq.version}/jboss-hornetq.sar"/>
</patternset>
</unzip>
<antcall target="run-all-examples">
<param name="jboss.configuration" value="messaging-${jboss.hornetq.version}"/>
</antcall>
- <delete dir="./output/jboss-messaging-${jboss.hornetq.version}"/>
+ <delete dir="./output/hornetq-${jboss.hornetq.version}"/>
</target>
<target name="old-client-compatibility-test" depends="check-jboss-availability">
<echo message="Checking current server's compatibility with a ${jboss.hornetq.version} client"/>
- <unzip src="${jboss.compatibility.home}/../jboss-messaging-${jboss.hornetq.version}.zip" dest="./output">
+ <unzip src="${jboss.compatibility.home}/../hornetq-${jboss.hornetq.version}.zip" dest="./output">
<patternset>
- <include name="jboss-messaging-${jboss.hornetq.version}/jboss-messaging-client.jar"/>
+ <include name="hornetq-${jboss.hornetq.version}/hornetq-client.jar"/>
</patternset>
</unzip>
<antcall target="run-all-examples">
- <param name="messaging.client.jar.path" value="${basedir}/output/jboss-messaging-${jboss.hornetq.version}"/>
+ <param name="hornetq.client.jar.path" value="${basedir}/output/hornetq-${jboss.hornetq.version}"/>
</antcall>
- <delete dir="./output/jboss-messaging-${jboss.hornetq.version}"/>
+ <delete dir="./output/hornetq-${jboss.hornetq.version}"/>
</target>
@@ -560,7 +560,7 @@
<antcall target="fail-on-serialization-debug-output"/>
<!-- record successful run -->
- <echo message="TEST_TYPE=${smoke.test.type} JBOSS_HOME=${jboss.home} JBOSS_CONFIGURATION=${jboss.configuration} CLIENT_VERSION=${jboss.hornetq.version} INSTALLATION_TYPE=${release.admin.target} SERVER_ARTIFACT_NAME=${messaging.server.artifact.name} EXAMPLE_NAME=${example.name} CLUSTERED=${clustered}${line.separator}"
+ <echo message="TEST_TYPE=${smoke.test.type} JBOSS_HOME=${jboss.home} JBOSS_CONFIGURATION=${jboss.configuration} CLIENT_VERSION=${jboss.hornetq.version} INSTALLATION_TYPE=${release.admin.target} SERVER_ARTIFACT_NAME=${hornetq.server.artifact.name} EXAMPLE_NAME=${example.name} CLUSTERED=${clustered}${line.separator}"
file="./output/smoke.log" append="yes"/>
</target>
@@ -587,7 +587,7 @@
</antcall>
<!-- record successful run -->
- <echo message="TEST_TYPE=${smoke.test.type} JBOSS_HOME=${jboss.home} JBOSS_CONFIGURATION=${jboss.configuration}-node0 CLIENT_VERSION=${jboss.hornetq.version} INSTALLATION_TYPE=${release.admin.target} SERVER_ARTIFACT_NAME=${messaging.server.artifact.name} EXAMPLE_NAME=${example.name} CLUSTERED=true${line.separator}"
+ <echo message="TEST_TYPE=${smoke.test.type} JBOSS_HOME=${jboss.home} JBOSS_CONFIGURATION=${jboss.configuration}-node0 CLIENT_VERSION=${jboss.hornetq.version} INSTALLATION_TYPE=${release.admin.target} SERVER_ARTIFACT_NAME=${hornetq.server.artifact.name} EXAMPLE_NAME=${example.name} CLUSTERED=true${line.separator}"
file="./output/smoke.log" append="yes"/>
</target>
Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java 2009-08-20 17:49:04 UTC (rev 7843)
+++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java 2009-08-20 18:06:54 UTC (rev 7844)
@@ -47,9 +47,9 @@
{
super.setUp();
- keyStorePath = "messaging.keystore";
+ keyStorePath = "hornetq.keystore";
keyStorePassword = "secureexample";
- trustStorePath = "messaging.truststore";
+ trustStorePath = "hornetq.truststore";
trustStorePassword = keyStorePassword;
}
@@ -97,7 +97,7 @@
return;
}
- SSLSupport.createServerContext("config/messaging.keystore",
+ SSLSupport.createServerContext("config/hornetq.keystore",
keyStorePassword, trustStorePath, trustStorePassword);
}
More information about the hornetq-commits
mailing list