[jboss-cvs] JBossAS SVN: r90646 - branches/JBPAPP_5_0/build.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 26 12:57:36 EDT 2009
Author: smarlow at redhat.com
Date: 2009-06-26 12:57:35 -0400 (Fri, 26 Jun 2009)
New Revision: 90646
Modified:
branches/JBPAPP_5_0/build/build.xml
Log:
JBPAPP-2052 Production profile for EAP 5
Modified: branches/JBPAPP_5_0/build/build.xml
===================================================================
--- branches/JBPAPP_5_0/build/build.xml 2009-06-26 16:47:54 UTC (rev 90645)
+++ branches/JBPAPP_5_0/build/build.xml 2009-06-26 16:57:35 UTC (rev 90646)
@@ -733,7 +733,7 @@
<antcall target="partition-community"/>
<antcall target="partition-production"/>
<!-- antcall target="makeConfigChanges"/ -->
- <antcall target="processSecurityAnnotations"/>
+ <!-- <antcall target="processSecurityAnnotations"/> -->
<antcall target="jboss-all-client"/>
<!--<antcall target="setup-ejb3-dist"/>-->
</target>
@@ -742,9 +742,7 @@
<target name="makeConfigChanges"
depends="makeProductionConfigChanges">
- <!-- Fix up the EOL characters for Windows files -->
- <!-- antcall target="fixEOL"/ -->
-
+
<replaceregexp file="${install.examples}/binding-manager/sample-bindings.xml"
flags="gm"
match="@.*${verconf.to.keep}\s"
@@ -800,135 +798,9 @@
<target name="makeProductionConfigChanges"
depends="partition-community,partition-production">
- <ant antfile="build.xml" target="updateConfigFiles">
- <property name="config.type" value="dev" />
- <property name="config.dir" value="${install.all}" />
- </ant>
-
- <ant antfile="build.xml" target="updateConfigFiles">
- <property name="config.type" value="dev" />
- <property name="config.dir" value="${install.default}" />
- </ant>
-
- <ant antfile="build.xml" target="updateConfigFiles">
- <property name="config.type" value="prod" />
- <property name="config.dir" value="${install.production}" />
- </ant>
-
</target>
- <!-- Modify run.sh for production config -->
- <target name="updateConfigFiles">
- <property name="config.type" value=""/>
- <property name="config.dir" value=""/>
-
- <condition property="conf.to.keep" value="DEVCONF" else="PRODCONF">
- <equals arg1="${config.type}" arg2="dev"/>
- </condition>
-
- <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 -->
-
- <replaceregexp file="${config.dir}/deploy/uuid-key-generator.sar/META-INF/jboss-service.xml"
- flags="gm"
- match="@.*${conf.to.keep}\s"
- replace=""
- />
-
- <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=""
- />
-
-
- <!-- Only the customers explicit production queues should be configured in the mq destinations file -->
-
- <replaceregexp file="${config.dir}/deploy-hasingleton/jms/jbossmq-destinations-service.xml"
- flags="gm"
- match="@.*${conf.to.keep}\s"
- 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=""
- />
-
- <replaceregexp file="${config.dir}/deploy/jms/jbossmq-destinations-service.xml"
- flags="gm"
- match="@.*${conf.to.keep}\s"
- replace=""
- />
-
- <replaceregexp file="${config.dir}/deploy/jms/jbossmq-destinations-service.xml"
- flags="gs"
- match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
- replace=""
- />
-
- <!-- Reduce log verbosity -->
-
- <replaceregexp file="${config.dir}/conf/jboss-log4j.xml"
- flags="gm"
- match="@.*${conf.to.keep}\s"
- replace=""
- />
-
- <replaceregexp file="${config.dir}/conf/jboss-log4j.xml"
- flags="gs"
- match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
- replace=""
- />
-
-
- <!-- Increase time between scans for hot deploy -->
-
- <replaceregexp file="${config.dir}/conf/jboss-minimal.xml"
- flags="gm"
- match="@.*${conf.to.keep}\s"
- replace=""
- />
-
- <replaceregexp file="${config.dir}/conf/jboss-minimal.xml"
- flags="gs"
- match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
- replace=""
- />
-
- <replaceregexp file="${config.dir}/conf/jboss-service.xml"
- flags="gm"
- match="@.*${conf.to.keep}\s"
- replace=""
- />
-
- <replaceregexp file="${config.dir}/conf/jboss-service.xml"
- flags="gs"
- match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
- replace=""
- />
-
- <!-- Disable connection close debug monitoring -->
-
- <replaceregexp file="${config.dir}/deploy/jbossjca-service.xml"
- flags="gm"
- match="@.*${conf.to.keep}\s"
- replace=""
- />
-
- <replaceregexp file="${config.dir}/deploy/jbossjca-service.xml"
- flags="gs"
- match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
- replace=""
- />
-
- </target>
-
<!-- Update config and other files for production config -->
<target name="processSecurityAnnotations"
depends="partition-community,partition-production">
@@ -984,71 +856,8 @@
<equals arg1="${build.unsecure}" arg2="true"/>
</condition>
- <!-- Uncomment the configuration to make the key generation cluster safe -->
-
- <replaceregexp file="${install.all}/${config.file}"
- flags="gm"
- match="@.*${conf.to.keep}\s"
- replace=""
- />
-
- <replaceregexp file="${install.all}/${config.file}"
- flags="gs"
- match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
- replace=""
- />
-
- <replaceregexp file="${install.default}/${config.file}"
- flags="gm"
- match="@.*${conf.to.keep}\s"
- replace=""
- />
-
- <replaceregexp file="${install.default}/${config.file}"
- flags="gs"
- match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
- replace=""
- />
-
-
- <replaceregexp file="${install.production}/${config.file}"
- flags="gm"
- match="@.*${conf.to.keep}\s"
- replace=""
- />
-
- <replaceregexp file="${install.production}/${config.file}"
- flags="gs"
- match="@${conf.to.delete}((?!@END.*CONF).)*@END${conf.to.delete}\s"
- replace=""
- />
</target>
- <!-- Before executing <replace> task on Windows, convert the target files from -->
- <!-- UNIX line termination (LF) to Windows line termination (CRLF) so that -->
- <!-- <replace> does not break due to line termination inconsistencies -->
- <target name="fixEOL" depends="check.windows" if="is.windows">
- <echo message="Fixing EOL characters for multi-line text replacement on Windows"/>
- <fixcrlf srcdir="../system/src/bin" includes="run.conf" eol="crlf"/>
- <fixcrlf srcdir="../system/src/bin" includes="run.sh" eol="crlf"/>
- <fixcrlf srcdir="../server/src/resources/uuid-key-generator/META-INF" includes="jboss-service.xml" eol="crlf"/>
- <fixcrlf srcdir="../messaging/src/etc/server/default/deploy" includes="jbossmq-destinations-service.xml" eol="crlf"/>
- <fixcrlf srcdir="../server/src/etc/conf/default" includes="jboss-log4j.xml" eol="crlf"/>
- <fixcrlf srcdir="../server/src/etc/conf/default" includes="jboss-minimal.xml" eol="crlf"/>
- <fixcrlf srcdir="../server/src/etc/conf/default" includes="jboss-service.xml" eol="crlf"/>
- <fixcrlf srcdir="../connector/src/resources/jca-sar" includes="jbossjca-service.xml" eol="crlf"/>
- <fixcrlf srcdir="../varia/src/resources/services/binding" includes="sample-bindings.xml" eol="crlf"/>
- <fixcrlf srcdir="../server/src/main/org/jboss/metadata/serviceref" includes="ServiceRefDelegate.java" eol="crlf"/>
- <fixcrlf srcdir="../varia/src/resources/services/invoker/http" includes="web.xml" eol="crlf"/>
- <fixcrlf srcdir="../varia/src/resources/services/invoker/httpha" includes="web.xml" eol="crlf"/>
- <fixcrlf srcdir="../varia/src/resources/jmx/web-inf" includes="jboss-web.xml" eol="crlf"/>
- <fixcrlf srcdir="../varia/src/resources/jmx" includes="jmx-console-web.xml" eol="crlf"/>
- <fixcrlf srcdir="../server/src/resources/jmx-invoker-adaptor/META-INF" includes="jboss-service.xml" eol="crlf"/>
- <fixcrlf srcdir="../server/src/etc/conf/default/props" includes="jmx-console-users.properties" eol="crlf"/>
- <fixcrlf srcdir="../console/src/resources/webconsole.war/WEB-INF" includes="jboss-web.xml" eol="crlf"/>
- <fixcrlf srcdir="../console/src/resources/webconsole.war/WEB-INF" includes="web.xml" eol="crlf"/>
- <fixcrlf srcdir="../console/src/resources/webconsole.war/WEB-INF/classes" includes="web-console-users.properties" eol="crlf"/>
- </target>
<target name="partition-production" depends="init">
@@ -1118,6 +927,7 @@
<exclude name="tmp/**"/>
<exclude name="work/**"/>
<exclude name="conf/jacorb.properties"/>
+ <exclude name="conf/jboss-log4j-production.xml"/>
<exclude name="deploy/cluster/**"/>
<exclude name="deploy/iiop-service.xml"/>
<exclude name="deploy/deploy.last/**"/>
@@ -1149,6 +959,13 @@
</fileset>
</copy>
+ <!-- move production config files to the names that are used -->
+ <move file="${install.production}/conf/jboss-log4j-production.xml" tofile="${install.production}/conf/jboss-log4j.xml"/>
+
+ <!-- delete production litter -->
+ <delete file="${install.production}/conf/jboss-log4j-production.xml"/>
+ <delete file="${install.all}/conf/jboss-log4j-production.xml"/>
+
<!-- Build server/minimal manually -->
<mkdir dir="${install.minimal.deploy}"/>
<mkdir dir="${install.minimal.deployers}"/>
@@ -1156,6 +973,7 @@
<fileset dir="${install.default.conf}">
<include name="jndi.properties"/>
<include name="jboss-log4j.xml"/>
+ <exclude name="jboss-log4j-production.xml"/>
<include name="bootstrap/classloader.xml"/>
<include name="bootstrap/aop.xml"/>
<include name="bootstrap/jmx.xml"/>
@@ -1557,10 +1375,4 @@
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
</target>
- <target name="check.windows">
- <condition property="is.windows">
- <os family="windows"/>
- </condition>
- </target>
-
</project>
More information about the jboss-cvs-commits
mailing list