User: user57
Date: 01/10/01 17:15:38
Modified: website build.xml
Log:
o added a default value for jivesoftware.jive.home (which is ~/website/jive)
o setup the build module to pull the generated .ear's, soon those .ear's
might be generated from this module...
o added jboss-mq and jboss-docs to the snapshot list
Revision Changes Path
1.11 +91 -120 build/website/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/build/website/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 2001/09/27 22:44:33 1.10
+++ build.xml 2001/10/02 00:15:38 1.11
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.10 2001/09/27 22:44:33 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.11 2001/10/02 00:15:38 user57 Exp $ -->
<project default="main" name="JBoss Website/Build">
@@ -139,7 +139,7 @@
<!-- Module name(s) & version -->
<property name="module.name" value="jboss-website"/>
<property name="module.Name" value="JBoss Website"/>
- <property name="module.version" value="unspecified"/>
+ <property name="module.version" value="DEV"/>
<!-- Invoke the rest of the configuration targets -->
<call target="_configure-tools"/>
@@ -158,87 +158,6 @@
<!-- Configure the thirdparty libraries required by this module. -->
<target name="_configure-libraries" unless="configure-libraries.disable">
- <!-- Java Naming and Directory Interface (JNDI) -->
- <property name="sun.jndi.root" value="${project.thirdparty}/sun/jndi"/>
- <property name="sun.jndi.lib" value="${sun.jndi.root}/lib"/>
-
- <!-- Java Management Extensions (JMX) -->
- <property name="sun.jmx.root" value="${project.thirdparty}/sun/jmx"/>
- <property name="sun.jmx.lib" value="${sun.jmx.root}/lib"/>
-
- <!-- Java API for XML Processing (JAXP) -->
- <property name="sun.jaxp.root" value="${project.thirdparty}/sun/jaxp"/>
- <property name="sun.jaxp.lib" value="${sun.jaxp.root}/lib"/>
-
- <!-- Java Authentication and Authorization Service (JAAS) -->
- <property name="sun.jaas.root" value="${project.thirdparty}/sun/jaas"/>
- <property name="sun.jaas.lib" value="${sun.jaas.root}/lib"/>
-
- <!-- JavaBeans Activation Framework (JAF) -->
- <property name="sun.jaf.root" value="${project.thirdparty}/sun/jaf"/>
- <property name="sun.jaf.lib" value="${sun.jaf.root}/lib"/>
-
- <!-- JavaMail -->
- <property name="sun.javamail.root" value="${project.thirdparty}/sun/javamail"/>
- <property name="sun.javamail.lib" value="${sun.javamail.root}/lib"/>
-
- <!-- Java Transaction Service (JTS) -->
- <property name="sun.jts.root" value="${project.thirdparty}/sun/jts"/>
- <property name="sun.jts.lib" value="${sun.jts.root}/lib"/>
-
- <!-- Log4j -->
- <property name="apache.log4j.root" value="${project.thirdparty}/apache/log4j"/>
- <property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
-
- <!-- EDU.oswego.cs.dl.util.concurrent -->
- <property name="oswego.concurrent.root"
value="${project.thirdparty}/oswego/concurrent"/>
- <property name="oswego.concurrent.lib" value="${oswego.concurrent.root}/lib"/>
-
- <!-- JPL-Util -->
- <property name="gjt.jpl-util.root" value="${project.thirdparty}/gjt/jpl-util"/>
- <property name="gjt.jpl-util.lib" value="${gjt.jpl-util.root}/lib"/>
-
- <!-- JavaGroups -->
- <property name="javagroups.javagroups.root"
value="${project.thirdparty}/javagroups/javagroups"/>
- <property name="javagroups.javagroups.lib"
value="${javagroups.javagroups.root}/lib"/>
-
- <!-- JSR 77 -->
- <property name="sun.jsr77.root" value="${project.thirdparty}/sun/jsr77"/>
- <property name="sun.jsr77.lib" value="${sun.jsr77.root}/lib"/>
-
- <!-- gnu.regexp -->
- <property name="gnu.regexp.root" value="${project.thirdparty}/gnu/regexp"/>
- <property name="gnu.regexp.lib" value="${gnu.regexp.root}/lib"/>
-
- <!-- Java Secure Socket Extension (JSSE) -->
- <property name="sun.jsse.root" value="${project.thirdparty}/sun/jsse"/>
- <property name="sun.jsse.lib" value="${sun.jsse.root}/lib"/>
-
- <!-- Hypersonic SQL -->
- <property name="hsql.hsql.root" value="${project.thirdparty}/hsql/hsql"/>
- <property name="hsql.hsql.lib" value="${hsql.hsql.root}/lib"/>
-
- <!-- Instant DB -->
- <property name="enhydra.instantdb.root"
value="${project.thirdparty}/enhydra/instantdb"/>
- <property name="enhydra.instantdb.lib" value="${enhydra.instantdb.root}/lib"/>
-
- <!-- Castor -->
- <property name="exolab.castor.root"
value="${project.thirdparty}/exolab/castor"/>
- <property name="exolab.castor.lib" value="${exolab.castor.root}/lib"/>
-
- <!-- Tyrex -->
- <property name="exolab.tyrex.root" value="${project.thirdparty}/exolab/tyrex"/>
- <property name="exolab.tyrex.lib" value="${exolab.tyrex.root}/lib"/>
-
- <!-- Jetty -->
- <property name="mortbay.jetty.root"
value="${project.thirdparty}/mortbay/jetty"/>
- <property name="mortbay.jetty.lib" value="${mortbay.jetty.root}/lib"/>
-
- <!-- Jetty3Extra -->
- <property name="mortbay.jetty3extra.root"
value="${project.thirdparty}/mortbay/jetty3extra"/>
- <property name="mortbay.jetty3extra.jmx" value="${mortbay.jetty3extra.root}"/>
- <property name="mortbay.jetty3extra.jmx.lib"
value="${mortbay.jetty3extra.jmx}/lib"/>
-
<!-- The combined library classpath -->
<path id="library.classpath">
</path>
@@ -255,10 +174,12 @@
<!-- Standard modules -->
<module name="website"/>
<module name="manual"/>
+ <module name="forums"/>
+ <module name="survey"/>
<!-- Module groups -->
<group name="standard">
- <include modules="website, manual"/>
+ <include modules="website, manual, forums, survey"/>
</group>
<!-- Module group sets -->
@@ -297,35 +218,8 @@
<!-- Install/Release structure -->
<property name="install.id" value="${module.name}-${module.version}"/>
<property name="release.id" value="${install.id}"/>
-
<property name="install.root" value="${module.output}/${install.id}"/>
- <property name="install.docs" value="${install.root}/docs"/>
- <property name="install.manual" value="${install.docs}/manual"/>
- <property name="install.api" value="${install.docs}/api"/>
- <property name="install.examples" value="${install.docs}/examples"/>
- <property name="install.bin" value="${install.root}/bin"/>
- <property name="install.client" value="${install.root}/client"/>
- <property name="install.conf" value="${install.root}/conf"/>
- <property name="install.conf.default" value="${install.conf}/default"/>
- <property name="install.db" value="${install.root}/db"/>
<property name="install.deploy" value="${install.root}/deploy"/>
- <property name="install.deploy.lib" value="${install.deploy}/lib"/>
- <property name="install.lib" value="${install.root}/lib"/>
- <property name="install.lib.ext" value="${install.lib}/ext"/>
- <property name="install.log" value="${install.root}/log"/>
- <property name="install.tmp" value="${install.root}/tmp"/>
-
- <!-- Not really sure why these are here -->
- <property name="install.admin" value="${install.root}/admin"/>
- <property name="install.admin.client" value="${install.admin}/client"/>
- <property name="install.admin.client.lib" value="${install.admin.client}/lib"/>
- <property name="install.admin.components" value="${install.admin}/components"/>
-
- <!-- Configuration for the nightly build and test job -->
- <property name="run.nightly.sleep" value="1"/> <!-- 1 minute -->
- <property name="run.nightly.email.tolist"
value="[EMAIL PROTECTED]"/>
- <property name="run.nightly.email.from" value="[EMAIL PROTECTED]"/>
- <property name="run.nightly.email.mailhost" value="localhost"/>
</target>
@@ -436,33 +330,89 @@
<!-- Module Pass-through Hooks -->
<!-- ================================================================== -->
+ <!-- ====== -->
<!-- Manual -->
+ <!-- ====== -->
<target name="_module-manual-most">
<property name="_module.name" value="manual" override="true"/>
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Nothing -->
+ <mkdir dir="${install.deploy}"/>
+ <copy todir="${install.deploy}">
+ <fileset dir="${_module.output}/lib">
+ <include name="manual.ear"/>
+ </fileset>
+ </copy>
</target>
<target name="_module-manual-all" depends="_module-manual-most">
<!-- Nothing -->
</target>
+ <!-- ======= -->
<!-- Website -->
+ <!-- ======= -->
<target name="_module-website-most">
<property name="_module.name" value="website" override="true"/>
<property name="_module.output" override="true"
value="${project.root}/${_module.name}/output"/>
- <!-- Nothing -->
+ <mkdir dir="${install.deploy}"/>
+ <copy todir="${install.deploy}">
+ <fileset dir="${_module.output}/lib">
+ <include name="website.ear"/>
+ </fileset>
+ </copy>
</target>
<target name="_module-website-all" depends="_module-website-most">
<!-- Nothing -->
</target>
+ <!-- ====== -->
+ <!-- Forums -->
+ <!-- ====== -->
+
+ <target name="_module-forums-most">
+ <property name="_module.name" value="forums" override="true"/>
+ <property name="_module.output" override="true"
+ value="${project.root}/${_module.name}/output"/>
+ <mkdir dir="${install.deploy}"/>
+ <copy todir="${install.deploy}">
+ <fileset dir="${_module.output}/lib">
+ <include name="forums.ear"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="_module-forums-all" depends="_module-forums-most">
+ <!-- Nothing -->
+ </target>
+
+ <!-- ====== -->
+ <!-- Survey -->
+ <!-- ====== -->
+ <target name="_module-survey-most">
+ <property name="_module.name" value="survey" override="true"/>
+ <property name="_module.output" override="true"
+ value="${project.root}/${_module.name}/output"/>
+ <!--
+ <mkdir dir="${install.deploy}"/>
+ <copy todir="${install.deploy}">
+ <fileset dir="${_module.output}/lib">
+ <include name="survey.ear"/>
+ </fileset>
+ </copy>
+ -->
+ </target>
+
+ <target name="_module-survey-all" depends="_module-survey-most">
+ <!-- Nothing -->
+ </target>
+
+
<!-- ================================================================== -->
<!-- Install -->
<!-- ================================================================== -->
@@ -586,7 +536,8 @@
<!-- Generate the Website -->
<!-- ================================================================== -->
- <target name="website" depends="init">
+ <target name="website" depends="init"
+ description="Builds the website">
<!-- just to be sure, lets clean first -->
<call target="modules-clean"/>
@@ -594,17 +545,37 @@
<call target="modules-most"/>
</target>
- <target name="website-install" depends="init">
+ <!--
+ | website-install does not depend on website, since the targets
+ | will be called by an external script which will use the build
+ | exit status to determine if the build was successfull.
+ |
+ | if the build was not successfull, then an error is sent and the
+ | website-install is NOT called, as it may leave the site in an
+ | unstable state.
+ |
+ | this target will only be called if website is successfull.
+ |
+ | perhaps website will be added as a dependency in the near future...
+ -->
+
+ <target name="website-install" depends="init"
+ description="Installs the website">
<!-- we need to know where to deploy files to -->
<require property="jboss.deploy.root"/>
+ <echo>Using jboss.deploy.root: ${jboss.deploy.root}</echo>
+ <!--
+ | all of this should really be done up into one .ear, holding
+ | .war & .jar files generated from children modules.
+ |
+ | but for now this is easier.
+ -->
+
<!-- copy the deployables -->
<copy todir="${jboss.deploy.root}">
- <fileset dir="${project.root}/manual/output/lib">
- <include name="manual.ear"/>
- </fileset>
- <fileset dir="${project.root}/website/output/lib">
- <include name="website.ear"/>
+ <fileset dir="${install.deploy}">
+ <include name="*"/>
</fileset>
</copy>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development