User: user57
Date: 01/07/28 19:29:30
Modified: jetty Tag: jboss_buildmagic build.sh build.xml config.xml
Removed: jetty Tag: jboss_buildmagic README TODO
Log:
o integrated into buildmagic
Revision Changes Path
No revision
No revision
1.1.2.3 +1 -1 contrib/jetty/Attic/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/Attic/build.sh,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- build.sh 2001/07/29 02:13:41 1.1.2.2
+++ build.sh 2001/07/29 02:29:30 1.1.2.3
@@ -23,7 +23,7 @@
## ##
### ====================================================================== ###
-# $Id: build.sh,v 1.1.2.2 2001/07/29 02:13:41 user57 Exp $
+# $Id: build.sh,v 1.1.2.3 2001/07/29 02:29:30 user57 Exp $
PROGNAME=`basename $0`
DIRNAME=`dirname $0`
1.1.2.3 +111 -77 contrib/jetty/Attic/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/Attic/build.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- build.xml 2001/07/29 02:13:41 1.1.2.2
+++ build.xml 2001/07/29 02:29:30 1.1.2.3
@@ -10,9 +10,9 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.1.2.2 2001/07/29 02:13:41 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.1.2.3 2001/07/29 02:29:30 user57 Exp $ -->
-<project name="jboss-jetty-plugin" default="main">
+<project name="jboss-plugins-jetty" default="main">
<!-- ================================================================== -->
<!-- Basic module configuration -->
@@ -31,8 +31,8 @@
| Setup the basic module roots.
|
| module.root - Should be the directory this file is in
- | project.root -
- | project.config -
+ | project.root - Where the project root directory is
+ | project.config - Where the project configuration files live
-->
<property name="module.root" value="${basedir}"/>
<property name="project.root">
@@ -87,16 +87,20 @@
<!-- Initialize, Configure and Bootstrap the build system -->
<!-- ================================================================== -->
- <!-- Bootstrap all required extensions -->
+ <!--
+ | Bootstrap all required extensions.
+ |
+ | Build local Ant extensions here if they are required.
+ |
+ | This target will not run once the bootstraped-already is set.
+ -->
<target name="bootstrap"
depends="bootstrap-init"
unless="bootstraped-already">
- <!-- Build local Ant extensions (if required) -->
- <!-- Mark things as bootstrapped -->
<property name="bootstraped-already" value="true"/>
</target>
- <!-- Fail if the required dependencies are missing -->
+ <!-- Fail if the required bootstrapping dependencies are missing -->
<target name="bootstrap-init"
depends="bootstrap-check"
unless="have-bootstrap-dependencies-already">
@@ -111,11 +115,17 @@
</target>
<!--
- | Configure the module build system
+ | Configure the module build system.
+ |
+ | o Updates/installs example files if they exist
+ | o Invokes the 'configure-hook' target, which should be defined in
+ | config.xml.
+ |
+ | This target will not run once the configured-already property is set.
-->
- <target name="configure" unless="configured-already"
+ <target name="configure"
+ unless="configured-already"
description="Configure the module build system.">
- <!-- Put the example files in place -->
<property name="module.examples" value="${module.root}/etc"/>
<property name="module.examples.extension" value="-example"/>
<copy todir="${module.root}" filtering="yes">
@@ -125,7 +135,6 @@
<mapper type="glob" from="*${module.examples.extension}" to="*"/>
</copy>
- <!-- Execute module configure hook and mark things as configured -->
<antcall target="configure-hook"/>
<property name="configured-already" value="true"/>
</target>
@@ -136,29 +145,30 @@
</target>
<!--
- | Initialize the build system
+ | Initialize the build system.
+ |
+ | o Sets the timestamp and build.number properties
+ | o Installs property defaults
+ | o Displays some module information
+ | o Invokes to 'init-hook' target which should be defined in config.xml
+ | o Resolves properties for psuedo late-binding
+ | o Installs filters for each property
+ |
+ | This target will not run once the initialized-already property is set.
-->
<target name="init"
depends="configure, bootstrap"
unless="initialized-already">
- <!-- Setup timestamp properties -->
<tstamp>
<format property="build.number" pattern="yyyyMMddHHmm"/>
</tstamp>
<property name="build.id" value="${build.number}"/>
-
- <!-- Show some informative fluff -->
- <echo>Project root: ${project.root}</echo>
- <echo>Module root: ${module.root}</echo>
-
- <!-- Execute module init hook -->
+ <property resource="planet57/tools/buildmagic/common.properties"/>
+ <property resource="planet57/tools/buildmagic/task.properties"/>
+ <moduleinfo/>
<call target="init-hook" unless="bypass-init-hook"/>
-
- <!-- Resolve all properties & install filters -->
<resolver force="${buildmagic.resolveproperties.force}"/>
<propertyfilter all="${buildmagic.propertyfilter.all}"/>
-
- <!-- Mark things as initialized -->
<property name="initialized-already" value="true"/>
</target>
@@ -177,7 +187,13 @@
<!-- Compile -->
<!-- ================================================================== -->
- <!-- Compile everything -->
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
<target name="compile"
depends="compile-classes"
description="Compile all source files."/>
@@ -202,22 +218,14 @@
</javac>
</target>
- <!-- Compile resource files -->
- <target name="compile-resources" depends="init">
- <mkdir dir="${build.resources}"/>
- <copy todir="${build.resources}" filtering="yes">
- <fileset dir="${source.resources}">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
<!-- ================================================================== -->
<!-- Build Jars -->
<!-- ================================================================== -->
- <!-- Build all jar files -->
+ <!--
+ | Build all jar files.
+ -->
<target name="jars" depends="compile" description="Builds all jar files.">
<mkdir dir="${build.jars}"/>
@@ -234,11 +242,24 @@
<!-- Build documents -->
<!-- ================================================================== -->
- <!-- Create all generated documenation -->
- <target name="docs" depends="javadocs"
+ <!--
+ | Create all generated documenation.
+ |
+ | This target should depend on other docs-* targets for each
+ | different type of docuementation that is to be generated.
+ -->
+ <target name="docs" depends="docs-api"
description="Builds all documentation."/>
+
+ <!-- Javadocs is an exception, but provide a docs-api to conform. -->
+ <target name="docs-api" depends="javadocs"/>
- <!-- Check if we need to build javadocs -->
+ <!--
+ | Check if we need to build javadocs
+ |
+ | Javadocs will only be generated if one or more .java source files
+ | is newer than the generated index.html.
+ -->
<target name="javadocs-check" depends="init">
<!-- if index.html is newer than the sources we are up to date -->
<uptodate property="javadoc-generated-already"
@@ -267,42 +288,59 @@
package="${javadoc.package}"
protected="${javadoc.protected}"
private="${javadoc.private}"
+ encoding="${javadoc.encoding}"
use="${javadoc.use}"
verbose="${javadoc.verbose}">
- <!-- <group title="Common" packages="*"/> -->
+ <group title="JDBC Extension" packages="javax.sql*"/>
+ <group title="J2EE" packages="javax*"/>
</javadoc>
</target>
<!-- ================================================================== -->
- <!-- Builds a release distribution. -->
+ <!-- Release/Install file copying. -->
<!-- ================================================================== -->
- <target name="release-files" depends="all">
- <mkdir dir="${module.release}"/>
-
- <!-- Release the generated jars -->
- <mkdir dir="${release.lib}"/>
- <copy todir="${release.lib}" filtering="no">
- <fileset dir="${build.jars}">
+ <!--
+ | This target is a helper for release and install to consolidate the
+ | task logic required to copy files.
+ -->
+ <target name="copy-files">
+ <!-- Copy the generated libraries -->
+ <mkdir dir="${to.lib}"/>
+ <copy todir="${to.lib}" filtering="no">
+ <fileset dir="${from.lib}">
<include name="**/*"/>
</fileset>
</copy>
- <!-- Release the generated javadocs -->
- <mkdir dir="${release.api}"/>
- <copy todir="${release.api}" filtering="no">
- <fileset dir="${build.api}">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${to.api}"/>
+ <copy todir="${to.api}" filtering="no">
+ <fileset dir="${from.api}">
<include name="**/*"/>
</fileset>
</copy>
</target>
- <target name="release" depends="release-files"
- description="Builds a release distribution.">
- <mkdir dir="${module.release}"/>
+ <!-- ================================================================== -->
+ <!-- Builds a release distribution. -->
+ <!-- ================================================================== -->
+
+ <target name="release"
+ depends="all"
+ description="Builds a release distribution.">
+ <!-- Copy the files to release -->
+ <antcall target="copy-files">
+ <param name="to.lib" value="${release.lib}"/>
+ <param name="from.lib" value="${build.jars}"/>
+ <param name="to.api" value="${release.api}"/>
+ <param name="from.api" value="${build.api}"/>
+ </antcall>
+
<!-- Build a jar for the release -->
+ <mkdir dir="${module.release}"/>
<mkdir dir="${module.output}"/>
<jar jarfile="${module.output}/${module.name}-${build.id}.jar">
<fileset dir="${module.release}">
@@ -313,7 +351,7 @@
<!-- ================================================================== -->
- <!-- Install release into project namespace. -->
+ <!-- Install release files into project output. -->
<!-- ================================================================== -->
<target name="install-check" depends="init">
@@ -321,24 +359,15 @@
<require property="install.module.api"/>
</target>
- <target name="install" depends="install-check,release-files"
+ <target name="install" depends="install-check, release"
description="Installs released files into project namespace.">
-
- <!-- Install the generated jars -->
- <mkdir dir="${install.lib}"/>
- <copy todir="${install.lib}" filtering="no">
- <fileset dir="${release.lib}">
- <include name="**/*"/>
- </fileset>
- </copy>
-
- <!-- Install the generated javadocs -->
- <mkdir dir="${install.module.api}"/>
- <copy todir="${install.module.api}" filtering="no">
- <fileset dir="${release.api}">
- <include name="**/*"/>
- </fileset>
- </copy>
+ <!-- Copy the files to project -->
+ <antcall target="copy-files">
+ <param name="to.lib" value="${install.lib}"/>
+ <param name="from.lib" value="${release.lib}"/>
+ <param name="to.api" value="${install.module.api}"/>
+ <param name="from.api" value="${release.api}"/>
+ </antcall>
</target>
@@ -369,20 +398,25 @@
<target name="help">
<projecthelp>
<header/>
- <header> The JBoss Jetty plugin source module.</header>
+ <header> The ${module.Name} module.</header>
<header/>
<footer/>
- <footer> * default target is 'main'</footer>
<footer> * -projecthelp for all targets</footer>
<footer> * -help for full options</footer>
</projecthelp>
</target>
- <target name="main" depends="jars"
- description="Executes the default target (jars)."/>
+ <target name="main" depends="most"
+ description="Executes the default target (most)."/>
<target name="all" depends="jars, docs"
description="Builds everything."/>
+
+ <target name="most" depends="jars"
+ description="Builds almost everything."/>
+
+ <target name="min" depends="compile"
+ description="Builds a minimal subset."/>
<target name="tests" depends="init"
description="Execute all tests."/>
1.1.2.2 +64 -75 contrib/jetty/Attic/config.xml
Index: config.xml
===================================================================
RCS file: /cvsroot/jboss/contrib/jetty/Attic/config.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- config.xml 2001/07/28 06:58:47 1.1.2.1
+++ config.xml 2001/07/29 02:29:30 1.1.2.2
@@ -14,7 +14,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: config.xml,v 1.1.2.1 2001/07/28 06:58:47 user57 Exp $ -->
+<!-- $Id: config.xml,v 1.1.2.2 2001/07/29 02:29:30 user57 Exp $ -->
<!-- ================================================================== -->
<!-- Module Setup -->
@@ -22,8 +22,8 @@
<!-- Module name(s) & version -->
<property name="module.name" value="${ant.project.name}"/>
- <property name="module.Name" value="JBoss Jetty Pluging"/>
- <property name="module.version" value="${buildnumber}"/>
+ <property name="module.Name" value="JBoss Jetty Plugin"/>
+ <property name="module.version" value="${build.number}"/>
<!-- This module is based on Java 1.2 -->
<property name="javac.target" value="1.2"/>
@@ -33,56 +33,67 @@
<!-- Tool Setup -->
<!-- ================================================================== -->
- <!-- BuildMagic -->
- <property name="buildmagic.root" value="${tools.root}/planet57/buildmagic"/>
- <property name="buildmagic.lib" value="${buildmagic.root}/lib"/>
- <path id="buildmagic.classpath">
- <fileset dir="${buildmagic.lib}">
- <include name="**/*.jar"/>
- </fileset>
- </path>
+ <!-- No tool dependencies -->
<!-- ================================================================== -->
<!-- Library Setup -->
<!-- ================================================================== -->
+ <!-- Java Naming and Directory Interface (JNDI) -->
+ <property name="sun.jndi.root" value="${thirdparty.root}/sun/jndi"/>
+ <property name="sun.jndi.lib" value="${sun.jndi.root}/lib"/>
+ <path id="sun.jndi.classpath">
+ <pathelement path="${sun.jndi.lib}/jndi.jar"/>
+ </path>
+
<!-- Java Management Extensions (JMX) -->
- <property name="jmx.root" value="${thirdparty.root}/sun/jmx"/>
- <property name="jmx.lib" value="${jmx.root}/lib"/>
- <path id="jmx.classpath">
- <pathelement path="${jmx.lib}/jmxri.jar"/>
+ <property name="sun.jmx.root" value="${thirdparty.root}/sun/jmx"/>
+ <property name="sun.jmx.lib" value="${sun.jmx.root}/lib"/>
+ <path id="sun.jmx.classpath">
+ <pathelement path="${sun.jmx.lib}/jmxri.jar"/>
</path>
- <!-- Java API for XML Processing (JAXP) -->
- <property name="jaxp.root" value="${thirdparty.root}/sun/jaxp"/>
- <property name="jaxp.lib" value="${jaxp.root}/lib"/>
- <path id="jaxp.classpath">
- <fileset dir="${jaxp.lib}">
+ <!-- Log4j -->
+ <property name="apache.log4j.root" value="${thirdparty.root}/apache/log4j"/>
+ <property name="apache.log4j.lib" value="${apache.log4j.root}/lib"/>
+ <path id="apache.log4j.classpath">
+ <pathelement path="${apache.log4j.lib}/log4j.jar"/>
+ </path>
+
+ <!-- JUnit -->
+ <property name="junit.junit.root" value="${thirdparty.root}/junit/junit"/>
+ <property name="junit.junit.lib" value="${junit.junit.root}/lib"/>
+ <path id="junit.junit.classpath">
+ <pathelement path="${junit.junit.lib}/junit.jar"/>
+ </path>
+
+ <!-- Jetty -->
+ <property name="mortbay.jetty.root" value="${thirdparty.root}/junit/junit"/>
+ <property name="mortbay.jetty.lib" value="${mortbay.jetty.root}/lib"/>
+ <path id="mortbay.jetty.classpath">
+ <fileset dir="${mortbay.jetty.lib}">
<include name="**/*.jar"/>
</fileset>
</path>
-
- <!-- Java Authentication and Authorization Service (JAAS) -->
- <property name="jaas.root" value="${thirdparty.root}/sun/jaas"/>
- <property name="jaas.lib" value="${jaas.root}/lib"/>
- <path id="jaas.classpath">
- <pathelement path="${jaas.lib}/jaas.jar"/>
- </path>
- <!-- Log4j -->
- <property name="log4j.root" value="${thirdparty.root}/apache/log4j"/>
- <property name="log4j.lib" value="${log4j.root}/lib"/>
- <path id="log4j.classpath">
- <pathelement path="${log4j.lib}/log4j.jar"/>
+ <!-- Jetty3Extra -->
+ <property name="mortbay.jetty3extra.root" value="${thirdparty.root}/junit/junit"/>
+ <property name="mortbay.jetty3extra.lib" value="${mortbay.jetty3extra.root}/lib"/>
+ <path id="mortbay.jetty3extra.classpath">
+ <fileset dir="${mortbay.jetty3extra.lib}">
+ <include name="**/*.jar"/>
+ </fileset>
</path>
<!-- The combined library classpath -->
- <path id="classpath.library">
- <path refid="jmx.classpath"/>
- <path refid="jaxp.classpath"/>
- <path refid="jaas.classpath"/>
- <path refid="log4j.classpath"/>
+ <path id="library.classpath">
+ <path refid="sun.jndi.classpath"/>
+ <path refid="sun.jmx.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="mortbay.jetty.classpath"/>
+ <path refid="mortbay.jetty3extra.classpath"/>
</path>
@@ -97,33 +108,16 @@
| a library from a dependent module does not exist.
-->
- <!-- J2EE -->
- <property name="j2ee.root" value="${project.root}/j2ee/output"/>
- <property name="j2ee.lib" value="${j2ee.root}/lib"/>
- <path id="j2ee.classpath">
- <pathelement path="${j2ee.lib}/jboss-j2ee.jar"/>
- <pathelement path="${j2ee.lib}/jboss-jdbc_ext.jar"/>
+ <!-- Server -->
+ <property name="jboss.server.root" value="${project.root}/server/output"/>
+ <property name="jboss.server.lib" value="${jboss.server.root}/lib"/>
+ <path id="jboss.server.classpath">
+ <pathelement path="${jboss.server.lib}/jboss-server.jar"/>
</path>
- <!-- Server -->
- <property name="server.root" value="${project.root}/server/output"/>
- <property name="server.lib" value="${server.root}/lib"/>
- <path id="server.classpath">
- <pathelement path="${server.lib}/jboss-server.jar"/>
- </path>
-
- <!-- Connector -->
- <property name="connector.root" value="${project.root}/connector/output"/>
- <property name="connector.lib" value="${connector.root}/lib"/>
- <path id="connector.classpath">
- <pathelement path="${connector.lib}/jboss-connector.jar"/>
- </path>
-
- <!-- The combined dependent module classpath -->
- <path id="classpath.dependentmodules">
- <path refid="j2ee.classpath"/>
- <path refid="server.classpath"/>
- <path refid="connector.classpath"/>
+ <!-- The combined depedant module classpath -->
+ <path id="dependentmodule.classpath">
+ <path refid="jboss.server.classpath"/>
</path>
@@ -132,20 +126,20 @@
<!-- ================================================================== -->
<!-- The combined thirdparty classpath -->
- <path id="classpath.thirdparty">
- <path refid="classpath.library"/>
- <path refid="classpath.dependentmodules"/>
+ <path id="thirdparty.classpath">
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
</path>
- <!-- ${classpath} and ${classpath.local} must have a value -->
+ <!-- classpath and local.classpath must have a value using with a path -->
<property name="classpath" value=""/>
- <property name="classpath.local" value=""/>
+ <property name="local.classpath" value=""/>
<!-- The classpath required to build classes. -->
<path id="javac.classpath">
<pathelement path="${classpath}"/>
- <pathelement path="${classpath.local}"/>
- <path refid="classpath.thirdparty"/>
+ <pathelement path="${local.classpath}"/>
+ <path refid="thirdparty.classpath"/>
</path>
<!-- Packages to include when generating api documentation -->
@@ -156,20 +150,15 @@
<path refid="javac.classpath"/>
</path>
- <!-- RMIC should generate stubs compatible with Java 1.2+ -->
- <property name="rmic.stubVersion" value="1.2"/>
- <property name="rmic.includes" value=""/>
-
<!-- Where source files live -->
<property name="source.java" value="${module.source}/main"/>
<property name="source.etc" value="${module.source}/etc"/>
- <property name="source.resources" value="${module.source}/resources"/>
<!-- Where build generated files will go -->
<property name="build.classes" value="${module.build}/classes"/>
<property name="build.jars" value="${module.build}/lib"/>
<property name="build.api" value="${module.build}/api"/>
- <property name="build.resources" value="${module.build}/resources"/>
+ <property name="build.etc" value="${module.build}/etc"/>
<!-- Where release generated files will go -->
<property name="release.lib" value="${module.release}/lib"/>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
