Changeset 3319

Timestamp:

08/26/11 17:44:00

Author:

douglm

Message:

Fix up references to projects now that access, davutil and rpiutil are not external projects.

Files:

• trunk (modified) (1 prop)
• trunk/build.xml (modified) (10 diffs)
• trunk/build/buildTools/deftasks.xml (modified) (2 diffs)
• trunk/build/bw-deployutil-3.7.jar (modified) (previous)
• trunk/build/quickstart/linux/bw (modified) (5 diffs)
• trunk/config/bwbuild/default/cal.properties (modified) (1 diff)
• trunk/config/bwbuild/derby/cal.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss-mysql/cal.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss-postgresql/cal.properties (modified) (1 diff)
• trunk/deployment/bw-core-appjars.xml (modified) (2 diffs)
• trunk/deployment/genkeys/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/monitor/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/sysevlog/shellscr/appjars.xml (modified) (1 diff)

trunk/build.xml

@@ -23 +23 @@
-            location="${org.bedework.project.bedework}/projects" />
-
-  <property name="org.bedework.project.access"
-            location="${org.bedework.projects}/access" />
-
-  <property name="org.bedework.project.caldav"
-            location="${org.bedework.projects}/caldav" />
@@ -35 +32 @@
-            location="${org.bedework.projects}/calendarapi" />
-
-  <property name="org.bedework.project.davutil"
-            location="${org.bedework.projects}/davutil" />
-
-  <property name="org.bedework.project.dumprestore"
-            location="${org.bedework.projects}/dumprestore" />
@@ -43 +37 @@
-  <property name="org.bedework.project.indexer"
-            location="${org.bedework.projects}/indexer" />
-
-  <property name="org.bedework.project.rpiutil"
-            location="${org.bedework.projects}/rpiutil" />
-
-  <property name="org.bedework.project.webapps"
@@ -185 +176 @@
-       ================================================================= -->
-
-
-
+
-                                build.webdav,build.caldav,
-                                build.calendarapi,
@@ -203 +193 @@
-  </target>
-
-
-
+
-                                clean.calendarapi,
-                                clean.webdav,clean.caldav,
@@ -215 +204 @@
-  </target>
-
-
-
+
-                                           clean.calendarapi,
-                                           clean.webdav,clean.caldav,
@@ -300 +288 @@
-    <mkdir dir="${org.bedework.projectdocs.home}" />
-
-    <ant antfile="${org.bedework.project.rpiutil}/build.xml" inheritall="false"
-         target="javadoc" >
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/rpiutil/api" />
-    </ant>
-
-    <ant antfile="${org.bedework.project.access}/build.xml" inheritall="false"
-         target="javadoc" >
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/access/api" />
-    </ant>
-
-    <ant antfile="${org.bedework.project.davutil}/build.xml" inheritall="false"
-         target="javadoc" >
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/davutil/api" />
-    </ant>
-
-    <ant antfile="${org.bedework.project.calendarapi}/build.xml" inheritall="false"
-         target="javadoc" >
@@ -364 +334 @@
-       Targets to build sub-projects.
-       ================================================================= -->
-
-  <!-- .................................................................
-                          access
-       .................................................................. -->
-  <target name="build.access" depends="init"
-          description="builds the access project">
-    <ant antfile="${org.bedework.project.access}/build.xml" inheritall="false"
-           target="build-all" >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.access" depends="init"
-          description="cleans the access project">
-    <ant antfile="${org.bedework.project.access}/build.xml" inheritall="false"
-           target="deep-clean" />
-  </target>
-
-  <target name="clean.build.access" depends="clean.access,build.access"
-          description="builds the access project"/>
-
-  <!-- .................................................................
@@ -450 +399 @@
-
-  <!-- .................................................................
-                          davutil
-       .................................................................. -->
-  <target name="build.davutil" depends="init"
-          description="builds the davutil project">
-    <ant antfile="${org.bedework.project.davutil}/build.xml" inheritall="false"
-           target="build-all"  >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.davutil" depends="init"
-          description="cleans the davutil project">
-    <ant antfile="${org.bedework.project.davutil}/build.xml" inheritall="false"
-           target="deep-clean" />
-  </target>
-
-  <target name="clean.build.davutil" depends="clean.davutil,build.davutil"
-          description="clean builds the davutil project"/>
-
-  <!-- .................................................................
-                          dumprestore
-       .................................................................. -->
@@ -511 +439 @@
-  <target name="clean.build.indexer" depends="clean.indexer,build.indexer"
-          description="builds the indexer project"/>
-
-  <!-- .................................................................
-                          rpiutil
-       .................................................................. -->
-  <target name="build.rpiutil" depends="init"
-          description="builds the rpiutil project">
-    <ant antfile="${org.bedework.project.rpiutil}/build.xml" inheritall="false"
-           target="build-all"  >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.rpiutil" depends="init"
-          description="cleans the rpiutil project">
-    <ant antfile="${org.bedework.project.rpiutil}/build.xml" inheritall="false"
-           target="deep-clean" />
-  </target>
-
-  <target name="clean.build.rpiutil" depends="clean.rpiutil,build.rpiutil"
-          description="builds the rpiutil project"/>
-
-  <!-- .................................................................

trunk/build/buildTools/deftasks.xml

@@ -218 +218 @@
-       ================================================================= -->
-  
+  <target name="build.access">
+    <execProject project="access" target="build" />
+  </target>
+  
+  <target name="clean.access">
+    <execProject project="access" target="clean" />
+  </target>
+  
-  <target name="build.bwxml">
-    <execProject project="bwxml" target="build" />
@@ -224 +232 @@
-  <target name="clean.bwxml">
-    <execProject project="bwxml" target="clean" />
+  </target>
+  
+  <target name="build.davutil">
+    <execProject project="davutil" target="build" />
+  </target>
+  
+  <target name="clean.davutil">
+    <execProject project="davutil" target="clean" />
+  </target>
+  
+  <target name="build.rpiutil">
+    <execProject project="rpiutil" target="build" />
+  </target>
+  
+  <target name="clean.rpiutil">
+    <execProject project="rpiutil" target="clean" />
-  </target>
-  

trunk/build/quickstart/linux/bw

@@ -21 +21 @@
-
-# Projects we need to update
-
+davutil 
-
-echo ""
@@ -77 +77 @@
-  echo "     -carddav     Target is for the CardDAV build"
-  echo "     -carddav deploy-addrbook    To deploy the Javascript Addressbook client."
+  echo "     -davutil     Target is for the Bedework dav util classes"
-  echo "     -rpiutil     Target is for the Bedework util classes"
-  echo "     -tzsvr       Target is for the timezones server build"
@@ -265 +266 @@
-catsvr=
-client=
+davutil=
-monitor=
-naming=
@@ -408 +410 @@
-      shift
-      ;;
+    -davutil)
+      davutil="yes"
+      pkgdefault=
+      shift
+      ;;
-    -monitor)
-      monitor="yes"
@@ -516 +523 @@
-fi
-
+if [ "$davutil" != "" ] ; then
+  cd $QUICKSTART_HOME/davutil
+fi
+
-if [ "$monitor" != "" ] ; then
-  cd $QUICKSTART_HOME/MonitorApp

trunk/config/bwbuild/default/cal.properties

@@ -136 +136 @@
-
-# A list of jars to copy, delimited by ","
-projects
+..
-
-# ------------------------------------------------------------------------

trunk/config/bwbuild/derby/cal.properties

@@ -135 +135 @@
-
-# A list of jars to copy, delimited by ","
-projects
+..
-
-# ------------------------------------------------------------------------

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

@@ -133 +133 @@
-
-# A list of jars to copy, delimited by ","
-projects
+..
-
-# ------------------------------------------------------------------------

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

@@ -134 +134 @@
-
-# A list of jars to copy, delimited by ","
-projects
+..
-
-# ------------------------------------------------------------------------

trunk/deployment/bw-core-appjars.xml

@@ -132 +132 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-davio" version="${org.bedework.davutil.version}" 
-projects
+..
-
-      <!-- =================== Bedework indexer jars ======================= -->
@@ -177 +177 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="rpiaccess" version="${org.bedework.access.version}" 
-projects
+..
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-              name="rpiutil" version="${org.bedework.rpiutil.version}" 
-projects
+..
-      
-      <!-- ======================= Ical4j jars ============================ -->

trunk/deployment/genkeys/shellscr/appjars.xml

@@ -18 +18 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="rpiutil" version="${org.bedework.rpiutil.version}" project="rpiutil"
-w.project.home}/projects
+edework.home}/..
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"

trunk/deployment/monitor/shellscr/appjars.xml

@@ -19 +19 @@
-              name="rpiaccess" 
-              version="${org.bedework.access.version}" project="access"
-projects
+..
-
-    </sequential>

trunk/deployment/sysevlog/shellscr/appjars.xml

@@ -19 +19 @@
-              name="rpiaccess" 
-              version="${org.bedework.access.version}" project="access"
-projects
+..
-
-    </sequential>