Changeset 3336

Timestamp:

09/08/11 11:38:31

Author:

douglm

Message:

Suppress some warnings from compiler.

Move the config log4j.xml into the .defaults directory

Change the way extra properties are handled - only used by synch

Files:

• trunk/build/buildwar.xml (modified) (1 diff)
• trunk/build/quickstart/build.xml (modified) (1 diff)
• trunk/build/quickstart/linux/bw (modified) (3 diffs)
• trunk/build/quickstart/windows/bw.bat (modified) (5 diffs)
• trunk/config/bwbuild/.defaults/log4j.xml (added)
• trunk/config/bwbuild/.defaults/synch-config.xml (moved) (moved from trunk/config/bwbuild/jboss-postgresql/synch-config.xml)
• trunk/config/bwbuild/default/build.properties (modified) (1 diff)
• trunk/config/bwbuild/default/log4j.xml (deleted)
• trunk/config/bwbuild/derby/build.properties (modified) (1 diff)
• trunk/config/bwbuild/derby/log4j.xml (deleted)
• trunk/config/bwbuild/jboss-h2/build.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss-h2/log4j.xml (deleted)
• trunk/config/bwbuild/jboss-mysql/build.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss-mysql/log4j.xml (deleted)
• trunk/config/bwbuild/jboss-postgresql/build.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss-postgresql/log4j.xml (deleted)
• trunk/docs/CalWs-SOAP.odt (modified) (previous)

trunk/build/buildwar.xml

@@ -190 +190 @@
-      <then>
-        <copy todir="${app.dest.properties}">
-config.home
+extra.properties.dir
-                    files="${org.bedework.extra.properties}"/> 
-          <filterset refid="property.filters" />

trunk/build/quickstart/build.xml

@@ -118 +118 @@
-
-  <!-- =================================================================
-.
-
-
-.
+
+
+
+
-          description="Copy the log4j config into the appserver">
-    <copy tofile="${org.bedework.log4j.config}" 
-home}/log4j.xml
+logging}
-            overwrite="true" />
-  </target>

trunk/build/quickstart/linux/bw

@@ -45 +45 @@
-# Special targets - avoiding dependencies
-
+deploylog4j=
-dirstart=
-
@@ -179 +180 @@
-          return
-        fi
+
+        if [ "$deploylog4j" != "" ] ; then
+          cd $QUICKSTART_HOME
+          specialTarget=deploylog4j
+      deploylog4j=
+          return
+        fi
-        
-#     projects
@@ -497 +505 @@
-      ;;
-# ------------------------Special targets
+        deploylog4j)
+          deploylog4j="yes"
+      pkgdefault=
+      shift
+      ;;
-        dirstart)
-          dirstart="yes"

trunk/build/quickstart/windows/bw.bat

@@ -58 +58 @@
-SET action=
-
+:: Special targets - avoiding dependencies
+
+SET deploylog4j=
+SET dirstart=
+
+SET specialTarget=
+
-:: check for command-line arguments and branch on them
-IF "%1noargs" == "noargs" GOTO usage
@@ -121 +128 @@
-:build-debug
-  SET bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true -Dorg.bedework.build.debug=true "
+  SHIFT
+  GOTO branch
+      
+:: ----------------------- Special targets
+:deploylog4j
+  SET deploylog4j="yes"
+  SET pkgdefault=
+  SHIFT
+  GOTO branch
+      
+:dirstart
+  SET dirstart="yes"
+  SET pkgdefault=
-  SHIFT
-  GOTO branch
@@ -349 +369 @@
-
-:: This below reflects the dependency ordering
+:: Special targets first
+  IF NOT "%dirstart%empty" == "empty" GOTO cdDirstart
+  IF NOT "%deploylog4j%empty" == "empty" GOTO cdDeploylog4j
+:: Now projects
-  IF NOT "%bwxml%empty" == "empty" GOTO cdBwxml
-  IF NOT "%rpiutil%empty" == "empty" GOTO cdRpiutil
@@ -377 +401 @@
-  GOTO runBedework
-    
+:dospecial
+  ECHO     WORKING DIRECTORY = %cd%
+  ECHO     COMMAND =  "%JAVA_HOME%\bin\java.exe" -classpath %CLASSPATH% %offline% -Dant.home="%ANT_HOME%" org.apache.tools.ant.launch.Launcher "%BWCONFIG%" %ant_listener% %ant_logger% %ant_loglevel% %bw_loglevel% %specialTarget%
+  ECHO.
+  ECHO.
+  "%JAVA_HOME%\bin\java.exe" -classpath %CLASSPATH% %offline% -Dant.home="%ANT_HOME%" org.apache.tools.ant.launch.Launcher "%BWCONFIG%" %ant_listener% %ant_logger% %ant_loglevel% %bw_loglevel% %specialTarget%
+
+  GOTO runBedework
+
+:: Special targets
+  
+:cdDirstart
+  cd %QUICKSTART_HOME%
+  SET dirstart=
+  SET specialTarget="dirstart"
+  GOTO dospecial
+  
+:cdDeploylog4j
+  cd %QUICKSTART_HOME%
+  SET deploylog4j=
+  SET specialTarget="deploylog4j"
+  GOTO dospecial
+
+:: Projects    
-:cdAccess
-  cd %QUICKSTART_HOME%\access
@@ -462 +510 @@
-:: (otherwise, we could just "GOTO %1")
-:branch
+:: Special targets 
+IF "%1" == "deploylog4j" GOTO deploylog4j
+IF "%1" == "dirstart" GOTO dirstart
+:: projects
-IF "%1" == "-quickstart" GOTO quickstart
-IF "%1" == "-bwchome" GOTO bwchome

trunk/config/bwbuild/default/build.properties

@@ -26 +26 @@
-
-org.bedework.config.sysevents.properties=${org.bedework.configuration.defaults}/sysevents.properties
+
+# Where we deploy the logging config from 
+org.bedework.config.logging=${org.bedework.configuration.defaults}/log4j.xml

trunk/config/bwbuild/derby/build.properties

@@ -26 +26 @@
-
-org.bedework.config.sysevents.properties=${org.bedework.configuration.defaults}/sysevents.properties
+
+# Where we deploy the logging config from 
+org.bedework.config.logging=${org.bedework.configuration.defaults}/log4j.xml

trunk/config/bwbuild/jboss-h2/build.properties

@@ -26 +26 @@
-
-org.bedework.config.sysevents.properties=${org.bedework.configuration.defaults}/sysevents.properties
+
+# Where we deploy the logging config from 
+org.bedework.config.logging=${org.bedework.configuration.defaults}/log4j.xml

trunk/config/bwbuild/jboss-mysql/build.properties

@@ -26 +26 @@
-
-org.bedework.config.sysevents.properties=${org.bedework.configuration.defaults}/sysevents.properties
+
+# Where we deploy the logging config from 
+org.bedework.config.logging=${org.bedework.configuration.defaults}/log4j.xml

trunk/config/bwbuild/jboss-postgresql/build.properties

@@ -26 +26 @@
-
-org.bedework.config.sysevents.properties=${org.bedework.configuration.defaults}/sysevents.properties
+
+# Where we deploy the logging config from 
+org.bedework.config.logging=${org.bedework.configuration.defaults}/log4j.xml