[jboss-cvs] JBoss Messaging SVN: r7312 - in trunk: src/bin and 6 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Jun 11 14:52:50 EDT 2009


Author: ataylor
Date: 2009-06-11 14:52:50 -0400 (Thu, 11 Jun 2009)
New Revision: 7312

Added:
   trunk/src/config/trunk/
   trunk/src/config/trunk/clustered/
   trunk/src/config/trunk/clustered/jbm-configuration.xml
   trunk/src/config/trunk/clustered/jbm-jboss-beans.xml
   trunk/src/config/trunk/clustered/jbm-jms.xml
   trunk/src/config/trunk/clustered/jbm-users.xml
   trunk/src/config/trunk/clustered/jndi.properties
   trunk/src/config/trunk/clustered/logging.properties
   trunk/src/config/trunk/non-clustered/
   trunk/src/config/trunk/non-clustered/jbm-configuration.xml
   trunk/src/config/trunk/non-clustered/jbm-jboss-beans.xml
   trunk/src/config/trunk/non-clustered/jbm-jms.xml
   trunk/src/config/trunk/non-clustered/jbm-users.xml
   trunk/src/config/trunk/non-clustered/jndi.properties
   trunk/src/config/trunk/non-clustered/logging.properties
Modified:
   trunk/build-messaging.xml
   trunk/src/bin/run.bat
   trunk/src/bin/run.sh
   trunk/src/config/stand-alone/clustered/jbm-configuration.xml
   trunk/src/config/stand-alone/clustered/logging.properties
   trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
   trunk/src/config/stand-alone/non-clustered/logging.properties
Log:
changed distro data and log dir and added config for ant runServer target

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2009-06-11 18:32:55 UTC (rev 7311)
+++ trunk/build-messaging.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -89,6 +89,8 @@
    <property name="src.config.dir" value="${src.dir}/config"/>
    <property name="src.config.standalone.non-clustered.dir" value="${src.dir}/config/stand-alone/non-clustered"/>
    <property name="src.config.standalone.clustered.dir" value="${src.dir}/config/stand-alone/clustered"/>
+   <property name="src.config.trunk.non-clustered.dir" value="${src.dir}/config/trunk/non-clustered"/>
+   <property name="src.config.trunk.clustered.dir" value="${src.dir}/config/trunk/clustered"/>
    <property name="src.config.jbossas.non-clustered.dir" value="${src.dir}/config/jboss-as/non-clustered"/>    
    <property name="src.config.jbossas.clustered.dir" value="${src.dir}/config/jboss-as/clustered"/>
    <property name="src.schema.dir" value="${src.config.dir}/common/schema"/>
@@ -814,7 +816,11 @@
             <include name="*.xml"/>
             <include name="jndi.properties"/>
             <include name="logging.properties"/>
+            <include name="stand-alone/**"/>
+            <include name="jboss-as/**"/>
             <exclude name="common/version.properties" />
+            <exclude name="*examples-ant.properties"/>
+            <exclude name="trunk"/>
          </fileset>
       </copy>
    	  <copy todir="${build.distro.native.dir}">
@@ -868,12 +874,6 @@
             <exclude name="**/*.*~"/>
          </fileset>
       </copy>
-
-      <copy todir="${build.distro.config.dir}">
-         <fileset dir="${src.config.dir}">
-            <exclude name="*examples-ant.properties"/>
-         </fileset>
-      </copy>
       
       <!-- examples-ant.properties allow the examples to be run from the source or from the distribution -->
       <!-- by configuring the correct lib/config location                                                -->
@@ -1410,12 +1410,12 @@
          <jvmarg value="-XX:+AggressiveOpts"/>
          <jvmarg value="-XX:+UseFastAccessorMethods"/>
          <jvmarg value="-Dcom.sun.management.jmxremote"/>
-         <jvmarg value="-Djava.util.logging.config.file=${src.config.standalone.non-clustered.dir}/logging.properties"/>
+         <jvmarg value="-Djava.util.logging.config.file=${src.config.trunk.non-clustered.dir}/logging.properties"/>
          <jvmarg value="-Djava.library.path=${native.bin.dir}"/>
          <!--<jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>-->
          <arg line="jbm-jboss-beans.xml"/>
          <classpath refid="jms.standalone.server.classpath"/>
-         <classpath path="${src.config.standalone.non-clustered.dir}" />
+         <classpath path="${src.config.trunk.non-clustered.dir}" />
       </java>
    </target>
 
@@ -1428,7 +1428,7 @@
          <jvmarg value="-XX:+AggressiveOpts"/>
          <jvmarg value="-XX:+UseFastAccessorMethods"/>
          <jvmarg value="-Dcom.sun.management.jmxremote"/>
-         <jvmarg value="-Djava.util.logging.config.file=${src.config.standalone.clustered.dir}/logging.properties"/>
+         <jvmarg value="-Djava.util.logging.config.file=${src.config.trunk.clustered.dir}/logging.properties"/>
          <jvmarg
                value="-Dorg.jboss.logging.Logger.pluginClass=org.jboss.messaging.integration.logging.JBMLoggerPlugin"/>
          <jvmarg value="-Djava.library.path=${native.bin.dir}"/>
@@ -1436,9 +1436,9 @@
          <jvmarg value="-Djnp.port=${jnp.port}"/>
          <jvmarg value="-Djnp.rmiPort=${jnp.rmiPort}"/>
          <jvmarg value="-Djbm.data.dir=${jbm.data.dir}"/>
-         <arg line="jbm-standalone-beans.xml"/>
+         <arg line="jbm-jboss-beans.xml"/>
          <classpath refid="jms.standalone.server.classpath"/>
-         <classpath path="${src.config.standalone.clustered.dir}" />
+         <classpath path="${src.config.trunk.clustered.dir}" />
       </java>
    </target>
 

Modified: trunk/src/bin/run.bat
===================================================================
--- trunk/src/bin/run.bat	2009-06-11 18:32:55 UTC (rev 7311)
+++ trunk/src/bin/run.bat	2009-06-11 18:52:50 UTC (rev 7312)
@@ -11,7 +11,7 @@
 for /R ..\lib %%A in (*.jar) do (
 SET CLASSPATH=!CLASSPATH!;%%A
 )
-mkdir logs
+mkdir ..\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-06-11 18:32:55 UTC (rev 7311)
+++ trunk/src/bin/run.sh	2009-06-11 18:52:50 UTC (rev 7312)
@@ -1,5 +1,5 @@
 export JBM_HOME=..
-mkdir -p logs
+mkdir -p ../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/stand-alone/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-configuration.xml	2009-06-11 18:32:55 UTC (rev 7311)
+++ trunk/src/config/stand-alone/clustered/jbm-configuration.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -78,4 +78,9 @@
       </address-setting>
    </address-settings>
 
+   <paging-directory>../data/paging</paging-directory>
+   <bindings-directory>../data/bindings</bindings-directory>
+   <journal-directory>../data/journal</journal-directory>
+   <large-messages-directory>../data/large-messages</large-messages-directory>
+
 </configuration>

Modified: trunk/src/config/stand-alone/clustered/logging.properties
===================================================================
--- trunk/src/config/stand-alone/clustered/logging.properties	2009-06-11 18:32:55 UTC (rev 7311)
+++ trunk/src/config/stand-alone/clustered/logging.properties	2009-06-11 18:52:50 UTC (rev 7312)
@@ -18,7 +18,7 @@
 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.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.

Modified: trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml	2009-06-11 18:32:55 UTC (rev 7311)
+++ trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -55,5 +55,9 @@
       </address-setting>
    </address-settings>
 
-
+   <paging-directory>../data/paging</paging-directory>
+   <bindings-directory>../data/bindings</bindings-directory>
+   <journal-directory>../data/journal</journal-directory>
+   <large-messages-directory>../data/large-messages</large-messages-directory>
+   
 </configuration>

Modified: trunk/src/config/stand-alone/non-clustered/logging.properties
===================================================================
--- trunk/src/config/stand-alone/non-clustered/logging.properties	2009-06-11 18:32:55 UTC (rev 7311)
+++ trunk/src/config/stand-alone/non-clustered/logging.properties	2009-06-11 18:52:50 UTC (rev 7312)
@@ -19,7 +19,7 @@
 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.pattern=../logs/messaging.log
 java.util.logging.FileHandler.limit=10000
 # Default global logging level.
 # This specifies which kinds of events are logged across

Added: trunk/src/config/trunk/clustered/jbm-configuration.xml
===================================================================
--- trunk/src/config/trunk/clustered/jbm-configuration.xml	                        (rev 0)
+++ trunk/src/config/trunk/clustered/jbm-configuration.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,81 @@
+<configuration xmlns="urn:jboss:messaging"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
+
+   <clustered>true</clustered>
+
+   <!-- Connectors -->
+   <connectors>
+      <connector name="netty-backup">
+         <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+         <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
+         <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
+      </connector>
+      <connector name="netty">
+         <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+         <param key="jbm.remoting.netty.host"  value="${jbm.remoting.netty.host:localhost}" type="String"/>
+         <param key="jbm.remoting.netty.port"  value="${jbm.remoting.netty.port:5445}" type="Integer"/>
+      </connector>
+      <connector name="in-vm">
+         <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+      </connector>
+   </connectors>
+
+   <!-- Acceptors -->
+   <acceptors>
+      <!-- In VM acceptor -->
+      <acceptor name="in-vm">
+         <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+         <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+      </acceptor>
+      <!-- Netty standard TCP acceptor -->
+      <acceptor name="netty">
+         <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+         <param key="jbm.remoting.netty.host"  value="${jbm.remoting.netty.host:localhost}" type="String"/>
+         <param key="jbm.remoting.netty.port"  value="${jbm.remoting.netty.port:5445}" type="Integer"/>
+      </acceptor>
+   </acceptors>
+
+   <!-- Clustering configuration -->
+   <broadcast-groups>
+      <broadcast-group name="bg-group1">
+         <local-bind-port>1234</local-bind-port>
+         <group-address>231.7.7.7</group-address>
+         <group-port>9876</group-port>
+         <broadcast-period>5000</broadcast-period>
+         <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+      </broadcast-group>
+   </broadcast-groups>
+
+   <discovery-groups>
+      <discovery-group name="dg-group1">
+         <group-address>231.7.7.7</group-address>
+         <group-port>9876</group-port>
+         <refresh-timeout>10000</refresh-timeout>
+      </discovery-group>
+   </discovery-groups>
+
+   <security-settings>
+      <security-setting match="#">
+         <permission type="createTempQueue" roles="guest"/>
+         <permission type="deleteTempQueue" roles="guest"/>
+         <permission type="consume" roles="guest"/>
+         <permission type="send" roles="guest"/>
+      </security-setting>
+   </security-settings>
+
+   <address-settings>
+      <!--default for catch all-->
+      <address-setting match="#">
+         <clustered>false</clustered>
+         <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+         <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+         <redelivery-delay>0</redelivery-delay>
+         <max-size-bytes>-1</max-size-bytes>
+         <page-size-bytes>10485760</page-size-bytes>
+         <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+         <message-counter-history-day-limit>10</message-counter-history-day-limit>
+      </address-setting>
+   </address-settings>
+
+</configuration>

Added: trunk/src/config/trunk/clustered/jbm-jboss-beans.xml
===================================================================
--- trunk/src/config/trunk/clustered/jbm-jboss-beans.xml	                        (rev 0)
+++ trunk/src/config/trunk/clustered/jbm-jboss-beans.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+   <!-- JNDI server. Disable this if you don't want JNDI -->
+   <bean name="JNDIServer" class="org.jnp.server.Main">
+      <property name="namingInfo">
+         <inject bean="Naming"/>
+      </property>
+      <property name="port">${jnp.port:1099}</property>
+      <property name="bindAddress">${jnp.host:localhost}</property>
+      <property name="rmiPort">${jnp.rmiPort:1098}</property>
+      <property name="rmiBindAddress">${jnp.host:localhost}</property>
+   </bean>
+
+   <!-- MBean server -->
+   <bean name="MBeanServer" class="javax.management.MBeanServer">
+      <constructor factoryClass="java.lang.management.ManagementFactory"
+                   factoryMethod="getPlatformMBeanServer"/>
+   </bean> 
+
+   <!-- The core configuration -->
+   <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
+   </bean>
+
+    <!-- The security manager -->
+   <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+      <start ignored="true"/>
+      <stop ignored="true"/>
+   </bean>
+
+    <!-- The core server -->
+   <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+     <start ignored="true"/>
+      <stop ignored="true"/>  
+      <constructor>
+         <parameter>
+            <inject bean="Configuration"/>
+         </parameter>
+         <parameter>
+            <inject bean="MBeanServer"/>
+         </parameter>
+         <parameter>
+            <inject bean="JBMSecurityManager"/>
+         </parameter>        
+      </constructor>         
+   </bean>
+   
+   <!-- The JMS server -->
+   <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+      <constructor>         
+         <parameter>
+            <inject bean="MessagingServer"/>
+         </parameter>         
+      </constructor>
+   </bean>
+  
+   
+</deployment>
\ No newline at end of file

Added: trunk/src/config/trunk/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/trunk/clustered/jbm-jms.xml	                        (rev 0)
+++ trunk/src/config/trunk/clustered/jbm-jms.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,30 @@
+<configuration xmlns="urn:jboss:messaging"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
+
+   <connection-factory name="ConnectionFactory">
+      <connector-ref connector-name="netty"/>
+      <entries>
+         <entry name="ConnectionFactory"/>
+         <entry name="XAConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <connection-factory name="ClusteredConnectionFactory">
+      <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+      <entries>
+         <entry name="/ClusteredConnectionFactory"/>
+         <entry name="/ClusteredXAConnectionFactory"/>
+         <entry name="java:/ClusteredConnectionFactory"/>
+         <entry name="java:/ClusteredXAConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <queue name="DLQ">
+      <entry name="/queue/DLQ"/>
+   </queue>
+   <queue name="ExpiryQueue">
+      <entry name="/queue/ExpiryQueue"/>
+   </queue>
+
+</configuration>
\ No newline at end of file

Added: trunk/src/config/trunk/clustered/jbm-users.xml
===================================================================
--- trunk/src/config/trunk/clustered/jbm-users.xml	                        (rev 0)
+++ trunk/src/config/trunk/clustered/jbm-users.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
+   <!-- the default user.  this is used where username is null-->
+   <defaultuser name="guest" password="guest">
+      <role name="guest"/>
+   </defaultuser>
+</configuration>
\ No newline at end of file

Added: trunk/src/config/trunk/clustered/jndi.properties
===================================================================
--- trunk/src/config/trunk/clustered/jndi.properties	                        (rev 0)
+++ trunk/src/config/trunk/clustered/jndi.properties	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file

Added: trunk/src/config/trunk/clustered/logging.properties
===================================================================
--- trunk/src/config/trunk/clustered/logging.properties	                        (rev 0)
+++ trunk/src/config/trunk/clustered/logging.properties	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,35 @@
+############################################################
+#  	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,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
+# 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.
+############################################################

Copied: trunk/src/config/trunk/non-clustered/jbm-configuration.xml (from rev 7305, trunk/src/config/stand-alone/non-clustered/jbm-configuration.xml)
===================================================================
--- trunk/src/config/trunk/non-clustered/jbm-configuration.xml	                        (rev 0)
+++ trunk/src/config/trunk/non-clustered/jbm-configuration.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,59 @@
+<configuration xmlns="urn:jboss:messaging"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="urn:jboss:messaging /schema/jbm-configuration.xsd">
+
+   <!-- Connectors -->
+   <connectors>
+      <connector name="netty">
+         <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+         <param key="jbm.remoting.netty.host"  value="${jbm.remoting.netty.host:localhost}" type="String"/>
+         <param key="jbm.remoting.netty.port"  value="${jbm.remoting.netty.port:5445}" type="Integer"/>
+      </connector>
+
+      <connector name="in-vm">
+         <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+      </connector>
+
+   </connectors>
+
+   <!-- Acceptors -->
+   <acceptors>
+      <!-- In VM acceptor -->
+      <acceptor name="in-vm">
+         <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+         <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+      </acceptor>
+
+      <!-- Netty TCP Acceptor -->
+      <acceptor name="netty">
+         <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+         <param key="jbm.remoting.netty.host"  value="${jbm.remoting.netty.host:localhost}" type="String"/>
+         <param key="jbm.remoting.netty.port"  value="${jbm.remoting.netty.port:5445}" type="Integer"/>
+      </acceptor>
+   </acceptors>
+
+    <security-settings>
+      <security-setting match="#">
+         <permission type="createTempQueue" roles="guest"/>
+         <permission type="deleteTempQueue" roles="guest"/>
+         <permission type="consume" roles="guest"/>
+         <permission type="send" roles="guest"/>
+      </security-setting>
+   </security-settings>
+
+   <address-settings>
+      <!--default for catch all-->
+      <address-setting match="#">
+         <clustered>false</clustered>
+         <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+         <expiry-address>jms.queue.ExpiryQueue</expiry-address>
+         <redelivery-delay>0</redelivery-delay>
+         <max-size-bytes>-1</max-size-bytes>
+         <page-size-bytes>10485760</page-size-bytes>
+         <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+         <message-counter-history-day-limit>10</message-counter-history-day-limit>
+      </address-setting>
+   </address-settings>
+
+
+</configuration>

Copied: trunk/src/config/trunk/non-clustered/jbm-jboss-beans.xml (from rev 7305, trunk/src/config/stand-alone/non-clustered/jbm-jboss-beans.xml)
===================================================================
--- trunk/src/config/trunk/non-clustered/jbm-jboss-beans.xml	                        (rev 0)
+++ trunk/src/config/trunk/non-clustered/jbm-jboss-beans.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/>
+
+   <!-- JNDI server. Disable this if you don't want JNDI -->
+   <bean name="JNDIServer" class="org.jnp.server.Main">
+      <property name="namingInfo">
+         <inject bean="Naming"/>
+      </property>
+      <property name="port">1099</property>
+      <property name="bindAddress">localhost</property>
+      <property name="rmiPort">1098</property>
+      <property name="rmiBindAddress">localhost</property>
+   </bean>
+   
+   <!-- MBean server -->
+   <bean name="MBeanServer" class="javax.management.MBeanServer">
+      <constructor factoryClass="java.lang.management.ManagementFactory"
+                   factoryMethod="getPlatformMBeanServer"/>
+   </bean> 
+
+   <!-- The core configuration -->
+   <bean name="Configuration" class="org.jboss.messaging.core.config.impl.FileConfiguration">
+   </bean>
+
+	<!-- The security manager -->
+   <bean name="JBMSecurityManager" class="org.jboss.messaging.core.security.impl.JBMSecurityManagerImpl">
+      <start ignored="true"/>
+      <stop ignored="true"/>
+   </bean>
+
+	<!-- The core server -->
+   <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl">
+     <start ignored="true"/>
+      <stop ignored="true"/>  
+      <constructor>
+         <parameter>
+            <inject bean="Configuration"/>
+         </parameter>
+         <parameter>
+            <inject bean="MBeanServer"/>
+         </parameter>
+         <parameter>
+            <inject bean="JBMSecurityManager"/>
+         </parameter>        
+      </constructor>         
+   </bean>
+   
+   <!-- The JMS server -->
+   <bean name="JMSServerManager" class="org.jboss.messaging.jms.server.impl.JMSServerManagerImpl">
+      <constructor>         
+         <parameter>
+            <inject bean="MessagingServer"/>
+         </parameter>         
+      </constructor>
+   </bean>
+
+</deployment>
\ No newline at end of file

Copied: trunk/src/config/trunk/non-clustered/jbm-jms.xml (from rev 7305, trunk/src/config/stand-alone/non-clustered/jbm-jms.xml)
===================================================================
--- trunk/src/config/trunk/non-clustered/jbm-jms.xml	                        (rev 0)
+++ trunk/src/config/trunk/non-clustered/jbm-jms.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,21 @@
+<configuration xmlns="urn:jboss:messaging"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:messaging /schema/jbm-jms.xsd">
+
+   <connection-factory name="ConnectionFactory">
+      <connector-ref connector-name="netty"/>
+      <entries>
+         <entry name="ConnectionFactory"/>
+         <entry name="XAConnectionFactory"/>
+      </entries>
+   </connection-factory>
+
+   <queue name="DLQ">
+      <entry name="/queue/DLQ"/>
+   </queue>
+
+   <queue name="ExpiryQueue">
+      <entry name="/queue/ExpiryQueue"/>
+   </queue>
+
+</configuration>
\ No newline at end of file

Copied: trunk/src/config/trunk/non-clustered/jbm-users.xml (from rev 7305, trunk/src/config/stand-alone/non-clustered/jbm-users.xml)
===================================================================
--- trunk/src/config/trunk/non-clustered/jbm-users.xml	                        (rev 0)
+++ trunk/src/config/trunk/non-clustered/jbm-users.xml	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,7 @@
+<configuration xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:messaging /schema/jbm-users.xsd">
+   <!-- the default user.  this is used where username is null-->
+   <defaultuser name="guest" password="guest">
+      <role name="guest"/>
+   </defaultuser>
+</configuration>
\ No newline at end of file

Copied: trunk/src/config/trunk/non-clustered/jndi.properties (from rev 7305, trunk/src/config/stand-alone/non-clustered/jndi.properties)
===================================================================
--- trunk/src/config/trunk/non-clustered/jndi.properties	                        (rev 0)
+++ trunk/src/config/trunk/non-clustered/jndi.properties	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,2 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file

Copied: trunk/src/config/trunk/non-clustered/logging.properties (from rev 7305, trunk/src/config/stand-alone/non-clustered/logging.properties)
===================================================================
--- trunk/src/config/trunk/non-clustered/logging.properties	                        (rev 0)
+++ trunk/src/config/trunk/non-clustered/logging.properties	2009-06-11 18:52:50 UTC (rev 7312)
@@ -0,0 +1,35 @@
+############################################################
+#  	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,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.
+############################################################




More information about the jboss-cvs-commits mailing list