Changeset 3235

Timestamp:

03/14/11 00:33:20

Author:

douglm

Message:

Make testsuite into a separate project.

Add extra comment to config listing components to be added to application list

Files:

• trunk (modified) (1 prop)
• trunk/build.xml (modified) (7 diffs)
• trunk/build/quickstart/linux/bw (modified) (4 diffs)
• trunk/config/bwbuild/default/cal.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss-h2/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/config/bwbuild/liferay5/cal.properties (modified) (1 diff)
• trunk/config/bwbuild/oracle10g/cal.properties (modified) (1 diff)
• trunk/deployment/testsuite (deleted)

trunk/build.xml

@@ -49 +49 @@
-  <property name="org.bedework.project.rpiutil"
-            location="${org.bedework.projects}/rpiutil" />
-
-  <property name="org.bedework.project.testsuite"
-            location="${org.bedework.projects}/testsuite" />
-
-  <property name="org.bedework.project.webapps"
@@ -197 +194 @@
-                                build.caldavimpl,
-                                build.bwtools,build.webapps,build.indexer,
-
-
+
-          description="builds the project">
-    <mkdir dir="${dist.home}/tools" />
@@ -221 +217 @@
-                                clean.caldavimpl,
-                                clean.bwtools,clean.webapps,clean.indexer,
-,clean.testsuite
+
-          description="Remove all generated files.">
-    <delete dir="${dist.home}" />
@@ -233 +229 @@
-                                           clean.caldavimpl,
-                                           clean.bwtools,clean.webapps,clean.indexer,
-,clean.testsuite
+
-          description="partial clean up for quickstart.">
-    <delete dir="${bin.home}" />
@@ -377 +373 @@
-                location="${org.bedework.projectdocs.home}/webapps/api" />
-    </ant>
-
-    <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
-         target="javadoc" >
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/testsuite/api" />
-    </ant>
-  </target>
-
@@ -577 +567 @@
-  <target name="clean.build.rpiutil" depends="clean.rpiutil,build.rpiutil"
-          description="builds the rpiutil project"/>
-
-  <!-- .................................................................
-                          testsuite
-       .................................................................. -->
-  <target name="build.testsuite" depends="init"
-          description="builds the testsuite project">
-    <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
-         target="build-all"  >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.testsuite" depends="init"
-          description="clean the testsuite project">
-    <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
-         target="deep-clean" />
-  </target>
-
-  <target name="clean.build.testsuite" depends="clean.testsuite,clean.testsuite"
-          description="builds the testsuite project"/>
-
-  <!-- .................................................................
@@ -661 +630 @@
-    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
-         target="cmdutil" />
-  </target>
-
-  <!-- =================================================================
-       Build and run the unit test suite
-       ================================================================= -->
-
-  <target name="bld.test" depends="init"
-          description="Build and run tests">
-    <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
-         target="bld.test" />
-  </target>
-
-  <target name="run.test" depends="init"
-          description="Build and run tests">
-    <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
-         target="run.test" />
-  </target>
-
-  <target name="run.test.debug" depends="init"
-          description="Build and run tests">
-    <ant antfile="${org.bedework.project.testsuite}/build.xml" inheritall="false"
-         target="run.test"  >
-      <property name="org.bedework.debug" value="yes" />
-    </ant>
-  </target>
-

trunk/build/quickstart/linux/bw

@@ -77 +77 @@
-  echo "     -monitor     Target is for the bedework monitor application"
-  echo "     -naming      Target is for the abstract naming api"
+  echo "     -testsuite   Target is for the bedework test suite"
-  echo "     -tzsvr       Target is for the timezones server build"
-  echo "     The default is a calendar build"
@@ -272 +273 @@
-monitor=
-naming=
+testsuite=
-tzsvr=
-webdav=
@@ -416 +418 @@
-    -naming)
-      naming="yes"
+      pkgdefault=
+      shift
+      ;;
+    -testsuite)
+      testsuite="yes"
-      pkgdefault=
-      shift
@@ -497 +504 @@
-fi
-
+if [ "$testsuite" != "" ] ; then
+  cd $QUICKSTART_HOME/testsuite
+fi
+
-if [ "$tzsvr" != "" ] ; then
-  cd $QUICKSTART_HOME/bwtzsvr

trunk/config/bwbuild/default/cal.properties

@@ -17 +17 @@
-#
-# Define the names of the applications we want to build
+# Note this is NOT all of the sections found below. Some components are now
+# included by default as they have become a jboss service, e..g indexing and 
+# dump/restore.
+#
+#Others are built as separate projects. However, all build information for
+# allprojects adn subprojects is in this file, and all configuration (with the
+# proviso below) is in the options file.
+#
+# Separate from this are the various configuration files, e.g. bedework-ds.xml 
+# which get deployed into the app server.
+# 
+# These are the names which MAY appear in the list:
+# 
+# CalAdmin:    admin client. You probably always want this
+# EventSubmit: public events submission client
+# Events:      Public events Client
+# Feeder:      Feed context. Better than using the main web client.
+# SoEDept:     Example calendar suite
+# UserCal:     personal web client
+# Pubcaldav:   Unauthenticated public caldav - alsoprovides unauth SOAP web services  
+# Usercaldav:  Authenticated caldav - Also provides SOAP web services  
+# Pubcalws:    Unauthenticated CalWS REST web service
+# Usercalws:   Authenticated CalWS REST web service
+# sysevlog:    System event logger - required
+# monitor:     System monitor - required
+# genkeys:     key generator - required
-org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
-test,
-test,
+
+
-
-#

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

@@ -17 +17 @@
-#
-# Define the names of the applications we want to build
+# Note this is NOT all of the sections found below. Some components are now
+# included by default as they have become a jboss service, e..g indexing and 
+# dump/restore.
+#
+#Others are built as separate projects. However, all build information for
+# allprojects adn subprojects is in this file, and all configuration (with the
+# proviso below) is in the options file.
+#
+# Separate from this are the various configuration files, e.g. bedework-ds.xml 
+# which get deployed into the app server.
+# 
+# These are the names which MAY appear in the list:
+# 
+# CalAdmin:    admin client. You probably always want this
+# EventSubmit: public events submission client
+# Events:      Public events Client
+# Feeder:      Feed context. Better than using the main web client.
+# SoEDept:     Example calendar suite
+# UserCal:     personal web client
+# Pubcaldav:   Unauthenticated public caldav - alsoprovides unauth SOAP web services  
+# Usercaldav:  Authenticated caldav - Also provides SOAP web services  
+# Pubcalws:    Unauthenticated CalWS REST web service
+# Usercalws:   Authenticated CalWS REST web service
+# sysevlog:    System event logger - required
+# monitor:     System monitor - required
+# genkeys:     key generator - required
-org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
-test,
-test,
+
+
-
-#

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

@@ -17 +17 @@
-#
-# Define the names of the applications we want to build
+# Note this is NOT all of the sections found below. Some components are now
+# included by default as they have become a jboss service, e..g indexing and 
+# dump/restore.
+#
+#Others are built as separate projects. However, all build information for
+# allprojects adn subprojects is in this file, and all configuration (with the
+# proviso below) is in the options file.
+#
+# Separate from this are the various configuration files, e.g. bedework-ds.xml 
+# which get deployed into the app server.
+# 
+# These are the names which MAY appear in the list:
+# 
+# CalAdmin:    admin client. You probably always want this
+# EventSubmit: public events submission client
+# Events:      Public events Client
+# Feeder:      Feed context. Better than using the main web client.
+# SoEDept:     Example calendar suite
+# UserCal:     personal web client
+# Pubcaldav:   Unauthenticated public caldav - alsoprovides unauth SOAP web services  
+# Usercaldav:  Authenticated caldav - Also provides SOAP web services  
+# Pubcalws:    Unauthenticated CalWS REST web service
+# Usercalws:   Authenticated CalWS REST web service
+# sysevlog:    System event logger - required
+# monitor:     System monitor - required
+# genkeys:     key generator - required
-org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
-test,
-test,
+
+
-
-#

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

@@ -16 +16 @@
-# Install options
-#
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
- SoEDept,UserCal,Pubcaldav,Usercaldav,\
-
-
+
-
-#

trunk/config/bwbuild/liferay5/cal.properties

@@ -17 +17 @@
-#
-# Define the names of the applications we want to build
+# Note this is NOT all of the sections found below. Some components are now
+# included by default as they have become a jboss service, e..g indexing and 
+# dump/restore.
+#
+#Others are built as separate projects. However, all build information for
+# allprojects adn subprojects is in this file, and all configuration (with the
+# proviso below) is in the options file.
+#
+# Separate from this are the various configuration files, e.g. bedework-ds.xml 
+# which get deployed into the app server.
+# 
+# These are the names which MAY appear in the list:
+# 
+# CalAdmin:    admin client. You probably always want this
+# EventSubmit: public events submission client
+# Events:      Public events Client
+# Feeder:      Feed context. Better than using the main web client.
+# SoEDept:     Example calendar suite
+# UserCal:     personal web client
+# Pubcaldav:   Unauthenticated public caldav - alsoprovides unauth SOAP web services  
+# Usercaldav:  Authenticated caldav - Also provides SOAP web services  
+# Pubcalws:    Unauthenticated CalWS REST web service
+# Usercalws:   Authenticated CalWS REST web service
+# sysevlog:    System event logger - required
+# monitor:     System monitor - required
+# genkeys:     key generator - required
-org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
- SoEDept,UserCal,Pubcaldav,Usercaldav,\
-test,
+
-
-#

trunk/config/bwbuild/oracle10g/cal.properties

@@ -17 +17 @@
-#
-# Define the names of the applications we want to build
+# Note this is NOT all of the sections found below. Some components are now
+# included by default as they have become a jboss service, e..g indexing and 
+# dump/restore.
+#
+#Others are built as separate projects. However, all build information for
+# allprojects adn subprojects is in this file, and all configuration (with the
+# proviso below) is in the options file.
+#
+# Separate from this are the various configuration files, e.g. bedework-ds.xml 
+# which get deployed into the app server.
+# 
+# These are the names which MAY appear in the list:
+# 
+# CalAdmin:    admin client. You probably always want this
+# EventSubmit: public events submission client
+# Events:      Public events Client
+# Feeder:      Feed context. Better than using the main web client.
+# SoEDept:     Example calendar suite
+# UserCal:     personal web client
+# Pubcaldav:   Unauthenticated public caldav - alsoprovides unauth SOAP web services  
+# Usercaldav:  Authenticated caldav - Also provides SOAP web services  
+# Pubcalws:    Unauthenticated CalWS REST web service
+# Usercalws:   Authenticated CalWS REST web service
+# sysevlog:    System event logger - required
+# monitor:     System monitor - required
+# genkeys:     key generator - required
-org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
- SoEDept,UserCal,Pubcaldav,Usercaldav,\
-test,
+
-
-#