[jboss-cvs] JBossAS SVN: r67571 - in branches/JBPAPP_4_2: connector/src/resources/jca-sar and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 28 16:06:30 EST 2007
Author: dbhole
Date: 2007-11-28 16:06:29 -0500 (Wed, 28 Nov 2007)
New Revision: 67571
Modified:
branches/JBPAPP_4_2/build/build.xml
branches/JBPAPP_4_2/connector/src/resources/jca-sar/jbossjca-service.xml
branches/JBPAPP_4_2/messaging/src/etc/server/default/deploy/jbossmq-destinations-service.xml
branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-log4j.xml
branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-minimal.xml
branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-service.xml
branches/JBPAPP_4_2/server/src/resources/uuid-key-generator/META-INF/jboss-service.xml
branches/JBPAPP_4_2/system/src/bin/run.sh
Log:
Remove .xml file code replacement that was done via <replace>. Instead, now
the .xml files can have @DEVCONF ... @ENDDEVCONF and
@PRODCONF ... @ENDPRODCONF sections for all/default/minimal and production
configs.
Modified: branches/JBPAPP_4_2/build/build.xml
===================================================================
--- branches/JBPAPP_4_2/build/build.xml 2007-11-28 20:51:56 UTC (rev 67570)
+++ branches/JBPAPP_4_2/build/build.xml 2007-11-28 21:06:29 UTC (rev 67571)
@@ -679,7 +679,7 @@
</fileset>
</copy>
- <!-- The customizationd for "production" runs go here -->
+ <!-- The customizations for "production" runs go here -->
<!-- JAVA_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512" -->
<copy tofile="${install.production}/run.conf"
@@ -898,396 +898,130 @@
</condition>
</target>
- <!-- Modify run.sh for production config -->
+ <!-- Update config and other files for production config -->
<target name="makeProductionConfigChanges"
- depends="partition-production">
+ depends="partition-default,partition-production">
- <!-- Fix up the EOL characters for Windows files -->
- <antcall target="fixEOL"/>
+ <!-- Fix up the EOL characters for Windows files -->
+ <antcall target="fixEOL"/>
- <!-- Set all JVMs except darwin to use -server -->
+ <ant antfile="build.xml" target="updateConfigFiles">
+ <property name="config.type" value="dev" />
+ <property name="config.dir" value="${install.all}" />
+ </ant>
- <replace file="${install.bin}/run.sh"
- summary="true">
+ <ant antfile="build.xml" target="updateConfigFiles">
+ <property name="config.type" value="dev" />
+ <property name="config.dir" value="${install.default}" />
+ </ant>
- <replacetoken><![CDATA[
-# If -server not set in JAVA_OPTS, set it, if supported
-SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
-if [ "x$SERVER_SET" = "x" ]; then
+ <ant antfile="build.xml" target="updateConfigFiles">
+ <property name="config.type" value="prod" />
+ <property name="config.dir" value="${install.production}" />
+ </ant>
- # Check for SUN(tm) JVM w/ HotSpot support
- if [ "x$HAS_HOTSPOT" = "x" ]; then
- HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
- fi
+
+ </target>
- # Enable -server if we have Hotspot, unless we can't
- if [ "x$HAS_HOTSPOT" != "x" ]; then
- # MacOS does not support -server flag
- if [ "$darwin" != "true" ]; then
- JAVA_OPTS="-server $JAVA_OPTS"
- fi
- fi
-fi
-]]></replacetoken>
+ <!-- Modify run.sh for production config -->
+ <target name="updateConfigFiles">
- <replacevalue><![CDATA[
-# If -server not set in JAVA_OPTS, set it, if supported
-SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
-if [ "x$SERVER_SET" = "x" ]; then
+ <property name="config.type" value=""/>
+ <property name="config.dir" value=""/>
- # Check for SUN(tm) JVM w/ HotSpot support
- if [ "x$HAS_HOTSPOT" = "x" ]; then
- HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
- fi
+ <condition property="conf.to.keep" value="DEVCONF" else="PRODCONF">
+ <equals arg1="${config.type}" arg2="dev"/>
+ </condition>
- # Enable -server if we have Hotspot, unless we can't
- # MacOS does not support -server flag
- if [ "$darwin" != "true" ]; then
- JAVA_OPTS="-server $JAVA_OPTS"
- fi
-fi
-]]></replacevalue>
+ <condition property="conf.to.delete" value="PRODCONF" else="DEVCONF">
+ <equals arg1="${config.type}" arg2="dev"/>
+ </condition>
+
+ <!-- Uncomment the configuration to make the key generation cluster safe -->
- </replace>
+ <replaceregexp file="${config.dir}/deploy/uuid-key-generator.sar/META-INF/jboss-service.xml"
+ flags="gm"
+ match="@.*${conf.to.keep}\s"
+ replace=""
+ />
- <!-- Uncomment the configuration to make the key generation cluster safe -->
+ <replaceregexp file="${config.dir}/deploy/uuid-key-generator.sar/META-INF/jboss-service.xml"
+ flags="gs"
+ match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
+ replace=""
+ />
- <replace file="${install.production}/deploy/uuid-key-generator.sar/META-INF/jboss-service.xml"
- summary="true">
- <replacetoken><![CDATA[
- <!-- Uncomment to make it cluster-safe: Select current Hi value query (FOR UPDATE is recommended)
- <attribute name="SelectHiSql">
- select HIGHVALUES from HILOSEQUENCES where SEQUENCENAME='general' FOR UPDATE
- </attribute>
- -->
-]]></replacetoken>
+ <!-- Only the customers explicit production queues should be configured in the mq destinations file -->
- <replacevalue><![CDATA[
- <!-- Uncomment to make it cluster-safe: Select current Hi value query (FOR UPDATE is recommended) -->
- <attribute name="SelectHiSql">
- select HIGHVALUES from HILOSEQUENCES where SEQUENCENAME='general' FOR UPDATE
- </attribute>
-]]></replacevalue>
+ <replaceregexp file="${config.dir}/deploy-hasingleton/jms/jbossmq-destinations-service.xml"
+ flags="gm"
+ match="@.*${conf.to.keep}\s"
+ replace=""
+ />
- </replace>
+ <replaceregexp file="${config.dir}/deploy-hasingleton/jms/jbossmq-destinations-service.xml"
+ flags="gs"
+ match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
+ replace=""
+ />
- <!-- Only the customers explicit production queues should be configured in the mq destinations file -->
- <replace file="${install.production}/deploy-hasingleton/jms/jbossmq-destinations-service.xml"
- summary="true">
+ <!-- Reduce log verbosity -->
- <replacetoken><![CDATA[
-<server>
- <!-- Destination without a configured SecurityManager or without a
- a SecurityConf will default to role guest with read=true, write=true,
- create=false.
- -->
-]]></replacetoken>
+ <replaceregexp file="${config.dir}/conf/jboss-log4j.xml"
+ flags="gm"
+ match="@.*${conf.to.keep}\s"
+ replace=""
+ />
- <replacevalue><![CDATA[
-<server>
- <!-- Destination without a configured SecurityManager or without a
- a SecurityConf will default to role guest with read=true, write=true,
- create=false.
-]]></replacevalue>
+ <replaceregexp file="${config.dir}/conf/jboss-log4j.xml"
+ flags="gs"
+ match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
+ replace=""
+ />
- </replace>
- <replace file="${install.production}/deploy-hasingleton/jms/jbossmq-destinations-service.xml"
- summary="true">
+ <!-- Increase time between scans for hot deploy -->
- <replacetoken><![CDATA[
-</server>
-]]></replacetoken>
+ <replaceregexp file="${config.dir}/conf/jboss-minimal.xml"
+ flags="gm"
+ match="@.*${conf.to.keep}\s"
+ replace=""
+ />
- <replacevalue><![CDATA[
--->
-</server>
-]]></replacevalue>
+ <replaceregexp file="${config.dir}/conf/jboss-minimal.xml"
+ flags="gs"
+ match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
+ replace=""
+ />
- </replace>
+ <replaceregexp file="${config.dir}/conf/jboss-service.xml"
+ flags="gm"
+ match="@.*${conf.to.keep}\s"
+ replace=""
+ />
- <!-- Reduce log verbosity -->
+ <replaceregexp file="${config.dir}/conf/jboss-service.xml"
+ flags="gs"
+ match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
+ replace=""
+ />
- <replace file="${install.production.conf}/jboss-log4j.xml"
- summary="true">
+ <!-- Disable connection close debug monitoring -->
- <replacetoken><![CDATA[
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
+ <replaceregexp file="${config.dir}/deploy/jbossjca-service.xml"
+ flags="gm"
+ match="@.*${conf.to.keep}\s"
+ replace=""
+ />
- <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"/>
+ <replaceregexp file="${config.dir}/deploy/jbossjca-service.xml"
+ flags="gs"
+ match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
+ replace=""
+ />
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-]]></replacetoken>
-
- <replacevalue><![CDATA[
- <!-- ============================== -->
- <!-- 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">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
- -->
-]]></replacevalue>
-
- </replace>
-
- <replace file="${install.production.conf}/jboss-log4j.xml"
- summary="true">
-
- <replacetoken><![CDATA[
- <!-- Buffer events and log them asynchronously
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <appender-ref ref="FILE"/>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="SMTP"/>
- </appender>
- -->
-]]></replacetoken>
-
- <replacevalue><![CDATA[
- <!-- Buffer events and log them asynchronously -->
- <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <appender-ref ref="FILE"/>
- <!--
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="SMTP"/>
- -->
- </appender>
-]]></replacevalue>
-
- </replace>
-
- <replace file="${install.production.conf}/jboss-log4j.xml"
- summary="true">
-
- <replacetoken><![CDATA[
- <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
- <category name="org.apache">
- <priority value="INFO"/>
- </category>
-
- <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
- <category name="org.jboss.serial">
- <priority value="INFO"/>
- </category>
-]]></replacetoken>
-
- <replacevalue><![CDATA[
- <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
- <category name="org.apache">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
- <category name="org.jboss.serial">
- <priority value="WARN"/>
- </category>
-]]></replacevalue>
-
- </replace>
-
- <replace file="${install.production.conf}/jboss-log4j.xml"
- summary="true">
-
- <replacetoken><![CDATA[
- <!-- Limit the JSR77 categories -->
- <category name="org.jboss.management">
- <priority value="INFO"/>
- </category>
-]]></replacetoken>
-
- <replacevalue><![CDATA[
- <!-- Limit the JSR77 categories -->
- <category name="org.jboss.management">
- <priority value="WARN"/>
- </category>
-
- <!-- Limit seam logging -->
- <category name="org.jboss.seam">
- <priority value="WARN"/>
- </category>
-]]></replacevalue>
-
- </replace>
-
- <replace file="${install.production.conf}/jboss-log4j.xml"
- summary="true">
-
- <replacetoken><![CDATA[
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-]]></replacetoken>
-
- <replacevalue><![CDATA[
- <root>
- <!-- <appender-ref ref="CONSOLE"/> -->
- <appender-ref ref="ASYNC"/>
- </root>
-]]></replacevalue>
-
- </replace>
-
- <replace file="${install.production.conf}/jboss-log4j.xml"
- summary="true">
-
- <replacetoken><![CDATA[
- <!-- Clustering logging -->
- <!-- Uncomment the following to redirect the org.jgroups and
- org.jboss.ha categories to a cluster.log file.
-
- <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- <category name="org.jgroups">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- <category name="org.jboss.ha">
- <priority value="DEBUG" />
- <appender-ref ref="CLUSTER"/>
- </category>
- -->
-]]></replacetoken>
-
- <replacevalue><![CDATA[
-]]></replacevalue>
-
- </replace>
-
- <replace file="${install.production.conf}/jboss-log4j.xml"
- summary="true">
-
- <replacetoken><![CDATA[
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-]]></replacetoken>
-
- <replacevalue><![CDATA[
- <!-- Clustering logging -->
- <!-- Uncomment the following to redirect the org.jgroups and
- org.jboss.ha categories to a cluster.log file. -->
- <!--
- <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss.ha">
- <priority value="INFO" />
- </category>
-]]></replacevalue>
-
- </replace>
-
- <replace file="${install.production.conf}/jboss-log4j.xml"
- summary="true">
-
- <replacetoken><![CDATA[
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-]]></replacetoken>
-
- <replacevalue><![CDATA[
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <category name="org.jboss.web">
- <priority value="INFO" />
- </category>
-]]></replacevalue>
-
- </replace>
-
- <!-- Increase time between scans for hot deploy -->
-
- <replace file="${install.production.conf}/jboss-minimal.xml"
- summary="true">
-
- <replacetoken><![CDATA[
- <attribute name="ScanPeriod">5000</attribute>
-]]></replacetoken>
-
- <replacevalue><![CDATA[
- <attribute name="ScanPeriod">60000</attribute>
-]]></replacevalue>
-
- </replace>
-
- <replace file="${install.production.conf}/jboss-service.xml"
- summary="true">
-
- <replacetoken><![CDATA[
- <attribute name="ScanPeriod">5000</attribute>
-]]></replacetoken>
-
- <replacevalue><![CDATA[
- <attribute name="ScanPeriod">60000</attribute>
-]]></replacevalue>
-
- </replace>
-
- <!-- Disable connection close debug monitoring -->
-
- <replace file="${install.production}/deploy/jbossjca-service.xml"
- summary="true">
-
- <replacetoken><![CDATA[
- <!-- Enable connection close debug monitoring -->
- <attribute name="Debug">true</attribute>
-]]></replacetoken>
-
- <replacevalue><![CDATA[
- <!-- Enable connection close debug monitoring -->
- <attribute name="Debug">false</attribute>
-]]></replacevalue>
-
- </replace>
</target>
<target name="conditional.eap.patches" depends="patch.for.42,patch.for.43"/>
Modified: branches/JBPAPP_4_2/connector/src/resources/jca-sar/jbossjca-service.xml
===================================================================
--- branches/JBPAPP_4_2/connector/src/resources/jca-sar/jbossjca-service.xml 2007-11-28 20:51:56 UTC (rev 67570)
+++ branches/JBPAPP_4_2/connector/src/resources/jca-sar/jbossjca-service.xml 2007-11-28 21:06:29 UTC (rev 67571)
@@ -60,7 +60,12 @@
<depends optional-attribute-name="TransactionManagerServiceName">jboss:service=TransactionManager</depends>
<!-- Enable connection close debug monitoring -->
+ at DEVCONF
<attribute name="Debug">true</attribute>
+ at ENDDEVCONF
+ at PRODCONF
+ <attribute name="Debug">false</attribute>
+ at ENDPRODCONF
</mbean>
Modified: branches/JBPAPP_4_2/messaging/src/etc/server/default/deploy/jbossmq-destinations-service.xml
===================================================================
--- branches/JBPAPP_4_2/messaging/src/etc/server/default/deploy/jbossmq-destinations-service.xml 2007-11-28 20:51:56 UTC (rev 67570)
+++ branches/JBPAPP_4_2/messaging/src/etc/server/default/deploy/jbossmq-destinations-service.xml 2007-11-28 21:06:29 UTC (rev 67571)
@@ -15,7 +15,9 @@
<!-- Destination without a configured SecurityManager or without a
a SecurityConf will default to role guest with read=true, write=true,
create=false.
+ at DEVCONF
-->
+ at ENDDEVCONF
<mbean code="org.jboss.mq.server.jmx.Topic"
name="jboss.mq.destination:service=Topic,name=testTopic">
<depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
@@ -86,5 +88,7 @@
name="jboss.mq.destination:service=Queue,name=ex">
<depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
</mbean>
-
+ at PRODCONF
+-->
+ at ENDPRODCONF
</server>
Modified: branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-log4j.xml
===================================================================
--- branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-log4j.xml 2007-11-28 20:51:56 UTC (rev 67570)
+++ branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-log4j.xml 2007-11-28 21:06:29 UTC (rev 67571)
@@ -61,6 +61,7 @@
<!-- Append messages to the console -->
<!-- ============================== -->
+ at DEVCONF
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
<param name="Target" value="System.out"/>
@@ -71,11 +72,26 @@
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
</layout>
</appender>
+ at ENDDEVCONF
+ at PRODCONF
+ <!--
+ <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">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+ at ENDPRODCONF
<!-- ====================== -->
<!-- More Appender examples -->
<!-- ====================== -->
+ at DEVCONF
<!-- Buffer events and log them asynchronously
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
@@ -84,6 +100,18 @@
<appender-ref ref="SMTP"/>
</appender>
-->
+ at ENDDEVCONF
+ at PRODCONF
+ <!-- Buffer events and log them asynchronously -->
+ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <appender-ref ref="FILE"/>
+ <!--
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="SMTP"/>
+ -->
+ </appender>
+ at ENDPRODCONF
<!-- EMail events to an administrator
<appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
@@ -154,19 +182,58 @@
</layout>
</appender>
-->
-
+
+ at PRODCONF
+ <!-- Clustering logging -->
+ <!-- Uncomment the following to redirect the org.jgroups and
+ org.jboss.ha categories to a cluster.log file. -->
+ <!--
+ <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+ at ENDPRODCONF
+
<!-- ================ -->
<!-- Limit categories -->
<!-- ================ -->
+ at PRODCONF
+ <category name="org.jboss.web">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.ha">
+ <priority value="INFO" />
+ </category>
+
+ at ENDPRODCONF
<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
<category name="org.apache">
+ at DEVCONF
<priority value="INFO"/>
+ at ENDDEVCONF
+ at PRODCONF
+ <priority value="WARN"/>
+ at ENDPRODCONF
</category>
<!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
<category name="org.jboss.serial">
+ at DEVCONF
<priority value="INFO"/>
+ at ENDDEVCONF
+ at PRODCONF
+ <priority value="WARN"/>
+ at ENDPRODCONF
</category>
<!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
@@ -186,10 +253,22 @@
-->
<!-- Limit the JSR77 categories -->
+ at DEVCONF
<category name="org.jboss.management">
<priority value="INFO"/>
</category>
+ at ENDDEVCONF
+ at PRODCONF
+ <category name="org.jboss.management">
+ <priority value="WARN"/>
+ </category>
+ <!-- Limit seam logging -->
+ <category name="org.jboss.seam">
+ <priority value="WARN"/>
+ </category>
+ at ENDPRODCONF
+
<!-- Enable JBossWS message tracing
<category name="org.jboss.ws.core.MessageTrace">
<priority value="TRACE"/>
@@ -264,10 +343,19 @@
<!-- Setup the Root category -->
<!-- ======================= -->
+ at DEVCONF
<root>
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>
+ at ENDDEVCONF
+ at PRODCONF
+ <root>
+ <!-- <appender-ref ref="CONSOLE"/> -->
+ <appender-ref ref="ASYNC"/>
+ </root>
+ at ENDPRODCONF
+ at DEVCONF
<!-- Clustering logging -->
<!-- Uncomment the following to redirect the org.jgroups and
@@ -293,5 +381,6 @@
<appender-ref ref="CLUSTER"/>
</category>
-->
+ at ENDDEVCONF
</log4j:configuration>
Modified: branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-minimal.xml
===================================================================
--- branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-minimal.xml 2007-11-28 20:51:56 UTC (rev 67570)
+++ branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-minimal.xml 2007-11-28 21:06:29 UTC (rev 67571)
@@ -134,7 +134,12 @@
-->
<attribute name="Filter">org.jboss.deployment.scanner.DeploymentFilter</attribute>
+ at DEVCONF
<attribute name="ScanPeriod">5000</attribute>
+ at ENDDEVCONF
+ at PRODCONF
+ <attribute name="ScanPeriod">60000</attribute>
+ at ENDPRODCONF
<!-- URLs are comma seperated and unprefixed arguments are considered
file URLs and resolve relative to server home(JBOSS_DIST/server/default)
Modified: branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-service.xml 2007-11-28 20:51:56 UTC (rev 67570)
+++ branches/JBPAPP_4_2/server/src/etc/conf/default/jboss-service.xml 2007-11-28 21:06:29 UTC (rev 67571)
@@ -648,7 +648,12 @@
</attribute>
<!-- Frequency in milliseconds to rescan the URLs for changes -->
+ at DEVCONF
<attribute name="ScanPeriod">5000</attribute>
+ at ENDDEVCONF
+ at PRODCONF
+ <attribute name="ScanPeriod">60000</attribute>
+ at ENDPRODCONF
<!-- A flag to disable the scans -->
<attribute name="ScanEnabled">true</attribute>
Modified: branches/JBPAPP_4_2/server/src/resources/uuid-key-generator/META-INF/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2/server/src/resources/uuid-key-generator/META-INF/jboss-service.xml 2007-11-28 20:51:56 UTC (rev 67570)
+++ branches/JBPAPP_4_2/server/src/resources/uuid-key-generator/META-INF/jboss-service.xml 2007-11-28 21:06:29 UTC (rev 67571)
@@ -38,11 +38,19 @@
create table HILOSEQUENCES (SEQUENCENAME varchar(50) not null, HIGHVALUES integer not null, constraint hilo_pk primary key (SEQUENCENAME))
</attribute>
+ at DEVCONF
<!-- Uncomment to make it cluster-safe: Select current Hi value query (FOR UPDATE is recommended)
<attribute name="SelectHiSql">
select HIGHVALUES from HILOSEQUENCES where SEQUENCENAME='general' FOR UPDATE
</attribute>
-->
+ at ENDDEVCONF
+ at PRODCONF
+ <!-- Uncomment to make it cluster-safe: Select current Hi value query (FOR UPDATE is recommended) -->
+ <attribute name="SelectHiSql">
+ select HIGHVALUES from HILOSEQUENCES where SEQUENCENAME='general' FOR UPDATE
+ </attribute>
+ at ENDPRODCONF
<!-- whether the table should be created (if doesn't exist yet) at the start phase -->
<attribute name="CreateTable">true</attribute>
Modified: branches/JBPAPP_4_2/system/src/bin/run.sh
===================================================================
--- branches/JBPAPP_4_2/system/src/bin/run.sh 2007-11-28 20:51:56 UTC (rev 67570)
+++ branches/JBPAPP_4_2/system/src/bin/run.sh 2007-11-28 21:06:29 UTC (rev 67571)
@@ -169,11 +169,9 @@
fi
# Enable -server if we have Hotspot, unless we can't
- if [ "x$HAS_HOTSPOT" != "x" ]; then
- # MacOS does not support -server flag
- if [ "$darwin" != "true" ]; then
- JAVA_OPTS="-server $JAVA_OPTS"
- fi
+ # MacOS does not support -server flag
+ if [ "$darwin" != "true" ]; then
+ JAVA_OPTS="-server $JAVA_OPTS"
fi
fi
More information about the jboss-cvs-commits
mailing list