[jboss-cvs] JBossAS SVN: r90748 - branches/JBPAPP_5_0/build.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jul 1 13:23:49 EDT 2009


Author: smarlow at redhat.com
Date: 2009-07-01 13:23:49 -0400 (Wed, 01 Jul 2009)
New Revision: 90748

Removed:
   branches/JBPAPP_5_0/build/buildprod.sh
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-07-01 17:21:04 UTC (rev 90747)
+++ branches/JBPAPP_5_0/build/build.xml	2009-07-01 17:23:49 UTC (rev 90748)
@@ -293,13 +293,11 @@
     <property name="install.minimal.deployers" value="${install.minimal}/deployers"/>
     <property name="install.minimal.conf" value="${install.minimal}/conf"/>
 
-    <!-- WEB PROFILE MIGHT BE REMOVED FROM EAP 5 AS PER EMAIL THREAD -->
     <property name="install.web" value="${install.server}/web"/>
     <property name="install.web.lib" value="${install.web}/lib"/>
     <property name="install.web.deploy" value="${install.web}/deploy"/>
     <property name="install.web.deployers" value="${install.web}/deployers"/>
     <property name="install.web.conf" value="${install.web}/conf"/>
-    <!-- WEB PROFILE MIGHT BE REMOVED FROM EAP 5 AS PER EMAIL THREAD -->
 
     <property name="install.standard" value="${install.server}/standard"/>
     <property name="install.standard.lib" value="${install.standard}/lib"/>
@@ -732,155 +730,30 @@
   <target name="partition-build" depends="init">
     <antcall target="partition-community"/>
     <antcall target="partition-production"/>
-    <!-- antcall target="makeConfigChanges"/ -->
-    <!-- <antcall target="processSecurityAnnotations"/>  -->
     <antcall target="jboss-all-client"/>
     <!--<antcall target="setup-ejb3-dist"/>-->
 	 <antcall target="apply_auth_patch"/>
+	 <antcall target="skipped_auth_patch"/>
   </target>
 
   <target name="apply_auth_patch" unless="build.unsecure">
 	<echo> "building secure in folder ${install.root}"</echo>
    <patch patchFile="jbossas-5-enableauth.patch" dir="${install.root}" strip="0">
-    
    </patch>
-
-
   </target>
 
-  <!-- Update config files -->
-  <target name="makeConfigChanges" 
-          depends="makeProductionConfigChanges">
-
-    
-     <replaceregexp file="${install.examples}/binding-manager/sample-bindings.xml"
-         flags="gm"
-         match="@.*${verconf.to.keep}\s"
-         replace=""
-     />
-
-     <replaceregexp file="${install.examples}/binding-manager/sample-bindings.xml"
-         flags="gs"
-         match="@${verconf.to.delete}((?!@END.*CONF).)*@END${verconf.to.delete}\s"
-         replace=""
-     />
-  
-     <replaceregexp file="${install.production.conf}/login-config.xml"
-         flags="gm"
-         match="@.*${verconf.to.keep}\s"
-         replace=""
-     />
-
-     <replaceregexp file="${install.production.conf}/login-config.xml"
-         flags="gs"
-         match="@${verconf.to.delete}((?!@END.*CONF).)*@END${verconf.to.delete}\s"
-         replace=""
-     />
-  
-     <replaceregexp file="${install.default.conf}/login-config.xml"
-         flags="gm"
-         match="@.*${verconf.to.keep}\s"
-         replace=""
-     />
-
-     <replaceregexp file="${install.default.conf}/login-config.xml"
-         flags="gs"
-         match="@${verconf.to.delete}((?!@END.*CONF).)*@END${verconf.to.delete}\s"
-         replace=""
-     />
-  
-     <replaceregexp file="${install.all.conf}/login-config.xml"
-         flags="gm"
-         match="@.*${verconf.to.keep}\s"
-         replace=""
-     />
-
-     <replaceregexp file="${install.all.conf}/login-config.xml"
-         flags="gs"
-         match="@${verconf.to.delete}((?!@END.*CONF).)*@END${verconf.to.delete}\s"
-         replace=""
-     />
-
+  <target name="skipped_auth_patch" if="build.unsecure">
+	<echo> "The 'build.unsecure' property was specified (it doesn't matter what value was given), skipping the secure patch"</echo>
   </target>
 
-
   <!-- Update config and other files for production config -->
   <target name="makeProductionConfigChanges" 
           depends="partition-community,partition-production">
 
   </target>
 
-
-  <!-- Update config and other files for production config -->
-  <target name="processSecurityAnnotations" 
-          depends="partition-community,partition-production">
-
-     <ant antfile="build.xml" target="updateSecurity">
-         <property name="config.file" value="conf/props/jmx-console-users.properties" />
-     </ant>
-
-     <ant antfile="build.xml" target="updateSecurity">
-         <property name="config.file" value="deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml" />
-     </ant>
-
-     <ant antfile="build.xml" target="updateSecurity">
-         <property name="config.file" value="deploy/http-invoker.sar/invoker.war/WEB-INF/web.xml" />
-     </ant>
-
-     <ant antfile="build.xml" target="updateSecurity">
-         <property name="config.file" value="deploy/jmx-console.war/WEB-INF/jboss-web.xml" />
-     </ant>
-      
-     <ant antfile="build.xml" target="updateSecurity">
-         <property name="config.file" value="deploy/jmx-console.war/WEB-INF/web.xml" />
-     </ant>
-
-     <ant antfile="build.xml" target="updateSecurity">
-         <property name="config.file" value="deploy/jmx-invoker-service.xml" />
-     </ant>
-      
-     <ant antfile="build.xml" target="updateSecurity">
-         <property name="config.file" value="deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-users.properties" />
-     </ant>
-      
-     <ant antfile="build.xml" target="updateSecurity">
-         <property name="config.file" value="deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml" />
-     </ant>
-      
-     <ant antfile="build.xml" target="updateSecurity">
-         <property name="config.file" value="deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml" />
-     </ant>
-      
-  </target>
-
-  <!-- Modify run.sh for production config -->
-  <target name="updateSecurity">
-
-        <property name="config.file" value=""/>
-
-        <condition property="conf.to.keep" value="UNSECCONF" else="SECURECONF">
-            <equals arg1="${build.unsecure}" arg2="true"/>
-        </condition>
-
-        <condition property="conf.to.delete" value="SECURECONF" else="UNSECCONF">
-            <equals arg1="${build.unsecure}" arg2="true"/>
-        </condition>
-
-  </target>
-
-
   <target name="partition-production" depends="init">
 
-    <!-- JAVA_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512" -->
-    <copy tofile="${install.production}/run.conf"
-      file="${install.bin}/run.conf" overwrite="true"/>
-    <replace file="${install.production}/run.conf" 
-      token="Xms128m" value="Xms1503m"/>
-    <replace file="${install.production}/run.conf" 
-      token="Xmx512m" value="Xmx1503m"/>
-
-      <antcall target="makeCCChanges"/> 
-
     <!-- Build production based on all -->
     <!-- Copy server/all to server/production
     -->
@@ -891,38 +764,11 @@
 
   </target>
 
-  <!-- Modify run.conf for EAP 5 security manager config -->
-  <target name="makeCCChanges">
-     <replace file="${install.production}/run.conf" summary="true">
-        <replacetoken><![CDATA[
-# Sample JPDA settings for remote socket debugging
-]]></replacetoken>
-        <replacevalue><![CDATA[
-## Specify the Security Manager options
-#JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$POLICY"
-
-# Sample JPDA settings for remote socket debugging
-]]></replacevalue>
-        </replace>
-  </target>
-
-
   <!-- Partition the default single configuration build into a minimal,
   default and all configs with a minimal set of jars in the root lib dir.
   -->
   <target name="partition-community" depends="init">
 
-    <!-- JAVA_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512" -->
-    <copy tofile="${install.production}/run.conf"
-      file="${install.bin}/run.conf" overwrite="true"/>
-    <replace file="${install.production}/run.conf" 
-      token="Xms128m" value="Xms1503m"/>
-    <replace file="${install.production}/run.conf" 
-      token="Xmx512m" value="Xmx1503m"/>
-    <!-- 
-      <antcall target="makeCCChanges"/> 
-      -->
-
     <!-- move to the common library directory the jars common to all configs;
          the minimal config currently is not point to it
     -->

Deleted: branches/JBPAPP_5_0/build/buildprod.sh
===================================================================
--- branches/JBPAPP_5_0/build/buildprod.sh	2009-07-01 17:21:04 UTC (rev 90747)
+++ branches/JBPAPP_5_0/build/buildprod.sh	2009-07-01 17:23:49 UTC (rev 90748)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-./build.sh  -Dversion.major=5 -Dversion.minor=1 -Dversion.revision=0 -Dversion.tag=GA -Dversion.name=EAP 




More information about the jboss-cvs-commits mailing list