From: <ma...@rh...> - 2008-10-26 19:25:02
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [1848] tabs...</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1848</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2008-10-26 14:24:58 -0500 (Sun, 26 Oct 2008)</dd> </dl> <h3>Log Message</h3> <pre>tabs... i hate tabs</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseservercontainersrcmainscriptsrhqcontainerbuildxml">rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseservercontainersrcmainscriptsrhqcontainerbuildxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml (1847 => 1848)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml 2008-10-26 08:41:20 UTC (rev 1847) +++ rhq/trunk/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml 2008-10-26 19:24:58 UTC (rev 1848) </span><span class="lines">@@ -16,11 +16,11 @@ </span><span class="cx"> <equals arg1="${dev.profile.active}" arg2="true" /> <equals arg1="${developer}" arg2="true" /> </or> </span><span class="rem">- </condition> </span><span class="add">+ </condition> </span><span class="cx"> </target> </span><span class="rem">- - <target name="set-dev-server-props" if="predeploy"> - <echo>*** Using dev database settings in rhq-server.properties...</echo> </span><span class="add">+ + <target name="set-dev-server-props" if="predeploy"> + <echo>*** Using dev database settings in rhq-server.properties...</echo> </span><span class="cx"> <property name="rhq.server.database.connection-url" value="${rhq.test.ds.connection-url}"/> <property name="rhq.server.database.driver-class" value="${rhq.test.ds.driver-class}"/> <property name="rhq.server.database.user-name" value="${rhq.test.ds.user-name}"/> </span><span class="lines">@@ -28,8 +28,8 @@ </span><span class="cx"> <property name="rhq.server.database.type-mapping" value="${rhq.test.ds.type-mapping}"/> </target> </span><span class="rem">- <target name="set-default-server-props" unless="predeploy"> - <echo>*** Using default database settings in rhq-server.properties...</echo> </span><span class="add">+ <target name="set-default-server-props" unless="predeploy"> + <echo>*** Using default database settings in rhq-server.properties...</echo> </span><span class="cx"> <property name="rhq.server.database.connection-url" value="${default.rhq.server.database.connection-url}"/> <property name="rhq.server.database.driver-class" value="${default.rhq.server.database.driver-class}"/> <property name="rhq.server.database.user-name" value="${default.rhq.server.database.user-name}"/> </span><span class="lines">@@ -39,11 +39,11 @@ </span><span class="cx"> <target name="initialize" depends="set-predeploy-prop, set-dev-server-props, set-default-server-props"> <echo>*** Database type is ${default.rhq.server.database.type-mapping}</echo> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <property name="jboss.home" location="${project.build.outputDirectory}/jbossas" /> </span><span class="rem">- <!-- TODO: we no longer deploy hypersonic - so we no longer have a marker file that we can check to see if server is running --> - <!-- </span><span class="add">+ <!-- TODO: we no longer deploy hypersonic - so we no longer have a marker file that we can check to see if server is running --> + <!-- </span><span class="cx"> <property name="marker.file" location="${jboss.home}/server/default/data/hypersonic/localDB.lck" /> <fail message="The RHQ container appears to be currently running (${marker.file} exists). Please stop the container before rebuilding it in place."> <condition> </span><span class="lines">@@ -88,8 +88,8 @@ </span><span class="cx"> <target name="prepare-container" depends="prepare-web-services-1, </span><span class="rem">- prepare-jbossas-dir, - prepare-bin-dir, </span><span class="add">+ prepare-jbossas-dir, + prepare-bin-dir, </span><span class="cx"> prepare-web-services-2" /> <target name="prepare-jbossas-dir" </span><span class="lines">@@ -145,7 +145,7 @@ </span><span class="cx"> <!-- Delete unused stuff from deploy dir... --> <echo>Removing unwanted files from ${jboss.deploy.dir} ...</echo> </span><span class="rem">- <!-- remove Hypersonic --> </span><span class="add">+ <!-- remove Hypersonic --> </span><span class="cx"> <delete file="${jboss.deploy.dir}/hsqldb-ds.xml" /> <delete dir="${jboss.deploy.dir}/juddi-service.sar" /> </span><span class="lines">@@ -182,8 +182,8 @@ </span><span class="cx"> <echo>Upgrading jboss-faces.jar to v${jboss-faces.version} ...</echo> <copy file="${settings.localRepository}/org/jboss/jboss-faces/${jboss-faces.version}/jboss-faces-${jboss-faces.version}.jar" </span><span class="rem">- tofile="${jsf-libs.dir}/jboss-faces.jar" overwrite="true" verbose="true" /> - </span><span class="add">+ tofile="${jsf-libs.dir}/jboss-faces.jar" overwrite="true" verbose="true" /> + </span><span class="cx"> <echo>Preparing JMS backend ...</echo> <mkdir dir="${jboss.deploy.dir}/jms"/> <copy todir="${jboss.deploy.dir}/${jms.oracle.dir}"> </span><span class="lines">@@ -225,9 +225,9 @@ </span><span class="cx"> <fileset dir="${jboss.home}" includes="*.*" /> </delete> </span><span class="rem">- <!-- make sure our downloads directories exist --> - <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-plugins"/> - <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-agent"/> </span><span class="add">+ <!-- make sure our downloads directories exist --> + <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-plugins"/> + <mkdir dir="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/rhq-agent"/> </span><span class="cx"> <!-- Let's deploy some developer-only stuff - we'll remove these later if this is a release build --> <echo>Deploying the performance testing plugin and the license file ...</echo> </span><span class="lines">@@ -240,7 +240,7 @@ </span><span class="cx"> verbose="true" failonerror="false"/> </span><span class="rem">- <echo>Enabling server to run on Java 6 ...</echo> </span><span class="add">+ <echo>Enabling server to run on Java 6 ...</echo> </span><span class="cx"> <move todir="${jboss.home}/lib/endorsed" verbose="true"> <fileset dir="${jboss.deploy.dir}/jbossws.sar"> <include name="jaxb-api.jar" /> </span><span class="lines">@@ -251,12 +251,12 @@ </span><span class="cx"> </fileset> <fileset dir="${jboss.home}/server/default/lib"> <include name="activation.jar" /> </span><span class="rem">- </fileset> </span><span class="add">+ </fileset> </span><span class="cx"> </move> <delete file="${jboss.home}/lib/endorsed/xalan.jar" verbose="true" /> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> </target> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <target name="prepare-bin-dir"> <echo>*** Preparing bin dir... ***</echo> <echo>connection URL is ${rhq.server.database.connection-url}</echo> </span><span class="lines">@@ -274,7 +274,7 @@ </span><span class="cx"> # Container configuration # ********************************** NOTE ************************************ </span><span class="rem">-# If the jboss.bind.address property is set to anything besides 0.0.0.0, </span><span class="add">+# If the jboss.bind.address property is set to anything besides 0.0.0.0, </span><span class="cx"> # uncomment the java.rmi.server.hostname property below and set it to the same # value - setting it to ${jboss.bind.address} will *not* work. jboss.bind.address=0.0.0.0 </span><span class="lines">@@ -396,7 +396,7 @@ </span><span class="cx"> <target name="prepare-web-services-1" depends="initialize"> <move todir="${jboss.deploy.dir}/jbossws.sar" verbose="true" failonerror="false"> </span><span class="rem">- <!-- failonerror is false because if the container is built clean </span><span class="add">+ <!-- failonerror is false because if the container is built clean </span><span class="cx"> the rej dir will not exist yet, so this error must be skipped; if undeploy-web-services has never been set, this will be a no-op --> <fileset dir="${jboss.deploy.dir}/jbossws.sar.rej" /> </span><span class="lines">@@ -411,7 +411,7 @@ </span><span class="cx"> <fileset dir="${jboss.deploy.dir}/jbossws.sar" /> </move> </target> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <target name="unzip-jboss" unless="jboss.uptodate"> <unzip src="${settings.localRepository}/jboss/jboss/${jboss.version}/jboss-${jboss.version}.zip" dest="${basedir}/target" /> </span><span class="lines">@@ -530,12 +530,12 @@ </span><span class="cx"> </target> <!-- Removing cluster service in 1.1, potentially adding back later for cluster management support </span><span class="rem">- dev profile or not, we always want to execute this target so remove the 'unless' attribute; </span><span class="add">+ dev profile or not, we always want to execute this target so remove the 'unless' attribute; </span><span class="cx"> do not fail on error, because we don't want to fail if the file has already been renamed --> <target name="undeploy-cluster-service"> <echo>Undeploying Cluster Service...</echo> </span><span class="rem">- <move failonerror="false" - file="${jboss.deploy.dir}/cluster-service.xml" </span><span class="add">+ <move failonerror="false" + file="${jboss.deploy.dir}/cluster-service.xml" </span><span class="cx"> tofile="${jboss.deploy.dir}/cluster-service.xml.rej"/> </target> </span> </pre> </div> </div> </body> </html> |