[jboss-cvs] JBoss Messaging SVN: r7070 - in trunk: examples/common and 26 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 27 08:57:21 EDT 2009
Author: ataylor
Date: 2009-05-27 08:57:21 -0400 (Wed, 27 May 2009)
New Revision: 7070
Added:
trunk/examples/common/config/logging.properties
trunk/examples/common/config/server.properties
trunk/examples/jms/client-kickoff/ant.properties
trunk/examples/jms/jmx/ant.properties
trunk/examples/jms/large-message/ant.properties
trunk/examples/jms/message-counters/ant.properties
trunk/examples/jms/paging/ant.properties
trunk/examples/jms/symmetric-cluster/ant.properties
trunk/examples/jms/xa-heuristic/ant.properties
trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerFormatter.java
Removed:
trunk/examples/common/config/log4j.xml
trunk/src/config/stand-alone/clustered/log4j.xml
trunk/src/config/stand-alone/non-clustered/log4j.xml
trunk/src/main/org/jboss/messaging/integration/logging/JBossLoggerHandler.java
trunk/tests/config/log4j.xml
trunk/tests/jms-tests/config/log4j.xml
trunk/tests/jms-tests/config/logging.properties
Modified:
trunk/build-messaging.xml
trunk/examples/common/build.xml
trunk/examples/common/config/ant.properties
trunk/examples/common/src/org/jboss/common/example/JBMExample.java
trunk/examples/common/src/org/jboss/common/example/SpawnedVMSupport.java
trunk/examples/jms/client-kickoff/build.xml
trunk/examples/jms/client-kickoff/src/org/jboss/jms/example/ClientKickoffExample.java
trunk/examples/jms/jaas/build.xml
trunk/examples/jms/jaas/server0/jbm-jboss-beans.xml
trunk/examples/jms/jmx/build.xml
trunk/examples/jms/jmx/src/org/jboss/jms/example/JMXExample.java
trunk/examples/jms/large-message/build.xml
trunk/examples/jms/large-message/src/org/jboss/jms/example/LargeMessageExample.java
trunk/examples/jms/message-counters/build.xml
trunk/examples/jms/message-counters/src/org/jboss/jms/example/MessageCounterExample.java
trunk/examples/jms/paging/build.xml
trunk/examples/jms/paging/src/org/jboss/jms/example/PagingExample.java
trunk/examples/jms/queue-message-redistribution/build.xml
trunk/examples/jms/symmetric-cluster/build.xml
trunk/examples/jms/symmetric-cluster/src/org/jboss/jms/example/SymmetricClusterExample.java
trunk/examples/jms/xa-heuristic/build.xml
trunk/examples/jms/xa-heuristic/src/org/jboss/jms/example/XAHeuristicExample.java
trunk/messaging.ipr
trunk/src/bin/run.bat
trunk/src/bin/run.sh
trunk/src/config/examples-ant.properties
trunk/src/config/stand-alone/clustered/logging.properties
trunk/src/config/stand-alone/non-clustered/logging.properties
trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerPlugin.java
Log:
removed log4j stuff and updated examples to get server settings from seperate file
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/build-messaging.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -312,7 +312,6 @@
<path location="${build.jars.dir}/${transports.jar.name}"/>
<path refid="jms.test.compilation.classpath"/>
<path refid="sun.jaxb.classpath"/>
- <path refid="apache.log4j.classpath"/>
<path refid="cglib.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.aop.classpath"/>
@@ -854,8 +853,7 @@
<!-- examples-ant.properties allow the examples to be run from the source or from the distribution -->
<!-- by configuring the correct lib/config location -->
- <copy tofile="${build.distro.examples.dir}/jms/common/config/ant.properties" file="src/config/examples-ant.properties" overwrite="true" />
- <copy tofile="${build.distro.examples.dir}/javaee/common/config/ant.properties" file="src/config/examples-ant.properties" overwrite="true" />
+ <copy tofile="${build.distro.examples.dir}/common/config/ant.properties" file="src/config/examples-ant.properties" overwrite="true" />
<zip basedir="${build.dir}"
destfile="${build.dir}/${build.artifact}.zip">
Modified: trunk/examples/common/build.xml
===================================================================
--- trunk/examples/common/build.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/common/build.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -58,7 +58,6 @@
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="config.dir" value="${imported.basedir}/config"/>
<property name="example.config.dir" value="config"/>
-
<path id="extra.classpath">
</path>
@@ -78,7 +77,6 @@
<include name="**/*client*.jar"/>
</fileset>
<fileset dir="${jars.dir}">
- <include name="apache-log4j/lib/log4j.jar"/>
<include name="netty/lib/netty-3.1.0.BETA1.jar"/>
</fileset>
</path>
@@ -88,12 +86,7 @@
<pathelement location="${config.dir}"/>
<pathelement location="${example.config.dir}"/>
<pathelement location="${classes.dir}"/>
- <path refid="extra.classpath"/>
<fileset dir="${jars.dir}">
- <include name="jboss/jboss-javaee/lib/jboss-javaee.jar"/>
- </fileset>
- <fileset dir="${jars.dir}">
- <include name="apache-log4j/lib/log4j.jar"/>
<include name="jboss/jnpserver/lib/jnpserver.jar"/>
<include name="netty/lib/netty-3.1.0.BETA1.jar"/>
</fileset>
@@ -130,24 +123,10 @@
<target name="runExample" depends="compile">
<property name="serverclasspath" refid="server.classpath"/>
- <property name="java-min-memory" value="512M"/>
- <property name="java-max-memory" value="2048M"/>
+ <property file="${imported.basedir}/config/server.properties"/>
<java classname="${example.classname}" fork="true" resultproperty="example-result">
- <jvmarg value="-XX:+UseParallelGC"/>
- <jvmarg value="-Xms${java-min-memory}"/>
- <jvmarg value="-Xmx${java-max-memory}"/>
- <jvmarg value="-XX:+AggressiveOpts"/>
- <jvmarg value="-XX:+UseFastAccessorMethods"/>
- <jvmarg value="-Dcom.sun.management.jmxremote"/>
- <jvmarg value="-Djava.util.logging.config.file=${logging.properties}"/>
- <jvmarg value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
- <!-- <jvmarg value="-Djava.library.path=${native.bin.dir}"/>-->
- <jvmarg value="-Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory"/>
- <jvmarg value="-Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"/>
- <jvmarg value="-Djbm.example.runServer=${jbm.example.runServer}"/>
- <jvmarg value="-Djbm.example.logserveroutput=${jbm.example.logserveroutput}"/>
- <!--<jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>-->
<jvmarg value="-Djbm.example.server.classpath=${serverclasspath}"/>
+ <jvmarg value="-Djbm.example.server.args=${server.args}"/>
<arg line="${jbm.example.beans.file}"/>
<sysproperty key="java.library.path" value="${java.library.path}${path.separator}${aio.library.path}"/>
<classpath refid="client.classpath"/>
@@ -194,7 +173,7 @@
<target name="all" description="Run all the examples">
<subant target="run" failonerror="true">
- <fileset dir=".." includes="*/build.xml" excludes="common/build.xml"/>
+ <fileset dir=".." includes="jms/*/build.xml" excludes="common/build.xml"/>
</subant>
</target>
Modified: trunk/examples/common/config/ant.properties
===================================================================
--- trunk/examples/common/config/ant.properties 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/common/config/ant.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -1,5 +1,4 @@
jbm.example.logserveroutput=true
-logging.properties=${imported.basedir}/../../src/config/stand-alone/non-clustered/logging.properties
jbm.jars.dir=${imported.basedir}/../../build/jars
jars.dir=${imported.basedir}/../../thirdparty
client.jars.dir=${imported.basedir}/../../build/jars
Deleted: trunk/examples/common/config/log4j.xml
===================================================================
--- trunk/examples/common/config/log4j.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/common/config/log4j.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- $Id: log4j.xml 536 2005-12-22 06:28:39Z ovidiu $ -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p @%t [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-
- <param name="File" value="./logs/messaging.log"/>
-
- <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
- for each test. We need to append if we want to preserve a full testsuite run log.
- Make sure the build script clears this log at the beginning of each run.
- -->
- <param name="Append" value="false"/>
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <!-- <param name="ConversionPattern" value="%d %-5p @%t [%c] %m%n"/> -->
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n -->
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-
- </layout>
- </appender>
-
- <category name="org.jboss">
- <priority value="INFO"/>
- </category>
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-
-
-</log4j:configuration>
Added: trunk/examples/common/config/logging.properties
===================================================================
--- trunk/examples/common/config/logging.properties (rev 0)
+++ trunk/examples/common/config/logging.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -0,0 +1,36 @@
+############################################################
+# Default Logging Configuration File
+#
+# You can use a different file by specifying a filename
+# with the java.util.logging.config.file system property.
+# For example java -Djava.util.logging.config.file=myfile
+############################################################
+
+############################################################
+# Global properties
+############################################################
+
+# "handlers" specifies a comma separated list of log Handler
+# classes. These handlers will be installed during VM startup.
+# Note that these classes must be on the system classpath.
+# By default we only configure a ConsoleHandler, which will only
+# show messages at the INFO and above levels.
+handlers=java.util.logging.ConsoleHandler
+#handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler
+java.util.logging.ConsoleHandler.formatter=org.jboss.messaging.integration.logging.JBMLoggerFormatter
+java.util.logging.FileHandler.level=INFO
+java.util.logging.FileHandler.formatter=org.jboss.messaging.integration.logging.JBMLoggerFormatter
+java.util.logging.FileHandler.pattern=logs/messaging.log
+java.util.logging.FileHandler.limit=10000
+# Default global logging level.
+# This specifies which kinds of events are logged across
+# all loggers. For any given facility this global level
+# can be overriden by a facility specific level
+# Note that the ConsoleHandler also has a separate level
+# setting to limit messages printed to the console.
+.level= INFO
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
Added: trunk/examples/common/config/server.properties
===================================================================
--- trunk/examples/common/config/server.properties (rev 0)
+++ trunk/examples/common/config/server.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -0,0 +1 @@
+server.args=-XX:+UseParallelGC -Xms512M -Xmx2048M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Modified: trunk/examples/common/src/org/jboss/common/example/JBMExample.java
===================================================================
--- trunk/examples/common/src/org/jboss/common/example/JBMExample.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/common/src/org/jboss/common/example/JBMExample.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -46,36 +46,28 @@
private String serverClasspath;
+ private String serverProps;
+
public abstract boolean runExample() throws Exception;
private boolean logServerOutput;
- private String[] allVMArgs;
-
private String[] configs;
-
- private static final String[] defaultArgs = new String[] {"-Xms512M",
- "-Xmx512M",
- "-XX:+UseParallelGC",
- "-XX:+AggressiveOpts",
- "-XX:+UseFastAccessorMethods"};
- protected void run(String[] serverVMArgs, String[] configs)
+ protected void run(String[] configs)
{
String runServerProp = System.getProperty("jbm.example.runServer");
String logServerOutputProp = System.getProperty("jbm.example.logserveroutput");
serverClasspath = System.getProperty("jbm.example.server.classpath");
boolean runServer = runServerProp == null ? true : Boolean.valueOf(runServerProp);
logServerOutput = logServerOutputProp == null?false:Boolean.valueOf(logServerOutputProp);
- log.info("jbm.example.runServer is " + runServer);
-
- allVMArgs = new String[serverVMArgs == null ? 1 : serverVMArgs.length + 1];
- if (serverVMArgs != null)
+ serverProps = System.getProperty("jbm.example.server.args");
+ if(System.getProperty("jbm.example.server.override.args") != null)
{
- System.arraycopy(serverVMArgs, 0, allVMArgs, 0, serverVMArgs.length);
- }
- String logProps = System.getProperty("java.util.logging.config.file");
- allVMArgs[allVMArgs.length - 1] = "-Djava.util.logging.config.file=" + logProps;
+ serverProps = System.getProperty("jbm.example.server..override.args");
+ }
+ System.out.println("serverProps = " + serverProps);
+ log.info("jbm.example.runServer is " + runServer);
this.configs = configs;
@@ -124,11 +116,6 @@
reportResultAndExit();
}
- protected void run(String[] args)
- {
- run( defaultArgs, args);
- }
-
protected void killServer(int id) throws Exception
{
System.out.println("Killing server " + id);
@@ -173,21 +160,11 @@
protected void startServer(int index) throws Exception
{
String config = configs[index];
- log.info("starting server with config '" + config + "' " + "logServerOutput " + logServerOutput);
- StringBuilder args = new StringBuilder();
- for (int i = 0; i < allVMArgs.length; i++)
- {
- args.append(allVMArgs[i]);
- if (i != allVMArgs.length - 1)
- {
- args.append(",");
- }
- }
- log.info("and vm args: " + args.toString());
+ log.info("starting server with config '" + config + "' " + "logServerOutput " + logServerOutput);
servers[index] = SpawnedVMSupport.spawnVM(
serverClasspath,
SpawnedJBMServer.class.getName(),
- allVMArgs,
+ serverProps,
logServerOutput,
"STARTED::",
"FAILED::",
Modified: trunk/examples/common/src/org/jboss/common/example/SpawnedVMSupport.java
===================================================================
--- trunk/examples/common/src/org/jboss/common/example/SpawnedVMSupport.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/common/src/org/jboss/common/example/SpawnedVMSupport.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -50,7 +50,7 @@
public static Process spawnVM(String classPath,
final String className,
- final String[] vmargs,
+ final String vmargs,
final boolean logOutput,
final String success,
final String failure,
@@ -60,21 +60,16 @@
StringBuffer sb = new StringBuffer();
sb.append("java").append(' ');
-
- for (String vmarg : vmargs)
+ String vmarg = vmargs;
+ if (System.getProperty("os.name").contains("Windows"))
{
- if (System.getProperty("os.name").contains("Windows"))
- {
- vmarg = vmarg.replaceAll("/", "\\\\");
- }
- sb.append(vmarg).append(' ');
+ vmarg = vmarg.replaceAll("/", "\\\\");
}
+ sb.append(vmarg).append(" ");
String pathSeparater = System.getProperty("path.separator");
classPath = classPath + pathSeparater + ".";
- // System.out.println("classPath = " + classPath);
- // I guess it'd be simpler to check if the OS is Windows...
-
- boolean isWindows = System.getProperty("os.name").contains("Windows");
+
+ boolean isWindows = System.getProperty("os.name").contains("Windows");
if (isWindows)
{
sb.append("-cp").append(" \"").append(classPath).append("\" ");
@@ -83,7 +78,7 @@
{
sb.append("-cp").append(" ").append(classPath).append(" ");
}
-
+
//FIXME - not good to assume path separator
String libPath = "-Djava.library.path=" + System.getProperty("java.library.path", "./native/bin");
if (isWindows)
@@ -93,7 +88,6 @@
}
sb.append("-Djava.library.path=").append(libPath).append(" ");
- // sb.append("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 ");
sb.append(className).append(' ');
for (String arg : args)
@@ -105,7 +99,7 @@
log.info("command line: " + commandLine);
- Process process = Runtime.getRuntime().exec(commandLine, new String[] {}, new File(configDir));
+ Process process = Runtime.getRuntime().exec(commandLine, new String[]{}, new File(configDir));
log.trace("process: " + process);
@@ -139,6 +133,13 @@
if (outputLogger.failed || errorLogger.failed)
{
+ try
+ {
+ process.destroy();
+ }
+ catch (Throwable e)
+ {
+ }
throw new RuntimeException("server failed to start");
}
return process;
@@ -207,11 +208,11 @@
{
if (sendToErr)
{
- System.err.println(className + " err:" + line);
+ System.err.println("JBMServer err:" + line);
}
else
{
- System.out.println(className + " out:" + line);
+ System.out.println("JBMServer out:" + line);
}
}
}
Added: trunk/examples/jms/client-kickoff/ant.properties
===================================================================
--- trunk/examples/jms/client-kickoff/ant.properties (rev 0)
+++ trunk/examples/jms/client-kickoff/ant.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -0,0 +1 @@
+server.args=-XX:+UseParallelGC -Xms512M -Xmx2048M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=3000 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Modified: trunk/examples/jms/client-kickoff/build.xml
===================================================================
--- trunk/examples/jms/client-kickoff/build.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/client-kickoff/build.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -31,7 +31,7 @@
<project default="run" name="JBoss Messaging Client Kickoff Example">
<import file="../../common/build.xml"/>
-
+ <property file="ant.properties"/>
<target name="run">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.jms.example.ClientKickoffExample"/>
Modified: trunk/examples/jms/client-kickoff/src/org/jboss/jms/example/ClientKickoffExample.java
===================================================================
--- trunk/examples/jms/client-kickoff/src/org/jboss/jms/example/ClientKickoffExample.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/client-kickoff/src/org/jboss/jms/example/ClientKickoffExample.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -21,8 +21,9 @@
*/
package org.jboss.jms.example;
-import java.util.HashMap;
-import java.util.concurrent.atomic.AtomicReference;
+import org.jboss.common.example.JBMExample;
+import org.jboss.messaging.core.management.MessagingServerControlMBean;
+import org.jboss.messaging.core.management.ObjectNames;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
@@ -35,11 +36,9 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
import javax.naming.InitialContext;
+import java.util.HashMap;
+import java.util.concurrent.atomic.AtomicReference;
-import org.jboss.common.example.JBMExample;
-import org.jboss.messaging.core.management.MessagingServerControlMBean;
-import org.jboss.messaging.core.management.ObjectNames;
-
/**
* An example that shows how to kick off a client connected to JBoss Messagingby using JMX.
*
@@ -51,11 +50,7 @@
public static void main(String[] args)
{
- String[] serverJMXArgs = new String[] { "-Dcom.sun.management.jmxremote",
- "-Dcom.sun.management.jmxremote.port=3000",
- "-Dcom.sun.management.jmxremote.ssl=false",
- "-Dcom.sun.management.jmxremote.authenticate=false" };
- new ClientKickoffExample().run(serverJMXArgs, args);
+ new ClientKickoffExample().run(args);
}
public boolean runExample() throws Exception
Modified: trunk/examples/jms/jaas/build.xml
===================================================================
--- trunk/examples/jms/jaas/build.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/jaas/build.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -31,7 +31,11 @@
<project default="run" name="JBoss Messaging JAAS Queue Example">
<import file="../../common/build.xml"/>
-
+ <path id="extra.classpath">
+ <fileset dir="${jars.dir}">
+ <include name="**/jbosssx-client.jar"/>
+ </fileset>
+ </path>
<target name="run">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.jms.example.JAASExample"/>
Modified: trunk/examples/jms/jaas/server0/jbm-jboss-beans.xml
===================================================================
--- trunk/examples/jms/jaas/server0/jbm-jboss-beans.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/jaas/server0/jbm-jboss-beans.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -25,7 +25,7 @@
<bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration"/>
<!-- The security manager using JAAS -->
- <bean name="JBMSecurityManager" class="org.jboss.messaging.integration.security.JAASSecurityManager">
+ <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JAASSecurityManager">
<property name="configurationName">org.jboss.jms.example.ExampleLoginModule</property>
<property name="configuration">
<inject bean="ExampleConfiguration"/>
Added: trunk/examples/jms/jmx/ant.properties
===================================================================
--- trunk/examples/jms/jmx/ant.properties (rev 0)
+++ trunk/examples/jms/jmx/ant.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -0,0 +1 @@
+server.args=-XX:+UseParallelGC -Xms512M -Xmx2048M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=3000 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Modified: trunk/examples/jms/jmx/build.xml
===================================================================
--- trunk/examples/jms/jmx/build.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/jmx/build.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -31,7 +31,7 @@
<project default="run" name="JBoss Messaging JMX Example">
<import file="../../common/build.xml"/>
-
+ <property file="ant.properties"/>
<target name="run">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.jms.example.JMXExample"/>
Modified: trunk/examples/jms/jmx/src/org/jboss/jms/example/JMXExample.java
===================================================================
--- trunk/examples/jms/jmx/src/org/jboss/jms/example/JMXExample.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/jmx/src/org/jboss/jms/example/JMXExample.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -21,7 +21,9 @@
*/
package org.jboss.jms.example;
-import java.util.HashMap;
+import org.jboss.common.example.JBMExample;
+import org.jboss.messaging.core.management.ObjectNames;
+import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
@@ -38,11 +40,8 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
import javax.naming.InitialContext;
+import java.util.HashMap;
-import org.jboss.common.example.JBMExample;
-import org.jboss.messaging.core.management.ObjectNames;
-import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
-
/**
* An example that shows how to manage JBoss Messaging using JMX.
*
@@ -54,12 +53,7 @@
public static void main(String[] args)
{
- String[] serverJMXArgs = new String[] { "-Dcom.sun.management.jmxremote",
- "-Dcom.sun.management.jmxremote.port=3000",
- "-Dcom.sun.management.jmxremote.ssl=false",
- "-Dcom.sun.management.jmxremote.authenticate=false"
- };
- new JMXExample().run(serverJMXArgs, args);
+ new JMXExample().run(args);
}
public boolean runExample() throws Exception
Added: trunk/examples/jms/large-message/ant.properties
===================================================================
--- trunk/examples/jms/large-message/ant.properties (rev 0)
+++ trunk/examples/jms/large-message/ant.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -0,0 +1 @@
+server.args=-XX:+UseParallelGC -Xms50M -Xmx50M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Modified: trunk/examples/jms/large-message/build.xml
===================================================================
--- trunk/examples/jms/large-message/build.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/large-message/build.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -31,7 +31,7 @@
<project default="run" name="JBoss Messaging Large Message Example">
<import file="../../common/build.xml"/>
-
+ <property file="ant.properties"/>
<target name="run" depends="delete-large-messages">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.jms.example.LargeMessageExample"/>
Modified: trunk/examples/jms/large-message/src/org/jboss/jms/example/LargeMessageExample.java
===================================================================
--- trunk/examples/jms/large-message/src/org/jboss/jms/example/LargeMessageExample.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/large-message/src/org/jboss/jms/example/LargeMessageExample.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -21,13 +21,7 @@
*/
package org.jboss.jms.example;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import org.jboss.common.example.JBMExample;
import javax.jms.BytesMessage;
import javax.jms.Connection;
@@ -37,9 +31,14 @@
import javax.jms.Queue;
import javax.jms.Session;
import javax.naming.InitialContext;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
-import org.jboss.common.example.JBMExample;
-
/**
* This example demonstrates the ability of JBoss Messaging to send and consume a very large message, much
* bigger than can fit in RAM.
@@ -51,14 +50,7 @@
{
public static void main(String[] args)
{
- // We limit the server to running in only 50MB of RAM
- String[] serverArgs = new String[] { "-Xms50M",
- "-Xmx50M",
- "-XX:+UseParallelGC",
- "-XX:+AggressiveOpts",
- "-XX:+UseFastAccessorMethods" };
-
- new LargeMessageExample().run(serverArgs, args);
+ new LargeMessageExample().run(args);
}
// The message we will send is size 256MB, even though we are only running in 50MB of RAM on both client and server.
Added: trunk/examples/jms/message-counters/ant.properties
===================================================================
--- trunk/examples/jms/message-counters/ant.properties (rev 0)
+++ trunk/examples/jms/message-counters/ant.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -0,0 +1 @@
+server.args=-XX:+UseParallelGC -Xms512M -Xmx2048M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=3001 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Modified: trunk/examples/jms/message-counters/build.xml
===================================================================
--- trunk/examples/jms/message-counters/build.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/message-counters/build.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -31,7 +31,7 @@
<project default="run" name="JBoss Messaging Message Counter Example">
<import file="../../common/build.xml"/>
-
+ <property file="ant.properties"/>
<target name="run">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.jms.example.MessageCounterExample"/>
Modified: trunk/examples/jms/message-counters/src/org/jboss/jms/example/MessageCounterExample.java
===================================================================
--- trunk/examples/jms/message-counters/src/org/jboss/jms/example/MessageCounterExample.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/message-counters/src/org/jboss/jms/example/MessageCounterExample.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -21,7 +21,10 @@
*/
package org.jboss.jms.example;
-import java.util.HashMap;
+import org.jboss.common.example.JBMExample;
+import org.jboss.messaging.core.management.MessageCounterInfo;
+import org.jboss.messaging.core.management.ObjectNames;
+import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
@@ -38,12 +41,8 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
import javax.naming.InitialContext;
+import java.util.HashMap;
-import org.jboss.common.example.JBMExample;
-import org.jboss.messaging.core.management.MessageCounterInfo;
-import org.jboss.messaging.core.management.ObjectNames;
-import org.jboss.messaging.jms.server.management.JMSQueueControlMBean;
-
/**
* An example showing how to use message counters to have information on a queue.
*
@@ -56,11 +55,7 @@
public static void main(String[] args)
{
- String[] serverJMXArgs = new String[] { "-Dcom.sun.management.jmxremote",
- "-Dcom.sun.management.jmxremote.port=3001",
- "-Dcom.sun.management.jmxremote.ssl=false",
- "-Dcom.sun.management.jmxremote.authenticate=false" };
- new MessageCounterExample().run(serverJMXArgs, args);
+ new MessageCounterExample().run(args);
}
public boolean runExample() throws Exception
Added: trunk/examples/jms/paging/ant.properties
===================================================================
--- trunk/examples/jms/paging/ant.properties (rev 0)
+++ trunk/examples/jms/paging/ant.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -0,0 +1 @@
+server.args=-XX:+UseParallelGC -Xms50M -Xmx50M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Modified: trunk/examples/jms/paging/build.xml
===================================================================
--- trunk/examples/jms/paging/build.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/paging/build.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -31,7 +31,7 @@
<project default="run" name="JBoss Messaging Paging Example">
<import file="../../common/build.xml"/>
-
+ <property file="ant.properties"/>
<target name="run">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.jms.example.PagingExample"/>
Modified: trunk/examples/jms/paging/src/org/jboss/jms/example/PagingExample.java
===================================================================
--- trunk/examples/jms/paging/src/org/jboss/jms/example/PagingExample.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/paging/src/org/jboss/jms/example/PagingExample.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -21,6 +21,8 @@
*/
package org.jboss.jms.example;
+import org.jboss.common.example.JBMExample;
+
import javax.jms.BytesMessage;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -31,8 +33,6 @@
import javax.jms.Session;
import javax.naming.InitialContext;
-import org.jboss.common.example.JBMExample;
-
/**
* A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message.
*
@@ -42,13 +42,7 @@
{
public static void main(String[] args)
{
- String[] serverArgs = new String[] { "-Xms50M",
- "-Xmx50M",
- "-XX:+UseParallelGC",
- "-XX:+AggressiveOpts",
- "-XX:+UseFastAccessorMethods" };
-
- new PagingExample().run(serverArgs, args);
+ new PagingExample().run(args);
}
public boolean runExample() throws Exception
Modified: trunk/examples/jms/queue-message-redistribution/build.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/build.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/queue-message-redistribution/build.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -33,10 +33,10 @@
<import file="../../common/build.xml"/>
<target name="run">
- <antcall target="runExample">
+ <!-- <antcall target="runExample">
<param name="example.classname" value="org.jboss.jms.example.QueueMessageRedistributionExample"/>
<param name="jbm.example.beans.file" value="server0 server1"/>
- </antcall>
+ </antcall>-->
</target>
<target name="runRemote">
Added: trunk/examples/jms/symmetric-cluster/ant.properties
===================================================================
--- trunk/examples/jms/symmetric-cluster/ant.properties (rev 0)
+++ trunk/examples/jms/symmetric-cluster/ant.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -0,0 +1 @@
+server.args=-XX:+UseParallelGC -Xms50M -Xmx100M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Modified: trunk/examples/jms/symmetric-cluster/build.xml
===================================================================
--- trunk/examples/jms/symmetric-cluster/build.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/symmetric-cluster/build.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -31,7 +31,7 @@
<project default="run" name="JBoss Messaging JMS Symmetric Cluster Example">
<import file="../../common/build.xml"/>
-
+ <property file="ant.properties"/>
<target name="run" depends="delete-files">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.jms.example.SymmetricClusterExample"/>
Modified: trunk/examples/jms/symmetric-cluster/src/org/jboss/jms/example/SymmetricClusterExample.java
===================================================================
--- trunk/examples/jms/symmetric-cluster/src/org/jboss/jms/example/SymmetricClusterExample.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/symmetric-cluster/src/org/jboss/jms/example/SymmetricClusterExample.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -21,6 +21,11 @@
*/
package org.jboss.jms.example;
+import org.jboss.common.example.JBMExample;
+import org.jboss.messaging.jms.JBossQueue;
+import org.jboss.messaging.jms.JBossTopic;
+import org.jboss.messaging.jms.client.JBossConnectionFactory;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.MessageConsumer;
@@ -30,11 +35,6 @@
import javax.jms.TextMessage;
import javax.jms.Topic;
-import org.jboss.common.example.JBMExample;
-import org.jboss.messaging.jms.JBossQueue;
-import org.jboss.messaging.jms.JBossTopic;
-import org.jboss.messaging.jms.client.JBossConnectionFactory;
-
/**
* This example demonstrates a cluster of three nodes set up in a symmetric topology - i.e. each node
* is connected to every other node in the cluster. Also each node, has it's own backup node.
@@ -62,7 +62,7 @@
"-XX:+AggressiveOpts",
"-XX:+UseFastAccessorMethods" };
- new SymmetricClusterExample().run(serverArgs, args);
+ new SymmetricClusterExample().run(args);
}
public boolean runExample() throws Exception
Added: trunk/examples/jms/xa-heuristic/ant.properties
===================================================================
--- trunk/examples/jms/xa-heuristic/ant.properties (rev 0)
+++ trunk/examples/jms/xa-heuristic/ant.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -0,0 +1 @@
+server.args=-XX:+UseParallelGC -Xms512M -Xmx2048M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=3001 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Modified: trunk/examples/jms/xa-heuristic/build.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/build.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/xa-heuristic/build.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -31,7 +31,7 @@
<project default="run" name="JBoss Messaging JMS XA Heuristic Example">
<import file="../../common/build.xml"/>
-
+ <property file="ant.properties"/>
<target name="run">
<antcall target="runExample">
<param name="example.classname" value="org.jboss.jms.example.XAHeuristicExample"/>
Modified: trunk/examples/jms/xa-heuristic/src/org/jboss/jms/example/XAHeuristicExample.java
===================================================================
--- trunk/examples/jms/xa-heuristic/src/org/jboss/jms/example/XAHeuristicExample.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/examples/jms/xa-heuristic/src/org/jboss/jms/example/XAHeuristicExample.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -21,8 +21,10 @@
*/
package org.jboss.jms.example;
-import java.util.ArrayList;
-import java.util.HashMap;
+import org.jboss.common.example.JBMExample;
+import org.jboss.messaging.core.management.ObjectNames;
+import org.jboss.messaging.core.transaction.impl.XidImpl;
+import org.jboss.messaging.utils.UUIDGenerator;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -43,12 +45,9 @@
import javax.naming.InitialContext;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import java.util.ArrayList;
+import java.util.HashMap;
-import org.jboss.common.example.JBMExample;
-import org.jboss.messaging.core.management.ObjectNames;
-import org.jboss.messaging.core.transaction.impl.XidImpl;
-import org.jboss.messaging.utils.UUIDGenerator;
-
/**
* A simple JMS example showing how to administer un-finished transactions.
*
@@ -63,12 +62,7 @@
public static void main(String[] args)
{
- String[] serverJMXArgs = new String[] { "-Dcom.sun.management.jmxremote",
- "-Dcom.sun.management.jmxremote.port=3001",
- "-Dcom.sun.management.jmxremote.ssl=false",
- "-Dcom.sun.management.jmxremote.authenticate=false"
- };
- new XAHeuristicExample().run(serverJMXArgs, args);
+ new XAHeuristicExample().run(args);
}
public boolean runExample() throws Exception
Modified: trunk/messaging.ipr
===================================================================
--- trunk/messaging.ipr 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/messaging.ipr 2009-05-27 12:57:21 UTC (rev 7070)
@@ -158,6 +158,78 @@
<maximumStackSize value="32" />
<properties />
</buildFile>
+ <buildFile url="file://$PROJECT_DIR$/examples/jms/xa-heuristic/build.xml">
+ <additionalClassPath />
+ <antReference projectDefault="true" />
+ <customJdkName value="" />
+ <maximumHeapSize value="128" />
+ <maximumStackSize value="32" />
+ <properties />
+ </buildFile>
+ <buildFile url="file://$PROJECT_DIR$/examples/jms/symmetric-cluster/build.xml">
+ <additionalClassPath />
+ <antReference projectDefault="true" />
+ <customJdkName value="" />
+ <maximumHeapSize value="128" />
+ <maximumStackSize value="32" />
+ <properties />
+ </buildFile>
+ <buildFile url="file://$PROJECT_DIR$/examples/jms/message-counters/build.xml">
+ <additionalClassPath />
+ <antReference projectDefault="true" />
+ <customJdkName value="" />
+ <maximumHeapSize value="128" />
+ <maximumStackSize value="32" />
+ <properties />
+ </buildFile>
+ <buildFile url="file://$PROJECT_DIR$/examples/jms/jmx/build.xml">
+ <additionalClassPath />
+ <antReference projectDefault="true" />
+ <customJdkName value="" />
+ <maximumHeapSize value="128" />
+ <maximumStackSize value="32" />
+ <properties />
+ </buildFile>
+ <buildFile url="file://$PROJECT_DIR$/examples/jms/client-kickoff/build.xml">
+ <additionalClassPath />
+ <antReference projectDefault="true" />
+ <customJdkName value="" />
+ <maximumHeapSize value="128" />
+ <maximumStackSize value="32" />
+ <properties />
+ </buildFile>
+ <buildFile url="file://$PROJECT_DIR$/examples/common/build.xml">
+ <additionalClassPath />
+ <antReference projectDefault="true" />
+ <customJdkName value="" />
+ <maximumHeapSize value="128" />
+ <maximumStackSize value="32" />
+ <properties />
+ </buildFile>
+ <buildFile url="file://$PROJECT_DIR$/examples/jms/jaas/build.xml">
+ <additionalClassPath />
+ <antReference projectDefault="true" />
+ <customJdkName value="" />
+ <maximumHeapSize value="128" />
+ <maximumStackSize value="32" />
+ <properties />
+ </buildFile>
+ <buildFile url="file://$PROJECT_DIR$/examples/jms/queue-message-redistribution/build.xml">
+ <additionalClassPath />
+ <antReference projectDefault="true" />
+ <customJdkName value="" />
+ <maximumHeapSize value="128" />
+ <maximumStackSize value="32" />
+ <properties />
+ </buildFile>
+ <buildFile url="file://$PROJECT_DIR$/examples/jms/management-notifications/build.xml">
+ <additionalClassPath />
+ <antReference projectDefault="true" />
+ <customJdkName value="" />
+ <maximumHeapSize value="128" />
+ <maximumStackSize value="32" />
+ <properties />
+ </buildFile>
</component>
<component name="BuildJarProjectSettings">
<option name="BUILD_JARS_ON_MAKE" value="false" />
Modified: trunk/src/bin/run.bat
===================================================================
--- trunk/src/bin/run.bat 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/src/bin/run.bat 2009-05-27 12:57:21 UTC (rev 7070)
@@ -8,7 +8,7 @@
for /R ..\lib %%A in (*.jar) do (
SET CLASSPATH=!CLASSPATH!;%%A
)
-
+mkdit logs
echo ***********************************************************************************
echo "java %JVM_ARGS% -classpath %CLASSPATH% org.jboss.messaging.integration.bootstrap.JBMBootstrapServer jbm-jboss-beans.xml"
echo ***********************************************************************************
Modified: trunk/src/bin/run.sh
===================================================================
--- trunk/src/bin/run.sh 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/src/bin/run.sh 2009-05-27 12:57:21 UTC (rev 7070)
@@ -1,5 +1,5 @@
export JBM_HOME=..
-
+mkdir logs
# By default, the server is started in the non-clustered standalone configuration
if [ a"$1" = a ]; then CONFIG_DIR=$JBM_HOME/config/stand-alone/non-clustered; else CONFIG_DIR="$1"; fi
Modified: trunk/src/config/examples-ant.properties
===================================================================
--- trunk/src/config/examples-ant.properties 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/src/config/examples-ant.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -1,4 +1,5 @@
-jbm.example.logserveroutput=false
-logging.properties=${imported.basedir}/../../../config/stand-alone/clustered/logging.properties
-jbm.jars.dir=${imported.basedir}/../../../lib
-jars.dir=${imported.basedir}/../../../lib
\ No newline at end of file
+jbm.example.logserveroutput=true
+jbm.jars.dir=${imported.basedir}/../../lib
+jars.dir=${imported.basedir}/../../lib
+client.jars.dir=${imported.basedir}/../../client
+aio.library.path=${imported.basedir}/../native/bin
\ No newline at end of file
Deleted: trunk/src/config/stand-alone/clustered/log4j.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/log4j.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/src/config/stand-alone/clustered/log4j.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- $Id: log4j.xml 536 2005-12-22 06:28:39Z ovidiu $ -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p @%t [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-
- <param name="File" value="./logs/messaging.log"/>
-
- <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
- for each test. We need to append if we want to preserve a full testsuite run log.
- Make sure the build script clears this log at the beginning of each run.
- -->
- <param name="Append" value="false"/>
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <!-- <param name="ConversionPattern" value="%d %-5p @%t [%c] %m%n"/> -->
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n -->
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-
- </layout>
- </appender>
-
- <category name="org.jboss">
- <priority value="INFO"/>
- </category>
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-
-
-</log4j:configuration>
Modified: trunk/src/config/stand-alone/clustered/logging.properties
===================================================================
--- trunk/src/config/stand-alone/clustered/logging.properties 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/src/config/stand-alone/clustered/logging.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -15,8 +15,12 @@
# Note that these classes must be on the system classpath.
# By default we only configure a ConsoleHandler, which will only
# show messages at the INFO and above levels.
-handlers=org.jboss.messaging.integration.logging.JBossLoggerHandler
-
+handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler
+java.util.logging.ConsoleHandler.formatter=org.jboss.messaging.integration.logging.JBMLoggerFormatter
+java.util.logging.FileHandler.level=INFO
+java.util.logging.FileHandler.pattern=logs/messaging.log
+java.util.logging.FileHandler.formatter=org.jboss.messaging.integration.logging.JBMLoggerFormatter
+java.util.logging.FileHandler.limit=10000
# Default global logging level.
# This specifies which kinds of events are logged across
# all loggers. For any given facility this global level
Deleted: trunk/src/config/stand-alone/non-clustered/log4j.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/log4j.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/src/config/stand-alone/non-clustered/log4j.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- $Id: log4j.xml 536 2005-12-22 06:28:39Z ovidiu $ -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p @%t [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-
- <param name="File" value="./logs/messaging.log"/>
-
- <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
- for each test. We need to append if we want to preserve a full testsuite run log.
- Make sure the build script clears this log at the beginning of each run.
- -->
- <param name="Append" value="false"/>
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <!-- <param name="ConversionPattern" value="%d %-5p @%t [%c] %m%n"/> -->
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n -->
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-
- </layout>
- </appender>
-
- <category name="org.jboss">
- <priority value="INFO"/>
- </category>
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-
-
-</log4j:configuration>
Modified: trunk/src/config/stand-alone/non-clustered/logging.properties
===================================================================
--- trunk/src/config/stand-alone/non-clustered/logging.properties 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/src/config/stand-alone/non-clustered/logging.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -15,8 +15,12 @@
# Note that these classes must be on the system classpath.
# By default we only configure a ConsoleHandler, which will only
# show messages at the INFO and above levels.
-handlers=org.jboss.messaging.integration.logging.JBossLoggerHandler
-
+handlers=java.util.logging.ConsoleHandler,java.util.logging.FileHandler
+java.util.logging.ConsoleHandler.formatter=org.jboss.messaging.integration.logging.JBMLoggerFormatter
+java.util.logging.FileHandler.level=INFO
+java.util.logging.FileHandler.formatter=org.jboss.messaging.integration.logging.JBMLoggerFormatter
+java.util.logging.FileHandler.pattern=logs/messaging.log
+java.util.logging.FileHandler.limit=10000
# Default global logging level.
# This specifies which kinds of events are logged across
# all loggers. For any given facility this global level
Added: trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerFormatter.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerFormatter.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerFormatter.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.integration.logging;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.logging.LogRecord;
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ */
+public class JBMLoggerFormatter extends java.util.logging.Formatter
+{
+ Date date = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss,SSS");
+ private String lineSeparator = System.getProperty("line.separator");
+
+ public synchronized String format(LogRecord record)
+ {
+ StringBuffer sb = new StringBuffer();
+ // Minimize memory allocations here.
+ date.setTime(record.getMillis());
+ sb.append(dateFormat.format(date)).append(" ");
+ sb.append(record.getLevel()). append(" [");
+ sb.append(record.getLoggerName()).append("]").append(" ");
+ sb.append(record.getMessage());
+ sb.append(" ");
+ sb.append(lineSeparator);
+ if (record.getThrown() != null)
+ {
+ try
+ {
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ record.getThrown().printStackTrace(pw);
+ pw.close();
+ sb.append(sw.toString());
+ }
+ catch (Exception ex)
+ {
+ }
+ }
+ return sb.toString();
+ }
+
+}
Modified: trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerPlugin.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerPlugin.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/src/main/org/jboss/messaging/integration/logging/JBMLoggerPlugin.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -24,91 +24,94 @@
import org.jboss.logging.LoggerPlugin;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
@SuppressWarnings("deprecation")
public class JBMLoggerPlugin implements LoggerPlugin
{
- org.apache.log4j.Logger logger;
+ Logger logger;
public void init(String s)
{
- logger = org.apache.log4j.Logger.getLogger(s);
+ logger = Logger.getLogger(s);
}
public boolean isTraceEnabled()
{
- return logger.isTraceEnabled();
+ return logger.isLoggable(Level.FINEST);
}
public void trace(Object o)
{
- logger.trace(o);
+ logger.log(Level.FINEST, o.toString());
}
public void trace(Object o, Throwable throwable)
{
- logger.trace(o, throwable);
+ logger.log(Level.FINEST, o.toString(), throwable);
}
public boolean isDebugEnabled()
{
- return logger.isDebugEnabled();
+ return logger.isLoggable(Level.FINE);
}
public void debug(Object o)
{
- logger.debug(o);
+ logger.log(Level.FINE, o.toString());
}
public void debug(Object o, Throwable throwable)
{
- logger.debug(o, throwable);
+ logger.log(Level.FINE, o.toString(), throwable);
}
public boolean isInfoEnabled()
{
- return logger.isInfoEnabled();
+ return logger.isLoggable(Level.INFO);
}
public void info(Object o)
{
- logger.info(o);
+ logger.log(Level.INFO, o.toString());
}
public void info(Object o, Throwable throwable)
{
- logger.info(o, throwable);
+ logger.log(Level.INFO, o.toString(), throwable);
}
public void warn(Object o)
{
- logger.warn(o);
+ logger.log(Level.WARNING, o.toString());
}
public void warn(Object o, Throwable throwable)
{
- logger.warn(o, throwable);
+ logger.log(Level.WARNING, o.toString(), throwable);
}
public void error(Object o)
{
- logger.warn(o);
+ logger.log(Level.SEVERE, o.toString());
}
public void error(Object o, Throwable throwable)
{
- logger.error(o, throwable);
+ logger.log(Level.SEVERE, o.toString(), throwable);
}
public void fatal(Object o)
{
- logger.fatal(o);
+ logger.log(Level.SEVERE, o.toString());
}
public void fatal(Object o, Throwable throwable)
{
- logger.fatal(o, throwable);
+ logger.log(Level.SEVERE, o.toString(), throwable);
}
}
Deleted: trunk/src/main/org/jboss/messaging/integration/logging/JBossLoggerHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/logging/JBossLoggerHandler.java 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/src/main/org/jboss/messaging/integration/logging/JBossLoggerHandler.java 2009-05-27 12:57:21 UTC (rev 7070)
@@ -1,119 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.messaging.integration.logging;
-
-import java.util.logging.Level;
-
-import org.jboss.logging.Logger;
-
-
-/**
- * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
- */
-public class JBossLoggerHandler extends BaseLoggerHandler
-{
- void publish(String loggerName, Level level, String message, Throwable throwable)
- {
- if (throwable == null)
- {
- switch (level.intValue())
- {
- case SEVERE:
- {
- Logger.getLogger(loggerName).error(message);
- break;
- }
- case WARNING:
- {
- Logger.getLogger(loggerName).warn(message);
- break;
- }
- case INFO:
- {
- Logger.getLogger(loggerName).info(message);
- break;
- }
- case CONFIG:
- {
- Logger.getLogger(loggerName).info(message);
- break;
- }
- case FINE:
- {
- Logger.getLogger(loggerName).debug(message);
- break;
- }
- case FINER:
- {
- Logger.getLogger(loggerName).debug(message);
- break;
- }
- case FINEST:
- {
- Logger.getLogger(loggerName).trace(message);
- break;
- }
- }
- }
- else
- {
- switch (level.intValue())
- {
- case SEVERE:
- {
- Logger.getLogger(loggerName).error(message, throwable);
- break;
- }
- case WARNING:
- {
- Logger.getLogger(loggerName).warn(message, throwable);
- break;
- }
- case INFO:
- {
- Logger.getLogger(loggerName).info(message, throwable);
- break;
- }
- case CONFIG:
- {
- Logger.getLogger(loggerName).info(message, throwable);
- break;
- }
- case FINE:
- {
- Logger.getLogger(loggerName).debug(message, throwable);
- break;
- }
- case FINER:
- {
- Logger.getLogger(loggerName).debug(message, throwable);
- break;
- }
- case FINEST:
- {
- Logger.getLogger(loggerName).trace(message, throwable);
- break;
- }
- }
- }
- }
-}
Deleted: trunk/tests/config/log4j.xml
===================================================================
--- trunk/tests/config/log4j.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/tests/config/log4j.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- log4j.xml,v 1.1 2006/03/31 21:20:11 timfox Exp -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <!-- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> -->
-
- <param name="File" value="${module.output}tests/logs/messaging-tests.log"/>
-
- <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
- for each test. We need to append if we want to preserve a full testsuite run log.
- Make sure the build script clears this log at the beginning of each run.
- -->
- <param name="Append" value="false"/>
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <!-- <param name="ConversionPattern" value="%d %-5p @%t [%c] %m%n"/> -->
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n -->
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="Target" value="System.out"/>
-
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%t %d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss">
- <priority value="INFO"/>
- </category>
-
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-
-</log4j:configuration>
Deleted: trunk/tests/jms-tests/config/log4j.xml
===================================================================
--- trunk/tests/jms-tests/config/log4j.xml 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/tests/jms-tests/config/log4j.xml 2009-05-27 12:57:21 UTC (rev 7070)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- $Id: log4j.xml 536 2005-12-22 06:28:39Z ovidiu $ -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <param name="Threshold" value="INFO"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p @%t [%c{1}] %m%n"/>
- </layout>
- </appender>
-
- <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
- <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-
- <param name="File" value="./logs/messaging.log"/>
-
- <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
- for each test. We need to append if we want to preserve a full testsuite run log.
- Make sure the build script clears this log at the beginning of each run.
- -->
- <param name="Append" value="false"/>
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <param name="Threshold" value="INFO"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <!-- <param name="ConversionPattern" value="%d %-5p @%t [%c] %m%n"/> -->
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n -->
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-
- </layout>
- </appender>
-
- <category name="org.jboss">
- <priority value="INFO"/>
- </category>
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-
-
-</log4j:configuration>
Deleted: trunk/tests/jms-tests/config/logging.properties
===================================================================
--- trunk/tests/jms-tests/config/logging.properties 2009-05-27 12:54:34 UTC (rev 7069)
+++ trunk/tests/jms-tests/config/logging.properties 2009-05-27 12:57:21 UTC (rev 7070)
@@ -1,31 +0,0 @@
-############################################################
-# Default Logging Configuration File
-#
-# You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.
-# For example java -Djava.util.logging.config.file=myfile
-############################################################
-
-############################################################
-# Global properties
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler
-# classes. These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the INFO and above levels.
-handlers=org.jboss.messaging.integration.logging.JBossLoggerHandler
-
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers. For any given facility this global level
-# can be overriden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= INFO
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
More information about the jboss-cvs-commits
mailing list