Changeset 3413

Timestamp:

11/30/11 13:55:07

Author:

douglm

Message:

(Partial updates as full update failed with some conflict)

Major refactoring of code to move all jar building into separate projects outside of the main bedework project which itself becomes an assembly project - that is it builds deployable components from the jars and other information.

This change is to facilitate the move to jboss 7.

Further changes are needed but probably no more major reorganization.

Files:

• trunk/build.xml (modified) (7 diffs)
• trunk/util/svncopy.sh (modified) (7 diffs)

trunk/build.xml

@@ -19 +19 @@
-              location="${org.bedework.project.bedework}/libcache"/>
-
-  <!-- Where we put other projects -->
-  <property name="org.bedework.projects"
-            location="${org.bedework.project.bedework}/projects" />
-
-  <property name="org.bedework.project.caldavimpl"
-            location="${org.bedework.projects}/caldavimpl" />
-
-  <property name="org.bedework.project.calendarapi"
-            location="${org.bedework.projects}/calendarapi" />
-
-  <property name="org.bedework.project.dumprestore"
-            location="${org.bedework.projects}/dumprestore" />
-
-  <property name="org.bedework.project.indexer"
-            location="${org.bedework.projects}/indexer" />
-
-  <property name="org.bedework.project.webapps"
-            location="${org.bedework.projects}/webapps" />
-
-  <property name="build.dir" location="${org.bedework.project.bedework}/build"/>
-  
@@ -53 +34 @@
-
-  <property name="project.version" value="${org.bedework.version}"/>
-
-  <property name="org.bedework.deployutil.jar"
-            location="${org.bedework.project.bedework}/bin/${org.bedework.deployutil.jar.name}-${project.version}.jar" />
-
-  <ant antfile="${org.bedework.project.bedework}/deployutil/build.xml" inheritrefs="true"
-         target="build" />
-  
-  <copy todir="${build.dir}" file="${org.bedework.deployutil.jar}" />
-  
-  <import file="${build.dir}/buildTools/deftasks.xml"/>
@@ -124 +97 @@
--->
-    <!-- ===============================================================
-Locations and jar files built by this project
+This project builds nothing - it just assembles
-         =============================================================== -->
-
@@ -141 +114 @@
-    <property name="org.bedework.deployment.base"
-              location="${org.bedework.project.bedework}/deployment" />
-
-    <property name="org.bedework.build.jar"
-              location="${bin.home}/${org.bedework.build.jar.name}-${project.version}.jar" />
-
-    <property name="org.bedework.deployutil.jar"
-              location="${bin.home}/${org.bedework.deployutil.jar.name}-${project.version}.jar" />
-  </target>
-
-  <target name="init.build" depends="init">
-    <mkdir dir="${dist.home}" />
-
-    <mkdir dir="${bin.home}" />
-
-    <mkdir dir="${org.bedework.empty.dir}" />
-  </target>
-
@@ -161 +120 @@
-       ================================================================= -->
-
-
-
-
-
-
+
-          description="builds the project">
-  </target>
-
-
-
-
-
-
-
+
+
+
-  </target>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-          description="partial clean up for quickstart.">
-    <delete dir="${bin.home}" />
-    <delete dir="${org.bedework.temp.dir}" />
-    <delete dir="${org.bedework.empty.dir}" />
-    <delete dir="${bw.project.home}/libcache"/>
-    <delete dir="${bw.project.home}/applib"/>
-
-    <delete>
@@ -204 +140 @@
-  </target>
-
-  <target name="clean.build" depends="clean, build"
-          description="cleans then builds the project"/>
-
-  <!-- =================================================================
-and "deploy.all" target builds and
+target
-       ================================================================= -->
-
@@ -216 +149 @@
-         target="deploy" />
-  </target>
-
-  <!-- =================================================================
-       The "clean.deploy" target cleans, builds and deploys the applications
-       ================================================================= -->
-
-  <target name="clean.deploy" depends="clean,deploy" />
-
-  <!-- =================================================================
-       The "build.configured" target builds configured applications
-       ================================================================= -->
-
-  <target name="build.configured" depends="build"
-          description="Build configured applications" >
-    <ant antfile="${org.bedework.project.bedework}/deployment}/build.xml" inheritrefs="true"
-         target="build.configured" />
-  </target>
-
-  <target name="clean.build.configured" depends="clean,build.configured" />
-
-  <!-- ======================== javadoc target =======================
-       We build these and copy in turn into the main bedework docs directory.
-
-       The org.bedework.projectdocs.home property allows each project to
-       locate the previously built javadocs so they can link to it.
-
-       We also assume access to the java api docs.
-       ================================================================= -->
-
-  <target name="javadoc" depends="init" description="Generate javadoc">
-    <property name="docs.home" location="${bw.project.home}/docs"/>
-    <property name="org.bedework.projectdocs.home" location="${docs.home}/projectdocs"/>
-    <delete dir="${org.bedework.projectdocs.home}" />
-    <mkdir dir="${org.bedework.projectdocs.home}" />
-
-    <ant antfile="${org.bedework.project.calendarapi}/build.xml" inheritall="false"
-         target="javadoc" >
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/calendarapi/api" />
-    </ant>
-
-    <ant antfile="${org.bedework.project.dumprestore}/build.xml" inheritall="false"
-         target="javadoc" >
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/dumprestore/api" />
-    </ant>
-
-    <ant antfile="${org.bedework.project.caldavimpl}/build.xml" inheritall="false"
-         target="javadoc" >
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/caldavimpl/api" />
-    </ant>
-
-    <ant antfile="${org.bedework.project.indexer}/build.xml" inheritall="false"
-         target="javadoc" >
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/indexer/api" />
-    </ant>
-
-    <ant antfile="${org.bedework.project.webapps}/build.xml" inheritall="false"
-         target="javadoc" >
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/webapps/api" />
-    </ant>
-  </target>
-
-  <!-- =================================================================
-       Targets to build sub-projects.
-       ================================================================= -->
-
-  <!-- .................................................................
-                          caldavimpl
-       .................................................................. -->
-  <target name="build.caldavimpl" depends="init"
-          description="builds the caldavimpl project">
-    <ant antfile="${org.bedework.project.caldavimpl}/build.xml" inheritall="false"
-       target="build-all"  >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.caldavimpl" depends="init"
-          description="clean the caldavimpl project">
-    <ant antfile="${org.bedework.project.caldavimpl}/build.xml" inheritall="false"
-         target="deep-clean" />
-  </target>
-
-  <target name="clean.build.caldavimpl" depends="init"
-          description="clean builds the caldavimpl project"/>
-
-  <!-- .................................................................
-                          calendarapi
-       .................................................................. -->
-  <target name="build.calendarapi" depends="init"
-          description="builds the calendar project">
-    <ant antfile="${org.bedework.project.calendarapi}/build.xml" inheritall="false"
-           target="build-all"  >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.calendarapi" depends="init"
-          description="clean the calendar project">
-    <ant antfile="${org.bedework.project.calendarapi}/build.xml" inheritall="false"
-           target="deep-clean" />
-  </target>
-
-  <target name="clean.build.calendarapi" depends="clean.calendarapi,build.calendarapi"
-          description="clean builds the calendarapi project"/>
-
-  <!-- .................................................................
-                          dumprestore
-       .................................................................. -->
-  <target name="build.dumprestore" depends="init"
-          description="builds the dumprestore project">
-    <ant antfile="${org.bedework.project.dumprestore}/build.xml" inheritall="false"
-           target="build-all"  >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.dumprestore" depends="init"
-          description="clean the dumprestore project">
-    <ant antfile="${org.bedework.project.dumprestore}/build.xml" inheritall="false"
-           target="deep-clean" />
-  </target>
-
-  <target name="clean.build.dumprestore" depends="clean.dumprestore,build.dumprestore"
-          description="builds the dumprestore project"/>
-
-  <!-- .................................................................
-                          indexer
-       .................................................................. -->
-  <target name="build.indexer" depends="init"
-          description="builds the indexer project">
-    <ant antfile="${org.bedework.project.indexer}/build.xml" inheritall="false"
-           target="build-all"  >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.indexer" depends="init"
-          description="clean the indexer project">
-    <ant antfile="${org.bedework.project.indexer}/build.xml" inheritall="false"
-           target="deep-clean" />
-  </target>
-
-  <target name="clean.build.indexer" depends="clean.indexer,build.indexer"
-          description="builds the indexer project"/>
-
-  <!-- .................................................................
-                          webapps
-       .................................................................. -->
-  <target name="build.webapps" depends="init"
-          description="builds the webapps project">
-    <ant antfile="${org.bedework.project.webapps}/build.xml" inheritall="false"
-           target="build-all"  >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.webapps" depends="init"
-          description="clean the webapps project">
-    <ant antfile="${org.bedework.project.webapps}/build.xml" inheritall="false"
-           target="deep-clean" />
-  </target>
-
-  <target name="clean.build.webapps" depends="clean.webapps,build.webapps"
-          description="builds the webapps project"/>
-
-  <!-- =================================================================
-       Targets to build sub-components of this project.
-       ================================================================= -->
-
-  <target name="build.build" depends="init"
-          description="builds the java build configuration component">
-    <ant antfile="${org.bedework.project.bedework}/build/build.xml" inheritrefs="true"
-           target="build" >
-      <property name="build.jar.file" location="${org.bedework.build.jar}" />
-    </ant>
-  </target>
-
-  <!-- Rebuild the http test suite only -->
-  <target name="httptest" depends="init"
-          description="Run httptest suite" >
-    <input message="httptest may destroy this calendar db. Proceed with test"
-           validargs="y,n"
-           addproperty="do.httptest" />
-    <condition property="do.abort">
-      <equals arg1="n" arg2="${do.httptest}"/>
-    </condition>
-    <fail if="do.abort">httptest aborted by user.</fail>
-
-    <ant antfile="${calendar.build.file}" inheritrefs="true"
-           target="bld.httptest" />
-
-    <ant antfile="${calendar.build.file}" inheritrefs="true"
-           target="run.httptest" />
-  </target>
-</project>

trunk/util/svncopy.sh

@@ -1 +1 @@
-#!/bin/bash
-
-the current trunk to a new location and adjust the bedework externals property
+all the projects in one branch to a new location
-
-usage() {
-
-
+
-  echo " "
-  echo " $0 help"
@@ -14 +13 @@
-  echo " par 3: comment text"
-  echo " "
-
+
+
+
-  echo " "
-  exit
@@ -70 +71 @@
-
-# ------------------------------------------------------------------
-
-
+
-#
-# par 1 - project name
@@ -80 +80 @@
-copyproject() {
-  echo "copyproject $1 $2 from $4"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  svn copy -m "$3" -rHEAD $SVNREPOSITORY/$1/$4 $SVNREPOSITORY/$1/$2
-}
@@ -119 +104 @@
-PROJECTS="$PROJECTS access"
-PROJECTS="$PROJECTS bedework"
+#  bwalarms  - later
+PROJECTS="$PROJECTS bwannotations"
+PROJECTS="$PROJECTS bwcalcore"
+PROJECTS="$PROJECTS bwcaldav"
+PROJECTS="$PROJECTS bwcalFacade"
+#  bwcrawler - can probably delete
+PROJECTS="$PROJECTS bwdeployutil"
+PROJECTS="$PROJECTS bwical"
+PROJECTS="$PROJECTS bwinterfaces"
+PROJECTS="$PROJECTS bwmisc"
+PROJECTS="$PROJECTS bwsysevents"
-PROJECTS="$PROJECTS bwtools"
-PROJECTS="$PROJECTS bwtzsvr"
+PROJECTS="$PROJECTS bwwebapps"
-PROJECTS="$PROJECTS bwxml"
-PROJECTS="$PROJECTS cachedfeeder"
-PROJECTS="$PROJECTS caldav"
-
+
-PROJECTS="$PROJECTS caldavTest"
-
+
-PROJECTS="$PROJECTS carddav"
-PROJECTS="$PROJECTS clientapp"
@@ -132 +129 @@
-PROJECTS="$PROJECTS davutil"
-PROJECTS="$PROJECTS dumprestore"
+#  exchgGateway - later
+#  exchgsynch - delete this one 
+#   freebusy   - aggregator - not supported
-PROJECTS="$PROJECTS indexer"
-PROJECTS="$PROJECTS monitor"
-PROJECTS="$PROJECTS naming"
-PROJECTS="$PROJECTS rpiutil"
-
+
+
-PROJECTS="$PROJECTS testsuite"
-
+
+
+
-PROJECTS="$PROJECTS webdav"
-
-SCTEMPDIR="${TMPDIR:=/tmp}/svncopydir$$"
-SCTEMPFILE=$SCTEMPDIR/svncopy
-
-mkdir $SCTEMPDIR
-
-# Assure the file is removed at program termination
-# or after we received a signal:
-trap 'rm -rf "$SCTEMPDIR" >/dev/null 2>&1' 0
-trap "exit 2" 1 2 3 15
-
-for project in $PROJECTS
@@ -155 +148 @@
-   copyproject "$project" "$TARGET" "$COMMENT" "$SOURCE"
-done
-
-svn co -N $SVNREPOSITORY/bedework/$TARGET $SCTEMPDIR/bedework
-svn propset svn:externals -F $SCTEMPFILE $SCTEMPDIR/bedework
-svn commit -N -m "Change externals to new copies" $SCTEMPDIR/bedework
-
-#more $SCTEMPFILE