Changeset 1944

Timestamp:

11/03/08 16:13:45

Author:

douglm

Message:

Changes to get an install script working

Files:

• trunk/build.xml (modified) (4 diffs)
• trunk/build/buildsh.xml (modified) (1 diff)
• trunk/build/quickstart/build.xml (modified) (3 diffs)
• trunk/build/quickstart/install.xml (added)
• trunk/build/quickstart/linux/addgroup (modified) (1 diff)
• trunk/build/quickstart/linux/addgroupmember (modified) (1 diff)
• trunk/build/quickstart/linux/adduser (modified) (1 diff)
• trunk/build/quickstart/linux/initdir (modified) (2 diffs)
• trunk/build/quickstart/run-dir.xml (modified) (5 diffs)
• trunk/config/bwbuild/default/build.properties (modified) (1 diff)
• trunk/config/bwbuild/default/cal.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss/democal.properties (modified) (2 diffs)
• trunk/config/bwbuild/liferay5/cal.properties (modified) (1 diff)
• trunk/config/configs/democal.properties (modified) (1 diff)
• trunk/deployment/build.xml (modified) (2 diffs)

trunk/build.xml

@@ -692 +692 @@
-          description="Build and run directory init">
-    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
-
+
+
+
+
+
-  </target>
-
@@ -698 +702 @@
-          description="Build and run directory tools to add a user">
-    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
-
+
+
+
+
+
-  </target>
-
@@ -704 +712 @@
-          description="Build and run directory tools to add a group">
-    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
-
+
+
+
+
+
-  </target>
-
@@ -710 +722 @@
-          description="Build and run directory tools to add a group member">
-    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
-
+
+
+
+
+
-  </target>
-

trunk/build/buildsh.xml

@@ -97 +97 @@
-    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/>
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    <if>
-isset property="propval.app.jdbcdriver.jar"
+available file="${org.bedework.global.ext.lib}/jdbc" type="dir" 
-      <then>
-
+
+
+
+
+
+
+
-      </then>
+      <else>
+        <!-- Include the quickstart jdbc driver -->
+        <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hsqldb}"/>
+      </else>
-    </if>
-
-    <!-- Include the quickstart jdbc driver -->
-    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hsqldb}"/>
-
-    <copy todir="${app.dest.classes}">

trunk/build/quickstart/build.xml

@@ -19 +19 @@
-  <import file="${bedework.quickstart.basedir}/run-tomcat.xml" />
-  <import file="${bedework.quickstart.basedir}/run-dir.xml" />
+  <import file="${bedework.quickstart.basedir}/install.xml" />
-
-  <target name="README" depends="init"
@@ -109 +110 @@
-    <property name="org.bedework.hsqldb.dir"
-              location="${org.bedework.project.bedework}/../hsqldb-1.7.3.3" />
+
+    <property name="org.bedework.directory.dir"
+              location="${org.bedework.project.bedework}/../apacheds-1.5.3-fixed" />
-  </target>
-
@@ -215 +219 @@
-         target="javadoc" />
-  </target>
+
+  <!-- =================================================================
+       The "start" target starts all quickstart components
+       ================================================================= -->
+
+  <target name="start" depends="run.init"
+          description="Start quickstart system" >
+    <parallel>
+      <antcall target="dirstart" inheritrefs="true" />
+      <antcall target="hsqldb" inheritrefs="true" />
+      <antcall target="tomcatstart" inheritrefs="true" />
+    </parallel>
+  </target>
-</project>

trunk/build/quickstart/linux/addgroup

@@ -57 +57 @@
-ant_class_def="org.apache.tools.ant.launch.Launcher"
-
-adduser
-adduser
+directory
+directory
-
-$JAVA_HOME/bin/java -classpath $CLASSPATH $ant_home_def $addgroup_defs $ant_class_def addGroup

trunk/build/quickstart/linux/addgroupmember

@@ -55 +55 @@
-ant_class_def="org.apache.tools.ant.launch.Launcher"
-
-adduser
-adduser
+directory
+directory
-
-$JAVA_HOME/bin/java -classpath $CLASSPATH $ant_home_def $addgroup_defs $ant_class_def addGroupMember

trunk/build/quickstart/linux/adduser

@@ -90 +90 @@
-ant_class_def="org.apache.tools.ant.launch.Launcher"
-
-adduser
-adduser
-adduser
-adduser
+directory
+directory
+directory
+directory
-
-$JAVA_HOME/bin/java -classpath $CLASSPATH $ant_home_def $adduser_defs $ant_class_def addUser

trunk/build/quickstart/linux/initdir

@@ -2 +2 @@
-
-#
-
+bw
-# within the svn repository.
-#
@@ -30 +30 @@
-
-if [ -z "$JAVA_HOME" -o ! -d "$JAVA_HOME" ] ; then
-
-
-
-
+
-fi
-

trunk/build/quickstart/run-dir.xml

@@ -25 +25 @@
-  <target name="dirstart" depends="run.init"
-          description="starts the directory server">
-
+ in ${org.bedework.directory.dir}
-    <java fork="true" dir="${org.bedework.directory.dir}"
-          classname="org.apache.directory.server.UberjarMain">
@@ -49 +49 @@
-    <java fork="true" dir="${org.bedework.directory.dir}"
-          jar="${org.bedework.directory.dir}/bin/apacheds-tools.jar">
--i
+install-path
-      <arg value="--configuration" />
-      <arg value="--help" />
+    </java>
+  </target>
+
+  <!-- =================================================================
+       The "dirstop" target runs the directory server tool to shut down the
+       directory server.
+       ================================================================= -->
+
+  <target name="dirstop" depends="run.init"
+          description="Runs the directory tool">
+    <echo message="Starting dstool to shut down directory"/>
+    <java fork="true" dir="${org.bedework.directory.dir}"
+          jar="${org.bedework.directory.dir}/bin/apacheds-tools.jar">
+      <arg value="graceful" />
+      <arg line="--install-path ${org.bedework.directory.dir}"/>
+      <arg value="--configuration" />
-    </java>
-  </target>
@@ -73 +89 @@
-  <target name="addGroup" depends="run.init"
-          description="Build and run directory tools to add a group">
-all="fals
+refs="tru
-           target="addGroup" />
-  </target>
@@ -79 +95 @@
-  <target name="addGroupMember" depends="run.init"
-          description="Build and run directory tools to add a group member">
-all="fals
+refs="tru
-           target="addGroupMember" />
-  </target>
@@ -100 +116 @@
-    </java>
-  </target>
+
+  <macrodef name="addBedeworkUser">
+    <attribute name="account"/>
+    <attribute name="firstName" default="first" />
+    <attribute name="lastName" default="last"/>
+    <attribute name="password" />
+    <sequential>
+      <var name="org.bedework.directory.account" value="@{account}" />
+      <var name="org.bedework.directory.firstname"  value="@{firstName}" />
+      <var name="org.bedework.directory.lastname"  value="@{lastName}" />
+      <var name="org.bedework.directory.password"  value="@{password}" />
+
+      <echo message="======== Add user ${org.bedework.directory.account} =======" />
+
+      <ant antfile="${bedework.build.file}" inheritrefs="true"
+             target="addUser" />
+    </sequential>
+  </macrodef>
-</project>

trunk/config/bwbuild/default/build.properties

@@ -18 +18 @@
-
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
+org.bedework.config.home=${env.BEDEWORK_CONFIG}
-org.bedework.config.properties=${env.BEDEWORK_CONFIG}/cal.properties
-org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml

trunk/config/bwbuild/default/cal.properties

@@ -62 +62 @@
-org.bedework.dojo.dir=dojo-0.4.1-ajax
-
-
-
+
+
+
+
+
-
-# ------------------------------------------------------------------------

trunk/config/bwbuild/jboss/democal.properties

@@ -71 +71 @@
-org.bedework.dojo.dir=dojo-0.4.1-ajax
-
-
-
+
+
+
+
+
-
-# ------------------------------------------------------------------------
@@ -92 +95 @@
-#  where most library files used by all applications go
-appserver.lib.dir=${org.bedework.jboss.config.dir}/lib
-
-appserver.jdbcdriver.jar=${appserver.lib.dir}/hsqldb.jar
-
-# where 'endorsed' library files go.  These classes override anything

trunk/config/bwbuild/liferay5/cal.properties

@@ -64 +64 @@
-org.bedework.dojo.dir=dojo-0.4.1-ajax
-
-
-
+
+
+
+
+
-
-# ------------------------------------------------------------------------

trunk/config/configs/democal.properties

@@ -62 +62 @@
-org.bedework.dojo.dir=dojo-0.4.1-ajax
-
-
-
+
+
+
+
+
-
-# ------------------------------------------------------------------------

trunk/deployment/build.xml

@@ -157 +157 @@
-    </copy>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </target>
-
@@ -173 +194 @@
-    <copy file="${org.bedework.default.lib}/xalan.jar"
-          todir="${appserver.endorsed.dir}"/>
-  </target>
-
-  <target name="deploy.appserver.jdbcdriver"
-          if="appserver.jdbcdriver.jar" >
-    <!-- copy jdbc jar so datasources work -->
-    <copy todir="${appserver.lib.dir}" file="${appserver.jdbcdriver.jar}"/>
-  </target>
-
-  <target name="deploy.appserver.javatools"
-          if="java.tools.jar" >
-    <!-- copy tools jar so jsps work -->
-    <copy todir="${appserver.lib.dir}" file="${java.tools.jar}"/>
-  </target>
-