Changeset 3564

Timestamp:

06/22/12 14:10:05

Author:

douglm

Message:

config for eventreg

Files:

• trunk/build/buildTools/deftasks.xml (modified) (1 diff)
• trunk/build/buildwar.xml (modified) (2 diffs)
• trunk/build/platforms/jboss-eventreg.xml (added)
• trunk/build/quickstart/linux/bw (modified) (7 diffs)
• trunk/config/bwbuild/.defaults/cal.properties (modified) (6 diffs)
• trunk/config/bwbuild/.defaults/versions.properties (modified) (1 diff)
• trunk/config/bwbuild/default/bedework-eventreg-ds.xml (added)
• trunk/config/bwbuild/jboss-postgresql-devel/bedework-eventreg-ds.xml (added)
• trunk/pom.xml (modified) (1 diff)

trunk/build/buildTools/deftasks.xml

@@ -274 +274 @@
-        <filter token="JBOSS-CARDDB-DATASOURCE"
-                value="${org.bedework.global.jboss.carddb.datasource.jndiname}"/>
+
+        <filter token="JBOSS-EVENTREGDB-DATASOURCE"
+                value="${org.bedework.global.jboss.eventreg.datasource.jndiname}"/>
-
-        <filter token="JBOSS-DB-DATASOURCE"

trunk/build/buildwar.xml

@@ -237 +237 @@
-
-    <antcall target="struts-stuff" inheritRefs="true" />
+
+    <if>
+      <isset property="propval.app.spring.app" />
+      <then>
+        <antcall target="spring-stuff" inheritRefs="true" />
+      </then>
+    </if>
-
-    <!-- Filter the temp copy of the web.xml file -->
@@ -384 +391 @@
-
-  </target>
+
+  <!-- =================================================================
+       If this is a struts app the following gets executed.
+       We create an updated struts-config.xml file and add some jars.
+       ================================================================= -->
+
+  <target name="spring-stuff">
+    <copy todir="${app.dest.webinf}">
+      <fileset dir="${app.sou.dir}/war/WEB-INF">
+        <include name="*-servlet.xml"/>
+      </fileset>
+    </copy>
+
+    <mkdir  dir="${app.dest.webinf}/tlds"/>
+    <copy todir="${app.dest.webinf}/tlds" >
+      <fileset dir="${resources.dir}/spring/tlds">
+        <include name="*"/>
+      </fileset>
+    </copy>
+  </target>
-</project>

trunk/build/quickstart/linux/bw

@@ -42 +42 @@
-updateProjects="$updateProjects  davutil"
-updateProjects="$updateProjects  dumprestore"
+# updateProjects="$updateProjects  eventreg"
-# updateProjects="$updateProjects  geronimo-hib"
+updateProjects="$updateProjects  genkeys"
-updateProjects="$updateProjects  indexer"
-updateProjects="$updateProjects  rpiutil"
@@ -72 +74 @@
-davutil=
-dumprestore=
+eventreg=
-exchgGateway=
+genkeys=
-geronimoHib=
-indexer=
@@ -165 +169 @@
-  echo "     -davutil      Target is for the Bedework dav util classes"
-  echo "     -dumprestore  Target is for the Bedework dump/restore service"
+  echo "     -eventreg     Target is for the event registration service build"
+  echo "     -genkeys      Target is for the genkeys module build"
-  echo "     -indexer      Target is for the Bedework indexer service"
-  echo "     -rpiutil      Target is for the Bedework util classes"
@@ -321 +327 @@
-        fi
-        
+        if [ "$eventreg" != "" ] ; then
+          cd $QUICKSTART_HOME/eventreg
+      eventreg=
+          return
+        fi
+        
-        if [ "$webdav" != "" ] ; then
-          cd $QUICKSTART_HOME/webdav
@@ -360 +372 @@
-          cd $QUICKSTART_HOME/bwinterfaces
-      bwinterfaces=
+          return
+        fi
+
+        if [ "$genkeys" != "" ] ; then
+          cd $QUICKSTART_HOME/genkeys
+      genkeys=
-          return
-        fi
@@ -863 +881 @@
-      
-      bwinterfaces="yes"
+      rpiutil="yes"
-      pkgdefault=
-      shift
@@ -971 +990 @@
-      bwsysevents="yes"
-      indexer="yes"
+      rpiutil="yes"
+      pkgdefault=
+      shift
+      ;;
+    -eventreg)
+      eventreg="yes"
+
+      bwxml="yes"
+      rpiutil="yes"
+      pkgdefault=
+      shift
+      ;;
+    -genkeys)
+      genkeys="yes"
+      
+      bwinterfaces="yes"
-      rpiutil="yes"
-      pkgdefault=

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

@@ -73 +73 @@
-org.bedework.global.jboss.tzdb.datasource.jndiname=/TzDS
-org.bedework.global.jboss.synch.datasource.jndiname=/SynchDS
+org.bedework.global.jboss.eventreg.datasource.jndiname=/EventregDS
-
-# Hibernate caching parameters
@@ -192 +193 @@
-# If set to true or yes will copy in the bedework synch db datasource def 
-org.bedework.global.copy.bedeworksynchds.config=yes
+
+# If set to true or yes will copy in the bedework eventreg db datasource def 
+org.bedework.global.copy.bedeworkeventregds.config=yes
-
-# If set to true or yes will build the web (CASifiable) version of carddav also 
@@ -467 +471 @@
-org.bedework.app.UserCal.display.name=Bedework
-org.bedework.app.UserCal.name=DemoUserCal
+
+# Specify login directory
+#org.bedework.app.UserCal.login.directory=...
-
-#
@@ -669 +676 @@
-#
-
+
-org.bedework.app.genkeys.project=bwcalFacade
-org.bedework.app.genkeys.sou.dir=
@@ -675 +683 @@
-org.bedework.app.genkeys.zip.name=genkeys
-org.bedework.app.genkeys.description=Bedework system Key generator
+
+#org.bedework.app.genkeys.project=genkeys
+#org.bedework.app.genkeys.sou.dir=
+#org.bedework.app.genkeys.name=genkeys
+#org.bedework.app.genkeys.package.type=service
+#org.bedework.app.genkeys.description=Bedework system Key generator
-
-#
@@ -796 +810 @@
-# --------------------------------------------------------------------
-#
+# Event registration Service.
+#
+org.bedework.app.eventreg.project=eventreg
+org.bedework.app.eventreg.sou.dir=server
+
+org.bedework.app.eventreg.web.xml=war/WEB-INF/web.xml
+org.bedework.app.eventreg.war.name=eventreg
+org.bedework.app.eventreg.context.root=eventreg
+# Set for jboss
+#org.bedework.app.usercarddav.virtual.host=events.rpi.edu
+
+org.bedework.app.eventreg.description=Bedework eventreg server.
+org.bedework.app.eventreg.display.name=Bedework eventreg server
+org.bedework.app.eventreg.name=Demoeventreg
+#org.bedework.app.eventreg.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.eventreg.logprefix=eventreg
+
+org.bedework.app.eventreg.security.domain=bedeworkdemo
+org.bedework.app.eventreg.security.prefix=demo
+org.bedework.app.eventreg.transport.guarantee=NONE
+org.bedework.app.eventreg.spring.app=true
+
+# Specify login directory
+#org.bedework.app.eventreg.login.directory=...
+
+#
+# --------------------------------------------------------------------
+#
-# Notification Service.
-#

trunk/config/bwbuild/.defaults/versions.properties

@@ -18 +18 @@
-org.bedework.davutil.version=3.8
-org.bedework.dumprestore.version=3.8
+org.bedework.eventreg.version=3.8
-org.bedework.exchggateway.version=3.8
+org.bedework.genkeys.version=3.8
-org.bedework.icalendar.version=3.8
-org.bedework.indexer.version=3.8

trunk/pom.xml

@@ -44 +44 @@
-    <bedeworkCalcoreVersion>3.8</bedeworkCalcoreVersion>
-    <bedeworkCaldavVersion>3.8</bedeworkCaldavVersion>
+    <bedeworkCaldavTestVersion>3.8</bedeworkCaldavTestVersion>
-    <bedeworkCalfacadeVersion>3.8</bedeworkCalfacadeVersion>
-    <bedeworkDavutilVersion>3.8</bedeworkDavutilVersion>
-    <bedeworkDumpresVersion>3.8</bedeworkDumpresVersion>
+    <bedeworkGenkeysVersion>3.8</bedeworkGenkeysVersion>
-    <bedeworkIcalendarVersion>3.8</bedeworkIcalendarVersion>
-    <bedeworkIndexerVersion>3.8</bedeworkIndexerVersion>