[Bedework-commit] bwtools r99 - trunk

[svnadmin at bedework.org]

Author: douglm
Date: 2011-02-16 15:13:23 -0500 (Wed, 16 Feb 2011)
New Revision: 99

Modified:
   trunk/build.xml
Log:
Fixed a build bug that caused a build failure after a clean.
Removed a lot of copying of files. There's now a definition of exactly which libraries are needed for the ears. This allows us to be more specific about which jars get loaded

Removed some geronimo stuff added a while back. It was all out of date.


Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2011-02-14 20:59:08 UTC (rev 98)
+++ trunk/build.xml	2011-02-16 20:13:23 UTC (rev 99)
@@ -275,4 +275,117 @@
       <arg value="${org.bedework.directory.group.member}" />
     </java>
   </target>
+
+  <!-- =================================================================
+       Run the cmdline utility
+       ================================================================= -->
+
+  <target name="cmdutil" depends="init"
+          description="run the cmdline utility">
+    <loadDeployConfig />
+
+    <property name="app.dest.classes"
+              location="${dist.home}/temp/cmdutil/classes" />
+
+    <delete dir="${app.dest.classes}" />
+    <mkdir dir="${app.dest.classes}" />
+
+    <property name="app.dest.properties"
+              location="${app.dest.classes}/properties/calendar" />
+
+    <mkdir dir="${app.dest.properties}" />
+
+    <copy tofile="${app.dest.properties}/options.xml"
+          file="${org.bedework.config.options}" />
+
+    <copy tofile="${app.dest.classes}/sysevents.properties"
+          file="${org.bedework.config.home}/application.sysevents.properties" />
+
+    <path id="run.classpath">
+      <fileset dir="${project.home}/lib">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${org.bedework.config.home}/lib/server">
+         <include name="*.jar"/>
+      </fileset>
+      <fileset dir="${dist.home}">
+         <include name="*.jar"/>
+      </fileset>
+      <pathelement location="${project.home}/resources" />
+      <pathelement location="${app.dest.classes}" />
+    </path>
+
+    <echo file="${app.dest.classes}/hibernate.properties">
+hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N'
+hibernate.dialect=${org.bedework.global.hibernate.dialect}
+hibernate.connection.driver_class=${org.bedework.global.jdbcdriver}
+hibernate.connection.username=${org.bedework.global.jdbcid}
+hibernate.connection.password=${org.bedework.global.jdbcpw}
+hibernate.connection.url=${org.bedework.global.jdbcurl}
+hibernate.cglib.use_reflection_optimizer=false
+hibernate.cache.use_second_level_cache=false
+#
+# Here for better debugging
+#
+hibernate.jdbc.batch_size=0
+    </echo>
+
+    <copy todir="${app.dest.classes}"
+          file="${project.home}/resources/log4j.xml" />
+
+    <copy todir="${app.dest.classes}">
+      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/properties" />
+      <filterset refid="property.filters" />
+    </copy>
+
+    <copy todir="${app.dest.classes}">
+      <fileset dir="${org.bedework.project.calendarapi}/calCore/resources/hbms" />
+      <filterset refid="property.filters" />
+    </copy>
+
+    <pathconvert property="run.txt.classpath"
+                 refid="run.classpath"
+                 targetos="unix"  pathsep=":" />
+    
+    <!--
+    <echo message="classpath=${run.txt.classpath}"/>
+    -->
+
+    <input message="Enter administrative user account:"
+           addproperty="org.bedework.cmdutil.arg.account" />
+
+    <input message="Enter input file name - null for System.in:"
+           addproperty="org.bedework.cmdutil.arg.infile" />
+
+
+    <if>
+      <equals arg1="${org.bedework.cmdutil.arg.infile}"
+              arg2="" />
+      <then>
+        <property name="org.bedework.cmdutil.arg.infile.par" value="" />
+      </then>
+      <else>
+        <property name="org.bedework.cmdutil.arg.infile.par" value="-f" />
+      </else>
+    </if>
+
+    <!--
+    <echo message="For this to work you need to do something like:"/>
+    <echo message="export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/douglm/drop2/java/yourkit/yjp-6.0.15/bin/linux-x86-32"/>
+     -->
+
+    <java classname="org.bedework.tools.cmdutil.CmdUtil"
+          fork="true"
+          failonerror="false"
+          resultproperty="org.bedework.cmdutil.status" >
+      <classpath refid="run.classpath" />
+      <arg value="-user" />
+      <arg value="${org.bedework.cmdutil.arg.account}" />
+      <arg value="${org.bedework.cmdutil.arg.infile.par}" />
+      <arg value="${org.bedework.cmdutil.arg.infile}" />
+      <!--
+      <jvmarg value="-agentlib:yjpagent" />
+       -->
+    </java>
+  </target>
 </project>