Changeset 3552

Timestamp:

05/17/12 10:00:31

Author:

douglm

Message:

Add deployActivemq and deploySolr targets and related properties

Files:

• trunk/build/quickstart/build.xml (modified) (1 diff)
• trunk/build/quickstart/linux/bw (modified) (4 diffs)
• trunk/build/quickstart/windows/bw.bat (modified) (5 diffs)
• trunk/config/bwbuild/.defaults/cal.properties (modified) (1 diff)

trunk/build/quickstart/build.xml

@@ -129 +129 @@
-    <copy file="${org.bedework.activemq.configurations}/activemq-jms-ds.xml"
-          tofile="${org.bedework.appserver.deploy.dir}/activemq-jms-ds.xml"
+          overwrite="yes" />
+  </target>
+
+  <!-- =================================================================
+       "deploySolr" target
+       ================================================================= -->
+
+  <target name="deploySolr" depends="init"
+          description="Copy the solr config into the appserver">
+    <copy file="${org.bedework.solr.configurations}/schema.xml"
+          tofile="${org.bedework.global.solr.dir}/${org.bedework.global.solr.publiccore}/conf/schema.xml"
+          overwrite="yes" />
+    <copy file="${org.bedework.solr.configurations}/solrconfig.xml"
+          tofile="${org.bedework.global.solr.dir}/${org.bedework.global.solr.publiccore}/conf/solrconfig.xml"
+          overwrite="yes" />
+    <copy file="${org.bedework.solr.configurations}/solr.xml"
+          tofile="${org.bedework.global.solr.dir}/solr.xml"
-          overwrite="yes" />
-  </target>

trunk/build/quickstart/linux/bw

@@ -87 +87 @@
-deploylog4j=
-deployActivemq=
+deploySolr=
-dirstart=
-
@@ -140 +141 @@
-  echo "      deploylog4j       deploys a log4j configuration"
-  echo "      deployActivemq    deploys the Activemq config"
+  echo "      deploySolr        deploys the quickstart solr config"
-  echo ""
-  echo "   PROJECT optionally defines the package to build. If omitted the main"
@@ -267 +269 @@
-          return
-        fi
+
+        if [ "$deploySolr" != "" ] ; then
+          cd $QUICKSTART_HOME
+          specialTarget=deploySolr
+      deploySolr=
+          return
+        fi
-        
-#     projects
@@ -737 +746 @@
-      shift
-      ;;
+    deploySolr)
+          deploySolr="yes"
+      pkgdefault=
+      shift
+      ;;
-        dirstart)
-          dirstart="yes"

trunk/build/quickstart/windows/bw.bat

@@ -101 +101 @@
-SET deploylog4j=
-SET deployActivemq=
+SET deploySolr=
-SET dirstart=
-
@@ -180 +181 @@
-:deployActivemq
-  SET deployActivemq="yes"
+  SET pkgdefault=
+  SHIFT
+  GOTO branch
+      
+:deploySolr
+  SET deploySolr="yes"
-  SET pkgdefault=
-  SHIFT
@@ -596 +603 @@
-  IF NOT "%deploylog4j%empty" == "empty" GOTO cdDeploylog4j
-  IF NOT "%deployActivemq%empty" == "empty" GOTO cdDeployActivemq
+  IF NOT "%deploySolr%empty" == "empty" GOTO cdDeploySolr
-:: Now projects
-  IF NOT "%bwdeployutil%empty" == "empty" GOTO cdBwdeployutil
@@ -667 +675 @@
-  SET specialTarget="deployActivemq"
-  GOTO dospecial
+  
+:cdDeploySolr
+  cd %QUICKSTART_HOME%
+  SET deploySolr=
+  SET specialTarget="deploySolr"
+  GOTO dospecial
-
-:: Projects    
@@ -909 +923 @@
-  ECHO      deploylog4j       deploys a log4j configuration
-  ECHO      deployActivemq    deploys the Activemq config
+  ECHO      deploySolr        deploys the quickstart solr config
-  ECHO.
-  ECHO    PROJECT optionally defines the package to build and is one of

trunk/config/bwbuild/.defaults/cal.properties

@@ -206 +206 @@
-
-# ------------------------------------------------------------------------
+# Solr defs
+# ------------------------------------------------------------------------
+
+org.bedework.global.solr.dir=${org.bedework.data.dir}/../solr
+
+# use the default solr configs 
+org.bedework.solr.configurations=${org.bedework.configuration.defaults}
+
+org.bedework.global.solr.publiccore=bwpublic
+
+# ------------------------------------------------------------------------
-# Deployment locations for the wsdls and associated files.
-# For each related service there is a run time URL to allow client services