User: user57
Date: 02/01/03 16:08:26
Modified: jboss build.xml
Log:
o Consolodate server module install tasks.
o Stop copying tmp.properties, db.properties, ...
Revision Changes Path
1.63 +19 -109 build/jboss/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/build/jboss/build.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- build.xml 2002/01/03 04:00:51 1.62
+++ build.xml 2002/01/04 00:08:26 1.63
@@ -12,7 +12,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.62 2002/01/03 04:00:51 user57 Exp $ -->
+<!-- $Id: build.xml,v 1.63 2002/01/04 00:08:26 user57 Exp $ -->
<project default="main" name="JBoss/Build">
@@ -203,8 +203,7 @@
pool,
connector,
admin,
- cluster,
- testsuite"/>
+ cluster"/>
</group>
<group name="optional">
@@ -449,6 +448,9 @@
<fileset dir="${_module.output}/lib">
<include name="*-client.jar"/>
<include name="connector.jar"/>
+ <include name="jmx-ejb-connector-client.jar"/>
+ <include name="jmx-rmi-connector-client.jar"/>
+ <include name="jmx-connector-client-factory.jar"/>
<!-- Shouldn't these go into bin ? -->
<include name="stop.jar"/>
@@ -458,11 +460,10 @@
<!-- Setup the deployment directory (deploy) -->
<mkdir dir="${install.deploy}"/>
- <!-- Setup the deployment directory for farm services (deploy/farm) -->
- <mkdir dir="${install.deploy.farm}"/>
<copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="deploy.txt"/>
+ <fileset dir="${_module.output}/lib">
+ <include name="jmx-ejb-adaptor.jar"/>
+ <include name="ejb-management.jar"/>
</fileset>
</copy>
@@ -471,103 +472,23 @@
<copy todir="${install.deploy.lib}" filtering="no">
<fileset dir="${_module.output}/lib">
<include name="jms-ra.rar"/>
- </fileset>
- </copy>
-
- <!-- Copy the mail service xml snippet (deploy) -->
- <copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
- <include name="mail-service.xml"/>
+ <include name="jmx-ejb-connector-server.sar"/>
+ <include name="jmx-html-adaptor.sar"/>
+ <include name="jmx-rmi-adaptor.sar"/>
</fileset>
</copy>
- <!-- No way, ray. in jboss-service.xml that gets deployed first.
- Copy the core service xml snippet (deploy) - ->
+ <!-- Copy Configuration snipets (deploy) -->
<copy todir="${install.deploy}" filtering="no">
<fileset dir="${_module.output}/etc/conf/default">
- <include name="core-service.xml"/>
- </fileset>
- </copy-->
-
- <!-- Copy the jetty service xml snippet (deploy) NOW IN A SAR -->
-
- <!-- Copy the jms service xml snippet (deploy) -->
- <copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
<include name="jms-service.xml"/>
- </fileset>
- </copy>
-
- <!-- Copy the j2eedeployment service xml snippet (deploy) -->
- <copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
+ <include name="mail-service.xml"/>
<include name="j2eedeployment-service.xml"/>
- </fileset>
- </copy>
-
- <!-- Copy the hsqldb defaultds service xml snippet (deploy) -->
- <copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/etc/conf/default">
<include name="hsqldb-default-service.xml"/>
+ <include name="user-service.xml"/>
</fileset>
</copy>
- <!-- Copy the jmx-ejb-adaptor.jar (deploy) -->
- <copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jmx-ejb-adaptor.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy the ejb-management.jar (deploy) -->
- <copy todir="${install.deploy}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="ejb-management.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy the jmx-ejb-connector-server.sar (deploy/lib) -->
- <copy todir="${install.deploy.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jmx-ejb-connector-server.sar"/>
- </fileset>
- </copy>
-
- <!-- Copy the jmx-html-adaptor.sar (deploy/lib) -->
- <copy todir="${install.deploy.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jmx-html-adaptor.sar"/>
- </fileset>
- </copy>
-
- <!-- Copy the jmx-rmi-connector-server.sar (deploy/lib) -->
- <copy todir="${install.deploy.lib}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jmx-rmi-adaptor.sar"/>
- </fileset>
- </copy>
-
- <!-- Copy the jmx-ejb-connector-client.jar (client) -->
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jmx-ejb-connector-client.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy the jmx-rmi-connector-client.jar (client) -->
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jmx-rmi-connector-client.jar"/>
- </fileset>
- </copy>
-
- <!-- Copy the jmx-connector-client-test.jar (client) -->
- <copy todir="${install.client}" filtering="no">
- <fileset dir="${_module.output}/lib">
- <include name="jmx-connector-client-factory.jar"/>
- </fileset>
- </copy>
-
<!-- Copy the generated scripts & runnable jars (bin) -->
<mkdir dir="${install.bin}"/>
<copy todir="${install.bin}" filtering="no">
@@ -589,39 +510,28 @@
<mkdir dir="${install.conf}"/>
<copy todir="${install.conf}" filtering="no">
<fileset dir="${_module.output}/etc/conf">
- <include name="**/*"/>
+ <include name="default/*"/>
+
+ <!-- Need to fix this, these files don't belong here -->
<exclude name="default/mail-service.xml"/>
<exclude name="default/core-service.xml"/>
<exclude name="default/jetty-service.xml"/>
<exclude name="default/jms-service.xml"/>
<exclude name="default/j2eedeployment-service.xml"/>
<exclude name="default/hsqldb-default-service.xml"/>
+ <exclude name="default/user-service.xml"/>
</fileset>
</copy>
<!-- Setup the database directory (db) -->
<mkdir dir="${install.db}"/>
- <copy todir="${install.db}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="db.properties"/>
- </fileset>
- </copy>
<!-- Setup the log file directory (log) -->
<mkdir dir="${install.log}"/>
- <copy todir="${install.log}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="log.properties"/>
- </fileset>
- </copy>
<!-- Setup the temporary file directory (tmp) -->
<mkdir dir="${install.tmp}"/>
- <copy todir="${install.tmp}" filtering="no">
- <fileset dir="${_module.output}/etc">
- <include name="tmp.properties"/>
- </fileset>
- </copy>
+
</target>
<target name="_module-server-all" depends="_module-server-most">
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
