User: user57
Date: 01/07/28 23:26:53
Modified: . Tag: jboss_buildmagic build.xml config.xml
Log:
o updated jboss changes from main
o almost have jboss/server module generating the correct binary structure
o updated <projecthelp> to sort the target list.
Revision Changes Path
No revision
No revision
1.1.2.6 +225 -33 jboss/Attic/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss/Attic/build.xml,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- build.xml 2001/07/29 04:57:41 1.1.2.5
+++ build.xml 2001/07/29 06:26:53 1.1.2.6
@@ -10,7 +10,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.1.2.5 2001/07/29 04:57:41 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.1.2.6 2001/07/29 06:26:53 user57 Exp $ -->
<project name="jboss-server" default="main">
@@ -195,7 +195,7 @@
| documentation compiles.
-->
<target name="compile"
- depends="compile-classes, compile-rmi, compile-etc"
+ depends="compile-classes, compile-rmi, compile-etc, compile-resources"
description="Compile all source files."/>
<!-- Compile all class files -->
@@ -238,10 +238,31 @@
stubVersion="${rmic.stubVersion}">
<classpath refid="javac.classpath"/>
<include name="${rmic.includes}"/>
- <include name="${rmic.excludes}"/>
+ <exclude name="${rmic.excludes}"/>
+
+ <include
name="org/jboss/tm/usertx/server/UserTransactionSessionFactoryImpl.class"/>
+ <include name="org/jboss/tm/usertx/server/UserTransactionSessionImpl.class"/>
+ <include name="org/jboss/jmx/server/JMXAdaptorImpl.class"/>
+ <include name="org/jboss/jmx/server/RMIConnectorImpl.class"/>
+ <include name="org/jboss/jmx/client/RMIClientConnectorImpl*Listener.class"/>
+ <include name="org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.class"/>
+
+ <!-- This should move to an plugin module -->
+ <!-- <include name="org/jboss/tm/plugins/tyrex/CoordinatorRemote.class"/> -->
+ <!-- <include name="org/jboss/tm/plugins/tyrex/ResourceRemote.class"/> -->
</rmic>
</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>
+
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
<mkdir dir="${build.etc}"/>
@@ -262,13 +283,181 @@
-->
<target name="jars" depends="compile" description="Builds all jar files.">
<mkdir dir="${build.jars}"/>
+
+ <!-- Build jboss.jar -->
+ <jar jarfile="${build.jars}/jboss.jar"
+ manifest="${build.etc}/jboss.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/**"/>
+
+ <!-- Exclude Main, it will go into run.jar -->
+ <exclude name="org/jboss/Main*"/>
+
+ <!-- ??? -->
+ <exclude name="org/jboss/tm/GlobalId.class"/>
+
+ <!-- Exclude the security classes that must be on the classpath -->
+ <exclude name="org/jboss/security/AnybodyPrincipal.class"/>
+ <exclude name="org/jboss/security/NobodyPrincipal.class"/>
+ <exclude name="org/jboss/security/SimplePrincipal.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-client.jar -->
+ <jar jarfile="${build.jars}/jboss-client.jar"
+ manifest="${build.etc}/jboss-client.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb/DeploymentException.class"/>
+ <include name="org/jboss/proxy/**"/>
+ <include name="org/jboss/ejb/plugins/jrmp/server/*Stub.class"/>
+ <include name="org/jboss/ejb/plugins/jrmp/interfaces/**"/>
+ <include name="org/jboss/ejb/plugins/jrmp12/interfaces/**"/>
+ <include name="org/jboss/ejb/plugins/jrmp13/interfaces/**"/>
+ <include name="org/jboss/ejb/CacheKey.class"/>
+ <include name="org/jboss/ejb/FastKey.class"/>
+ <include name="org/jboss/monitor/client/*.class"/>
+ <include name="org/jboss/tm/TransactionPropagationContextFactory.class"/>
+ <include name="org/jboss/tm/GlobalId.class"/>
+ <include name="org/jboss/tm/usertx/client/*.class"/>
+ <include name="org/jboss/tm/usertx/interfaces/*.class"/>
+ <include name="org/jboss/tm/usertx/server/*Stub.class"/>
+ <include name="org/jboss/util/SerializableEnumeration.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-metadata.jar -->
+ <jar jarfile="${build.jars}/jboss-metadata.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/metadata/**"/>
+ <include name="org/jboss/ejb/DeploymentException.class"/>
+ </fileset>
+ <fileset dir="${build.etc}/conf/default">
+ <include name="standardjboss.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-util.jar -->
+ <jar jarfile="${build.jars}/jboss-util.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/util/Service.class"/>
+ <include name="org/jboss/util/ServiceMBean*"/>
+ <include name="org/jboss/util/MBeanProxy*"/>
+ <include name="org/jboss/proxy/**"/>
+ <include name="org/jboss/logging/Log.class"/>
+ <include name="org/jboss/logging/LogWriter.class"/>
+ <include name="org/jboss/monitor/MetricsConstants.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-deployer.jar -->
+ <jar jarfile="${build.jars}/jboss-deployer.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/deployment/DeployerMBean*"/>
+ <include name="org/jboss/deployment/DeploymentException*"/>
+ </fileset>
+ </jar>
- <!-- Build the module jar -->
- <jar jarfile="${build.jars}/${module.name}.jar">
+ <!-- Build run.jar -->
+ <jar jarfile="${build.jars}/run.jar"
+ manifest="${build.etc}/run.mf">
<fileset dir="${build.classes}">
+ <include name="org/jboss/Main*"/>
+ </fileset>
+ </jar>
+
+ <!-- Build verifier.jar -->
+ <jar jarfile="${build.jars}/verifier.jar"
+ manifest="${build.etc}/verifier.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/verifier/**"/>
+ </fileset>
+ </jar>
+
+
+ <!-- Build rmiconnector.jar -->
+ <jar jarfile="${build.jars}/rmiconnector.jar"
+ manifest="${build.etc}/rmiconnector.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/jmx/interfaces/JMXConnector**"/>
+ <include name="org/jboss/jmx/interfaces/RMI**"/>
+ <include name="org/jboss/jmx/server/RMIConnector**"/>
+ <include name="org/jboss/jmx/server/ObjectHandler.class"/>
+ <include name="org/jboss/util/Service**"/>
+ <include name="org/jboss/logging/Log.class"/>
+ <include name="org/jboss/logging/Log$$**"/>
+ <include name="org/jboss/naming/**"/>
+
+ <!-- why ?? -->
+ <include name="test/jboss/jmx/TestServer**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build deploy.jar -->
+ <jar jarfile="${build.jars}/deploy.jar"
+ manifest="${build.etc}/deploy.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/jmx/interfaces/JMXAdaptor.class"/>
+ <include name="org/jboss/jmx/client/Deployer.class"/>
+ <include name="org/jboss/jmx/server/JMXAdaptorImpl_Stub.class"/>
+ <include name="org/jboss/ejb/CacheKey.class"/>
+ <include name="org/jboss/util/FastKey.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Build stop.jar -->
+ <jar jarfile="${build.jars}/stop.jar"
+ manifest="${build.etc}/stop.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/jmx/interfaces/JMXAdaptor.class"/>
+ <include name="org/jboss/jmx/client/Stop.class"/>
+ <include name="org/jboss/jmx/server/JMXAdaptorImpl_Stub.class"/>
+ <include name="org/jboss/ejb/CacheKey.class"/>
+ <include name="org/jboss/util/FastKey.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Build connector.jar -->
+ <jar jarfile="${build.jars}/connector.jar"
+ manifest="${build.etc}/connector.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/jmx/interfaces/JMXConnector.class"/>
+ <include name="org/jboss/jmx/interfaces/JMXConnectorMBean.class"/>
+ <include name="org/jboss/jmx/interfaces/RMIConnector.class"/>
+ <include name="org/jboss/jmx/interfaces/RMINotificationListener.class"/>
+ <include name="org/jboss/jmx/client/RMIClientConnectorImpl*.class"/>
+ <include name=",org/jboss/jmx/server/RMIConnectorImpl_Stub.class"/>
+ <include name="org/jboss/jmx/server/ObjectHandler.class"/>
+ <include name="org/jboss/jmx/client/ConnectorFactory*.class"/>
+ <include name="org/jboss/util/Service.class"/>
+ <include name="org/jboss/util/ServiceMBean*.class"/>
+ <include name="org/jboss/logging/Log.class"/>
+ <include name="org/jboss/logging/Log$$*.class"/>
+ <include name="org/jboss/logging/LogToCategory.class"/>
+
+ <!-- why? -->
+ <include name="test/jboss/jmx/TestClient*.class"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jms-ra.rar -->
+ <jar jarfile="${build.jars}/jms-ra.rar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/jms/ra/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/org/jboss/jms/ra/">
<include name="**"/>
</fileset>
</jar>
+
+ <!-- Build jboss-castorjdo.jar -->
+ <!-- This should move to an plugin module
+ <jar jarfile="${build.jars}/jboss-castorjdo.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/jdo/castor/**"/>
+ </fileset>
+ </jar>
+ -->
+
</target>
@@ -323,40 +512,14 @@
protected="${javadoc.protected}"
private="${javadoc.private}"
use="${javadoc.use}"
- verbose="${javadoc.verbose}">
+ verbose="${javadoc.verbose}"
+ bottom="Copyright © 2000 The JBoss Organization. All Rights
Reserved.">
<!-- <group title="???" packages="*"/> -->
</javadoc>
</target>
<!-- ================================================================== -->
- <!-- Release/Install file copying. -->
- <!-- ================================================================== -->
-
- <!--
- | 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>
-
- <!-- Copy the generated javadocs -->
- <mkdir dir="${to.api}"/>
- <copy todir="${to.api}" filtering="no">
- <fileset dir="${from.api}">
- <include name="**/*"/>
- </fileset>
- </copy>
- </target>
-
-
- <!-- ================================================================== -->
<!-- Builds a release distribution. -->
<!-- ================================================================== -->
@@ -400,6 +563,35 @@
<param name="to.api" value="${install.module.api}"/>
<param name="from.api" value="${release.api}"/>
</antcall>
+
+ <!-- Make some directories -->
+ <mkdir dir="${install.db}/hypersonic"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Release/Install file copying. -->
+ <!-- ================================================================== -->
+
+ <!--
+ | 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>
+
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${to.api}"/>
+ <copy todir="${to.api}" filtering="no">
+ <fileset dir="${from.api}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
</target>
1.1.2.4 +3 -2 jboss/Attic/config.xml
Index: config.xml
===================================================================
RCS file: /cvsroot/jboss/jboss/Attic/config.xml,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- config.xml 2001/07/29 01:25:13 1.1.2.3
+++ config.xml 2001/07/29 06:26:53 1.1.2.4
@@ -14,7 +14,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: config.xml,v 1.1.2.3 2001/07/29 01:25:13 user57 Exp $ -->
+<!-- $Id: config.xml,v 1.1.2.4 2001/07/29 06:26:53 user57 Exp $ -->
<!-- ================================================================== -->
<!-- Module Setup -->
@@ -215,17 +215,18 @@
<!-- RMIC should generate stubs compatible with Java 1.2+ -->
<property name="rmic.stubVersion" value="1.2"/>
- <property name="rmic.includes" value="**/NamingServer.class"/>
<!-- 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.etc" value="${module.build}/etc"/>
+ <property name="build.resources" value="${module.build}/resources"/>
<!-- 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
