diff --git a/ant/project.xml b/ant/project.xml index 448727ce..36b23ece 100644 --- a/ant/project.xml +++ b/ant/project.xml @@ -41,6 +41,9 @@ commons-jelly commons-jelly-tags-xml 20030211.142705 + + root.maven + diff --git a/antlr/plugin.jelly b/antlr/plugin.jelly index d3ab01a4..c2c7543e 100644 --- a/antlr/plugin.jelly +++ b/antlr/plugin.jelly @@ -20,8 +20,11 @@ prereqs="antlr:prepare-filesystem"> + + + refid="maven.antlr.compile.src.set"/> ${maven.antlr.grammars} diff --git a/antlr/project.xml b/antlr/project.xml index a54568b3..802ef1b6 100644 --- a/antlr/project.xml +++ b/antlr/project.xml @@ -58,21 +58,33 @@ ant ant 1.5.3-1 + + root + commons-jelly commons-jelly-tags-antlr 20030211.143720 + + root.maven + commons-lang commons-lang 1.0.1 + + root.maven + antlr antlr 2.7.2 + + root + diff --git a/artifact/src/main/org/apache/maven/deploy/deployers/AbstractDeployer.java b/artifact/src/main/org/apache/maven/deploy/deployers/AbstractDeployer.java index cda1197e..d3fdbc2e 100644 --- a/artifact/src/main/org/apache/maven/deploy/deployers/AbstractDeployer.java +++ b/artifact/src/main/org/apache/maven/deploy/deployers/AbstractDeployer.java @@ -63,7 +63,7 @@ import org.apache.maven.deploy.exceptions.TransferFailedException; * * @author Jason van Zyl * @author Michal Maczka - * @version $Id: AbstractDeployer.java,v 1.2 2003/08/02 22:48:39 michal Exp $ + * @version $Id: AbstractDeployer.java,v 1.3 2003/08/19 04:45:05 dion Exp $ */ public abstract class AbstractDeployer implements Deployer { diff --git a/artifact/src/main/org/apache/maven/deploy/deployers/Deployer.java b/artifact/src/main/org/apache/maven/deploy/deployers/Deployer.java index 1e086307..f9c78a5b 100644 --- a/artifact/src/main/org/apache/maven/deploy/deployers/Deployer.java +++ b/artifact/src/main/org/apache/maven/deploy/deployers/Deployer.java @@ -67,7 +67,7 @@ import org.apache.maven.deploy.exceptions.TransferFailedException; * * @author Michal Maczka - * @version $Id: Deployer.java,v 1.4 2003/08/02 22:48:39 michal Exp $ + * @version $Id: Deployer.java,v 1.5 2003/08/19 04:45:05 dion Exp $ */ public interface Deployer { diff --git a/artifact/src/main/org/apache/maven/deploy/deployers/FileDeployer.java b/artifact/src/main/org/apache/maven/deploy/deployers/FileDeployer.java index 2866e40f..22fedeab 100644 --- a/artifact/src/main/org/apache/maven/deploy/deployers/FileDeployer.java +++ b/artifact/src/main/org/apache/maven/deploy/deployers/FileDeployer.java @@ -69,7 +69,7 @@ import org.apache.maven.deploy.exceptions.TransferFailedException; * file system. * * @author Michal Maczka - * @version $Id: FileDeployer.java,v 1.9 2003/08/02 22:48:39 michal Exp $ + * @version $Id: FileDeployer.java,v 1.10 2003/08/19 04:45:05 dion Exp $ */ public class FileDeployer extends AbstractDeployer { diff --git a/artifact/src/main/org/apache/maven/deploy/deployers/GenericSshDeployer.java b/artifact/src/main/org/apache/maven/deploy/deployers/GenericSshDeployer.java index 12a73741..91ccdc2f 100644 --- a/artifact/src/main/org/apache/maven/deploy/deployers/GenericSshDeployer.java +++ b/artifact/src/main/org/apache/maven/deploy/deployers/GenericSshDeployer.java @@ -79,7 +79,7 @@ import com.jcraft.jsch.UserInfo; * and if that doesn't work then we fall back * to using the login and password * - * @version $Id: GenericSshDeployer.java,v 1.6 2003/08/02 22:48:39 michal Exp $ + * @version $Id: GenericSshDeployer.java,v 1.7 2003/08/19 04:45:05 dion Exp $ * @todo still have to account for differing setups for people deploying to * their own sites and to the central repository. * @todo improve exception handling diff --git a/artifact/src/main/org/apache/maven/deploy/deployers/SFtpDeployer.java b/artifact/src/main/org/apache/maven/deploy/deployers/SFtpDeployer.java index e4b08464..f1850cc7 100644 --- a/artifact/src/main/org/apache/maven/deploy/deployers/SFtpDeployer.java +++ b/artifact/src/main/org/apache/maven/deploy/deployers/SFtpDeployer.java @@ -71,7 +71,7 @@ import com.jcraft.jsch.SftpProgressMonitor; * An SSH2/SFTP deployer * * @author Michal Maczka - * @version $Revision: 1.7 $ $Date: 2003/08/02 22:48:39 $ + * @version $Revision: 1.8 $ $Date: 2003/08/19 04:45:05 $ */ public class SFtpDeployer extends GenericSshDeployer { diff --git a/artifact/src/main/org/apache/maven/deploy/deployers/ScpDeployer.java b/artifact/src/main/org/apache/maven/deploy/deployers/ScpDeployer.java index 13054cf4..55fd0424 100644 --- a/artifact/src/main/org/apache/maven/deploy/deployers/ScpDeployer.java +++ b/artifact/src/main/org/apache/maven/deploy/deployers/ScpDeployer.java @@ -77,7 +77,7 @@ import java.util.List; * An SSH2/SCP deployer * * @author Michal Maczka - * @version $Revision: 1.6 $ $Date: 2003/08/02 22:48:39 $ + * @version $Revision: 1.7 $ $Date: 2003/08/19 04:45:05 $ */ public class ScpDeployer extends GenericSshDeployer { diff --git a/artifact/src/main/org/apache/maven/deploy/util/Packager.java b/artifact/src/main/org/apache/maven/deploy/util/Packager.java index c7934203..a96df04e 100644 --- a/artifact/src/main/org/apache/maven/deploy/util/Packager.java +++ b/artifact/src/main/org/apache/maven/deploy/util/Packager.java @@ -70,7 +70,7 @@ import java.util.zip.ZipOutputStream; /** * * @author Michal Maczka - * @version $Id: Packager.java,v 1.1 2003/08/02 22:51:45 michal Exp $ + * @version $Id: Packager.java,v 1.2 2003/08/19 04:45:07 dion Exp $ */ public class Packager { diff --git a/aspectj/project.xml b/aspectj/project.xml index 1c4f62f9..9bfbf25f 100644 --- a/aspectj/project.xml +++ b/aspectj/project.xml @@ -48,14 +48,23 @@ aspectj:aspectjrt 1.0.6 + + root + aspectj:aspectj-ant 1.0.6 + + root + aspectj:aspectj-tools 1.0.6 + + root + diff --git a/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleBodyTag.java b/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleBodyTag.java index dd75b65c..4eb18af8 100644 --- a/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleBodyTag.java +++ b/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleBodyTag.java @@ -3,7 +3,7 @@ package org.apache.maven.cactus.sample; /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2002 The Apache Software Foundation. All rights + * Copyright (c) 2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,7 +69,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport; * * @author Nicholas Lesiecki * - * @version $Id: SampleBodyTag.java,v 1.1 2003/03/22 16:39:10 vmassol Exp $ + * @version $Id: SampleBodyTag.java,v 1.2 2003/08/19 04:45:06 dion Exp $ */ public class SampleBodyTag extends BodyTagSupport { /** diff --git a/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleFilter.java b/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleFilter.java index f1318157..2a56693c 100644 --- a/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleFilter.java +++ b/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleFilter.java @@ -3,7 +3,7 @@ package org.apache.maven.cactus.sample; /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2002 The Apache Software Foundation. All rights + * Copyright (c) 2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -76,7 +76,7 @@ import org.apache.maven.cactus.sample.util.GenericResponseWrapper; * * @author Vincent Massol * - * @version $Id: SampleFilter.java,v 1.1 2003/03/22 16:39:10 vmassol Exp $ + * @version $Id: SampleFilter.java,v 1.2 2003/08/19 04:45:06 dion Exp $ */ public class SampleFilter implements Filter { /** diff --git a/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleServlet.java b/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleServlet.java index 42283357..16bd8e9e 100644 --- a/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleServlet.java +++ b/cactus/sample/src/java/org/apache/maven/cactus/sample/SampleServlet.java @@ -3,7 +3,7 @@ package org.apache.maven.cactus.sample; /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2002 The Apache Software Foundation. All rights + * Copyright (c) 2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -68,7 +68,7 @@ import javax.servlet.http.HttpSession; * @author Vincent Massol * @author Eric Pugh * - * @version $Id: SampleServlet.java,v 1.1 2003/03/22 16:39:10 vmassol Exp $ + * @version $Id: SampleServlet.java,v 1.2 2003/08/19 04:45:06 dion Exp $ */ public class SampleServlet extends HttpServlet { diff --git a/cactus/sample/src/java/org/apache/maven/cactus/sample/util/FilterServletOutputStream.java b/cactus/sample/src/java/org/apache/maven/cactus/sample/util/FilterServletOutputStream.java index 7dc07a27..5b993511 100644 --- a/cactus/sample/src/java/org/apache/maven/cactus/sample/util/FilterServletOutputStream.java +++ b/cactus/sample/src/java/org/apache/maven/cactus/sample/util/FilterServletOutputStream.java @@ -3,7 +3,7 @@ package org.apache.maven.cactus.sample.util; /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2002 The Apache Software Foundation. All rights + * Copyright (c) 2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -73,7 +73,7 @@ import javax.servlet.ServletOutputStream; * * @author Vincent Massol * - * @version $Id: FilterServletOutputStream.java,v 1.1 2003/03/22 16:39:10 vmassol Exp $ + * @version $Id: FilterServletOutputStream.java,v 1.2 2003/08/19 04:45:07 dion Exp $ * * @see GenericResponseWrapper */ diff --git a/cactus/sample/src/java/org/apache/maven/cactus/sample/util/GenericResponseWrapper.java b/cactus/sample/src/java/org/apache/maven/cactus/sample/util/GenericResponseWrapper.java index 452e1c2d..c6c4ef19 100644 --- a/cactus/sample/src/java/org/apache/maven/cactus/sample/util/GenericResponseWrapper.java +++ b/cactus/sample/src/java/org/apache/maven/cactus/sample/util/GenericResponseWrapper.java @@ -3,7 +3,7 @@ package org.apache.maven.cactus.sample.util; /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2002 The Apache Software Foundation. All rights + * Copyright (c) 2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -77,7 +77,7 @@ import javax.servlet.http.HttpServletResponseWrapper; * * @author Vincent Massol * - * @version $Id: GenericResponseWrapper.java,v 1.1 2003/03/22 16:39:10 vmassol Exp $ + * @version $Id: GenericResponseWrapper.java,v 1.2 2003/08/19 04:45:07 dion Exp $ * * @see FilterServletOutputStream */ diff --git a/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestHttpUnitIntegration.java b/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestHttpUnitIntegration.java new file mode 100644 index 00000000..4ed8797b --- /dev/null +++ b/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestHttpUnitIntegration.java @@ -0,0 +1,127 @@ +package org.apache.maven.cactus.sample; + +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2002-2003 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" and + * "Apache Maven" must not be used to endorse or promote products + * derived from this software without prior written permission. For + * written permission, please contact apache@apache.org. + * + * 5. Products derived from this software may not be called "Apache", + * "Apache Maven", nor may "Apache" appear in their name, without + * prior written permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + * ==================================================================== + */ + +import java.io.IOException; +import java.io.PrintWriter; + +import org.apache.cactus.ServletTestCase; + +/** + * Test the HtppUnit integration. + * + * @author Vincent Massol + * + * @version $Id: TestHttpUnitIntegration.java,v 1.2 2003/08/19 04:45:06 dion Exp $ + */ +public class TestHttpUnitIntegration extends ServletTestCase +{ + /** + * Verify that the HttpUnit integration works. + * + * @exception IOException on test failure + */ + public void testHttpUnitGetText() throws IOException + { + PrintWriter pw = response.getWriter(); + + pw.print("something to return for the test"); + } + + /** + * Verify that HttpUnit integration works + * + * @param theResponse the response from the server side. + * + * @exception IOException on test failure + */ + public void endHttpUnitGetText( + com.meterware.httpunit.WebResponse theResponse) throws IOException + { + String text = theResponse.getText(); + + assertEquals("something to return for the test", text); + } + + //------------------------------------------------------------------------- + + /** + * Verify that we can set several headers in the response and + * assert them in endXXX(). + */ + public void testResponseAddHeadersHttpUnit() + { + response.addHeader("X-Access-Header1", "value1"); + response.addHeader("X-Access-Header2", "value2"); + } + + /** + * Verify that we can set several headers in the response and + * assert them in endXXX(). + * + * @param theResponse the response from the server side. + */ + public void endResponseAddHeadersHttpUnit( + com.meterware.httpunit.WebResponse theResponse) + { + String value1 = theResponse.getHeaderField("X-Access-Header1"); + String value2 = theResponse.getHeaderField("X-Access-Header2"); + + assertEquals("value1", value1); + assertEquals("value2", value2); + } +} diff --git a/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleBodyTag.java b/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleBodyTag.java index 670115b0..637dca3d 100644 --- a/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleBodyTag.java +++ b/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleBodyTag.java @@ -3,7 +3,7 @@ package org.apache.maven.cactus.sample; /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2002 The Apache Software Foundation. All rights + * Copyright (c) 2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -70,7 +70,7 @@ import org.apache.cactus.WebResponse; * * @author Nciholas Lesiecki * - * @version $Id: TestSampleBodyTag.java,v 1.2 2003/05/23 21:05:56 vmassol Exp $ + * @version $Id: TestSampleBodyTag.java,v 1.3 2003/08/19 04:45:06 dion Exp $ */ public class TestSampleBodyTag extends JspTestCase { diff --git a/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleFilter.java b/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleFilter.java index 9faffe87..14fc7bc8 100644 --- a/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleFilter.java +++ b/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleFilter.java @@ -3,7 +3,7 @@ package org.apache.maven.cactus.sample; /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2002 The Apache Software Foundation. All rights + * Copyright (c) 2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -77,7 +77,7 @@ import org.apache.cactus.WebResponse; * * @author Vincent Massol * - * @version $Id: TestSampleFilter.java,v 1.1 2003/03/22 16:39:09 vmassol Exp $ + * @version $Id: TestSampleFilter.java,v 1.2 2003/08/19 04:45:06 dion Exp $ */ public class TestSampleFilter extends FilterTestCase { diff --git a/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleServlet.java b/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleServlet.java index 834a61d7..aa9255be 100644 --- a/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleServlet.java +++ b/cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestSampleServlet.java @@ -3,7 +3,7 @@ package org.apache.maven.cactus.sample; /* ==================================================================== * The Apache Software License, Version 1.1 * - * Copyright (c) 2002 The Apache Software Foundation. All rights + * Copyright (c) 2002-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/castor/project.xml b/castor/project.xml index 43119b8b..0be423af 100644 --- a/castor/project.xml +++ b/castor/project.xml @@ -30,6 +30,9 @@ castor 0.9.4.3 + + root + diff --git a/checkstyle/plugin.jelly b/checkstyle/plugin.jelly index 934287fa..4b5467c7 100644 --- a/checkstyle/plugin.jelly +++ b/checkstyle/plugin.jelly @@ -47,14 +47,16 @@ - - - - - - - - + + + + + + + + + + diff --git a/checkstyle/project.xml b/checkstyle/project.xml index a46026e2..8e93dbc5 100644 --- a/checkstyle/project.xml +++ b/checkstyle/project.xml @@ -86,31 +86,49 @@ antlr antlr 2.7.2 + + root + checkstyle checkstyle 3.1 + + root + regexp regexp 1.2 + + root + commons-beanutils commons-beanutils 1.6.1 + + root + commons-collections commons-collections 2.1 + + root + commons-logging commons-logging 1.0.3 + + root + diff --git a/checkstyle/xdocs/changes.xml b/checkstyle/xdocs/changes.xml index 0be7efb0..6dea022b 100644 --- a/checkstyle/xdocs/changes.xml +++ b/checkstyle/xdocs/changes.xml @@ -9,6 +9,10 @@ + + Add maven dependency and classes directory to classpath. This stops + 'Unable to get class information for '<classname>' errors. + Add xml declaration to generated report. Fixed for character encoding. diff --git a/console/project.xml b/console/project.xml index 36c76252..1dc32770 100644 --- a/console/project.xml +++ b/console/project.xml @@ -41,11 +41,17 @@ commons-jelly commons-jelly-tags-interaction 20030211.143817 + + root.maven + commons-jelly commons-jelly-tags-log 20030211.142821 + + root.maven + diff --git a/developer-activity/project.xml b/developer-activity/project.xml index f144f19e..0aa19958 100644 --- a/developer-activity/project.xml +++ b/developer-activity/project.xml @@ -30,12 +30,18 @@ commons-jelly commons-jelly-tags-jsl 20030211.143151 + + root.maven + commons-jelly commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + diff --git a/developer-activity/src/plugin-resources/developer-activity.jsl b/developer-activity/src/plugin-resources/developer-activity.jsl index 35c08682..ab12dc8e 100644 --- a/developer-activity/src/plugin-resources/developer-activity.jsl +++ b/developer-activity/src/plugin-resources/developer-activity.jsl @@ -30,13 +30,14 @@ Number of files changed + - ${name} + ${name} ${commits} ${changedFiles} diff --git a/developer-activity/xdocs/changes.xml b/developer-activity/xdocs/changes.xml index 2c1cf4d6..f995ff7b 100644 --- a/developer-activity/xdocs/changes.xml +++ b/developer-activity/xdocs/changes.xml @@ -7,6 +7,9 @@ + + Add link with team list. + Add xml declaration to generated report. Fixed for character encoding. diff --git a/eclipse/src/plugin-resources/templates/classpath.jelly b/eclipse/src/plugin-resources/templates/classpath.jelly index 9af9a16b..3077036c 100644 --- a/eclipse/src/plugin-resources/templates/classpath.jelly +++ b/eclipse/src/plugin-resources/templates/classpath.jelly @@ -3,33 +3,19 @@ xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant" + xmlns:maven="jelly:maven" xmlns="dummy" trim="true"> - - - - - - - + Contains JUnit tests - - - - - - - + @@ -37,12 +23,8 @@ - - - - - - + + Setting compile of ${testSrcDir} to ${testOutputDir} @@ -83,13 +65,7 @@ Contains Cactus Tests! - - - Cutting off basedir from Cactus source directory - - - - + ${pom.getPluginContext('maven-cactus-plugin').getVariable('plugin').getDependency('cactus').getVersion()} @@ -119,14 +95,9 @@ - - - - - - + Setting default output directory to ${outputDir} - \ No newline at end of file + diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly index ca10c1cc..5f400779 100644 --- a/ejb/plugin.jelly +++ b/ejb/plugin.jelly @@ -100,7 +100,10 @@ - + + diff --git a/ejb/plugin.properties b/ejb/plugin.properties index 677662df..a599d2aa 100644 --- a/ejb/plugin.properties +++ b/ejb/plugin.properties @@ -12,3 +12,7 @@ maven.ejb.manifest=${maven.ejb.descriptordir}/MANIFEST.MF # This list is probably incomplete... # Users' projects can add to the list by setting maven.ejb.client.excludes. maven.ejb.client.base.excludes=**/*Bean.class,**/*CMP.class,**/*Session.class +# Files to include and exclude from ejb +# Note: Files are relative to build.dir +maven.ejb.includes=** +maven.ejb.excludes=**/package.html diff --git a/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml index 08502ae1..48d5dfc7 100644 --- a/ejb/xdocs/changes.xml +++ b/ejb/xdocs/changes.xml @@ -6,6 +6,9 @@ + + Added maven.ejb.excludes and maven.ejb.includes properties. + Added deploy, deploy-snapshot and install-snapshot goals diff --git a/ejb/xdocs/properties.xml b/ejb/xdocs/properties.xml index be86fa87..c586b34f 100644 --- a/ejb/xdocs/properties.xml +++ b/ejb/xdocs/properties.xml @@ -20,6 +20,26 @@ src/ejb + + maven.ejb.includes + Yes + + Files to include in ejb + Note: Files are relative to + ${maven.build.dest}. + + ** + + + maven.ejb.excludes + Yes + + Files to exclude in ejb + Note: Files are relative to + ${maven.build.dest}. + + **/package.html + maven.ejb.client.base.excludes Yes diff --git a/faq/project.xml b/faq/project.xml index 2a30cf2c..ea6eb6a3 100644 --- a/faq/project.xml +++ b/faq/project.xml @@ -44,6 +44,9 @@ commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + diff --git a/file-activity/project.xml b/file-activity/project.xml index de5d0bc7..828028f3 100644 --- a/file-activity/project.xml +++ b/file-activity/project.xml @@ -63,12 +63,18 @@ commons-jelly commons-jelly-tags-jsl 20030211.143151 + + root.maven + commons-jelly commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml index 65aa2f44..56f1f264 100644 --- a/html2xdoc/project.xml +++ b/html2xdoc/project.xml @@ -34,22 +34,34 @@ commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + commons-jelly commons-jelly-tags-html 20030317.100924 http://jakarta.apache.org/commons/jelly/tags/html/ + + root.maven + nekohtml - 0.7.1 + 0.7.7 + + root.maven + commons-logging 1.0.3 + + root.maven + dom4j diff --git a/idea/plugin.jelly b/idea/plugin.jelly index e72b6741..e9af47fd 100644 --- a/idea/plugin.jelly +++ b/idea/plugin.jelly @@ -1,590 +1,39 @@ - + - + + description="Generate IDEA .ipr, .iml and .iws project files"> + + Creating ${basedir}/${pom.artifactId}.ipr ... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - Creating ${basedir}/${pom.artifactId}.iws ... + Creating ${basedir}/${pom.artifactId}.iws ... - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${cvsRoot} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + Creating ${basedir}/${pom.artifactId}.iml ... + + + + + + diff --git a/idea/plugin.properties b/idea/plugin.properties new file mode 100644 index 00000000..00333b93 --- /dev/null +++ b/idea/plugin.properties @@ -0,0 +1,2 @@ +# Project version - v3 for 3.0+; v4 for "Aurora" +maven.idea.project.version=3 \ No newline at end of file diff --git a/idea/project.xml b/idea/project.xml index 61ac512a..ab230ce5 100644 --- a/idea/project.xml +++ b/idea/project.xml @@ -5,7 +5,7 @@ 3 maven-idea-plugin Maven IDEA Plug-in - 1.2 + 1.2-SNAPSHOT IDEA Plugin for Maven http://maven.apache.org/reference/plugins/idea/ /www/maven.apache.org/reference/plugins/idea/ @@ -32,5 +32,14 @@ Java Developer + + Brett Porter + brett + brett@apache.org + f2 network + + Java Developer + + diff --git a/idea/src/plugin-resources/templates/v3/project.jelly b/idea/src/plugin-resources/templates/v3/project.jelly new file mode 100644 index 00000000..8c00ab74 --- /dev/null +++ b/idea/src/plugin-resources/templates/v3/project.jelly @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/idea/src/plugin-resources/templates/v3/workspace.jelly b/idea/src/plugin-resources/templates/v3/workspace.jelly new file mode 100644 index 00000000..70f45a75 --- /dev/null +++ b/idea/src/plugin-resources/templates/v3/workspace.jelly @@ -0,0 +1,457 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${cvsRoot} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/idea/src/plugin-resources/templates/v4/module.jelly b/idea/src/plugin-resources/templates/v4/module.jelly new file mode 100644 index 00000000..952c0805 --- /dev/null +++ b/idea/src/plugin-resources/templates/v4/module.jelly @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/idea/src/plugin-resources/templates/v4/project.jelly b/idea/src/plugin-resources/templates/v4/project.jelly new file mode 100644 index 00000000..f0d21528 --- /dev/null +++ b/idea/src/plugin-resources/templates/v4/project.jelly @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/idea/src/plugin-resources/templates/v4/workspace.jelly b/idea/src/plugin-resources/templates/v4/workspace.jelly new file mode 100644 index 00000000..80cee743 --- /dev/null +++ b/idea/src/plugin-resources/templates/v4/workspace.jelly @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/j2ee/project.xml b/j2ee/project.xml index 7d4377fe..e0f7715b 100644 --- a/j2ee/project.xml +++ b/j2ee/project.xml @@ -67,11 +67,17 @@ ant 1.5.3-1 + + root + commons-jelly commons-jelly-tags-log 20030211.142821 + + root.maven + commons-logging @@ -80,10 +86,16 @@ dom4j 1.4 + + root.maven + xml-apis 1.0.b2 + + root + junit diff --git a/jalopy/plugin.jelly b/jalopy/plugin.jelly index 2c5b37cf..4b702e4b 100644 --- a/jalopy/plugin.jelly +++ b/jalopy/plugin.jelly @@ -1,3 +1,5 @@ + + diff --git a/jar/project.xml b/jar/project.xml index d6aca0a9..b1b976df 100644 --- a/jar/project.xml +++ b/jar/project.xml @@ -21,6 +21,9 @@ commons-jelly commons-jelly-tags-velocity 20030303.205659 + + root.maven + diff --git a/java/plugin.jelly b/java/plugin.jelly index 518fd8e6..908b7c65 100644 --- a/java/plugin.jelly +++ b/java/plugin.jelly @@ -6,6 +6,27 @@ xmlns:define="jelly:define" xmlns:maven="jelly:maven"> + + + + + + + + + + + + + + + + + + + + + @@ -22,27 +43,26 @@ - Compiling to ${maven.build.dest} + Compiling to ${maven.build.dest} - - + - - - - - + debug="${maven.compile.debug}" + deprecation="${maven.compile.deprecation}" + target="${maven.compile.target}" + optimize="${maven.compile.optimize}"> + + + + - + @@ -94,7 +114,7 @@ - java:jar is deprecated and will be removed. Please use jar:jar + java:jar is deprecated and will be removed. Please use jar:jar diff --git a/java/plugin.properties b/java/plugin.properties index e9a7ad7a..b16dad0c 100644 --- a/java/plugin.properties +++ b/java/plugin.properties @@ -4,7 +4,4 @@ maven.jar.manifest = ${maven.conf.dir}/Manifest.mf maven.jar.mainclass = -compileTarget = 1.1 -compileDebug = on -compileOptimize = off -compileDeprecation = off +maven.compile.target = 1.1 \ No newline at end of file diff --git a/jboss/announcements/1.2.ann b/jboss/announcements/1.2.ann new file mode 100644 index 00000000..6710f994 --- /dev/null +++ b/jboss/announcements/1.2.ann @@ -0,0 +1,35 @@ +The Maven team is pleased to announce the JBoss plugin 1.2 release! + +http://maven.apache.org/reference/plugins/jboss + +The Maven JBoss plugin is a plugin containing goals useful for creating +a JBoss server configuration and deploying J2EE modules in it. + +Changes in this version include (last changes first): + +o Fixed bug when using JBoss 3.0.4/Tomcat 4.1.12 is used. When + jboss:start is executed, it causes a NoClassDefFoundError. This was due + to the working directory not being an absolute filename. Thanks to + Willie Wu. +o Copy dependencies using artifact path to allow jar overrides to work +o The plugin now supports JBoss 3.2.x by default. Support for + JBoss 3.0.x is still available by setting the + maven.jboss.version=3.0 property. +o Added default start/stop script that are packaged into the + generated jboss zip. Custom scripts can also be provided by + overriding the maven.jboss.script.dir property. +o When generating the JBoss server configuration zip, exclude + JBoss tmp and log directories from the zip. +o Change strategy for bunding J2EE modules in the jboss server + configuration. This is now achieved through dependencies in + project.xml. for any J2EE module you want to incude add a + jboss.bundle property in the said dependency definition. + +Note that this plugin has been tested with Maven beta 10. Using it with +another version of Maven is at your own risks! :-) + +You can download the JBoss Maven plugin here: +http://www.ibiblio.org/maven/maven/jars/maven-jboss-plugin-1.2.jar + +Have fun! +-Vincent \ No newline at end of file diff --git a/jboss/plugin.jelly b/jboss/plugin.jelly index 277f34d0..403133a0 100644 --- a/jboss/plugin.jelly +++ b/jboss/plugin.jelly @@ -163,8 +163,10 @@ - - + + + + + + + @@ -267,6 +272,9 @@ + + + diff --git a/jboss/project.xml b/jboss/project.xml index 6d439556..e4456204 100644 --- a/jboss/project.xml +++ b/jboss/project.xml @@ -5,7 +5,7 @@ 3 maven-jboss-plugin Maven JBoss Plug-in - 1.2-SNAPSHOT + 1.3-SNAPSHOT Plugin for JBoss. JBoss plugin http://maven.apache.org/reference/plugins/jboss/ @@ -31,6 +31,11 @@ 1.2 1.2 + MAVEN_JBOSS_1_2 + + + 1.3 + 1.3 HEAD @@ -53,8 +58,8 @@ jcej@tragus.org - Willie Wu - ctwillie@ust.hk + Willie Vu + willievu@yahoo.com diff --git a/jboss/src/plugin-resources/run b/jboss/src/plugin-resources/run index c88c1daa..1cad881d 100755 --- a/jboss/src/plugin-resources/run +++ b/jboss/src/plugin-resources/run @@ -3,5 +3,5 @@ # Default JBoss start up shell script. It calls the default script found # in JBOSS_HOME/bin. # ---------------------------------------------------------------------------- -JAVA_OPTS="-Djboss.server.home.dir=@jboss.server.home.dir@ -Djboss.server.home.url=@jboss.server.home.url@" -@maven.jboss.home@/bin/run -c @maven.jboss.conf.name@ +export JAVA_OPTS="-Djboss.server.home.dir=@jboss.server.home.dir@ -Djboss.server.home.url=@jboss.server.home.url@" +@maven.jboss.home@/bin/run.sh -c @maven.jboss.conf.name@ diff --git a/jboss/src/plugin-resources/shutdown.3.0 b/jboss/src/plugin-resources/shutdown.3.0 index 2a9ddaa1..20e01144 100755 --- a/jboss/src/plugin-resources/shutdown.3.0 +++ b/jboss/src/plugin-resources/shutdown.3.0 @@ -3,4 +3,4 @@ # Default JBoss shutdown shell script. It calls the default script found # in JBOSS_HOME/bin. # ---------------------------------------------------------------------------- -@maven.jboss.home@/bin/shutdown @maven.jboss.hostname@ +@maven.jboss.home@/bin/shutdown.sh @maven.jboss.hostname@ diff --git a/jboss/src/plugin-resources/shutdown.3.2 b/jboss/src/plugin-resources/shutdown.3.2 index 9809de7a..769a158a 100755 --- a/jboss/src/plugin-resources/shutdown.3.2 +++ b/jboss/src/plugin-resources/shutdown.3.2 @@ -3,4 +3,4 @@ # Default JBoss shutdown shell script. It calls the default script found # in JBOSS_HOME/bin. # ---------------------------------------------------------------------------- -@maven.jboss.home@/bin/shutdown -S +@maven.jboss.home@/bin/shutdown.sh -S diff --git a/jboss/xdocs/changes.xml b/jboss/xdocs/changes.xml index 32963bac..74c33565 100644 --- a/jboss/xdocs/changes.xml +++ b/jboss/xdocs/changes.xml @@ -7,7 +7,16 @@ - + + + Fixes + MAVEN-570. + Make the JBoss plugin work on unix (JBoss scripts have a sh extension + which we were missing). + + + + Fixed bug when using JBoss 3.0.4/Tomcat 4.1.12 is used. When jboss:start is executed, it causes a diff --git a/jboss/xdocs/index.xml b/jboss/xdocs/index.xml index af368a7e..e4614b2b 100644 --- a/jboss/xdocs/index.xml +++ b/jboss/xdocs/index.xml @@ -21,6 +21,13 @@ Date Description + + 18 Aug 2003 + + Release of version 1.2. Read the + announcement. + + 17 Jun 2003 diff --git a/jboss/xdocs/navigation.xml b/jboss/xdocs/navigation.xml index 5b7b162b..7dd5449e 100644 --- a/jboss/xdocs/navigation.xml +++ b/jboss/xdocs/navigation.xml @@ -13,6 +13,7 @@ + diff --git a/jbuilder/plugin.jelly b/jbuilder/plugin.jelly index c3746a11..035a0e5d 100644 --- a/jbuilder/plugin.jelly +++ b/jbuilder/plugin.jelly @@ -1,3 +1,5 @@ + + - + diff --git a/jdee/plugin.jelly b/jdee/plugin.jelly index 77121824..8763cd25 100644 --- a/jdee/plugin.jelly +++ b/jdee/plugin.jelly @@ -2,6 +2,7 @@ - (quote (jde-sourcepath (quote ("./${pom.build.sourceDirectory}")))) + + (quote (jde-sourcepath (quote ("./${srcDir}")))) (quote (jde-compile-option-directory "./target/classes")) @@ -45,7 +47,8 @@ (quote (jde-global-classpath (quote ("./target/classes" -"./${pom.build.unitTestSourceDirectory}" + +"./${srcDir}" diff --git a/jdepend/project.xml b/jdepend/project.xml index be2d2c48..7b3c8b74 100644 --- a/jdepend/project.xml +++ b/jdepend/project.xml @@ -67,24 +67,39 @@ commons-jelly commons-jelly-tags-jsl 20030211.143151 + + root.maven + commons-jelly commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + jdepend 2.5 + + root.maven + xerces 2.4.0 + + root.maven + xml-apis 1.0.b2 + + root + diff --git a/jdiff/plugin.jelly b/jdiff/plugin.jelly index eb6f5583..4b42c712 100644 --- a/jdiff/plugin.jelly +++ b/jdiff/plugin.jelly @@ -2,6 +2,7 @@ @@ -30,24 +31,26 @@ + - + + + value="${maven.jdiff.new.dir}/${pom.repository.cvsModule}/${relativeSrcDir}"/> @@ -55,7 +58,7 @@ - + @@ -63,15 +66,16 @@ value="${maven.jdiff.dir}/${maven.jdiff.old.tag}"/> + + value="${maven.jdiff.old.dir}/${pom.repository.cvsModule}/${relativeSrcDir}"/> diff --git a/jdiff/project.xml b/jdiff/project.xml index 77e5d802..e1197ea0 100644 --- a/jdiff/project.xml +++ b/jdiff/project.xml @@ -39,6 +39,9 @@ jdiff 1.0.7 + + root + diff --git a/jellydoc/project.xml b/jellydoc/project.xml index b6b7776a..2b4b93ff 100644 --- a/jellydoc/project.xml +++ b/jellydoc/project.xml @@ -43,20 +43,32 @@ commons-jelly-tags-jsl 20030211.143151 http://jakarta.apache.org/commons/jelly/tags/jsl/ + + root.maven + commons-jelly commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + javadoc 1.3 + + root.maven + nekohtml - 0.7.1 + 0.7.7 + + root.maven + diff --git a/jellydoc/xdocs/changes.xml b/jellydoc/xdocs/changes.xml index adfc45b4..dbd575bb 100644 --- a/jellydoc/xdocs/changes.xml +++ b/jellydoc/xdocs/changes.xml @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/junit-report/project.xml b/junit-report/project.xml index 39d49b02..75260ff0 100644 --- a/junit-report/project.xml +++ b/junit-report/project.xml @@ -46,12 +46,18 @@ commons-jelly commons-jelly-tags-jsl 20030211.143151 + + root.maven + commons-jelly commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + diff --git a/junitdoclet/plugin.jelly b/junitdoclet/plugin.jelly index ac263703..6ebe1396 100644 --- a/junitdoclet/plugin.jelly +++ b/junitdoclet/plugin.jelly @@ -1,3 +1,5 @@ + + diff --git a/jxr/plugin.jelly b/jxr/plugin.jelly index c1c292df..56567903 100644 --- a/jxr/plugin.jelly +++ b/jxr/plugin.jelly @@ -72,16 +72,8 @@ - - - - - - - - - - - - - - - + ant 1.5.3-1 + + root + commons-jelly 20030724.033229 + + root.maven + commons-jelly commons-jelly-tags-jsl 20030211.143151 + + root.maven + commons-jelly commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + commons-lang 1.0.1 + + root.maven + dom4j 1.4 + + root.maven + xerces 2.4.0 + + root.maven + oro 2.0.7 + + root.maven + commons-logging @@ -87,6 +111,9 @@ xml-apis 1.0.b2 + + root + diff --git a/jxr/src/main/org/apache/maven/jxr/JXR.java b/jxr/src/main/org/apache/maven/jxr/JXR.java index d92da4e8..1db6db74 100644 --- a/jxr/src/main/org/apache/maven/jxr/JXR.java +++ b/jxr/src/main/org/apache/maven/jxr/JXR.java @@ -66,7 +66,7 @@ import org.apache.tools.ant.DirectoryScanner; * Main entry point into Maven used to kick off the XReference code building. * * @author Kevin A. Burton - * @version $Id: JXR.java,v 1.5 2003/07/31 04:59:32 dion Exp $ + * @version $Id: JXR.java,v 1.6 2003/08/19 04:45:06 dion Exp $ */ public class JXR { diff --git a/jxr/src/main/org/apache/maven/jxr/JxrBean.java b/jxr/src/main/org/apache/maven/jxr/JxrBean.java index 1f8d38fd..f91822f1 100644 --- a/jxr/src/main/org/apache/maven/jxr/JxrBean.java +++ b/jxr/src/main/org/apache/maven/jxr/JxrBean.java @@ -80,7 +80,7 @@ import org.apache.commons.logging.LogFactory; * @author Josh Lucas * @author Jason van Zyl * @author Brian Leonard - * @version $Id: JxrBean.java,v 1.7 2003/08/04 14:35:36 dion Exp $ + * @version $Id: JxrBean.java,v 1.8 2003/08/19 04:45:06 dion Exp $ */ public class JxrBean { diff --git a/latka/project.xml b/latka/project.xml index 7aee4e67..d49d9659 100644 --- a/latka/project.xml +++ b/latka/project.xml @@ -31,36 +31,60 @@ commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + commons-latka 1.0-dev.20030107.163533 + + root.maven + commons-httpclient 2.0alpha1-20020829 + + root.maven + jaxen 1.0-FCS-full + + root.maven + jdom 1.0b8 + + root.maven + junit 3.8.1 + + root + regexp 1.2 http://jakarta.apache.org/regexp/ + + root.maven + xalan 2.4.1 http://xml.apache.org/xalan-j/ + + root + @@ -70,10 +94,16 @@ commons-jelly-tags-html 20030317.100924 http://jakarta.apache.org/commons/jelly/libs/html/ + + root.maven + nekohtml - 0.7.1 + 0.7.7 + + root.maven + diff --git a/license/plugin.jelly b/license/plugin.jelly index 19d8d3f7..8a6e0804 100644 --- a/license/plugin.jelly +++ b/license/plugin.jelly @@ -47,10 +47,10 @@ + name="Project License" + pluginName="maven-license-plugin" + link="license" + description="Displays the primary license for the project."/> @@ -100,6 +100,7 @@ section="Project License" output="${genDocs}/license.xml" inputFile="${licenseFile}"/> + diff --git a/linkcheck/project.xml b/linkcheck/project.xml index c858f568..a7c1cfe3 100644 --- a/linkcheck/project.xml +++ b/linkcheck/project.xml @@ -19,14 +19,23 @@ commons-beanutils 1.6.1 + + root.maven + commons-collections 2.1 + + root.maven + commons-grant 1.0-beta-4 + + root.maven + commons-httpclient @@ -35,49 +44,79 @@ commons-jelly 20030724.033229 + + root.maven + commons-util final + + root.maven + commons-lang 1.0.1 + + root.maven + commons-jelly commons-jelly-tags-jsl 20030211.143151 + + root.maven + commons-jelly commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + commons-jelly commons-jelly-tags-ant 20030211.142045 http://jakarta.apache.org/commons/jelly/libs/ant/ + + root.maven + commons-logging 1.0.3 + + root.maven + log4j 1.2.8 + + root.maven + dom4j 1.4 + + root.maven + jtidy 4aug2000r7-dev + + root.maven + maven @@ -87,11 +126,17 @@ rhino 1.5R4-RC3 js-1.5R4-RC3.jar + + root.maven + werkz - 1.0-beta-11 + 1.0-beta-7 http://werkz.sourceforge.net/ + + root.maven + diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly index 3e25c271..0a8a8390 100644 --- a/multiproject/plugin.jelly +++ b/multiproject/plugin.jelly @@ -60,7 +60,9 @@ - + + + ant-contrib cpptasks 20030309.134440 + + root + bcel 5.0 + + root + diff --git a/pdf/project.xml b/pdf/project.xml index 850fcf03..6fa05da6 100644 --- a/pdf/project.xml +++ b/pdf/project.xml @@ -55,10 +55,16 @@ xerces 2.4.0 + + root + xml-apis 1.0.b2 + + root + xalan diff --git a/perforce/project.xml b/perforce/project.xml index fe7d1ff9..cbb038c6 100644 --- a/perforce/project.xml +++ b/perforce/project.xml @@ -43,10 +43,16 @@ ant 1.5.3-1 + + root + oro 2.0.7 + + root + diff --git a/plugin/project.xml b/plugin/project.xml index 1dde8e00..d240437a 100644 --- a/plugin/project.xml +++ b/plugin/project.xml @@ -40,18 +40,27 @@ commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + commons-jelly commons-jelly-tags-http 20030211.143043 http://jakarta.apache.org/commons/jelly/libs/http/ + + root.maven + commons-httpclient commons-httpclient 2.0-rc1 http://jakarta.apache.org/commons/httpclient/ + + root.maven + diff --git a/pom/project.xml b/pom/project.xml index 4ecaa62f..304e99b4 100644 --- a/pom/project.xml +++ b/pom/project.xml @@ -49,11 +49,17 @@ dom4j 1.4 + + root.maven + xml-apis 1.0.b2 + + root + @@ -65,17 +71,26 @@ isorelax 20030108 + + root + xercesjarv 20020712-DG + + root + xerces 2.4.0 + + root + diff --git a/repository/project.xml b/repository/project.xml index 68690d1d..dcfac0f3 100644 --- a/repository/project.xml +++ b/repository/project.xml @@ -33,12 +33,18 @@ commons-jelly-tags-util 20030211.141939 http://jakarta.apache.org/commons/jelly/libs/util/ + + root.maven + commons-jelly commons-jelly-tags-xml 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + root.maven + diff --git a/repository/src/plugin-resources/repository-audit.xml b/repository/src/plugin-resources/repository-audit.xml index d1b0fce5..0222117f 100644 --- a/repository/src/plugin-resources/repository-audit.xml +++ b/repository/src/plugin-resources/repository-audit.xml @@ -1449,7 +1449,7 @@ Template: tjdo http://tjdo.sourceforge.net/ http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/tjdo/tjdo/docs/LICENSE.txt - + ASF Style diff --git a/runner/project.xml b/runner/project.xml index 943f83e7..121845db 100644 --- a/runner/project.xml +++ b/runner/project.xml @@ -20,6 +20,9 @@ commons-jelly commons-jelly-tags-velocity 20030303.205659 + + root.maven + velocity diff --git a/simian/maven.xml b/simian/maven.xml index defc11d9..c6034d1d 100644 --- a/simian/maven.xml +++ b/simian/maven.xml @@ -14,6 +14,7 @@ + diff --git a/simian/plugin.jelly b/simian/plugin.jelly index ea4f86c4..49fef814 100644 --- a/simian/plugin.jelly +++ b/simian/plugin.jelly @@ -170,4 +170,4 @@ - \ No newline at end of file + diff --git a/simian/project.xml b/simian/project.xml index 41240380..259f2d77 100644 --- a/simian/project.xml +++ b/simian/project.xml @@ -2,7 +2,7 @@ ${basedir}/../project.xml maven-simian-plugin - Simian + Maven Simian Plugin 1.2-SNAPSHOT Simian Plugin for Maven Simian Plugin for Maven @@ -89,14 +89,6 @@ - - - - **/*TestCase.java - - - - maven-simian-plugin diff --git a/statcvs/project.xml b/statcvs/project.xml index 3af100e4..26c9e922 100644 --- a/statcvs/project.xml +++ b/statcvs/project.xml @@ -47,10 +47,16 @@ statcvs 0.1.2a + + root.maven + jfreechart 0.9.2 + + root.maven + diff --git a/struts/project.xml b/struts/project.xml index 401b08af..6f088f87 100644 --- a/struts/project.xml +++ b/struts/project.xml @@ -39,6 +39,9 @@ commons-jelly commons-jelly-tags-log 20030211.142821 + + root.maven + commons-lang @@ -59,10 +62,16 @@ xml-apis 1.0.b2 + + root + ant 1.5.3-1 + + root + xerces diff --git a/test/plugin.jelly b/test/plugin.jelly index 853747ce..5e29aae9 100644 --- a/test/plugin.jelly +++ b/test/plugin.jelly @@ -1,77 +1,88 @@ - - - - + + - - + + - + - - + - Compiling test sources ... - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + - - - - - - - - - - - - - No test sources to compile. - - + + No test source files to compile. + + - - @@ -111,17 +123,12 @@ - - - - - - No tests to run. - - + - --> + + No tests to run. + @@ -155,13 +162,13 @@ description="Execute a single test defined using the 'testcase' variable" prereqs="test:compile"> - - + + You must define the test case to run via -Dtestcase=classname - Example: maven -Dtestcase=MyTest test:single-test + Example: maven -Dtestcase=MyTest test:single @@ -217,13 +224,13 @@ description="Execute all the tests matching the given 'testmatch' variable" prereqs="test:compile"> - - + + You must define the test case to run via -Dtestmatch=pattern - Example: maven -Dtestmatch=*Foo* test:match-test + Example: maven -Dtestmatch=*Foo* test:match diff --git a/test/plugin.properties b/test/plugin.properties index 89ec4e93..ed13ce25 100644 --- a/test/plugin.properties +++ b/test/plugin.properties @@ -10,13 +10,4 @@ maven.junit.usefile = true maven.test.dest = ${maven.build.dir}/test-classes maven.test.reportsDirectory = ${maven.build.dir}/test-reports maven.test.skip = false -maven.junit.jvmargs= - -skipTests = false - -compileDebug = on -compileDeprecation = on -compileOptimize = off - -testDest = ${basedir}/target/test-classes -reportsDirectory = ${basedir}/target/test-reports +maven.junit.jvmargs= \ No newline at end of file diff --git a/test/project.xml b/test/project.xml index 0db60f14..74614eb3 100644 --- a/test/project.xml +++ b/test/project.xml @@ -19,16 +19,25 @@ junit 3.8.1 + + root + xml-apis 1.0.b2 http://xml.apache.org/xerces2-j/ + + root + xerces - 2.0.2 + 2.4.0 http://xml.apache.org/xerces2-j/ + + root + diff --git a/tjdo/.cvsignore b/tjdo/.cvsignore new file mode 100644 index 00000000..31418650 --- /dev/null +++ b/tjdo/.cvsignore @@ -0,0 +1,4 @@ +target +maven.log +velocity.log +build.properties \ No newline at end of file diff --git a/tjdo/plugin.jelly b/tjdo/plugin.jelly new file mode 100644 index 00000000..d385d9a8 --- /dev/null +++ b/tjdo/plugin.jelly @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + JDO-enhancing classes for Triactive JDO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Classes are now JDO-enhanced for Triactive JDO + + + diff --git a/tjdo/plugin.properties b/tjdo/plugin.properties new file mode 100644 index 00000000..39793811 --- /dev/null +++ b/tjdo/plugin.properties @@ -0,0 +1,18 @@ +# ------------------------------------------------------------------- +# P L U G I N P R O P E R T I E S +# ------------------------------------------------------------------- +# Triactive JDO plugin +# Author: Andy Jefferson (andy@ajsoft.net) +# ------------------------------------------------------------------- + +# Parameters for specification of location of JDO files +# Directory root +maven.tjdo.jdo.fileset.dir=${maven.build.dest} +# File Includes +maven.tjdo.jdo.fileset.include=**/*.jdo +# File Excludes +maven.tjdo.jdo.fileset.exclude= + +# Location of any JAR containing the JDBC driver for the data store being used +maven.tjdo.jdbc.jar= + diff --git a/tjdo/project.properties b/tjdo/project.properties new file mode 100644 index 00000000..df6f93f4 --- /dev/null +++ b/tjdo/project.properties @@ -0,0 +1,7 @@ +# ------------------------------------------------------------------- +# P R O J E C T P R O P E R T I E S +# ------------------------------------------------------------------- +maven.xdoc.date=left +maven.xdoc.version=${pom.currentVersion} +maven.license.licenseFile=${basedir}/../../../LICENSE.txt + diff --git a/tjdo/project.xml b/tjdo/project.xml new file mode 100644 index 00000000..c8ad7970 --- /dev/null +++ b/tjdo/project.xml @@ -0,0 +1,27 @@ + + + + ${basedir}/../project.xml + 3 + maven-tjdo-plugin + Maven TJDO plugin + 0.1.1 + + Maven TJDO plugin + http://maven.apache.org/reference/plugins/tjdo/ + /www/maven.apache.org/reference/plugins/tjdo/ + + scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/tjdo/ + http://cvs.apache.org/viewcvs/maven/src/plugins-build/tjdo/ + + + + + + tjdo + tjdo + 2.0-beta + + + + diff --git a/tjdo/xdocs/changes.xml b/tjdo/xdocs/changes.xml new file mode 100644 index 00000000..8359b4cf --- /dev/null +++ b/tjdo/xdocs/changes.xml @@ -0,0 +1,15 @@ + + + + Changes + Andy Jefferson + + + + + + New plugin providing support for TJDO "enhance" method. + + + + diff --git a/tjdo/xdocs/goals.xml b/tjdo/xdocs/goals.xml new file mode 100644 index 00000000..1b6a5b95 --- /dev/null +++ b/tjdo/xdocs/goals.xml @@ -0,0 +1,23 @@ + + + + + Maven TJDO Plug-in Goals + Andy Jefferson + + + +
+ + + + + + +
GoalDescription
tjdo:enhance + This is the default goal of the plugin. It provides the enhancement + of classes to use TJDO for persistence of java classes. +
+
+ + diff --git a/tjdo/xdocs/index.xml b/tjdo/xdocs/index.xml new file mode 100644 index 00000000..c30005ed --- /dev/null +++ b/tjdo/xdocs/index.xml @@ -0,0 +1,17 @@ + + + + + Maven TJDO Plug-in + Andy Jefferson + + + +
+

+ This plugin provides an interface to the Triactive JDO implementation + (TJDO) of Sun's JDO spec. +

+
+ + diff --git a/tjdo/xdocs/navigation.xml b/tjdo/xdocs/navigation.xml new file mode 100644 index 00000000..6e5247dc --- /dev/null +++ b/tjdo/xdocs/navigation.xml @@ -0,0 +1,17 @@ + + + + Maven TJDO Plugin + + + + + + + + + + + + + diff --git a/tjdo/xdocs/properties.xml b/tjdo/xdocs/properties.xml new file mode 100644 index 00000000..0f8d0395 --- /dev/null +++ b/tjdo/xdocs/properties.xml @@ -0,0 +1,38 @@ + + + + TJDO Properties + Andy Jefferson + + + +
+ + + + + + + + + + + + + + + + + +
PropertyOptional?Description
maven.tjdo.jdo.fileset.dirYes + Directory root of the filespace including the JDO files + defining the datastore persistence to be managed by TJDO. + The default is ${maven.build.dest} +
maven.tjdo.jdo.fileset.includeYes + Include pattern of JDO files. The default is **/*.jdo +
maven.tjdo.jdo.fileset.excludeYes + Exclude pattern of JDO files. The default is empty. +
+
+ + diff --git a/touchstone-partner/plugin.jelly b/touchstone-partner/plugin.jelly index c0d71bda..d49b1302 100644 --- a/touchstone-partner/plugin.jelly +++ b/touchstone-partner/plugin.jelly @@ -1,18 +1,11 @@ + xmlns:j="jelly:core"> preGoal for touchstone-goal-C is running ... - - - - inside touchstone-partner : ${plugin.id} + @@ -21,12 +14,7 @@ - - - + diff --git a/touchstone/plugin.properties b/touchstone/plugin.properties index 9f1fa64c..257e5552 100644 --- a/touchstone/plugin.properties +++ b/touchstone/plugin.properties @@ -6,13 +6,7 @@ # ------------------------------------------------------------------- maven.touchstone.A = A -maven.touchstone.B = B +maven.touchstone.B = C maven.touchstone.C = C maven.touchstone.D = D maven.touchstone.E = E - -touchstoneA = A -touchstoneB = B -touchstoneC = C -touchstoneD = D -touchstoneE = E diff --git a/uberjar/project.xml b/uberjar/project.xml index 3482af9c..1522bbe3 100644 --- a/uberjar/project.xml +++ b/uberjar/project.xml @@ -74,6 +74,9 @@ commons-jelly commons-jelly-tags-velocity 20030303.205659 + + root.maven + classworlds diff --git a/war/plugin.jelly b/war/plugin.jelly index a713559d..ca0660b3 100644 --- a/war/plugin.jelly +++ b/war/plugin.jelly @@ -123,9 +123,9 @@ - - - + diff --git a/was40/project.xml b/was40/project.xml index cb4653b6..ec8e0701 100644 --- a/was40/project.xml +++ b/was40/project.xml @@ -40,6 +40,9 @@ commons-jelly-tags-util 20030211.141939 http://jakarta.apache.org/commons/jelly/libs/util/ + + root.maven + diff --git a/wizard/project.xml b/wizard/project.xml index 0173fc5e..02b59120 100644 --- a/wizard/project.xml +++ b/wizard/project.xml @@ -26,16 +26,25 @@ commons-jelly commons-jelly-tags-interaction 20030211.143817 + + root.maven + commons-jelly commons-jelly-tags-log 20030211.142821 + + root.maven + commons-jelly commons-jelly-tags-swing 20030211.143925 + + root.maven + diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly index a207790d..1096afab 100644 --- a/xdoc/plugin.jelly +++ b/xdoc/plugin.jelly @@ -282,6 +282,8 @@ + + - + + + + diff --git a/xdoc/project.xml b/xdoc/project.xml index b05c4f1f..5c29319c 100644 --- a/xdoc/project.xml +++ b/xdoc/project.xml @@ -65,6 +65,9 @@ ant 1.5.3-1 + + root + dom4j @@ -99,6 +102,10 @@ 20030211.142705 http://jakarta.apache.org/commons/jelly/libs/xml/ + + commons-logging + 1.0.3 + maven maven diff --git a/xdoc/src/main/org/apache/maven/DependencyDescriberBean.java b/xdoc/src/main/org/apache/maven/DependencyDescriberBean.java index 1fb0466e..c4b73bdc 100644 --- a/xdoc/src/main/org/apache/maven/DependencyDescriberBean.java +++ b/xdoc/src/main/org/apache/maven/DependencyDescriberBean.java @@ -60,15 +60,20 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.maven.project.Dependency; import org.apache.maven.project.Project; /** * @author Michal Maczka - * @version $Id: DependencyDescriberBean.java,v 1.1 2003/07/25 22:47:30 michal Exp $ + * @version $Id: DependencyDescriberBean.java,v 1.2 2003/08/19 04:45:06 dion Exp $ */ public class DependencyDescriberBean { + /** for debug output */ + private Log log = LogFactory.getLog(DependencyDescriberBean.class); + /** */ private List dependencies = new ArrayList(); private Project project; @@ -100,7 +105,7 @@ public class DependencyDescriberBean Project resolvedProject = resolveProject(dependency); if (resolvedProject != null) { - System.out.println("POM URL:" + resolvedProject.getUrl()); + log.debug("POM URL:" + resolvedProject.getUrl()); describedDependency.setUrl(resolvedProject.getUrl()); describedDependency.setDescription( resolvedProject.getDescription()); @@ -145,13 +150,13 @@ public class DependencyDescriberBean } else { - System.out.println("Failed to read POM:" + projectFile); + log.debug("Failed to read POM:" + projectFile); return null; } } catch (Exception e) { - System.out.println("Failed to read POM:" + projectFile); + log.debug("Failed to read POM:" + projectFile); return null; } } diff --git a/xdoc/src/plugin-resources/css/tigris.css b/xdoc/src/plugin-resources/css/tigris.css index 22c62033..034fc2b1 100644 --- a/xdoc/src/plugin-resources/css/tigris.css +++ b/xdoc/src/plugin-resources/css/tigris.css @@ -1,4 +1,4 @@ -/* $Id: tigris.css,v 1.2 2003/08/04 14:56:59 dion Exp $ +/* $Id: tigris.css,v 1.3 2003/08/19 04:45:08 dion Exp $ This file defines basic default formatting for HTML conforming to Tigris application style. To extend or override these rules for your instance, edit inst.css instead of this file. */ diff --git a/xdoc/src/plugin-resources/images/file.gif b/xdoc/src/plugin-resources/images/file.gif new file mode 100644 index 00000000..72c13cc7 Binary files /dev/null and b/xdoc/src/plugin-resources/images/file.gif differ diff --git a/xdoc/src/plugin-resources/images/folder-closed.gif b/xdoc/src/plugin-resources/images/folder-closed.gif new file mode 100644 index 00000000..2baed621 Binary files /dev/null and b/xdoc/src/plugin-resources/images/folder-closed.gif differ diff --git a/xdoc/src/plugin-resources/images/folder-open.gif b/xdoc/src/plugin-resources/images/folder-open.gif new file mode 100644 index 00000000..3955d19e Binary files /dev/null and b/xdoc/src/plugin-resources/images/folder-open.gif differ diff --git a/xdoc/src/plugin-resources/images/help_logo.gif b/xdoc/src/plugin-resources/images/help_logo.gif index 397d8251..cc25c033 100644 Binary files a/xdoc/src/plugin-resources/images/help_logo.gif and b/xdoc/src/plugin-resources/images/help_logo.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_alertsml.gif b/xdoc/src/plugin-resources/images/icon_alertsml.gif new file mode 100644 index 00000000..641308d1 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_alertsml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_arrowfolder1_sml.gif b/xdoc/src/plugin-resources/images/icon_arrowfolder1_sml.gif new file mode 100644 index 00000000..89408afa Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_arrowfolder1_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_arrowfolder2_sml.gif b/xdoc/src/plugin-resources/images/icon_arrowfolder2_sml.gif new file mode 100644 index 00000000..d9e7e1cf Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_arrowfolder2_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_arrowfolderclosed1_sml.gif b/xdoc/src/plugin-resources/images/icon_arrowfolderclosed1_sml.gif new file mode 100644 index 00000000..c48e8b64 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_arrowfolderclosed1_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_arrowfolderopen2_sml.gif b/xdoc/src/plugin-resources/images/icon_arrowfolderopen2_sml.gif new file mode 100644 index 00000000..477e327c Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_arrowfolderopen2_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_arrowmembers1_sml.gif b/xdoc/src/plugin-resources/images/icon_arrowmembers1_sml.gif new file mode 100644 index 00000000..b4dea830 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_arrowmembers1_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_arrowmembers2_sml.gif b/xdoc/src/plugin-resources/images/icon_arrowmembers2_sml.gif new file mode 100644 index 00000000..0e743574 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_arrowmembers2_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_arrowusergroups1_sml.gif b/xdoc/src/plugin-resources/images/icon_arrowusergroups1_sml.gif new file mode 100644 index 00000000..5177959c Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_arrowusergroups1_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_arrowusergroups2_sml.gif b/xdoc/src/plugin-resources/images/icon_arrowusergroups2_sml.gif new file mode 100644 index 00000000..574bb456 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_arrowusergroups2_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_arrowwaste1_sml.gif b/xdoc/src/plugin-resources/images/icon_arrowwaste1_sml.gif new file mode 100644 index 00000000..25d75f73 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_arrowwaste1_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_arrowwaste2_sml.gif b/xdoc/src/plugin-resources/images/icon_arrowwaste2_sml.gif new file mode 100644 index 00000000..54dbf425 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_arrowwaste2_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_confirmsml.gif b/xdoc/src/plugin-resources/images/icon_confirmsml.gif new file mode 100644 index 00000000..ca3c810b Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_confirmsml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_doc_lrg.gif b/xdoc/src/plugin-resources/images/icon_doc_lrg.gif new file mode 100644 index 00000000..b4582671 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_doc_lrg.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_doc_sml.gif b/xdoc/src/plugin-resources/images/icon_doc_sml.gif new file mode 100644 index 00000000..239bfaad Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_doc_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_error_lrg.gif b/xdoc/src/plugin-resources/images/icon_error_lrg.gif new file mode 100644 index 00000000..fccffd17 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_error_lrg.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_folder_lrg.gif b/xdoc/src/plugin-resources/images/icon_folder_lrg.gif new file mode 100644 index 00000000..3683e75c Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_folder_lrg.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_folder_sml.gif b/xdoc/src/plugin-resources/images/icon_folder_sml.gif new file mode 100644 index 00000000..8e26f89a Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_folder_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_help_lrg.gif b/xdoc/src/plugin-resources/images/icon_help_lrg.gif new file mode 100644 index 00000000..c2162957 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_help_lrg.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_help_sml.gif b/xdoc/src/plugin-resources/images/icon_help_sml.gif new file mode 100644 index 00000000..43bfd56f Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_help_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_info_lrg.gif b/xdoc/src/plugin-resources/images/icon_info_lrg.gif new file mode 100644 index 00000000..b390fd4a Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_info_lrg.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_info_sml.gif b/xdoc/src/plugin-resources/images/icon_info_sml.gif new file mode 100644 index 00000000..c6cb9ad7 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_info_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_infosml.gif b/xdoc/src/plugin-resources/images/icon_infosml.gif new file mode 100644 index 00000000..1aa2d30a Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_infosml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_members_lrg.gif b/xdoc/src/plugin-resources/images/icon_members_lrg.gif new file mode 100644 index 00000000..7ba2df6b Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_members_lrg.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_members_sml.gif b/xdoc/src/plugin-resources/images/icon_members_sml.gif new file mode 100644 index 00000000..997e6998 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_members_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_sortdown.gif b/xdoc/src/plugin-resources/images/icon_sortdown.gif new file mode 100644 index 00000000..9561bbe2 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_sortdown.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_sortleft.gif b/xdoc/src/plugin-resources/images/icon_sortleft.gif new file mode 100644 index 00000000..4fd21e8c Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_sortleft.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_sortright.gif b/xdoc/src/plugin-resources/images/icon_sortright.gif new file mode 100644 index 00000000..ea8076e3 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_sortright.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_sortup.gif b/xdoc/src/plugin-resources/images/icon_sortup.gif new file mode 100644 index 00000000..61942d6d Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_sortup.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_success_lrg.gif b/xdoc/src/plugin-resources/images/icon_success_lrg.gif new file mode 100644 index 00000000..9af317d8 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_success_lrg.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_usergroups_lrg.gif b/xdoc/src/plugin-resources/images/icon_usergroups_lrg.gif new file mode 100644 index 00000000..3a4e3569 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_usergroups_lrg.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_usergroups_sml.gif b/xdoc/src/plugin-resources/images/icon_usergroups_sml.gif new file mode 100644 index 00000000..92361013 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_usergroups_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_warning_lrg.gif b/xdoc/src/plugin-resources/images/icon_warning_lrg.gif new file mode 100644 index 00000000..83359d81 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_warning_lrg.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_warning_sml.gif b/xdoc/src/plugin-resources/images/icon_warning_sml.gif new file mode 100644 index 00000000..873bbb52 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_warning_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_waste_lrg.gif b/xdoc/src/plugin-resources/images/icon_waste_lrg.gif new file mode 100644 index 00000000..e5434aa4 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_waste_lrg.gif differ diff --git a/xdoc/src/plugin-resources/images/icon_waste_sml.gif b/xdoc/src/plugin-resources/images/icon_waste_sml.gif new file mode 100644 index 00000000..6dd046d4 Binary files /dev/null and b/xdoc/src/plugin-resources/images/icon_waste_sml.gif differ diff --git a/xdoc/src/plugin-resources/images/nw_maj.gif b/xdoc/src/plugin-resources/images/nw_maj.gif new file mode 100644 index 00000000..452296b7 Binary files /dev/null and b/xdoc/src/plugin-resources/images/nw_maj.gif differ diff --git a/xdoc/src/plugin-resources/images/nw_maj_hi.gif b/xdoc/src/plugin-resources/images/nw_maj_hi.gif new file mode 100644 index 00000000..54c39336 Binary files /dev/null and b/xdoc/src/plugin-resources/images/nw_maj_hi.gif differ diff --git a/xdoc/src/plugin-resources/images/nw_maj_rond.gif b/xdoc/src/plugin-resources/images/nw_maj_rond.gif new file mode 100644 index 00000000..add42a40 Binary files /dev/null and b/xdoc/src/plugin-resources/images/nw_maj_rond.gif differ diff --git a/xdoc/src/plugin-resources/images/nw_med.gif b/xdoc/src/plugin-resources/images/nw_med.gif new file mode 100644 index 00000000..d2b6d91d Binary files /dev/null and b/xdoc/src/plugin-resources/images/nw_med.gif differ diff --git a/xdoc/src/plugin-resources/images/nw_med_hi.gif b/xdoc/src/plugin-resources/images/nw_med_hi.gif new file mode 100644 index 00000000..0c2db4cf Binary files /dev/null and b/xdoc/src/plugin-resources/images/nw_med_hi.gif differ diff --git a/xdoc/src/plugin-resources/images/nw_med_rond.gif b/xdoc/src/plugin-resources/images/nw_med_rond.gif new file mode 100644 index 00000000..8aaa564e Binary files /dev/null and b/xdoc/src/plugin-resources/images/nw_med_rond.gif differ diff --git a/xdoc/src/plugin-resources/images/nw_min_036.gif b/xdoc/src/plugin-resources/images/nw_min_036.gif new file mode 100644 index 00000000..eb344a8f Binary files /dev/null and b/xdoc/src/plugin-resources/images/nw_min_036.gif differ diff --git a/xdoc/src/plugin-resources/images/nw_min_hi.gif b/xdoc/src/plugin-resources/images/nw_min_hi.gif new file mode 100644 index 00000000..a8a30abf Binary files /dev/null and b/xdoc/src/plugin-resources/images/nw_min_hi.gif differ diff --git a/xdoc/src/plugin-resources/images/poweredby_036.gif b/xdoc/src/plugin-resources/images/poweredby_036.gif new file mode 100644 index 00000000..49d0345d Binary files /dev/null and b/xdoc/src/plugin-resources/images/poweredby_036.gif differ diff --git a/xdoc/src/plugin-resources/images/product_logo.gif b/xdoc/src/plugin-resources/images/product_logo.gif new file mode 100644 index 00000000..327b8388 Binary files /dev/null and b/xdoc/src/plugin-resources/images/product_logo.gif differ diff --git a/xdoc/src/plugin-resources/images/se_maj_rond.gif b/xdoc/src/plugin-resources/images/se_maj_rond.gif new file mode 100644 index 00000000..da2510e9 Binary files /dev/null and b/xdoc/src/plugin-resources/images/se_maj_rond.gif differ diff --git a/xdoc/src/plugin-resources/images/sw_maj_rond.gif b/xdoc/src/plugin-resources/images/sw_maj_rond.gif new file mode 100644 index 00000000..110bdf4e Binary files /dev/null and b/xdoc/src/plugin-resources/images/sw_maj_rond.gif differ diff --git a/xdoc/src/plugin-resources/images/sw_med_rond.gif b/xdoc/src/plugin-resources/images/sw_med_rond.gif new file mode 100644 index 00000000..6671c3d0 Binary files /dev/null and b/xdoc/src/plugin-resources/images/sw_med_rond.gif differ diff --git a/xdoc/src/plugin-resources/templates/cvs-usage.xml b/xdoc/src/plugin-resources/templates/cvs-usage.xml index c2d26155..743aa077 100644 --- a/xdoc/src/plugin-resources/templates/cvs-usage.xml +++ b/xdoc/src/plugin-resources/templates/cvs-usage.xml @@ -29,7 +29,7 @@ #end - #if ($repository.connection) + #if ($repository.connection && $repository.connection != '')

This project's CVS repository can be checked out through anonymous (pserver) @@ -49,7 +49,7 @@

#end - #if ($repository.developerConnection) + #if ($repository.developerConnection && $repository.developerConnection != '') #set ($conn = $repository.getCvsRoot($repository.developerConnection, 'username')) #set ($module = $repository.getCvsModule($repository.developerConnection)) #set ($server = $repository.getCvsServer($repository.developerConnection)) diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index 9e861e62..bccb12f1 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -7,6 +7,10 @@ + + Fixed bug where top level xdocs were using xdocs/navigation.xml instead of the generated + one when it was available. + Dependency report was completely rewritten. Report generator is now aware of notion of type and groupId.