[Bedework-commit] bedework r1956 - in trunk: config/bwbuild/default config/bwbuild/jboss config/bwbuild/liferay5 config/configs deployment/resources deployment/webadmin/webapp deployment/webconfig/webapp deployment/webpublic/webapp deployment/websubmit/webapp deployment/webuser/webapp

[svnadmin at bedework.org]

Author: johnsa
Date: 2008-11-07 22:51:07 -0500 (Fri, 07 Nov 2008)
New Revision: 1956

Modified:
   trunk/config/bwbuild/default/cal.properties
   trunk/config/bwbuild/jboss/democal.properties
   trunk/config/bwbuild/liferay5/cal.properties
   trunk/config/configs/democal.properties
   trunk/deployment/resources/build.xml
   trunk/deployment/webadmin/webapp/build.xml
   trunk/deployment/webconfig/webapp/build.xml
   trunk/deployment/webpublic/webapp/build.xml
   trunk/deployment/websubmit/webapp/build.xml
   trunk/deployment/webuser/webapp/build.xml
Log:
adding jquery to build

Modified: trunk/config/bwbuild/default/cal.properties
===================================================================
--- trunk/config/bwbuild/default/cal.properties	2008-11-07 22:14:38 UTC (rev 1955)
+++ trunk/config/bwbuild/default/cal.properties	2008-11-08 03:51:07 UTC (rev 1956)
@@ -58,8 +58,9 @@
 
 org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed
 
-# Where we keep the dojo stuff in deployment/resources/javascript
+# Where we keep the javascript libraries in deployment/resources/javascript
 org.bedework.dojo.dir=dojo-0.4.1-ajax
+org.bedework.jquery.dir=jquery
 
 # A place to put extra jars and files, e.g. jdbc drivers.
 # This can be directed at any local directory

Modified: trunk/config/bwbuild/jboss/democal.properties
===================================================================
--- trunk/config/bwbuild/jboss/democal.properties	2008-11-07 22:14:38 UTC (rev 1955)
+++ trunk/config/bwbuild/jboss/democal.properties	2008-11-08 03:51:07 UTC (rev 1956)
@@ -67,8 +67,9 @@
 
 org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed
 
-# Where we keep the dojo stuff in deployment/resources/javascript
+# Where we keep the javascript libraries in deployment/resources/javascript
 org.bedework.dojo.dir=dojo-0.4.1-ajax
+org.bedework.jquery.dir=jquery
 
 # A place to put extra jars and files, e.g. jdbc drivers.
 # This can be directed at any local directory

Modified: trunk/config/bwbuild/liferay5/cal.properties
===================================================================
--- trunk/config/bwbuild/liferay5/cal.properties	2008-11-07 22:14:38 UTC (rev 1955)
+++ trunk/config/bwbuild/liferay5/cal.properties	2008-11-08 03:51:07 UTC (rev 1956)
@@ -60,8 +60,9 @@
 
 org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed
 
-# Where we keep the dojo stuff in deployment/resources/javascript
+# Where we keep the javascript libraries in deployment/resources/javascript
 org.bedework.dojo.dir=dojo-0.4.1-ajax
+org.bedework.jquery.dir=jquery
 
 # A place to put extra jars and files, e.g. jdbc drivers.
 # This can be directed at any local directory

Modified: trunk/config/configs/democal.properties
===================================================================
--- trunk/config/configs/democal.properties	2008-11-07 22:14:38 UTC (rev 1955)
+++ trunk/config/configs/democal.properties	2008-11-08 03:51:07 UTC (rev 1956)
@@ -58,8 +58,9 @@
 
 org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed
 
-# Where we keep the dojo stuff in deployment/resources/javascript
+# Where we keep the javascript libraries in deployment/resources/javascript
 org.bedework.dojo.dir=dojo-0.4.1-ajax
+org.bedework.jquery.dir=jquery
 
 # A place to put extra jars and files, e.g. jdbc drivers.
 # This can be directed at any local directory

Modified: trunk/deployment/resources/build.xml
===================================================================
--- trunk/deployment/resources/build.xml	2008-11-07 22:14:38 UTC (rev 1955)
+++ trunk/deployment/resources/build.xml	2008-11-08 03:51:07 UTC (rev 1956)
@@ -24,6 +24,8 @@
 
     <property name="org.bedework.use.dojo" value="true" />
 
+    <property name="org.bedework.use.jquery" value="true" />
+
     <property name="common.war.name"
               value="${org.bedework.global.build.common.context.war.name}" />
     <property name="common.dest.war"
@@ -63,6 +65,16 @@
           </then>
         </if>
 
+        <if>
+          <isset property="org.bedework.use.jquery" />
+          <then>
+            <!-- Add jquery -->
+            <copy todir="${common.dest.war}/javascript/jquery">
+              <fileset dir="${common.resources.dir}/javascript/${org.bedework.jquery.dir}" />
+            </copy>
+          </then>
+        </if>
+
         <copy todir="${common.dest.war}">
           <fileset dir="${common.resources.dir}/xsl" />
         </copy>

Modified: trunk/deployment/webadmin/webapp/build.xml
===================================================================
--- trunk/deployment/webadmin/webapp/build.xml	2008-11-07 22:14:38 UTC (rev 1955)
+++ trunk/deployment/webadmin/webapp/build.xml	2008-11-08 03:51:07 UTC (rev 1956)
@@ -19,7 +19,9 @@
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
 
-    <property name="org.bedework.use.dojo" value="true" />
+    <property name="org.bedework.use.dojo" value="true" />
+
+    <property name="org.bedework.use.jquery" value="true" />
 
     <!-- Flag as struts -->
     <property name="org.bedework.strutsapp" value="true" />

Modified: trunk/deployment/webconfig/webapp/build.xml
===================================================================
--- trunk/deployment/webconfig/webapp/build.xml	2008-11-07 22:14:38 UTC (rev 1955)
+++ trunk/deployment/webconfig/webapp/build.xml	2008-11-08 03:51:07 UTC (rev 1956)
@@ -19,7 +19,9 @@
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
 
-    <property name="org.bedework.use.dojo" value="true" />
+    <property name="org.bedework.use.dojo" value="true" />
+
+    <property name="org.bedework.use.jquery" value="true" />
 
     <!-- Flag as struts -->
     <property name="org.bedework.strutsapp" value="true" />

Modified: trunk/deployment/webpublic/webapp/build.xml
===================================================================
--- trunk/deployment/webpublic/webapp/build.xml	2008-11-07 22:14:38 UTC (rev 1955)
+++ trunk/deployment/webpublic/webapp/build.xml	2008-11-08 03:51:07 UTC (rev 1956)
@@ -19,7 +19,9 @@
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
 
-    <property name="org.bedework.use.dojo" value="true" />
+    <property name="org.bedework.use.dojo" value="true" />
+
+    <property name="org.bedework.use.jquery" value="true" />
 
     <!-- Flag as struts -->
     <property name="org.bedework.strutsapp" value="true" />

Modified: trunk/deployment/websubmit/webapp/build.xml
===================================================================
--- trunk/deployment/websubmit/webapp/build.xml	2008-11-07 22:14:38 UTC (rev 1955)
+++ trunk/deployment/websubmit/webapp/build.xml	2008-11-08 03:51:07 UTC (rev 1956)
@@ -21,6 +21,8 @@
 
     <property name="org.bedework.use.dojo" value="true" />
 
+    <property name="org.bedework.use.jquery" value="true" />
+
     <!-- Flag as struts -->
     <property name="org.bedework.strutsapp" value="true" />
 

Modified: trunk/deployment/webuser/webapp/build.xml
===================================================================
--- trunk/deployment/webuser/webapp/build.xml	2008-11-07 22:14:38 UTC (rev 1955)
+++ trunk/deployment/webuser/webapp/build.xml	2008-11-08 03:51:07 UTC (rev 1956)
@@ -19,7 +19,9 @@
 
     <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
 
-    <property name="org.bedework.use.dojo" value="true" />
+    <property name="org.bedework.use.dojo" value="true" />
+
+    <property name="org.bedework.use.jquery" value="true" />
 
     <!-- Flag as struts -->
     <property name="org.bedework.strutsapp" value="true" />