User: schaefera
Date: 01/09/29 23:21:36
Modified: . build.xml
Log:
Adjusted the JBoss Survey to XDoclet and the proper usage of some
archvies. Also the module "website" contains now a target "survey-jars"
which only compiles the JBoss Survey without the whole overhead of
"Snapshots".
Revision Changes Path
1.16 +50 -20 newsite/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/newsite/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 2001/09/29 02:02:37 1.15
+++ build.xml 2001/09/30 06:21:36 1.16
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.15 2001/09/29 02:02:37 schaefera Exp $ -->
+<!-- $Id: build.xml,v 1.16 2001/09/30 06:21:36 schaefera Exp $ -->
<project default="main" name="JBoss/Website">
@@ -220,10 +220,18 @@
<property name="release.id" value="${install.id}"/>
<property name="install.root" value="${module.output}/${install.id}"/>
+ <!-- Log4j -->
+ <property name="apache.log4j.root" value="${project.thirdparty}/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>
+
<!-- The combined thirdparty classpath -->
<path id="thirdparty.classpath">
<path refid="library.classpath"/>
<path refid="dependentmodule.classpath"/>
+ <path refid="apache.log4j.classpath"/>
</path>
<!-- This module is based on Java 1.2 -->
@@ -243,8 +251,8 @@
<!-- The classpath required to build survey. -->
<path id="survey.classpath">
<pathelement path="${survey.lib}/jboss-j2ee.jar"/>
- <pathelement
path="${build.snapshots}/jboss-all/thirdparty/sun/javamail/lib/mail.jar"/>
- <pathelement
path="${build.snapshots}/jboss-all/thirdparty/sun/servlet/lib/servlet.jar"/>
+ <pathelement path="${project.thirdparty}/sun/javamail/lib/mail.jar"/>
+ <pathelement path="${project.thirdparty}/sun/servlet/lib/servlet.jar"/>
<path refid="javac.classpath"/>
</path>
<property name="survey.classpath" refid="survey.classpath"/>
@@ -267,15 +275,24 @@
value=":pserver:[EMAIL PROTECTED]:/cvsroot/jboss"/>
<property name="snapshot.modules" value="jboss-all"/>
+ <!-- xdoclet -->
+ <path id="xdoclet.task.classpath">
+ <path refid="javac.classpath"/>
+ <path refid="survey.classpath"/>
+ <pathelement location="${project.tools}/lib/xdoclet.jar"/>
+ <pathelement location="${project.tools}/lib/ant.jar"/>
+ </path>
+ <property name="xdoclet.task.classpath"
+ refid="xdoclet.task.classpath"/>
<!-- ejbdoclet -->
- <path id="dreambean.ejbdoclet.task.classpath">
+<!-- <path id="dreambean.ejbdoclet.task.classpath">
<path refid="javac.classpath"/>
<path refid="survey.classpath"/>
<pathelement location="${project.root}/tools/lib/ejbdoclet.jar"/>
</path>
<property name="dreambean.ejbdoclet.task.classpath"
refid="dreambean.ejbdoclet.task.classpath"
- />
+ /> -->
</target>
@@ -396,25 +413,30 @@
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.metadata.survey}"/>
<mkdir dir="${build.metadata.survey}/META-INF"/>
- <taskdef name="ejbdoclet"
- classname="ejbdoclet.EJBDocletTask"
+
+
+ <taskdef
+ name="xdoclet"
+ classname="xdoclet.ejb.EjbDocletTask"
/>
- <ejbdoclet
+ <xdoclet
sourcepath="${survey.ejb.source}"
destdir="${build.gen}"
- classpath="${dreambean.ejbdoclet.task.classpath}"
+ classpath="${xdoclet.task.classpath}"
ejbspec="1.1"
excludedtags="@version,@author"
>
<fileset dir="${survey.ejb.source}">
<include name="org/jboss/survey/ejb/**/*Bean.java" />
</fileset>
- <dataobject pattern="{0}Data"/>
- <remoteinterface pattern ="{0}"/>
- <homeinterface pattern="{0}Home"/>
- <entitypk pattern="{0}PK"/>
- <entitybmp pattern="{0}BMP"/>
- <entitycmp pattern="{0}CMP"/>
+ <dataobject/>
+ <remoteinterface/>
+ <homeinterface/>
+ <entitypk/>
+ <entitypk/>
+ <entitybmp/>
+ <entitycmp/>
+ <session/>
<deploymentdescriptor
xmlencoding ="UTF-8"
destdir="${build.metadata.survey}/META-INF"
@@ -425,7 +447,8 @@
datasource="java:/SurveyDS"
destdir="${build.metadata.survey}/META-INF"
/>
- </ejbdoclet>
+ </xdoclet>
+
</target>
<!-- ================================================================== -->
@@ -449,7 +472,7 @@
<!-- Compile the Auxiliary Classes -->
<!-- ================================================================== -->
- <target name="survey-compile" depends="init">
+ <target name="survey-compile" depends="survey-ejb-compile">
<mkdir dir="${build.classes}"/>
<javac srcdir="${survey.client.source}"
@@ -469,8 +492,7 @@
<!--
| Build all jar files.
-->
- <target name="jars" depends="compile,survey-ejb-compile,survey-compile"
description="Builds all jar files.">
-<!-- <target name="jars"
depends="init,compile-metadata,survey-ejb-compile,survey-compile" description="Builds
all jar files."> -->
+ <target name="jars" depends="compile" description="Builds all jar files exception
Survey.">
<mkdir dir="${build.lib}"/>
<war warfile="${build.lib}/website.war"
@@ -507,6 +529,14 @@
</fileset>
</ear>
+ </target>
+
+ <!--
+ | Build all JBoss Survey jar files.
+ -->
+ <target name="survey-jars" depends="survey-compile, compile-metadata"
description="Builds all jar files for JBoss Survey.">
+ <mkdir dir="${build.lib}"/>
+
<jar jarfile="${build.lib}/survey.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/survey/ejb/**/*.class"/>
@@ -767,7 +797,7 @@
<target name="main" depends="most"
description="Executes the default target (most)."/>
- <target name="all" depends="jars, docs"
+ <target name="all" depends="jars, survey-jars, docs"
description="Builds everything."/>
<target name="most" depends="jars"
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
