bodewig 2004/03/17 23:36:43
Modified: profile gump.xml
project jetty.xml mx4j.xml
Added: project packaged-jetty.xml
Log:
Try to break circular dependency
Revision Changes Path
1.324 +2 -0 gump/profile/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/gump/profile/gump.xml,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- gump.xml 17 Mar 2004 08:07:35 -0000 1.323
+++ gump.xml 18 Mar 2004 07:36:43 -0000 1.324
@@ -228,6 +228,7 @@
<module href="project/cos.xml"/>
<module href="project/multipartrequest.xml"/>
<module href="project/packaged-jaxen.xml"/>
+ <module href="project/packaged-jetty.xml"/>
<module href="project/packaged-dom4j.xml"/>
<module
href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/jicarilla/jicarilla-sandbox/platform/gump/gump-module.xml?content-type=text/xml&rev=HEAD"/>
<module
href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/jicarilla/jicarilla-maven-repository/gump-module.xml?content-type=text/xml&rev=HEAD"/>
@@ -308,6 +309,7 @@
<project name="tranquilo" package="xsdlib-20010424"/>
<project name="nsuml" package="nsuml"/>
<project name="packaged-jaxen" package="jaxen-1.0-FCS"/>
+ <project name="packaged-jetty" package="Jetty-5.0.beta2"/>
<project name="saxpath" package="jaxen-1.0-FCS"/>
<project name="packaged-dom4j" package="dom4j-1.4"/>
1.12 +1 -0 gump/project/jetty.xml
Index: jetty.xml
===================================================================
RCS file: /home/cvs/gump/project/jetty.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jetty.xml 27 Feb 2004 09:22:56 -0000 1.11
+++ jetty.xml 18 Mar 2004 07:36:43 -0000 1.12
@@ -34,6 +34,7 @@
<depend project="commons-logging" runtime="true"/>
<depend project="xml-xerces"/>
<depend project="mx4j"/>
+ <depend project="mx4j-tools-from-packaged-jetty"/>
<work nested="classes"/>
<jar name="lib/org.mortbay.jetty.jar"/>
1.21 +15 -0 gump/project/mx4j.xml
Index: mx4j.xml
===================================================================
RCS file: /home/cvs/gump/project/mx4j.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mx4j.xml 27 Feb 2004 13:33:56 -0000 1.20
+++ mx4j.xml 18 Mar 2004 07:36:43 -0000 1.21
@@ -70,4 +70,19 @@
<license name="src/docs/english/license.xml"/>
</project>
+ <project name="mx4j-tools-from-packaged-jetty">
+ <package>mx4j</package>
+ <package>javax.management</package>
+
+ <ant basedir="build" target="release"/>
+ <depend project="mx4j" inherit="all"/>
+
+ <work nested="classes/core"/>
+ <depend project="packaged-jetty"/>
+
+ <home nested="dist"/>
+ <jar name="lib/mx4j-tools.jar" id="tools"/>
+ <license name="src/docs/english/license.xml"/>
+ </project>
+
</module>
1.1 gump/project/packaged-jetty.xml
Index: packaged-jetty.xml
===================================================================
<?xml version="1.0" ?>
<!--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<module name="packaged-jetty">
<description>
Java HTTP Servlet Server
</description>
<project name="packaged-jetty">
<package>org.mortbay</package>
<jar name="lib/org.mortbay.jetty.jar"/>
<license name="LICENSE.html"/>
</project>
</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
