From b623fe0dda3bc06017829c2ea996213d79566aa5 Mon Sep 17 00:00:00 2001 From: dion Date: Tue, 19 Aug 2003 04:45:08 +0000 Subject: [PATCH] Switch stable branch back to HEAD git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113855 13f79535-47bb-0310-9956-ffa450edef68 --- ant/project.xml | 3 + antlr/plugin.jelly | 5 +- antlr/project.xml | 12 + .../deploy/deployers/AbstractDeployer.java | 2 +- .../maven/deploy/deployers/Deployer.java | 2 +- .../maven/deploy/deployers/FileDeployer.java | 2 +- .../deploy/deployers/GenericSshDeployer.java | 2 +- .../maven/deploy/deployers/SFtpDeployer.java | 2 +- .../maven/deploy/deployers/ScpDeployer.java | 2 +- .../apache/maven/deploy/util/Packager.java | 2 +- aspectj/project.xml | 9 + .../maven/cactus/sample/SampleBodyTag.java | 4 +- .../maven/cactus/sample/SampleFilter.java | 4 +- .../maven/cactus/sample/SampleServlet.java | 4 +- .../util/FilterServletOutputStream.java | 4 +- .../sample/util/GenericResponseWrapper.java | 4 +- .../sample/TestHttpUnitIntegration.java | 127 ++++ .../cactus/sample/TestSampleBodyTag.java | 4 +- .../maven/cactus/sample/TestSampleFilter.java | 4 +- .../cactus/sample/TestSampleServlet.java | 2 +- castor/project.xml | 3 + checkstyle/plugin.jelly | 18 +- checkstyle/project.xml | 18 + checkstyle/xdocs/changes.xml | 4 + console/project.xml | 6 + developer-activity/project.xml | 6 + .../plugin-resources/developer-activity.jsl | 3 +- developer-activity/xdocs/changes.xml | 3 + .../templates/classpath.jelly | 45 +- ejb/plugin.jelly | 5 +- ejb/plugin.properties | 4 + ejb/xdocs/changes.xml | 3 + ejb/xdocs/properties.xml | 20 + faq/project.xml | 3 + file-activity/project.xml | 6 + html2xdoc/project.xml | 14 +- idea/plugin.jelly | 583 +----------------- idea/plugin.properties | 2 + idea/project.xml | 11 +- .../templates/v3/project.jelly | 128 ++++ .../templates/v3/workspace.jelly | 457 ++++++++++++++ .../templates/v4/module.jelly | 43 ++ .../templates/v4/project.jelly | 111 ++++ .../templates/v4/workspace.jelly | 302 +++++++++ j2ee/project.xml | 12 + jalopy/plugin.jelly | 2 + jar/project.xml | 3 + java/plugin.jelly | 48 +- java/plugin.properties | 5 +- jboss/announcements/1.2.ann | 35 ++ jboss/plugin.jelly | 12 +- jboss/project.xml | 11 +- jboss/src/plugin-resources/run | 4 +- jboss/src/plugin-resources/shutdown.3.0 | 2 +- jboss/src/plugin-resources/shutdown.3.2 | 2 +- jboss/xdocs/changes.xml | 11 +- jboss/xdocs/index.xml | 7 + jboss/xdocs/navigation.xml | 1 + jbuilder/plugin.jelly | 4 +- jdee/plugin.jelly | 7 +- jdepend/project.xml | 15 + jdiff/plugin.jelly | 16 +- jdiff/project.xml | 3 + jellydoc/project.xml | 14 +- jellydoc/xdocs/changes.xml | 2 +- junit-report/project.xml | 6 + junitdoclet/plugin.jelly | 2 + jxr/plugin.jelly | 20 +- jxr/project.xml | 27 + jxr/src/main/org/apache/maven/jxr/JXR.java | 2 +- .../main/org/apache/maven/jxr/JxrBean.java | 2 +- latka/project.xml | 32 +- license/plugin.jelly | 9 +- linkcheck/project.xml | 47 +- multiproject/plugin.jelly | 4 +- multiproject/plugin.properties | 2 +- native/project.xml | 6 + pdf/project.xml | 6 + perforce/project.xml | 6 + plugin/project.xml | 9 + pom/project.xml | 15 + repository/project.xml | 6 + .../src/plugin-resources/repository-audit.xml | 2 +- runner/project.xml | 3 + simian/maven.xml | 1 + simian/plugin.jelly | 2 +- simian/project.xml | 10 +- statcvs/project.xml | 6 + struts/project.xml | 9 + test/plugin.jelly | 141 +++-- test/plugin.properties | 11 +- test/project.xml | 11 +- tjdo/.cvsignore | 4 + tjdo/plugin.jelly | 76 +++ tjdo/plugin.properties | 18 + tjdo/project.properties | 7 + tjdo/project.xml | 27 + tjdo/xdocs/changes.xml | 15 + tjdo/xdocs/goals.xml | 23 + tjdo/xdocs/index.xml | 17 + tjdo/xdocs/navigation.xml | 17 + tjdo/xdocs/properties.xml | 38 ++ touchstone-partner/plugin.jelly | 18 +- touchstone/plugin.properties | 8 +- uberjar/project.xml | 3 + war/plugin.jelly | 6 +- was40/project.xml | 3 + wizard/project.xml | 9 + xdoc/plugin.jelly | 7 +- xdoc/project.xml | 7 + .../apache/maven/DependencyDescriberBean.java | 13 +- xdoc/src/plugin-resources/css/tigris.css | 2 +- xdoc/src/plugin-resources/images/file.gif | Bin 0 -> 152 bytes .../plugin-resources/images/folder-closed.gif | Bin 0 -> 220 bytes .../plugin-resources/images/folder-open.gif | Bin 0 -> 229 bytes .../src/plugin-resources/images/help_logo.gif | Bin 1997 -> 2113 bytes .../plugin-resources/images/icon_alertsml.gif | Bin 0 -> 154 bytes .../images/icon_arrowfolder1_sml.gif | Bin 0 -> 1082 bytes .../images/icon_arrowfolder2_sml.gif | Bin 0 -> 1080 bytes .../images/icon_arrowfolderclosed1_sml.gif | Bin 0 -> 441 bytes .../images/icon_arrowfolderopen2_sml.gif | Bin 0 -> 664 bytes .../images/icon_arrowmembers1_sml.gif | Bin 0 -> 1073 bytes .../images/icon_arrowmembers2_sml.gif | Bin 0 -> 1072 bytes .../images/icon_arrowusergroups1_sml.gif | Bin 0 -> 1072 bytes .../images/icon_arrowusergroups2_sml.gif | Bin 0 -> 1076 bytes .../images/icon_arrowwaste1_sml.gif | Bin 0 -> 606 bytes .../images/icon_arrowwaste2_sml.gif | Bin 0 -> 609 bytes .../images/icon_confirmsml.gif | Bin 0 -> 94 bytes .../plugin-resources/images/icon_doc_lrg.gif | Bin 0 -> 1335 bytes .../plugin-resources/images/icon_doc_sml.gif | Bin 0 -> 355 bytes .../images/icon_error_lrg.gif | Bin 0 -> 1531 bytes .../images/icon_folder_lrg.gif | Bin 0 -> 1548 bytes .../images/icon_folder_sml.gif | Bin 0 -> 634 bytes .../plugin-resources/images/icon_help_lrg.gif | Bin 0 -> 1418 bytes .../plugin-resources/images/icon_help_sml.gif | Bin 0 -> 1019 bytes .../plugin-resources/images/icon_info_lrg.gif | Bin 0 -> 1383 bytes .../plugin-resources/images/icon_info_sml.gif | Bin 0 -> 606 bytes .../plugin-resources/images/icon_infosml.gif | Bin 0 -> 77 bytes .../images/icon_members_lrg.gif | Bin 0 -> 1570 bytes .../images/icon_members_sml.gif | Bin 0 -> 1023 bytes .../plugin-resources/images/icon_sortdown.gif | Bin 0 -> 117 bytes .../plugin-resources/images/icon_sortleft.gif | Bin 0 -> 121 bytes .../images/icon_sortright.gif | Bin 0 -> 122 bytes .../plugin-resources/images/icon_sortup.gif | Bin 0 -> 117 bytes .../images/icon_success_lrg.gif | Bin 0 -> 1492 bytes .../images/icon_usergroups_lrg.gif | Bin 0 -> 1520 bytes .../images/icon_usergroups_sml.gif | Bin 0 -> 1026 bytes .../images/icon_warning_lrg.gif | Bin 0 -> 1491 bytes .../images/icon_warning_sml.gif | Bin 0 -> 576 bytes .../images/icon_waste_lrg.gif | Bin 0 -> 780 bytes .../images/icon_waste_sml.gif | Bin 0 -> 562 bytes xdoc/src/plugin-resources/images/nw_maj.gif | Bin 0 -> 49 bytes .../src/plugin-resources/images/nw_maj_hi.gif | Bin 0 -> 51 bytes .../plugin-resources/images/nw_maj_rond.gif | Bin 0 -> 51 bytes xdoc/src/plugin-resources/images/nw_med.gif | Bin 0 -> 48 bytes .../src/plugin-resources/images/nw_med_hi.gif | Bin 0 -> 47 bytes .../plugin-resources/images/nw_med_rond.gif | Bin 0 -> 46 bytes .../plugin-resources/images/nw_min_036.gif | Bin 0 -> 45 bytes .../src/plugin-resources/images/nw_min_hi.gif | Bin 0 -> 46 bytes .../plugin-resources/images/poweredby_036.gif | Bin 0 -> 808 bytes .../plugin-resources/images/product_logo.gif | Bin 0 -> 680 bytes .../plugin-resources/images/se_maj_rond.gif | Bin 0 -> 50 bytes .../plugin-resources/images/sw_maj_rond.gif | Bin 0 -> 51 bytes .../plugin-resources/images/sw_med_rond.gif | Bin 0 -> 46 bytes .../plugin-resources/templates/cvs-usage.xml | 4 +- xdoc/xdocs/changes.xml | 4 + 166 files changed, 2110 insertions(+), 827 deletions(-) create mode 100644 cactus/sample/src/test-cactus/org/apache/maven/cactus/sample/TestHttpUnitIntegration.java create mode 100644 idea/plugin.properties create mode 100644 idea/src/plugin-resources/templates/v3/project.jelly create mode 100644 idea/src/plugin-resources/templates/v3/workspace.jelly create mode 100644 idea/src/plugin-resources/templates/v4/module.jelly create mode 100644 idea/src/plugin-resources/templates/v4/project.jelly create mode 100644 idea/src/plugin-resources/templates/v4/workspace.jelly create mode 100644 jboss/announcements/1.2.ann create mode 100644 tjdo/.cvsignore create mode 100644 tjdo/plugin.jelly create mode 100644 tjdo/plugin.properties create mode 100644 tjdo/project.properties create mode 100644 tjdo/project.xml create mode 100644 tjdo/xdocs/changes.xml create mode 100644 tjdo/xdocs/goals.xml create mode 100644 tjdo/xdocs/index.xml create mode 100644 tjdo/xdocs/navigation.xml create mode 100644 tjdo/xdocs/properties.xml create mode 100644 xdoc/src/plugin-resources/images/file.gif create mode 100644 xdoc/src/plugin-resources/images/folder-closed.gif create mode 100644 xdoc/src/plugin-resources/images/folder-open.gif create mode 100644 xdoc/src/plugin-resources/images/icon_alertsml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_arrowfolder1_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_arrowfolder2_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_arrowfolderclosed1_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_arrowfolderopen2_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_arrowmembers1_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_arrowmembers2_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_arrowusergroups1_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_arrowusergroups2_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_arrowwaste1_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_arrowwaste2_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_confirmsml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_doc_lrg.gif create mode 100644 xdoc/src/plugin-resources/images/icon_doc_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_error_lrg.gif create mode 100644 xdoc/src/plugin-resources/images/icon_folder_lrg.gif create mode 100644 xdoc/src/plugin-resources/images/icon_folder_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_help_lrg.gif create mode 100644 xdoc/src/plugin-resources/images/icon_help_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_info_lrg.gif create mode 100644 xdoc/src/plugin-resources/images/icon_info_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_infosml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_members_lrg.gif create mode 100644 xdoc/src/plugin-resources/images/icon_members_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_sortdown.gif create mode 100644 xdoc/src/plugin-resources/images/icon_sortleft.gif create mode 100644 xdoc/src/plugin-resources/images/icon_sortright.gif create mode 100644 xdoc/src/plugin-resources/images/icon_sortup.gif create mode 100644 xdoc/src/plugin-resources/images/icon_success_lrg.gif create mode 100644 xdoc/src/plugin-resources/images/icon_usergroups_lrg.gif create mode 100644 xdoc/src/plugin-resources/images/icon_usergroups_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_warning_lrg.gif create mode 100644 xdoc/src/plugin-resources/images/icon_warning_sml.gif create mode 100644 xdoc/src/plugin-resources/images/icon_waste_lrg.gif create mode 100644 xdoc/src/plugin-resources/images/icon_waste_sml.gif create mode 100644 xdoc/src/plugin-resources/images/nw_maj.gif create mode 100644 xdoc/src/plugin-resources/images/nw_maj_hi.gif create mode 100644 xdoc/src/plugin-resources/images/nw_maj_rond.gif create mode 100644 xdoc/src/plugin-resources/images/nw_med.gif create mode 100644 xdoc/src/plugin-resources/images/nw_med_hi.gif create mode 100644 xdoc/src/plugin-resources/images/nw_med_rond.gif create mode 100644 xdoc/src/plugin-resources/images/nw_min_036.gif create mode 100644 xdoc/src/plugin-resources/images/nw_min_hi.gif create mode 100644 xdoc/src/plugin-resources/images/poweredby_036.gif create mode 100644 xdoc/src/plugin-resources/images/product_logo.gif create mode 100644 xdoc/src/plugin-resources/images/se_maj_rond.gif create mode 100644 xdoc/src/plugin-resources/images/sw_maj_rond.gif create mode 100644 xdoc/src/plugin-resources/images/sw_med_rond.gif 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 0000000000000000000000000000000000000000..72c13cc759802c2e071749a825bded149ec10b18 GIT binary patch literal 152 zcmZ?wbhEHb7(nqS z3nK#qCxZ@124n^Ui>rV~5eK7k=1G1Imkq2k1sn^0u&Ok0Xc(?p(|JeEY{S}CkLH98 oY&#gZJRas1i6~4y&7Je>j_2|#haPktE!w@IJJCmvS&6|K0IVxF2><{9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2baed621d8c7250eddc0f67378c2754f6caa7750 GIT binary patch literal 220 zcmZ?wbhEHblw#mx*v!o^bLPzM?(V9ps{jB0zj^cK%$YN3X=$rgt=h6>%dTC!9zJ{s z6lXvJia%Kx85p=3bU2j-dnMX#ZS|_kb%LmVWx=45d#sABC$pXEzL*o z)Pv+1n;i=z5*V0|vO8K?G&(I@kg%qLsk14mjX`eF#n4bD4TV^*8;M+O%o+{v{ARw8 z;>vB7kSi~AXX8o;P8Md=Rx439ZE|*%FpZLzFLh)w*PJ*ht(~1kQB#OXo3p)e{z6fv KDh^3O25SH_=1CC% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3955d19e52e964149fc4e9b52acd994bf4b67e99 GIT binary patch literal 229 zcmZ?wbhEHblw#mx*v!o^bLPyhuCD+8|G#via%Kx85p=3bUPGVel@SCaw@A4}_-r_L;k0}i;T<_PZOoS?+Or*Z6*%*O-= z5eM$-D-&LA*;eY8&&`zM&&Z_dqgJfU$l0tIP$AqODer2-sxH*Z+95h^y03|#`{{8#F z`uX1d`MUl3y#N00{Pwi{__zJ|xcv9H{rJ87_`&@8;`{mG`uXbp^{)H$ul@G1{PnT> z^sxT=)BgPG{{8d&@u>attNin={rJ}W`Qrcl=KlNT|Ni!W{Oz0j?VbGaqWJ5f`tGFu z^}hY~&HVZ2`R9}I;E?(0miz0O_~@AW>zZw1HoK`|{N#nRqF?*uhy3P=^4x{^Dt!2EZVyBf?qmoti-GTGlfbZ9S?$&+m)O_gBdgsu2=g)cN z&Uod`c*?bEwW43Mp#!>eSJf=rTtOQ48Pt(8}+lUAvcRjH9x zr;k*njZ>qGQlg4cu$Wn{mROQ{N0)y}lY2;yct)OvPMm~In1M@_d`X*wO__mAmw-!+ zbwrDELy2)hg>FEQct(bAL4RjFeP%m*WIBUKYd(BsJ9uC?bX_)bTQz%QI(J_NkWuJk*G*TcUlUfV8Mfb2o4-5un-mmhzuGuG=LE1R92jqVn|3pphAZU zctx}bL4pO4J$(3}LBmGZ+nQfqD5zk7!wMUaZRE+LXAj`OgVUtBwCeCoNERp@*nlDj zLPXGzBUV_qR-&SSXtKnL3O;0(h97?ba!Dc6 zC2>a`UsB@8Bf^Y%qCrp^T9G#ch%=Cy6`9^xztC`LTh7bXaVWi58Vu@<=398DlD(sFU(8*r3i#u=K75tSr~bh}6=$$&c$k=>LtqKHijB;=9g zY&^g?uo5J)h)Ig*v62csF=OOOt_EZ1#dMQAGL<5%w9-i^qdYU_$s(Vq zriV^y(_uI(pEzPU-z52s#^V^2Bse1{iOn`D$12b`U7Itm#@Yyfq;WXgaO0+|6zRf7 zc5URiV;IwI8?n$tm;Z7KGe;vm;)x-nI}kP@r~UB&<)l53HX7Gl5UT@$O`_N#W=#;I zP+LyWHX6xta2#EH*+?bRG1BeOqxkK~C(?`wPLj0KPWFe|tZC3UWG?>A?#voQxj>$a z?WW`cVWYB1ojxG**L1342 z(D3FI4x(j+90#mXE|5$Q)ge=H#Vb&e3Q>^a6tB}oEM(z}Qh-lvj1nBP)Tgzu zO)hxx3mcFmct7!xZA8ek2r^Cw6=GF|6$DfTCrp7r?#Y6G7Q%?eLQo|(HMOc)<`7W` z&5^nHVNiZ#BHQ}^7Ltu_kgXggyT~pQ0YF3mjc=`Mp#o=73uaVr7R7KNM6$@TBZ9*ljV$Ei zK4?E3!Yh)O6Vl8w>5Y&LAZ8IH-v^;a5@^su7YvjLDG$X+jfrSpVU*ecw&4w9j?8dm ztehk@`9Tqd!*SwsCe@NCl55xkhT9=Yk~k@l4j#xpBiTq2LjHrzlURcows3|_+PEHu t_+lE+SVTsD=sb~A0HPR8x$885yQigetuqd zc35(9Rc>xlYHCkrW=vvYNnTz?T3SO^RzOlxJw`?}LP9ZrKR+)wHz_kSCND1|D=Q!) zBO1%gn99nR$H$e%#+1XulET7~x3`J5wurN{hO)ASudjoyu7azpfU2s0r>A|UrhKEL zdZMCvo}PA_n{=9*bC;KKmX>gml5LNVYm19$ii&54hh>I_WP^iZe}7+ldt7&SS#xt% zZ*Nm;Yfxu@XH8>cN?%_`S64w(Q$9~mJ4;JAM@Kb7Lo&?FnaawT$jFw)#+Ajzl*Gi7 z!NHNdyp6iLjJdgsxVVb8wu!a1h_tkava*J;v4ya(gs!fGt*wHrtbwYkfT^i}sHlFX zrhTQQe59m%qM~}Cp?RR7c%GhjoSb!tj=jg4xG zifD<6XNZVqhK6N?gkyq&Vu68SeSKbed0TaLSaft(adA~`ZBlG(QE6#UWMoTWVM$l* zCLJOo8Wj}~5fKd@9v2!K6c!c{5)uvx2?q`i4hsqj2n7WM0s;a70RfZ00#1|Q0xgr^ z0ttU1`2+y~0Mr0100000VE`!r00{p8vj`kWu%N+%2oow?$grWqhY%x5oJcWZpD7YH zHJMSdqsNa=Oi>WE06?-PA5*GqC`MVNL4`b!05DC?%9}U`W=a7Fjv@~pf&mzjvuH{g z5kS<*0MrAdQ@mOjol4P>gd;JVdZ?hx1=WAA55G`wWaO1rDFrNnUCR*C2_;UndhjJ6 z4%@p2%Q%SSO715BCGZL+n5dQqSRy_E1z`Zdkin2gP_p7oS_4}ih5_It6|&$FwtRI$ zMC^bB00iDN{KVQL>rZR9c=57jpq*yT@XYW8U;uzC4qv-&Jypi5U%VJtZ~!cp5Eg&B zJe4^T4M1-=!HHKCUNp@VX4b=t|9?;*1e;&eBv=CSko$J+HxSa(7X5fK<5d@4}^fHbq@v4#$C?65-| zD8hlm8+a^YivR#jQd@Sgb)=z3FPMJ7S@`-%9a)I^+9r@@ z0fQp1h0%~8p$uWbArRsqkQRSrz#)emaOkju9!*>##Sn4u(1srk9J0`B@CqdCqO7G! z(4?2j%bFVn)%pn$4V_EF6(#5}ha53vK|>uq%waPReCklg2ek+iaT=JQa4~D_3g>Pe zZX~TVx*`Ku5D|qow8|%I$Z>@uJItYj7;?;k^VeS^S;QrV?BK=`2%LYR5P`xO+i0Vk z#49Pf1x;EeLwbx7M-F%h|I=2r5tv?K-dm;ajC5gb>1|_O(M)v1|nqF!bU9d#D;5+7N^e{9+fski;Q? z06!g&$PP=e#WWTWGv^V+J^Fi_$3zx|5WeP85dnh(8o)U=aI1fFMX&_~o{<0)Y+?kM zAb~QRaRC4@K~|1~PYtRR!KGLz!g|-Uo0(XHCW?GP76r(K26!+cv*BP4d`JYXFo6k6 zY(NiH_(c~6qr{v10T}=w1qb{vJ~iAx4QMz+8OR_5H0U7{&=?dM>2?z^s6qwSDa9>h z@d{R~Viiqz1uaQL;S2!O4>D!Ui5Bbti$;p)k^qo`S0Kqpqs$->u(-tvo}mB*G(!|r j;Dcv0*2%AMAqHRg0tTeDN>+a2Zney%E_d0GfB*nH2jb~K 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 0000000000000000000000000000000000000000..641308d18f56ad88dc1154b2a167f44406b771cc GIT binary patch literal 154 zcmZ?wbhEHb6lCCM*vtR||NsAAw|)DhnKMsczPx_RmM1S?{`vp^@BjZ*)z#k;6SLyu z-@ktkR0CGap!k!8k%57iK?lSInZdx~zTxCej)fA^3_kxF7BR@XwLA_rYIQ94y-(#&cMn^?J?r@TwEfGI_JH^x?&wBSr78*S@`4 z^W;qVqf=!MPL$q1UUKJX@%!s_@2=Ipxl;4;V%78Wl~2!BJUv(O_;mS)8}+x2mOQ<8 z?81)hbKA1cY{@*eDdWV3^nqW3RP+_x-o@6v=lOA>Z3j^DK?e#gSN?ek-|FNobbH)iwf z=ws{Bj;>8TvL^NL>Xb#(D_72ISkU3Wuq$Bg)bQ1l!&XiVT`?hKd4I^#-ryxYL5sVC z7IX&8Y4zJMBXZreh`w^y>GfVyYdz<*_|9nbo>JpEzumv5Hl{t_v8TkPqrj;x-?1gv zVPd6wW2S9WmR(hnWo4pePNY>{m{D%1QFe%7R+LkUuU?X`VUn-W)5nj)LPIA_oOu2E z_0_9a*VotQoF2v}`8|(F%sBA)sIZdbs+5IJ$NPP+ zTdwTc`0)^@phCiio|VSS-4D*TWL=ebIi+Kge)z2ij?P7&UCfL648$)AsrOHL@q%?< Vr1P-(#&cMn^?J?r@TwEfGI_JH^x?&wBSr78*S@`4 z^W;qVqf=!MPL$q1UUKJX@%!s_@2=Ipxl;4;V%78Wl~2!BJUv(O_;mS)8}+x2mOQ<8 z?81)hbKA1cY{@*eDdWV3^nqW3RP+_x-o@6v=lOA>Z3j^DK?e#gSN?ek-|FNobbH)iwf z=ws{Bj;>8TvL^NL>Xb#(D_72ISkU3Wuq$Bg)bQ1l!&XiVT`?hKd4I^#-ryxYL5sVC z7IX&8Y4zJMBXZreh`w^y>GfVyYdz<*_|9nbo>JpEzumv5Hl{t_v8TkPqrj;x-?1gv zVPd6wW2S9WmR(hnWo4pePNY>{m{D%1QFe%7R+LkUuU?X`VUn-W)5nj)LPIA_oOu2E z_0_9a*VotQ}>rOS>OE1M-4ZaUn|#m&Pe^I}0`+WgfKn?EU5q#j{ckTbCmT;#^5;Wi_LGkK|kyu)1XIuE5|2Uz6v=Lv8Isd9^2 z)u|kt=8@XdEAH39z}TGXGuP6#$1mjYvXcU;@$0r6YHRf| S$wtiN{Q24X@~-^$y8HIY{rl(m?4)DI#)qLX0cHqc$-^X;>!g1BUZ|>H8<<5BN(R=OIe(%|X z)xmqrv}xGDaM8JJ&$nyIv1r`HbJM(TzpHH3!i2n~V7H)Mv6@=Nt!2TfW1xsntCUxz zj#QL=Nsf0$nSxA)Z$hoCs()xbbzV1WQZQCkRg#gB{{H^*^73tMZU6uO0000000000 z00000A^8LW0027xEC2ui03HAj000Koz@2bNES`=?qQuit6`#fi;eaTiRxpDhCkqO%5f~C8#BsF)I=MR| zD<^-j5)>6478b@sH^|CDF((QT7!x8EBOm57U&(YdE20$RA0Q?%H7s&;J1;93?-m~| jG-!x`vWi_(_`RmiVKi_u!{&w>3@8|#ie);ic z$*0FtzdoPyFV|LQ5>OZ!5m)Oz-nyUlF!Y0Gz7yJl5=hHYt_c~+3Y zfmNMv9^VQJ4V^S`;=h0YK7IO>o0|*t1=u%3j8Oc^!pOkj%%B5uHz-aR*uOS7H#N7k z>gjgq=(LC`DH^m+oaAi4!NtnTp{b=~Y@n)dIC*iCEFT9uH#aXY4-YqwnCX%wMyq%P z*Q^s#Q{KE~vhi9uIVlloaY;peGaX$M6KDI&SFYN%81f2=h{%X3shl@8(^b}0Z?a>u zwXk4eak}1ObnAqHp^1&QFb4-G&qcPM8Q=BdmI!Gm%;5-pd{`^umfaZ#_Y4J_%2vN4 z45`d5jjVzlxhonThAYam7`W|v_{Oc7mA@}^N5Lbuc26zkmj!~#t&D8a6Q=IixR`Z= sr)k=Y3e%vrJ{j|VrLBR78(5^Rb3B%cDz|e>Te;=1UQ>E~(SgAl09|h($ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b4dea83017b16654745ea8669167e14ebf3a7633 GIT binary patch literal 1073 zcmZ?wbhEHblxN^)_|5xz@{A6)u7S|L(`v6{1DP~Js4l!{SVPVF9|Ni{_x$EDz4gbDv z{QY71zfa45zL@g+^{fvMr~Z3C@Bj1m|1Y}!zwG`0X8Mye<@b)2yu4WT_FCPOyN56A z$Ue9#`RvxLt9$d$Z7*2fuD*G?%bq1M2Ua8iYWnoSYnB z%z|Thl)xDRia%Kx85rg>=zvs!@&p6Ne+GL_8IKJM4mNWLYfWkK2v}st#owe6(7?dX z!z6n)@p0R^g&l16EE19m%?=(lZ|-C^FBkA=l4g>z5O~1U#@EaAb|v$3Ud6_lO4;N^bvy7<-@1TidV)5`_+B9QT+}WrJOhJ>f zm3*sQG+PgDiP$PsB7H!+nUyze%Y=(AUOZ~$)-P2x5|^lnYOq{TP-;2eqv=_&XGiyh zBMriFvO896RB@l6=-Q*u_%Y}Kv#^{|#Eb=p+4|%i<~bZ($fW9xz@{A6)u7S|L(`v6{1DP~Js4l!{SVPVF9|Ni{_x$EDz4gbDv z{QY71zfa45zL@g+^{fvMr~Z3C@Bj1m|1Y}!zwG`0X8Mye<@b)2yu4WT_FCPOyN56A z$Ue9#`RvxLt9$d$Z7*2fuD*G?%bq1M2Ua8iYWnoSYnB z%z|Thl)xDRia%Kx85rg>=zvs!@&p6Ne+GL_8IKJM4mNWLYfWkK2v}stW~|8)xPXC? zPlCm2*5PBkbDaeZRsRSqNNM0!z(=xL@&eQuuXn7xI|2{4I z_i6dRPb>bvnfmj^lz;E$e0VtZ-}`x2PxkzO-v0kZ*Z-Hj|KCji|7p+vPy7CVIrit< z?f*aTKRHu=?^wyZYqhT~RlmGg_4Zoble>p6pV@L@NA|&0$!E7_o!*>zb#MOVJ$dK0 z7p$F=aeQmVv#WD(NW~qRpQZB&?YLkE|a=hqrPe3#1(TVzkYZlK$YQO6zl0kwi77=wYl-LCUx%*XWbFRy2YP$f2?q~ zr?{6q!#ZzvUscXkZY)b(IGrUJ=Gib$FkrG3VrW)nvKC}A=VdVFWH91jc>4HpSZL^^ zi4!khzPx(%>iYWnoSYnB+5o4KVM{3fWMO1r*vg;-@*yZsFmU{5$mW#s*s$PWGl#H} zPIBu>Q6(;AzBfvTS-K=cRpe40A2~BQD!J{(jzXs6BE2k+uOw`A>fzJ#YPpi}(5cHI z!lL+9jcWk!1SzeICmzK|I`}0F7xC0QJvCJ)a&y|nN1hkXPEydH_2$E-R<23%iCp`t zq)JyEG>xB>!FaiuWu|fB1rbAwFs;z$$PEq;1-*k8`Aim3oa9n|Ew+h6#=#@uAcKs3 z4WI5Jm5c!CUF`e<8Xp`Ew2GAR2;REPenHtIKR`?3LPKKfZxSk(ZNH{T6z3I-N{(ZsU`)JCj(F8N57jncvc&)=goYf(mXeybC_B^ivI3 N8n8C$s+IzSH2}obj8Xsq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..574bb45615b3320126b5d7a7734fd24174772a76 GIT binary patch literal 1076 zcmZ?wbhEHblw;s$_|5!z(=xL@&eQuuXn7xI|2{4I z_i6dRPb>bvnfmj^lz;E$e0VtZ-}`x2PxkzO-v0kZ*Z-Hj|KCji|7p+vPy7CVIrit< z?f*aTKRHu=?^wyZYqhT~RlmGg_4Zoble>p6pV@L@NA|&0$!E7_o!*>zb#MOVJ$dK0 z7p$F=aeQmVv#WD(NW~qRpQZB&?YLkE|a=hqrPe3#1(TVzkYZlK$YQO6zl0kwi77=wYl-LCUx%*XWbFRy2YP$f2?q~ zr?{6q!#ZzvUscXkZY)b(IGrUJ=Gib$FkrG3VrW)nvKC}A=VdVFWH91jc>4HpSZL^^ zi4!khzPx(%>iYWnoSYnB+5o4KVM{3fWMO1r*vg;-@*yZsFmU{5$mW#s*s$PWGl#H} zPIBu>Q6;uSO`998ZJZ*;t6XYKC-w>(`)Bn^COtmJDHF_fsOYF*;v6ZRu#SrdT{|a8 z>Be{jYI=uxH)l0m32;<)pQY?pbD%@8b@`e|d(K^vLQh;L%f@XBaQvj~b7Z;yVy>9a zs-0p6wjL8Kh1q;3uHT%|DLaFeTSRW7iRvj6PeCP5t;grqwjN+?VG-jw@bU2T3rb#1 zY+DsMyx$#UX5q3CC{S#bb#D3gh4Bl=CFxVm*_sj;8X8+Ti{9~^TD*Lsvd=s&L7&)c zM;0zogNz@|>H$lD~_`DCFzWx05=hDq*w;sH1p1!kn=B|zVE^pX- z>Eg|27j8VgdgsOUdoL4em&a5r2*~JmjjTwjUm2P=IiY$$2O{R!-d7 zIAd4W{QaHt_I1qNJ7e{+>8p;;U4L@<_H!$DURb;5(&}9oHtxT&Vc+FV2d->Bcy;Tc zYugTA+jHX9{?m63p1FJY+`U6*?;bgS|HP$-$1grOcH#c%E04}yfAab3kK~4xv(_G; zzwy+%y_a?#yYb-JyNA!;fB5|U-N&zY9>2N$==JkApPs$``1<{qSMNT5`|<1P^@6Lh&aHBLjm!gAT||pg3V*-`(Kf)ZEhA#HOyOXl*0Q z>DD%}jn`P8k&)F*h*@;fye3U2{^^eLl7hk$z32OD^IA+dG}n?ASmiZe+uqsS+=bCh zMsAhoj!9akeAA~pt6Hw|@j2F}#lvT4sH0&eA#%aT_i~G-`Du0|WhJQ#z7HNPcskv} zS=UPZjoahwp=Q=lc2(VujXWH-vVwWFP7jhICotO@ cxLr!uVCqqFWx1d*apKkG90ti^Tr3RM0GdSb!2kdN literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..54dbf42593231e241fe784ce7b9a308f6c82c6a5 GIT binary patch literal 609 zcmZ?wbhEHblx5&&c*Xz%|NsBLb?>D~_`DCFzWx05=hDq*w;sH1p1!kn=B|zVE^pX- z>Eg|27j8VgdgsOUdoL4em&a5r2*~JmjjTwjUm2P=IiY$$2O{R!-d7 zIAd4W{QaHt_I1qNJ7e{+>8p;;U4L@<_H!$DURb;5(&}9oHtxT&Vc+FV2d->Bcy;Tc zYugTA+jHX9{?m63p1FJY+`U6*?;bgS|HP$-$1grOcH#c%E04}yfAab3kK~4xv(_G; zzwy+%y_a?#yYb-JyNA!;fB5|U-N&zY9>2N$==JkApPs$``1<{qSMNT5`|<1P^@6Lh&aHBLjm!gAT||pg3V*-`C*Z)ZEhA#HOyOXl*0Q z>DD%}jn`P8k&)F*h*@;fye3U2{^^eLl7hnX=V|j=OgA*wk``DsN!#Ap+}wrHOh&H7 z`_SPdUM*UteAA~pt6H{td3yTz`1<-CJI=#rXsDxMB_Y!0b>-TPHcj)>>_*B;QWKwE zzuEfgw1u;-mG~qt->+PABg$WPFpDWX`uTZDLjr@mnNP)r0PRan5~mwpTozooNRdTv g8mr}n=Ed&Lf(as;N)2qCed>X3Gb}d;C@@$90C42?9RL6T literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ca3c810bd34f89e9c50a146d9ce7293be75700fe GIT binary patch literal 94 zcmZ?wbhEHb6lCCMn8*ME|NsAIm7qrh{xbbRcn|9|Fr_I})Zi?P}d?Kn}X)yzXH30p>A+P`d literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b4582671abb2d5b9b75d19b4454188dd1611947c GIT binary patch literal 1335 zcmZ?wbhEHbRA5kG_|5x(y^UAXb|>YW!i?!UTz@8z|- zFJdbfMVHTyESViqJS#MRYH-d(|MV`Oiw^cKJTPI&p-IaQ&scqI`l_RI*PooT?!>}PrA;oE2d{2DbZz^Q>)Q@r+i~>9-jlcYoVd0B^qqaDZXY~z z_wc!UhtA$Ta{m6w%a2Z6dU*WegJT!&pT6?w?6oInu0B3@{mJFq&oAA2_VVrLuit-t z`S$bk*B^1!OSH^AlN(k}UVeD$%A-?O9GSKD`23Bh=508+Wb4_*Th1)ne0ts9OS_KW z+~Ke_wno9CvWdOeslZL>*sGiJ$wD}&4;hA z-+y`a?(?G;?>~O|{_V%F-+%rB@xR}1|IeHL@83UQ+=1h8lpr$%6o0ZXGB8YK&;jWO z(3bpzOq>{Oq)-Dkpat=K({8rTq$yix`_-8K(9y ze{YH54C0+CugaR>!ud3Lx|~H}n@h@3S0BdG0KG&{k)ECz6O_)nbUaxsDjBfYYp()R z_f^}Pw3Hk#&hyRd6Ao8-e0;{sE)`Ib^Y?}6nrKetpa})WN4jsd#Bg`qJiT3intJ7@ z7{>`O^nw?4XnHPE=?LiGI%S*BET5f4sYVmn-ZadySkiEY<=T^m8sX*q@>W5w4@^9K ztXC@i7SF1Kk{cU5nB_JWns`iD*#Z_zY;{!Q-CKP@$@JV` znJP!C=b2YmNALe{x0u0~`^0?qmb}X|1eF}>xn#B87aR>^WNMSv?~AegY!G{3W2g$t zi)+%#oh+By69}V=ql`^GO=B@M8NR4fJ4ayK_04r{qR~$8w6dEL4O_#0=X795{B#a7a!yNbdF1$zqXpJ)-C$FzHzVGp}Mw r3L`Ub!UqR7ff)jgY|G1CH_1)y{+~e%x=gCKTIE;}|e2`D5W9WfJ5203n#B`>c{5-B1uFTK9ELKMQo#12A106XAx Bv`hd1 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fccffd17d74756f8332e7e401bd02719f2e95387 GIT binary patch literal 1531 zcmVNk%w1VITk?0QUd@00030|Ns8}{)(T!jtdTv3=f724QUArV+jji7Z|8U zN1sANqh@EP4H0(<40H($TL%io5EZ@;6ub`n5~K|gp$!qA4H1?M5R(iL ziVF^j3lE124}J;_dB*2xf&v(7$M3YDZU{ryj5G_(9z5yF2*D= z%O*0-EIYX=Ho8|}lO8F|F+xfc8B7!!r7b&lAu8LiwCmyG&o)SbA}-4~OHdXa(K=3O z9VcBHB8DwFHHAGuygR60iv3rxYewDa^m$`(RyMvj!g`2#F zoV-+!>%ztpqA)wRObx5U@D#n`>c z+rP`)zRKIf&fdb!-Net|$@7v<*=j`(8?(^~V_xAYu`~3a-`}~nJE}}p`n>{?; z(9qk^(EtDcA^8LW00930EC2ui03ZM$000R80RIUbNU)&6g9fXyTE)s7xQ7rQh72(5y9L-7K!C@OAJ2i)cIp~Ng6}}8{8;ZAGm@t+p8QwMV>e|uae}0GO&H8m>}F0| zNfg{LnE3L^L>SE@r9OnBN|nlnm$s|#;0-(3RKS!4V8e>#2P|E>Tg0jj;OdddzPE7W z^3z9GfirJwF?PK)sjpwZrUI8LHEI;8PolIjB?_`!C`_0vK~iKWkexS~vK{QoZGh*` z1B^Y6Jo!){JaN!~X=Ke{SEA%VVUiSS(W1(i(|D;8<&V39U2o!Cwv3o3+KC)F8l)#q znlfa_NO_`U%+i0aL5}OBXi@Twb>N);DWheh5hOVxbeT4gGiXwV3JKa%hocrO<;|mz zAYsCz_C$S>haGXiu|^vlZNX6!Jv4BF2^IJOpa8-tvkWJ1pz$0QW4OW5MosuofC?yB zkb;B)b#+QosNAy&7+`Qwg%ng|q2NYa`~brW4XAJd1}I{8$|;?FrU`FRJh4O)M0^+k z101Y?K?W>na7TOjw1|!?uGCWr6iz5{#129T;A8+pw4lKT8@O<#K+xQSPKC=^s`YAA=K~z2z(6m zOqWG^=1Uh8m~a6H3^efr2@jOmkZBPJh#{ zTvLrOVQkPs2L{0KK?paHKm!g|tXq&Urz~C9C6%GtCT;?J>m=v&%`e`0~mx hu+$RE(ze)g3of$Al1nbS=(5W!z|5re)&vCv06Pq;x=;WB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3683e75ceb075d5fcfec110d20b03c7f46fc879e GIT binary patch literal 1548 zcmchW?LQL;0LPbO)UBe()2dObD>>VxPkL}eSg0c^Wu=K(c^IP@^RRhnh&HbB(8G*8 zraX0dwhhfz7PCBUj2UK@hq2VBcJ8`A;(jl_Z@+K8KbJGk$81p$00giG__6i%b+x)e zt?p8*d1^IZrTU;$%2ld`zyDUNl=%zug(@XowNk#k_-b{fVRePAT;?q<46J<~`!ts; zpP^1qWY5p$%+Kb@q;!e6S~1rsmo+afbjfBq)>Q9hGhGTfM=tA;&+*qjOQxm#@gcHA zM3sng$47Ff#Fb;C4YSfV>14~Sw0&-dDIQ}iD0t(dZu#8kigHRmC;YNDzq}-sPi9C* z(^LxT*kG1WaBtvU`t)S0M9h#*c1k6@1%;5^7R_Pcxy@zTQhm(Mc_xo}lV zZm$b(ufIM0F>$OnRz01zEF_7#aEn9npFR@i2jZmfqb1xs6Fs-Z?5Od#QDfbaqVC95 zVbY2)X?Y}ZaVTM7FkT@b$oX+|{jsvX*x3*G86JMRH)fg_GxaWdl531YuOGb?Y5vLc2V;e+j1L2KARODMlNw7)6j!<*pV*SFr) z-xPM@Mwk&p9pN9_umi1OwfUEs75)v6ed`LYFv|Tq%24g4sJ7?VTZ;Xf>3&T`*BXni zy?J)^4ejddC&>Cj-?uN(-PM6zF9JKO0$7y+H1Z$S4=z>ZUaX*AsK~iccHg@++v|Cj zS8?WfdWL6B-ep-2At%-)JKE_{qU-$_=f^2$A11iw6Wt#rxlJ%)vTmQwjC4$oaJY-L zPYr`pVw|(@IFZ90(y;a^p>QhRWr<5%p6@{WKOHTx=QqMR^Z8YiUV#dL!BY5c^qgqb3e zsF3h)g#X3(f5Ysn<^}*@7-0EB{NobrN*3j zDpV6R+(-qaIBGW`Pyq-*`PqA*b9yDzDS(ES6j@h%)3d@g=bmmlodHPRTeXFUrvNhg zi#?*;F>nXwU8|#Z7`#7;Qs|ABxmVhR^R{VSWo3M#J36FpK4*#K)H!Y0)MB$kaEP8cDK*VL6}?$NatRSbqX9c(_0Md7cIepgK61?j z%lOb`4d_WHYcHP;3J9v9uakOL7a9f*2cS1SfTBIBo_5AU%o#z05Ylq7(`E~>wFgaO z#?4gB@D!VMadeq3m_DEN2(P_}jP179Z0iSK^co)ZV|=$OcFv?Z(BLK=IIT?jE_evE z*QQ?qb21HyK|R3+l+*$ZlNHQO5Y3%@_6{VRmAuu5<_Y|@&tnB-xb7HS|_Jxi&eR2mJL5oId1qfFFG|owY5LfzFJzOZE>)b0yGvZW5#ZG+ef9L3=};uqcn({l;Zq^R;&;_7OK)0jVUN0}pBTX+|j7$R*>Tk|N*^q>h8m z^T_Ksox?zCh#04&)AWBH_jtdSu^6y)3IZ@`v^7$w4rUE)uLcL0*_LSjG;J-e7(d$vVB0pc!*Y${ mbs=p&IF9+tFXs6IgC{xU!|gRJRrga7pEHap%Q_1OocIT4<@AgI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8e26f89ab658b0e5b7eb531482a90350d07d60d0 GIT binary patch literal 634 zcmV-=0)_oYNk%w1VGsZh0OkMy00030|NsB~m;CsX{`!^u`j!3rmHzye{P&Xl_mlbX zj`{A5`R|SQ?Tq&5iS_7+=GlPv>5BL2itgcs_U4H7<%jg-hvCtC>(+kq@aWvca_`rD z?bUqb%y;6-cHqc$-^X;^#dGi1e(u(N?9_be(R%04dF9P`<<5BH%XjeDf7-=#<=)27 zxNFX~YRt50%Ccz4uxG)lW7@)T*1m7lyl&IGZPB@G&9!RFvuWGIa@DeSXmwBn4fS`y^p^8wgl~=2iR;iIysE|~rk5r|NQ>2Viql;3YiBOz{POz9+u9jGi zcSVuWKAw&O)+9kGS}DF|Ns900000000000A^8LW004XdEC2ui z01yBV000NqfMrTZNJ&q8h$A67PKbP86$}y-RY+h!MmIQOjyD$z5fmy41PB5fG-+Q` zW+Xu(uq8AyAvQ2FM^i|AG%#=v4NiopkpqemCRM^%;qxJh7y}b{ zym&$+NR=#9=jgJn#eIXxVyVbf%Yk}p@<;6dZaksCQjm}rTUM@r3_ UZ`P2pbLXc~FM6UF{TT=VJH%-)MgRZ+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c2162957f52bf2a92c6e3307d14f749e8f388355 GIT binary patch literal 1418 zcmc(e=_At(0LMoPDUEbKJk9k?qjL6m($kY`HbzIYyXsXGV)TmPuul%zZu# zsp%n!&?L%JCWVxeXvc5c^LYM==lkOG`t#!Rbwa|ee+z_wAfO+hjmhP5O?3qT_#%^i zm&qh@xlAf~C>FhuiaMp@Znqc}oWtn7Z0q&0v}?cDeyxCjOo#=T5`i;f9{hP>ioBHpnUpZ5ifg zk(F#8?q`{k>R3c^p{F}#;T;kqk8_HBXen?e)$K`J822u^ig{*8c$sq#m|o>&yOU(f0p!q zIBBpgqOCljh3(&P^Fj^lTs6zLig{K%OBM;p!Wq)~8{*f=jK$|E;}2r^JuzRW2-cgId*pCiL@mpAiWmFx zLClN$(fn>~e`Dy~0v~p+m$AW)oMbqU6VzIIzPaRFPi0{D9duVkKxcUXm+jwP=GT7P zkCEY=n}(#PAo}Y=`s#uo)nE#VuKAfRWm)cZMQ3UXd^q{u9ESJ3T(7%y&x#z6@@!ON zv2Q)|Y(C!UdWLgB3L-ZNev5jll)xKHLHB7BwB=jQyp60ry&P zb}5n`eiR#~Lms!?vaR;49<(X&;x&v}TFj%x=O1U->WAXN+cyQncN*hlWU2{5{l>2s zx-;dA319|gPttHSkNn_Fqr3;INkz48t-`LyuF{ zOoNu0;zkceqWk+31q5AIE-D*YX>`W`H)`zE%j-+can)n#oxG;H^=4`Ow;|iM4xZzl z)Khj0Os%U(mHp>*oSM1v)GVSxYggPDthO*{5X#Q;SU6PQ-JD~jvWpLOJRA~Qm|b-* z%siV@)T8ZIH*h;0_^6X0n|}ac Cw38kH literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..43bfd56ff4d8dd78a36e9a00a424f7b4738a78e3 GIT binary patch literal 1019 zcmZ?wbhEHb&!azI*8lmk;p@A#e}6sr`F`csH>>~s zIP>r4m4CnPoH)?)>&v-+zaISi^`x`TyQbLV#)-NwueSXAa`5A=`Y(4IUtX^MaJ%`- z!``3ICTgkho9T;rJ1HfF>nDck_t$$Yni#ZrV(^M-;VY(xzrSAl`f~M?GvyCXl-@sH za_?Blje~{j=SF|M+xY2L{l}a2@2}UryH@+=O3kZF)h{nrJwIRh>|Ev3a}|$Imp?pJ zcJFxUy%VL!HfDUe161Ge_G<0(3snzKm4Cj|B*e!kE5R-+!C_+}nG&vFlw#3e=e~GC z@VRYSr#5Gt*pR+^X~L~Tg*OfqT-ud;VQ0?Sty!lxXC7FYeEV?G_5B5x_vD%Ah-{o0 zxn)lDy6F)IRwV6Rny_n8{Py{=Tj#}WoE3F!UE0yLsfSjj9ABTletN{(so|?9hpn6# zy1YMRX>ah7o}fitfeShVHq40ZD|ekw@cbMsu7o<}q`shydjmvisL p!{GFbhpkJ$uq=A4eoo%G`Ip_CyB!l`UA7c+>n!QG_@;ru8UVsPTmAq5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b390fd4acff2f7d1634a80e0cdd6220704720a4e GIT binary patch literal 1383 zcmds$|2xwO0LMQomb$L)q%S9TM^~qGJ&&%sDEB-zqb0?m)IDgCOT|Tq zibjT}pG_$bx&Gix{Jm2#cLJhr`(MuU3CDV)FsM|<>8r*5mvaBQNbvn9`$WXe~>vDoeY~PRyp?qBf$597358 zQ^?7qiIQ(U%%_VB$|cyMniN7gfl^=0YPtKUxu{ZF#FUhBU*Pn zWf*%qYg$;Gn>Wvz-Ula9!qLntASI91NMuM-bIVCgX<t(giT7`0z&M-AN@^#!TW3oB2uv_6M$&5~8!Lhk>zZ#LD4L>dN?gbhk2|UuL8UHcmr;YGUm50a*GL6&PhVjELDKJ7 z@bWQ9fXA3gyTFMIu-u|>iCk@Jt1MBY!f4H^*T=~|rT)TIupIEbbHJX;aqG;d^h43s zY&7g=x46@GYxj{{!#xw*3zu!5Q}gb-#%k#>wsLz%b7Bqzf>oK8Qe3RiBfD_yjUNx1WY%a1IW3k3Asse`eoL+ow%vA_Y{`TUaCR#^kS+ zUgYc2a@}HrEd2e97Ta!ELo(Ozx6MTS5O>XnzQNO~6I|zNBi?E4!Rj)7jHhhdgsOUdoQoueZi?7 z>>gViTe&E#V48n=mrru5S3;v}WQB8hiDz7$TU2Fg8RZkU)J)l4H+4sO@7jjxJ4?G(<~7c1nYFul=C0P+d#d`@bj{yi z-npcE!T#Qb2PP~z)H;3B%r(bntUlH>Y2~CvyV|C%UbyM>vTf&9?!2&e&!siHFV0_c zVB`KP8}?n^dg$7Yqc`@PxOMQ%-NWbZ9Xfk=)1K2OFF!hV;r{6>kIr6ua^~ve%eS9j zy7lbD`I|4_et!J??bq+WzI^-n`RfmdkOIfh!pgqYwSCK`t~@$#!^!1aj_y2mzyI{@?vuB79>2N$==JkApPs$`_~ygc*YCf)diVLp z{pXKfy#M&+`?nvze*gIk#Q*;N0|qHLXbBUFKUo+V7>XElKuSSz!oa?}p{S|3rL`#` zEj=M8CWV#D$GthOu#hRgfH^NPHz`Z6or!6tudIJkhF|)EqL_SUmH;#E=*;vU)ut4d z*}1MJ+3|6yK5|W*0YQlwY}}E_93D;*P3)($(!#iHyj&dYc$?gAB*f@)n?~7Mn)5Ze zB*b!gs&gB@F*e|Da`5(ac688Lp~TGAEh5PBlHo`4aV}w%hy?;49h(#+>`NXTD0(SZf(AeeG-00Zf>et@sCNe`+kg9=IZhE_xAYu`~3a-`}}r!dg0>YqNb#cj*V%9R9P@LgbncP&K z+gz2+T%y}$e4$jf;)Y{-ON63jvDJ!acvXdvd40tyd%!7x%q)J$D}2K$g~m9H%0-gX zNtVu3Vuv`M)?cR9ZKl(5uiSliwIzGMD0#Ujc(x{by(oRWEq%EzfW0z=ygHK0O_Rn_ zn$267#bBS#WvbP5tJQc+RY7&KBy_GLa;YM9uq1S>BXg=FcCsaRu_t=5ENYu5ez7%* zyGED9S)$BpoV;+ex~X!eA#kD~Z=oP@r6F;oB6OrDgRnl3x>B3MVx6mqZJHi#o*#9h zDu=B_YnB~pksNoQFIRCWXN($XjU0KKG-ZbvXNDqUfft#ehGBdaUw0H=c@=hmSYC7! zU2zjzY!PK{J5^&4MoSunhJHv*7*|{>M@koXd2C2a5k*EBMn)C={loqJ#6Lb6{rtiG z`n&!3xBmCD{`9Q=@SbdFPXFze{^o}Kc}JgzPn&~Hh;c!BWdgQiUiw0D{G-S`x5gb6Zs#SyZ!cha)t*L-w%Zdst5umJDvjYm+6L$`qH)u_h zDQia%M}QC-^5zW@AT2?A?$B|&)(!4PWXRS{4R9lZW5+kjR#l;*-a59~u6gs;Rlv7* z1U&>$kfL;H1!n{BL$ah^I& zZnLYCB#>dm$Gv;)*o_lcZr;5O&CQnoAV9vn`SL5?;md~)A3b`#nE1>6Jo@zNMVLT2 zQz(r;er55aMj2>iGLUltjCWpnH8>Fm7hilKMlWXdb4D2i8u$-_sv#jAbv_VrKo?hJ zp#>LUfI-FqWi@dJB6#3|#y%ScsNi`V&=ExxR$zg}7IJt&h7wJXVTT=uBsofr_JK%5 z3_CPY#S~P45ylu;#vz9wa}Yv^A%}IKqe~oqS@7 zDz3Pq3k^fWAOsIO0O3Fb3%t;R8Kv&A#~+qlLdheHbh1e)q@dCYE3m-w3jwwonkxe? zprAr9d+?EJvB!48NhzqL!pbYL%t8w;!w^8Nwb*Kl!U-g>Fi9hekZUfw>JmIlEw|v3 z%PzreAg`|Vs!#$6B8;F!8mp`V3%~+vOv^2~d@PJU|7dV+wjN}#fe9jrfCC626rBSL zN*ItxBE0wl3^BwU<4i9!{*wX8A5f4p1~?2|^w%NSP{BV1PyluT1xb(r1{7E@&;%D0 UAotvJ4@7qX5E!L*K>+~(J2ci24FCWD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..997e6998fd4c81ef692362880a94792872f73f16 GIT binary patch literal 1023 zcmZ?wbhEHb6kyxz@{A6)u7S|L(`v6{1DP~Js4l!{SVPVF9|Ni{_x$EDz4gbDv z{QY71zfa45zL@g+^{fvMr~Z3C@Bj1m|1Y}!zwG`0X8Mye<@b)2yu4WT_FCPOyN56A z$Ue9#`RvxLt9$d$Z7*2fuD*G?%bq1M2Ua85Kyq4$`bV8 zXQA&B&wh=i6RJ#JHnC|(oybs9Wt;3HWD^(E=)}OQG+(OKL3Z)Mg9h)TM z*d}7w#Bz*TSk5S7#)89aeew?T91bpW?QG%`;OXfoIDCAfM);Z>MrF004gn4$MUM@K gJ*Vo#?VDoQtmfxA_gcK(+xq`Oplq9?fU9B0wZdiD&sMF8xgvG$ZOwdF25SHo{3VxA_eOO29DO+JV_}nHPlV^3nO-6xA_l75EpIg@Su(rcN;BlIe>#U7yqGujeIRDl5cFM}={qrseF)~;K E0Lh*wBLDyZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..61942d6d1c232805f932d3894fa3efb41dbc31f5 GIT binary patch literal 117 zcmZ?wbhEHbxA_gcI@yYfX-VUD6>PlTrkbJWT=7sA|g@8>OlZzIIWU=08SOCy~C literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9af317d8442bdb5e6b734d9fe71236c4e1dbd952 GIT binary patch literal 1492 zcmV;_1uObTNk%w1VITk?0QUd@00030|Ns8}{)(T!{r&#$@%8xm``O>>(b?wE*yUY$ zqF8g9RBn?@V}(atd_z}tTXvpTahFnRj!^|K)7$6t_W3F|NuROGq_xeu$Jx2Y*x=^wS z>hAMSWPFOEyQa9y@$~oh`18n4^TMt80~vQg?2M zv80N+nq--AKwU>WQ9w&|Q%7q}U6W#(yqs~GaE-%@rrV=_qY@1P{(uStaj+3l} z@b~Ows5W%MKW(@?YqdLEoHJXQGFOu@M|dYhawT!RK5Vu;YO_0MuR3R~Ic2IiUZ6Ev zmoizEF;$K)Z@NBSpEX#LF;k2$QHCu_eJXy;O?J9SiPTqp!cu&vUyQYKn7x5}nP{)c zp1;$wrL>#2#;ncO$M*U3e9c34#6WSnJ#V-?REjNs&_#R8Lwd+UdB{R}#X)MXI#!P_ zRf{fEi7kE1L|m3KREaKPpf+)~K7-RrfXzx+hc}L^dC=O)?eyqUgey^kD^GqZPJ1az zbSd@s^Z)<n0FneQp8WU1BaRX{ae{O*qXSF=LuR&E zNp!~tm{zXHM99Kp8aQpDN|mYxLyfCNjC?rRQ~)Van8Jz`OG|?gArnBn7{JxzwNP;5 z%B3aeOPDZQT(HI1^^KdqfCH!5!iLYEJX=V#C8}};8$E#tCBm~|@r?nPGh;3>!i%0g ze+D6P^kp$)k5ky}0W@fmqf3jV@U@xKgozQjL4*M<`jI72oyHtsdfH=_JA_(88imVL zElx~`3%INqGYBz~B{>?UX(PUBa(W#9?5Z-U0W66oMY=>u(YB4+rqRL*#0R&K&83%Lx zXG;LzT=QN4_QWGhIJz977(pytVL*dQJOM=$UvwhNEZ=a%Q9ZecBg`(mm{HIQ4c>Gg z1f0l1%{0~s$Wb@T9K#DS#i+802L!D^MUF@uafA+NP(#f;)5KGcHyma2%PFdyvI;B6 z)IpF6I*O=;H1o_;PCDv16AU*26atJgsIbyZFTNxbOLPLI;6#}R0Fi(h<$z-jI=YOr z$}_=ab4x3)K&p&0>ny_#83UoQV5XBL#1RgR!Z0(8F}=7FO*GJ~lVMiZ* z2qK6del*euBV{Z>5C=KjPy`Jzz~Dj)M6j@e3Mr(3!U+T1CV~YgWl)3+1s|O7!VW(i u@dzS>0Kx?)J)i&t5G)V@11w7*!2}dE&_D$hSYW{g4rnmb&O8$o5CA*0tKk~} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3a4e356931cad1101df3b2c0aafa12c0fb488625 GIT binary patch literal 1520 zcmVUi zCV?z6#wIr4w7SSNN}*k7%05_5946CEXVzVO(sYn!Vq{`qVRA`ou6n7FXO2oTO*J1q z@$>ij`uxz?<=Efq2`5uWU4C45pHgXyaEh;ooxRA?;q~|Wma4|1w9K)<)V|BzEr)BXCC{rtl7@UZ>*yXoh`;M$J; z__yKRuKM@S`0kDE<(2pErvCP_?&-IPhkgF@sL;oZLO?M5`QiWm_x0w8{_mYCCKB`E zjsEPG#<+O><%ap5b>vp8xZ}dKv0~8|#oc>zPd6lTe^;K&p63 z>aBL#tAMVSfX%q2%V7r3X%xz36Vz=L&TJdlcqQ9_GTetf+lxqAJR{hXS>m2$ZcQ2MUlTo8gj3!zUA#$ghxSQo@(8_sem%y%}^h)>&x>yp9M-};hC&Oqazic$hdqkv;ey&UmuU8^#Ivb@#3dDd~!J&?sIR{rF2%JC= zUq3IWqoI#61ydabg(w4hAptrL0sf$y;L*^>KR@{K@xZ^o{{H^`{r&j(`0?@a=;-L$ z+S+DjX8-^HA^8LW00930EC2ui03ZM$000R80RIUbNU)&6g9sBUT*#21A551rS;{o1 z;X+TA^1zuhU_hfy77>O5G$0HYE?(5+8MG*5L4KYD4LIZF%$bvL9xZhAY15)gfCS?6 z)aZ|)j!19X0V&cF95o#wwfrZl(I7#EkPgVhWlkl8kUo_}2^CVsQHlT^vZHkXmorQa zg1XunDB)MOj+J2+$vy15W<~_Y9Xjmmntp)aug~QK7sqRggRBK)TuPelr7VuP?M-nm_%jz zr|;gBRIM13Og{r%kp?cgEQ3%#%UF@d6b?4gL^8w7LJKXmq%jabt>EI}GWrbEPZc)Q z5Jf-d;iE+-tEl4QEEe9P;6GLz;~|2s2y_nK1S@&QQcIt|5c3N#z)a&QHPnP7 zsyImC@PiOP3=zZ-tUAF;pRf$g6U;BY5aWw4&_E;2H@t%5Ycfdu@I$0SByq&CP`vuf zFToJQsWH$r(+oGGhMM=!WWJ8iYwj1#Xp>A0gXJn!7I1QJM$`^3ckLJ^I?1Q#rCItjZ2 z4?OY2lg&R@XmL*!R74R46HG)=3LC|g(@i%9Z`|?6A-_`!L01Un^M)s9V<$W6sPoRz W@350ij_0`~RMSuY>~u&00RTHZ4*LfH literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..923610139a6c14f11495fc8a99e25153241e3082 GIT binary patch literal 1026 zcmZ?wbhEHb6ky<9!~xDe%{rSJvXjj`uF$8|L5)hUv&L{+57*^ z^#7ms{QtD?|CeKbzTN)+^Zx(8U!R;Qzjv(U-L=|Rm#SZ0ta^K`?#bQ5m(Oguup|56 zs^qgnibREAncsOq|$NlNIGy6(W}t@15@-TRw#UV6 z_lnqW7jWD!<9}Qw^q^AsO0m$Ic>ep9Vt1;fUp31;YE*jMtdd|M_^d-~W0A>*3cLQQ z)P0+legFFTVGhf+9Io@3e7DLaZzaN>%&lV3l)5unO&FpBkbBHM`+f!f^o zS(Cc=hqLYoV%_4;x<6L9+f&?2o?)FgyRRzeDmRv;E}YI14D)Q5Cm1l<3NbXRGFb~U zne#Fjb21olFns;`_3`7!moHxiCJ%5j8J>jVPZmZ7hHVTwAn$?l1Ovx?hFne=j|~eP zo3ggKJe>68frFum-;xyzmnO{7%wBQBsoCW?pNP!{o-LCXvvwQX9kQ{UbogkuHuHUv zlN%4Y@tgZh47W6IA_XJI(YeUB%4KD`(emK)6#_BXC97#-gvMrgaJ` WdUTv{_Ud02v?}Ugm#Ve`gEau$#()?A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..83359d818d05e8bbc90e903cd834f0c92a64a70e GIT binary patch literal 1491 zcmV;^1uXhUNk%w1VITk?0QUd@00030|Ns8}{)(T!u8)zil9py-WR;AZg@20u{r-rH zrkta@ij=T?iK$Rsd2D~Ake<4$waM@C_4)ez`1$)~c$-#adSPvW(b?wE*yY&Y>f7P# zU3sEdbDC6clT2fUM_hbES9M!y^~QfiJ+Xp2r|hf86CNnd|RU42AYc4B|2HAGuy zgR5wRt8j|2a*VQBY>9P^vU`)ZewDa?mbieIxr3Ryg`2#FoV<@;>gnB$I;-+)Z)z5u?n0Y!lmP64z%E)nyXW zWD?F}5zS%|%wZAAU=hb(5y4v!zgrNzSrEKh5W89ss8J55P!6U~4y8{Ho=gp$OAVSz z4S6~W`FIxebrt7s6yO74f%N* zrcx2mXBN+87x{Z0yImLTb|2(&9{GJDuv!@FcOk1@BB^XYPchQ*vX;l!p)>PN5QI zNf3kvp9I(#K!C@OAFoJZlHdqNf?zd!$OOe5;TYm;OY?^p0{x0 z=JA7|0D%TW)?)11Z=c`4fcYuNM^BzS1vuCeRjEXuy?O53wR54^$$-n4FYCy0;2yk< z@5=d8yx3y|eDyd6ST_#BUYj|0?7%_0MuBa{?v2o%Dcg0SJ8Yb?aloiYj@-C!s+;+` z#R!@ZgIy)y#sn0!kp&qCkRy&a+hn5}FRP^D2qXpom_P#0Vb+2<++c&vHPXbhQ9Pdz z@`x&|2$MrWK)g{P7G|KK#s>aiV@);DJi|;f8zu8eE38N|2_BEThaXyVUXsCBD~RC2oIqThL53I`T#*4B5e?8BB$6w3MinAk_aiKn4-r(IcR`^ z6;nLXgax?>S&1c>xN^uSvkW2&DTx#-%Pfl6;=n*MR6#|CH&_q{9emUw#~pUq(Z?Qp z=%Gg-e-J}VIu#Jq0u)Ywv4jyt3=zZ^K>W~!4_oxW!vM40fWk>DfPnB!Sy%bj7w z8LP{2I!WYbmF&-Ixi?j6tD|K1XR2M#l>Aw*aXL%wXS3nYW}{zi=4WzsU5r%E6qx+# za{AThd85YVOsT`KDUrWsBtGknIa3>Sy(4;AS@f^Dxt>-=XPXm#FD(1Lr2hBv=9?3X zZS^!XrNw@)>eiN((2|w-y>{aB1+99DGMA?}+UTggT+(Z*rf8+5x~aWVOGcurtl;&U zIa)H3I&#vwvQjJBn`YHj9iKlB7`)(M#!e{yWMO1rC}Yq8NrU2qfqia6SyOXMYa1sM zM_a34eqyRfcQbQJY;^IYGTuzaxglKLqNQEA}OiQec+sQ#rUUjLqg_MpsPmY43 zsgmVV8EHK$eV-B~6*UcAW2+w%1e4o&9#aAczLGF}PmMg|6J0Ey4q A)Bpeg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e5434aa48adaf4949cb0c28d4ce807de45c36c73 GIT binary patch literal 780 zcmZ?wbhEHbRA5kGc*Xz%|Ns9FC|nVg*;_ebOWl<1UGw&J%-PdDfB(VLcMhMud*s}` zlb0SIzi|KB-51ei^CF99g%?f_$(6h9bU%e!@VnIy#{P2Ql!P)%*>0Q3b zt;zK(lj>H4=1vOC==M)-_e*I@Z(5zzvL?HAZ9(UTg02mPT^mYzH!qkbN~PV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6dd046d467f3cae0b6be35c23e7f619e2b0942f0 GIT binary patch literal 562 zcmZ?wbhEHbD~_`DCFzWx05=hDq*w;sH1p1!kn=B|zVE^pX- z>Eg|27j8VgdgsOUdoL4em&a5r2*~JmjjTwjUm2P=IiY$$2O{R!-d7 zIAd4W{QaHt_I1qNJ7e{+>8p;;U4L@<_H!$DURb;5(&}9oHtxT&Vc+FV2d->Bcy;Tc zYugTA+jHX9{?m63p1FJY+`U6*?;bgS|HP$-$1grOcH#c%E04}yfAab3kK~4xv(_G; zzwy+%y_a?#yYb-JyNA!;fB5|U-N&zY9>2N$==JkApPs$``1<{qSMNT5`|%6tFR=dx zHKF*Eg^_{5lR*dMN>H3Iu=h83HnFKIDq7pfayIpN@*3+iGP0TpF^l$kYC7>xa+H@8 z6rQQgYca{tTuWMDiM_MAxeKG2jND8uQ@%-)oK-D%@bDQL>S$O=h|JV9-@|UCtR!{% z>?8|kT`TdK>Q@=v`E(R6_j28{GgFfjo5^js$Ki&R;7ks^J&x?QpJ#ds8n||GEO2a! Pv#%EvQadBU!C(ylc;?T$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..452296b7b4531d8da30ae402a531a47a5676b145 GIT binary patch literal 49 xcmZ?wbhEHbWMyDwXkcXc4+e@qSr{1@7#VaJfB+=Jz{Jr~KauOaYXE7>4R`087>BE0A4Z;o&W#< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0c2db4cf6f43c6e10ad50de0fb6c71efb30fd577 GIT binary patch literal 47 vcmZ?wbhEHbWMN=oXkcXc4+e@qSr{1@7#VaJfB+=Jz{J+VpSX~RmBAVSM+FOM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8aaa564efd112ab0cd54182167927e9da610cfdd GIT binary patch literal 46 ucmZ?wbhEHbWMN=oXkcXc4+e@qSr{1@7#VaJfB+=Jz{J`j&$u#%!5RQNRSRnX literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eb344a8fde73f8b2ecde36e44adf615b83a5edeb GIT binary patch literal 45 vcmZ?wbhEHbWM*JyXkcVuFi!jb|G(l-79f+6L5BedKr#$WEG@DEfeh9F;N-n5I}G+S%Xk>mT`@#@ACDbw8qcb z;>^s<|Ns900000000000A^8LW000aCEC2ui0A>It000F4aL7rky*TU5I}czej$~<` zXsWKK#J+GW&w)Er;uH>hkK;9+ZUp3kj51rYS7RcdO=c4rrADXHm{RK_9T1_O(jyll^seHza0&eOEkxR)tntjVzCIhCwc4LTQwLXpe!N zo}QSWqN8darl+W>s;jK6uCK7Mva__cwzs&s9t8&p3kwMc1-itn1PKTw!x9As1_Tua z%M=9C7}FEd+Su07!`0j2;=2MM2*Cyi0s;~T3L)pq1t13%2LTA!5(xnb6$>L27?4oT zABA_kVCcI*pj-e23kUFfm;f2Rf%E!Rn5d6HG6c~7CIA$u4g@rZ^(G*^7XVnrmjLm- z45?wF0Gbq7rW`=v9Y_Ko3{GIFk7a-_p2|~fI1$^mN260(4zJ;4RyA^v_ z0?^C%Y6C>DuCc*_Ni_mYI3lHN4|kzjV9A#PKLLMt4-hOCB6Gfr31s(&+^~V=)Cs7c z@VtZJ0M!T6v+yplXT7}#v=w1+@xI&d7<3QS0?AAjKwdmimO~{L#H0WQ<Zz!vswylI0029Qfm$H| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..327b838868e819f867cd1f76a52a7f8886201247 GIT binary patch literal 680 zcmV;Z0$2SM)j$~<` zXsWI(nH)i|7;SwOFA~p%jTVELFn~z-Y>J_hb|mSPF=JB&gen&&oS}zG5~YcNbeamr z2IIowdon~*Po{)R?g|x`1icgv$W20HbyRmveS#%V0~-YjYcdLZLKTw*F$V=OViGTB zTNIrE1CbJLF?$(}W($Z0kE51W0VZCeh!dtza+4I5mu6xGPeW(~3By9gns^+w#1oH0 z$Vw){N~9Cc2bwX=yc51q3d0MU2nDeSTa9P2o6P|SdI^t4rs@enI1)3w| zPp%%{B!pu_U=^24Jml2~ox%;O?OiR4lt$ zI8%^>CIU}j8hg`%T}DkXV*yMVZV|x%B`KKFgRbeLM*uq%Fu-k6Ed_d%#`wd6o61=i zCJ|jJbb?0iV_NM_tozAe9(7iz4e^ zQ3Ou5mHBdlyO{ATSFXVL0=L1D0dDNIvVu=6OH(9?yK^gMKUz-_SOzUzR0*0eO~7RB z90iCIh85%VXc(QkoG1}#jfH}M=L7^yke;C~6a #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.