svn commit: r17806 - trunk: . modules/dev modules/dev/src/org/argouml/dev modules/dev/src/org/argouml/dev/test modules/jscheme src src/argouml-app src/argouml-app/lib src/argouml-app/src/bin src/argouml-app/src/org/argouml/i18n src/argouml-app/src/org/argouml/notation src/argouml-app/src/org/argouml/notation/providers/java src/argouml-app/src/org/argouml/notation/providers/uml src/argouml-app/src/org/argouml/notation/ui src/argouml-app/src/org/argouml/profile src/argouml-app/src/org/argouml/profile/profiles/uml14 src/argouml-app/tests/org/argouml/profile src/argouml-app/tests/org/argouml/profile/internal src/argouml-build src/argouml-core-diagrams-activity2 src/argouml-core-diagrams-class2 src/argouml-core-diagrams-sequence2 src/argouml-core-diagrams-sequence2/src/org/argouml/i18n src/argouml-core-diagrams-structure2 src/argouml-core-diagrams-uml2 src/argouml-cor
Linus Tolke <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: linus
Date: 2010-01-12 10:21:28-0800
New Revision: 17806
Modified:
trunk/build.bat (props changed)
trunk/build.sh (props changed)
trunk/build.xml (props changed)
trunk/modules/dev/build.properties (props changed)
trunk/modules/dev/plugin.properties (props changed)
trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java (contents, props changed)
trunk/modules/dev/src/org/argouml/dev/DevActionFactory.java (contents, props changed)
trunk/modules/dev/src/org/argouml/dev/EventPumpInspectorPanel.java (contents, props changed)
trunk/modules/dev/src/org/argouml/dev/test/TestPanel.java (contents, props changed)
trunk/modules/jscheme/build.sh (props changed)
trunk/src/argouml-app/build.properties (props changed)
trunk/src/argouml-app/lib/antlr.LICENSE.txt (contents, props changed)
trunk/src/argouml-app/plugin.properties (props changed)
trunk/src/argouml-app/plugin.xml (props changed)
trunk/src/argouml-app/src/bin/argouml.sh (props changed)
trunk/src/argouml-app/src/bin/argouml2.bat (props changed)
trunk/src/argouml-app/src/bin/argouml2.sh (props changed)
trunk/src/argouml-app/src/org/argouml/i18n/wfr.properties (contents, props changed)
trunk/src/argouml-app/src/org/argouml/notation/package.html (props changed)
trunk/src/argouml-app/src/org/argouml/notation/providers/java/package.html (props changed)
trunk/src/argouml-app/src/org/argouml/notation/providers/uml/package.html (props changed)
trunk/src/argouml-app/src/org/argouml/notation/ui/package.html (props changed)
trunk/src/argouml-app/src/org/argouml/profile/package.html (props changed)
trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/README.txt (contents, props changed)
trunk/src/argouml-app/tests/org/argouml/profile/internal/package.html (props changed)
trunk/src/argouml-app/tests/org/argouml/profile/package.html (props changed)
trunk/src/argouml-build/build.bat (props changed)
trunk/src/argouml-core-diagrams-activity2/build.properties (props changed)
trunk/src/argouml-core-diagrams-activity2/build.xml (contents, props changed)
trunk/src/argouml-core-diagrams-activity2/plugin.properties (props changed)
trunk/src/argouml-core-diagrams-class2/build.properties (props changed)
trunk/src/argouml-core-diagrams-class2/build.xml (contents, props changed)
trunk/src/argouml-core-diagrams-class2/plugin.properties (props changed)
trunk/src/argouml-core-diagrams-sequence2/build.properties (props changed)
trunk/src/argouml-core-diagrams-sequence2/build.xml (props changed)
trunk/src/argouml-core-diagrams-sequence2/plugin.properties (props changed)
trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/i18n/button.properties (contents, props changed)
trunk/src/argouml-core-diagrams-structure2/build.properties (props changed)
trunk/src/argouml-core-diagrams-structure2/build.xml (contents, props changed)
trunk/src/argouml-core-diagrams-structure2/plugin.properties (props changed)
trunk/src/argouml-core-diagrams-uml2/build.properties (props changed)
trunk/src/argouml-core-diagrams-uml2/build.xml (contents, props changed)
trunk/src/argouml-core-diagrams-uml2/plugin.properties (props changed)
trunk/src/argouml-core-infra/build.properties (props changed)
trunk/src/argouml-core-infra/build.xml (props changed)
trunk/src/argouml-core-infra/plugin.properties (props changed)
trunk/src/argouml-core-model-euml/build.bat (props changed)
trunk/src/argouml-core-model-euml/build.properties (props changed)
trunk/src/argouml-core-model-euml/build.xml (contents, props changed)
trunk/src/argouml-core-model-euml/build2.bat (props changed)
trunk/src/argouml-core-model-euml/plugin.properties (props changed)
trunk/src/argouml-core-model-euml/plugin.xml (props changed)
trunk/src/argouml-core-model-mdr/build.bat (props changed)
trunk/src/argouml-core-model-mdr/build/java/readme-build-java.txt (props changed)
trunk/src/argouml-core-model-mdr/build2.bat (props changed)
trunk/src/argouml-core-model-mdr/lib/README.txt (props changed)
trunk/src/argouml-core-model-mdr/lib/jmi-license.txt (props changed)
trunk/src/argouml-core-model-mdr/lib/licenses.txt (props changed)
trunk/src/argouml-core-model-mdr/lib/mof-license.txt (props changed)
trunk/src/argouml-core-model-mdr/lib/versioninfo.txt (props changed)
trunk/src/argouml-core-model-mdr/plugin.xml (props changed)
trunk/src/argouml-core-model-mdr/src/README.txt (props changed)
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/mof/01-02-15.xml (props changed)
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/mof/01-02-15_Diff.xml (props changed)
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/mof/01-12-02_Diff.xml (props changed)
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/mof/01-12-02_Diff_openmodel.xml (props changed)
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/mof/ActionUML_Interchange_Metamodel_FTF_omg_Diff.xml (props changed)
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/mof/README.txt (props changed)
trunk/src/argouml-core-model-mdr/tests/org/argouml/model/mdr/package.html (props changed)
trunk/src/argouml-core-model-mdr/tools/lib/mdrant-patched.txt (props changed)
trunk/src/argouml-core-model/plugin.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/build.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Abstraction.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Association.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/AssociationClass.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/AssociationEnd.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Attribute.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Class.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Comment.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Datatype.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Enumeration.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/EnumerationLiteral.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Exception.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Generalization.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Interface.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Operation.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Package.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Parameter.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Signal.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Stereotype.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/Usage.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels-hand.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/xslt/01-02-15.xml (props changed)
trunk/src/argouml-core-umlpropertypanels/xslt/test.xml (props changed)
trunk/src/build.bat (props changed)
trunk/tools/apache-ant-1.7.0/bin/ant.bat (props changed)
trunk/tools/apache-ant-1.7.0/bin/antRun.bat (props changed)
trunk/tools/apache-ant-1.7.0/bin/lcp.bat (props changed)
trunk/tools/apache-ant-1.7.0/fetch.xml (props changed)
trunk/tools/apache-ant-1.7.0/get-m2.xml (props changed)
trunk/tools/apache-ant-1.7.0/lib/libraries.properties (props changed)
trunk/tools/checkstyle-4.3/build.xml (contents, props changed)
trunk/tools/checkstyle-4.3/checkstyle_checks.xml (contents, props changed)
trunk/tools/checkstyle-4.3/import-control.xml (contents, props changed)
trunk/tools/checkstyle-4.3/pom-optional.xml (contents, props changed)
trunk/tools/checkstyle-4.3/pom.xml (contents, props changed)
trunk/tools/checkstyle-4.3/sun_checks.xml (contents, props changed)
trunk/tools/checkstyle-4.3/suppressions.xml (contents, props changed)
trunk/tools/cobertura-1.9/lib/jakarta-oro-license.txt (props changed)
trunk/tools/cobertura-1.9/lib/log4j-license.txt (props changed)
trunk/tools/cruisecontrol/build-argouml.xml (contents, props changed)
trunk/tools/cruisecontrol/config.xml (contents, props changed)
trunk/tools/cruisecontrol/emailmap.properties (props changed)
trunk/tools/eclipse/eclipse-argo-codetemplates.xml (props changed)
trunk/tools/fop-0.20.5/fop.bat (props changed)
trunk/tools/fop-0.20.5/xalan.bat (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/AbstractParser.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/ClassFileParser.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/DependencyConstraint.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/FileManager.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/JDepend.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/JavaClass.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/JavaClassBuilder.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/JavaPackage.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/PackageComparator.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/PackageFilter.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/ParserListener.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/framework/PropertyConfigurator.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/swingui/AboutDialog.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/swingui/AfferentNode.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/swingui/DependTree.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/swingui/DependTreeModel.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/swingui/EfferentNode.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/swingui/JDepend.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/swingui/PackageNode.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/swingui/StatusPanel.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/textui/JDepend.java (props changed)
trunk/tools/jdepend-2.9/src/jdepend/xmlui/JDepend.java (props changed)
trunk/tools/junit-3.8.2/README.html (props changed)
trunk/tools/junit-3.8.2/cpl-v10.html (props changed)
trunk/tools/pmd-4.0/bin/build.xml (props changed)
trunk/tools/pmd-4.0/bin/cpd.sh (props changed)
trunk/tools/pmd-4.0/bin/cpdgui.bat (props changed)
trunk/tools/pmd-4.0/bin/cygwin-run.sh (props changed)
trunk/tools/pmd-4.0/bin/designer.bat (props changed)
trunk/tools/pmd-4.0/bin/designer.sh (props changed)
trunk/tools/pmd-4.0/bin/pmd.bat (props changed)
trunk/tools/pmd-4.0/bin/pmd.sh (props changed)
trunk/tools/pmd-4.0/etc/LICENSE.txt (props changed)
trunk/tools/pmd-4.0/etc/changelog.txt (props changed)
trunk/www/docs/max_talanov_2007/index.html (props changed)
trunk/www/documentation/printablehtml/manual/argomanual.html (props changed)
trunk/www/googlessoc2008.html (props changed)
trunk/www/gsoc2007/index.html (props changed)
trunk/www/gsoc2007/profiles/index.html (props changed)
trunk/www/gsoc2007/profiles/index_arquivos/colorschememapping.xml (contents, props changed)
trunk/www/gsoc2007/profiles/index_arquivos/filelist.xml (contents, props changed)
trunk/www/gsoc2007/profiles/proposal0/argouml-profiles.txt (contents, props changed)
trunk/www/gsoc2007/profiles/proposal0/index.html (contents, props changed)
trunk/www/gsoc2007/profiles/tutorial/index_arquivos/colorschememapping.xml (props changed)
trunk/www/gsoc2007/profiles/tutorial/index_arquivos/filelist.xml (props changed)
trunk/www/gsoc2008/index.html (contents, props changed)
trunk/www/index2.html (props changed)
trunk/www/profiles/uml14/README.txt (props changed)
trunk/www/proposals/eclipse-plugin-handler/index.html (props changed)
trunk/www/proposals/iconproposal/index.html (props changed)
trunk/www/proposals/sequencediagrams/index.html (props changed)
trunk/www/psf/index.html (props changed)
trunk/www/support.html (props changed)
trunk/www/tours/explorer.html (props changed)
trunk/www/v05/bugs.txt (props changed)
trunk/www/v07/changes.txt (props changed)
Log:
Fixed properties.
Modified: trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java 2010-01-12 10:21:28-0800
@@ -1,56 +1,56 @@
-// $Id$
-// Copyright (c) 2006 The Regents of the University of California. All
-// Rights Reserved. Permission to use, copy, modify, and distribute this
-// software and its documentation without fee, and without a written
-// agreement is hereby granted, provided that the above copyright notice
-// and this paragraph appear in all copies. This software program and
-// documentation are copyrighted by The Regents of the University of
-// California. The software program and documentation are supplied "AS
-// IS", without any accompanying services from The Regents. The Regents
-// does not warrant that the operation of the program will be
-// uninterrupted or error-free. The end-user understands that the program
-// was developed for research purposes and is advised not to rely
-// exclusively on the program for any reason. IN NO EVENT SHALL THE
-// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-package org.argouml.dev;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-
-//import org.argouml.uml.diagram.sequence.MessageNode;
-
-/**
- * TODO: Add Javadoc
- *
- * @author Bob Tarling
- */
-public class CallerListNodeBuilder {
-
- // TODO: Refers to old sequence diagram implementation - needs to be updated
-
-// public static void addNodeTree(
-// DefaultMutableTreeNode treeNode,
-// MessageNode mn) {
-// List callers = mn.getCallers();
-// if (callers != null) {
-// for (Iterator it = callers.iterator(); it.hasNext(); ) {
-// Object o = it.next();
-// DefaultMutableTreeNode tn =
-// new DefaultMutableTreeNode(o.getClass().getName());
-// treeNode.add(tn);
-// }
-// }
-// }
-}
+// $Id$
+// Copyright (c) 2006 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.dev;
+
+import java.util.Iterator;
+import java.util.List;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+
+//import org.argouml.uml.diagram.sequence.MessageNode;
+
+/**
+ * TODO: Add Javadoc
+ *
+ * @author Bob Tarling
+ */
+public class CallerListNodeBuilder {
+
+ // TODO: Refers to old sequence diagram implementation - needs to be updated
+
+// public static void addNodeTree(
+// DefaultMutableTreeNode treeNode,
+// MessageNode mn) {
+// List callers = mn.getCallers();
+// if (callers != null) {
+// for (Iterator it = callers.iterator(); it.hasNext(); ) {
+// Object o = it.next();
+// DefaultMutableTreeNode tn =
+// new DefaultMutableTreeNode(o.getClass().getName());
+// treeNode.add(tn);
+// }
+// }
+// }
+}
Modified: trunk/modules/dev/src/org/argouml/dev/DevActionFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/DevActionFactory.java?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/modules/dev/src/org/argouml/dev/DevActionFactory.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/DevActionFactory.java 2010-01-12 10:21:28-0800
@@ -1,67 +1,67 @@
-// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
-// Copyright (c) 2009 The Regents of the University of California. All
-// Rights Reserved. Permission to use, copy, modify, and distribute this
-// software and its documentation without fee, and without a written
-// agreement is hereby granted, provided that the above copyright notice
-// and this paragraph appear in all copies. This software program and
-// documentation are copyrighted by The Regents of the University of
-// California. The software program and documentation are supplied "AS
-// IS", without any accompanying services from The Regents. The Regents
-// does not warrant that the operation of the program will be
-// uninterrupted or error-free. The end-user understands that the program
-// was developed for research purposes and is advised not to rely
-// exclusively on the program for any reason. IN NO EVENT SHALL THE
-// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-package org.argouml.dev;
-
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-
-import org.argouml.model.Model;
-import org.argouml.ui.ContextActionFactory;
-
-/**
- * Test factory for dev module context actions
- *
- * @author Bob
- */
-public class DevActionFactory implements ContextActionFactory {
-
- public List createContextPopupActions(Object element) {
- // TODO: Auto-generated method stub
- List list = null;
- if (Model.getFacade().isAClass(element)) {
- list = new ArrayList(1);
- Icon img = new ImageIcon(
- ClassLoader.getSystemResource("org/argouml/dev/test.gif"));
- list.add(new TestAction("Test Action", img));
- }
- return list;
- }
-
- class TestAction extends AbstractAction {
-
- public TestAction(String name, Icon icon) {
- super(name, icon);
- }
-
- public void actionPerformed(ActionEvent arg0) {
- }
-
- }
-}
+// $Id$
+// Copyright (c) 2009 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.dev;
+
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+
+import org.argouml.model.Model;
+import org.argouml.ui.ContextActionFactory;
+
+/**
+ * Test factory for dev module context actions
+ *
+ * @author Bob
+ */
+public class DevActionFactory implements ContextActionFactory {
+
+ public List createContextPopupActions(Object element) {
+ // TODO: Auto-generated method stub
+ List list = null;
+ if (Model.getFacade().isAClass(element)) {
+ list = new ArrayList(1);
+ Icon img = new ImageIcon(
+ ClassLoader.getSystemResource("org/argouml/dev/test.gif"));
+ list.add(new TestAction("Test Action", img));
+ }
+ return list;
+ }
+
+ class TestAction extends AbstractAction {
+
+ public TestAction(String name, Icon icon) {
+ super(name, icon);
+ }
+
+ public void actionPerformed(ActionEvent arg0) {
+ }
+
+ }
+}
Modified: trunk/modules/dev/src/org/argouml/dev/EventPumpInspectorPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/EventPumpInspectorPanel.java?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/modules/dev/src/org/argouml/dev/EventPumpInspectorPanel.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/EventPumpInspectorPanel.java 2010-01-12 10:21:28-0800
@@ -1,131 +1,131 @@
-// $Id: EventPumpInspectorPanel.java 11132 2006-09-06 23:29:12Z bobtarling $
-// Copyright (c) 2006-2007 The Regents of the University of California. All
-// Rights Reserved. Permission to use, copy, modify, and distribute this
-// software and its documentation without fee, and without a written
-// agreement is hereby granted, provided that the above copyright notice
-// and this paragraph appear in all copies. This software program and
-// documentation are copyrighted by The Regents of the University of
-// California. The software program and documentation are supplied "AS
-// IS", without any accompanying services from The Regents. The Regents
-// does not warrant that the operation of the program will be
-// uninterrupted or error-free. The end-user understands that the program
-// was developed for research purposes and is advised not to rely
-// exclusively on the program for any reason. IN NO EVENT SHALL THE
-// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-package org.argouml.dev;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
-
-import org.argouml.model.Model;
-
-/**
- * The event pump inspector displays the contents of the event
- * pump. There is no event mechanism to refresh this panel. The
- * user must press the refresh button to see the latest state.
- * @author Bob Tarling
- */
-public final class EventPumpInspectorPanel extends JPanel {
-
- /**
- * The UID.
- */
- private static final long serialVersionUID = -7217414480003857977L;
-
- /**
- * The instance.
- */
- private static final EventPumpInspectorPanel INSTANCE =
- new EventPumpInspectorPanel();
-
- /**
- * @return The instance.
- */
- public static EventPumpInspectorPanel getInstance() {
- return INSTANCE;
- }
-
- private JScrollPane scroller;
-
- /**
- * Constructor.
- */
- private EventPumpInspectorPanel() {
- setLayout(new BorderLayout());
- this.add(new JButton(new RefreshAction()), BorderLayout.NORTH);
- }
-
- private class RefreshAction extends AbstractAction {
-
- /**
- * UID
- */
- private static final long serialVersionUID = -2527310696451597274L;
-
- RefreshAction() {
- super("Refresh");
- }
-
- public void actionPerformed(ActionEvent arg0) {
- JTree tree = new JTree(getTree());
- tree.expandRow(0);
- if (scroller != null) {
- remove(scroller);
- }
- scroller = new JScrollPane(tree);
- add(scroller);
- invalidate();
- validate();
- }
- }
-
-
- /**
- * Getter provided for the dev module. This supplies a tree
- * model of registered listeners.
- * @return a root tree node
- */
- TreeNode getTree() {
- DefaultMutableTreeNode root =
- new DefaultMutableTreeNode("Event Pump Debug Info");
- addSubtree(root, Model.getPump().getDebugInfo());
- return root;
- }
-
- private void addSubtree(DefaultMutableTreeNode root, List list) {
- DefaultMutableTreeNode node = null;
- for (Object o : list) {
- if (o instanceof String) {
- node = new DefaultMutableTreeNode(o);
- root.add(node);
- } else if (o instanceof List) {
- if (node == null) {
- node = new DefaultMutableTreeNode();
- }
- addSubtree(node, (List) o);
- } else {
- throw new IllegalStateException("Unexpected object");
- }
- }
- }
-
-}
+// $Id$
+// Copyright (c) 2006-2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.dev;
+
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
+
+import org.argouml.model.Model;
+
+/**
+ * The event pump inspector displays the contents of the event
+ * pump. There is no event mechanism to refresh this panel. The
+ * user must press the refresh button to see the latest state.
+ * @author Bob Tarling
+ */
+public final class EventPumpInspectorPanel extends JPanel {
+
+ /**
+ * The UID.
+ */
+ private static final long serialVersionUID = -7217414480003857977L;
+
+ /**
+ * The instance.
+ */
+ private static final EventPumpInspectorPanel INSTANCE =
+ new EventPumpInspectorPanel();
+
+ /**
+ * @return The instance.
+ */
+ public static EventPumpInspectorPanel getInstance() {
+ return INSTANCE;
+ }
+
+ private JScrollPane scroller;
+
+ /**
+ * Constructor.
+ */
+ private EventPumpInspectorPanel() {
+ setLayout(new BorderLayout());
+ this.add(new JButton(new RefreshAction()), BorderLayout.NORTH);
+ }
+
+ private class RefreshAction extends AbstractAction {
+
+ /**
+ * UID
+ */
+ private static final long serialVersionUID = -2527310696451597274L;
+
+ RefreshAction() {
+ super("Refresh");
+ }
+
+ public void actionPerformed(ActionEvent arg0) {
+ JTree tree = new JTree(getTree());
+ tree.expandRow(0);
+ if (scroller != null) {
+ remove(scroller);
+ }
+ scroller = new JScrollPane(tree);
+ add(scroller);
+ invalidate();
+ validate();
+ }
+ }
+
+
+ /**
+ * Getter provided for the dev module. This supplies a tree
+ * model of registered listeners.
+ * @return a root tree node
+ */
+ TreeNode getTree() {
+ DefaultMutableTreeNode root =
+ new DefaultMutableTreeNode("Event Pump Debug Info");
+ addSubtree(root, Model.getPump().getDebugInfo());
+ return root;
+ }
+
+ private void addSubtree(DefaultMutableTreeNode root, List list) {
+ DefaultMutableTreeNode node = null;
+ for (Object o : list) {
+ if (o instanceof String) {
+ node = new DefaultMutableTreeNode(o);
+ root.add(node);
+ } else if (o instanceof List) {
+ if (node == null) {
+ node = new DefaultMutableTreeNode();
+ }
+ addSubtree(node, (List) o);
+ } else {
+ throw new IllegalStateException("Unexpected object");
+ }
+ }
+ }
+
+}
Modified: trunk/modules/dev/src/org/argouml/dev/test/TestPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/test/TestPanel.java?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/modules/dev/src/org/argouml/dev/test/TestPanel.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/test/TestPanel.java 2010-01-12 10:21:28-0800
@@ -1,45 +1,45 @@
-// $Id: FigInspectorPanel.java 14249 2008-03-28 06:37:18Z tfmorris $
-// Copyright (c) 2006 The Regents of the University of California. All
-// Rights Reserved. Permission to use, copy, modify, and distribute this
-// software and its documentation without fee, and without a written
-// agreement is hereby granted, provided that the above copyright notice
-// and this paragraph appear in all copies. This software program and
-// documentation are copyrighted by The Regents of the University of
-// California. The software program and documentation are supplied "AS
-// IS", without any accompanying services from The Regents. The Regents
-// does not warrant that the operation of the program will be
-// uninterrupted or error-free. The end-user understands that the program
-// was developed for research purposes and is advised not to rely
-// exclusively on the program for any reason. IN NO EVENT SHALL THE
-// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
-// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
-// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
-// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
-// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
-// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
-// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-package org.argouml.dev.test;
-
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-/**
- * Empty panel for testing.
- *
- * @author Bob Tarling
- */
-public final class TestPanel extends JPanel {
-
- /**
- * Constructor.
- */
- public TestPanel() {
- setName("Test Panel");
- add(new JLabel("test"));
- setEnabled(true);
- }
-}
+// $Id$
+// Copyright (c) 2006 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.dev.test;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+/**
+ * Empty panel for testing.
+ *
+ * @author Bob Tarling
+ */
+public final class TestPanel extends JPanel {
+
+ /**
+ * Constructor.
+ */
+ public TestPanel() {
+ setName("Test Panel");
+ add(new JLabel("test"));
+ setEnabled(true);
+ }
+}
Modified: trunk/src/argouml-app/lib/antlr.LICENSE.txt
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/lib/antlr.LICENSE.txt?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/src/argouml-app/lib/antlr.LICENSE.txt (original)
+++ trunk/src/argouml-app/lib/antlr.LICENSE.txt 2010-01-12 10:21:28-0800
@@ -1,6 +1,6 @@
SOFTWARE RIGHTS
-$Id: //depot/code/org.antlr/main/main/RIGHTS#3 $
+$Id$
ANTLR 1989-2000 Developed by jGuru.com (MageLang Institute),
http://www.ANTLR.org and http://www.jGuru.com
Modified: trunk/src/argouml-app/src/org/argouml/i18n/wfr.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/i18n/wfr.properties?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/i18n/wfr.properties (original)
+++ trunk/src/argouml-app/src/org/argouml/i18n/wfr.properties 2010-01-12 10:21:28-0800
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id$
# Copyright (c) 2009 The Regents of the University of California. All
# Rights Reserved. Permission to use, copy, modify, and distribute this
# software and its documentation without fee, and without a written
Modified: trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/README.txt
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/README.txt?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/README.txt (original)
+++ trunk/src/argouml-app/src/org/argouml/profile/profiles/uml14/README.txt 2010-01-12 10:21:28-0800
@@ -1,42 +1,42 @@
-This directory contains the default UML profiles distributed with ArgoUML. They
-are not accessed over the web for ArgoUML usage, but are included here so that
-they are available for other tools which consume XMI files exported from
-ArgoUML.
-
-Because the linkages between the XMI files are made by ID, the links are
-impervious to name changes, but the IDs must be kept stable. For this reason
-if an element is ever deleted or has its ID changed, a new version of the
-profile file will be created so that the old version is available for existing
-projects to continue to access.
-
-STANDARD PROFILES
-
-- default-uml14.xmi - standard model elements from Appendix A of the
- UML 1.4 specification
-
-- default-java.xmi - Java-specific types and datatypes. Prior to ArgoUML 0.26,
- the default profile was a combination of this profile plus
- the UML 1.4 profile. It currently only contains a small set of types
- from java.lang, java.util, and java.math.
-
-- metaprofile.xmi - contains the elements needed to create profiles with ArgoUML.
-
-- C++ profile - where?
-
-CONTRIBUTED AND OTHER PROFILES
-
-- default-uml14-uml20-deprecated.xmi - same as default-uml14, but with items
- which have been removed in the UML 2.0 specification marked as
- deprecated.
-
-- default-uml14-uml20-subset.xmi - subset of standard model elements
- from UML 1.4 specifcation which are also in UML 2.0.
-
-- andromda-profile-32-noextensions.xmi - Modeling profile for standard
- AndroMDA 3.2 cartridges. Created by taking distributed AndroMDA 3.2
- profile, importing all MagicDraw "modules", and writing out as "rich"
- XMI file which was then imported into ArgoUML and written back out again
- to strip all MagicDraw extensions.
-
-- andromda-profile-31.xmi - Modeling profile for standard AndroMDA 3.1 cartridges
-
+This directory contains the default UML profiles distributed with ArgoUML. They
+are not accessed over the web for ArgoUML usage, but are included here so that
+they are available for other tools which consume XMI files exported from
+ArgoUML.
+
+Because the linkages between the XMI files are made by ID, the links are
+impervious to name changes, but the IDs must be kept stable. For this reason
+if an element is ever deleted or has its ID changed, a new version of the
+profile file will be created so that the old version is available for existing
+projects to continue to access.
+
+STANDARD PROFILES
+
+- default-uml14.xmi - standard model elements from Appendix A of the
+ UML 1.4 specification
+
+- default-java.xmi - Java-specific types and datatypes. Prior to ArgoUML 0.26,
+ the default profile was a combination of this profile plus
+ the UML 1.4 profile. It currently only contains a small set of types
+ from java.lang, java.util, and java.math.
+
+- metaprofile.xmi - contains the elements needed to create profiles with ArgoUML.
+
+- C++ profile - where?
+
+CONTRIBUTED AND OTHER PROFILES
+
+- default-uml14-uml20-deprecated.xmi - same as default-uml14, but with items
+ which have been removed in the UML 2.0 specification marked as
+ deprecated.
+
+- default-uml14-uml20-subset.xmi - subset of standard model elements
+ from UML 1.4 specifcation which are also in UML 2.0.
+
+- andromda-profile-32-noextensions.xmi - Modeling profile for standard
+ AndroMDA 3.2 cartridges. Created by taking distributed AndroMDA 3.2
+ profile, importing all MagicDraw "modules", and writing out as "rich"
+ XMI file which was then imported into ArgoUML and written back out again
+ to strip all MagicDraw extensions.
+
+- andromda-profile-31.xmi - Modeling profile for standard AndroMDA 3.1 cartridges
+
Modified: trunk/src/argouml-core-diagrams-activity2/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/build.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/build.xml (original)
+++ trunk/src/argouml-core-diagrams-activity2/build.xml 2010-01-12 10:21:28-0800
@@ -1,316 +1,316 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml 17140 2009-05-05 04:56:19Z linus $
-
- Ant build file for argouml-core-diagrams-activity2.
-
- This is designed to work:
- - in the subdirectory named argouml-core-diagrams-activity2,
- as stored in the repository.
- Used when compiling, running tests from the command line.
- - When checked out from within Eclipse (project named
- argouml-core-diagrams-activity2)
- Used for generating code.
-
-Building this requires:
- argouml-core-infra
- argouml-core-model
- argouml-app
-
- -->
-
-<project basedir="." default="compile" name="argouml-core-diagrams-activity2">
-
- <!-- =================================================================== -->
- <!-- Initialization target -->
- <!-- =================================================================== -->
-
- <target name="init" depends="pde-init">
-
- <property name="build.dir" location="build" />
- <property name="build.classes" value="${build.dir}/classes" />
-
- <path id="src.compile.classpath">
- <fileset dir="../argouml-core-infra/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-core-model/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-app/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- This runtime classpath is used for tests and other things started
- from this file.
- -->
- <path id="src.run.classpath">
- <path refid="src.compile.classpath"/>
- <!-- only one of the following will be used at a time -->
- <!-- we put them together because there's little risk of crosstalk -->
- <fileset dir="../argouml-core-model-mdr/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-core-model-euml/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- Try to figure out where our tools directory is. Done after overrides
- are loaded so user can override, but before defaults -->
- <property name="tool.test.file" value="checkstyle/java.header"/>
- <available file="../argouml-core-tools/${tool.test.file}" type="file"
- value="../argouml-core-tools"
- property="argo.tools.dir"
- />
- <available file="../../tools/${tool.test.file}" type="file"
- value="../../tools"
- property="argo.tools.dir"
- />
-
- <path id="tests.compile.classpath">
- <pathelement location="${build.classes}"/>
- <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
- <path refid="src.compile.classpath"/>
- </path>
-
- <path id="tests.run.classpath">
- <path refid="tests.compile.classpath"/>
- <fileset dir="../argouml-core-model-mdr/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="tests.all.classpath">
- <pathelement location="${build.classes}"/>
- <pathelement location="build/tests/classes"/>
- <path refid="tests.run.classpath"/>
- </path>
-
- </target>
-
- <!-- =================================================================== -->
- <!-- Initialization target for optional ant tasks -->
- <!-- =================================================================== -->
- <target name="ant.optional.init" depends="init">
- <path id="ant.optional.classpath">
- <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
- <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
- </path>
-
- <taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
- <classpath>
- <path refid="ant.optional.classpath"/>
- </classpath>
- </taskdef>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Prepares the build directory -->
- <!-- =================================================================== -->
-
- <target name="prepare" depends="init">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.classes}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compiles the source directory -->
- <!-- =================================================================== -->
- <target name="compile" depends="prepare"
- description="Compile the sources.">
-
- <echo message="Compiling the sources in argouml-core-diagrams-activity2"/>
-
- <javac debug="on"
- deprecation="on"
- destdir="${build.classes}"
- includes="org/argouml/**/*.java"
- optimize="on"
- includeAntRuntime="no"
- bootclasspath="${bundleBootClasspath}"
- srcdir="src"
- source="1.5"
- target="1.5">
- <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
- <compilerarg line="-log '${build.dir}/compile.log'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
- <classpath>
- <path refid="src.compile.classpath"/>
- </classpath>
- </javac>
- </target>
-
- <!-- =================================================================== -->
- <!-- Creates the jar file -->
- <!-- =================================================================== -->
- <target name="jar" depends="compile"
- description="Build the main jar file.">
- <jar basedir="${build.classes}"
- excludes="*.txt,*.bat,*.xml,*.sh"
- includes="org/argouml/**"
- manifest="src/META-INF/MANIFEST.MF"
- jarfile="${build.dir}/argouml-diagrams-sequence.jar" />
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Clean targets -->
- <!-- =================================================================== -->
- <target name="clean" depends="init"
- description="Clean out all built files.">
- <delete dir="${build.dir}"/>
- <antcall target="pde-clean" />
- </target>
-
-
-
- <!-- ################################################################### -->
- <!-- Section with tests. -->
- <!-- ################################################################### -->
-
-
- <!-- =================================================================== -->
- <!-- Compiles the tests -->
- <!-- =================================================================== -->
-
- <target name="compile-tests" depends="prepare">
-
- <!-- create directories -->
- <mkdir dir="build/tests/classes"/>
-
- <javac debug="true"
- deprecation="on"
- optimize="false"
- destdir="build/tests/classes"
- srcdir="tests"
- source="1.5"
- target="1.5">
- <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
- <classpath>
- <path refid="tests.compile.classpath"/>
- </classpath>
- </javac>
-
- <!-- copy test files -->
- <copy todir="build/tests/classes/testmodels">
- <fileset dir="tests/testmodels" includes="**/**"/>
- </copy>
- </target>
-
- <!-- =================================================================== -->
- <!-- Run the junit tests. -->
- <!-- =================================================================== -->
- <target name="tests" depends="compile,compile-tests"
- description="Run all tests that don't require any GUI components in headleass mode.">
-
- <mkdir dir="build/tests/reports"/>
-
- <junit errorproperty="junit.failure" failureproperty="junit.failure"
- fork="yes" dir="${basedir}" forkmode="perTest"
- haltonfailure="false"
- maxmemory="48M" printsummary="true">
- <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>
- <sysproperty key="java.awt.headless" value="true"/>
- <sysproperty key="argouml.tests.dir" value="tests"/>
- <assertions>
- <enable/>
- </assertions>
- <classpath refid="tests.all.classpath"/>
- <formatter type="xml"/>
- <batchtest todir="build/tests/reports">
- <fileset dir="tests">
- <include name="org/argouml/**/Test*.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Eclipse PDE targets from here to end of file -->
- <!-- =================================================================== -->
- <!--
- Required targets (called in this order) are:
- build.jars
- gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
- gather.logs
- -->
-
- <target name="pde-properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
- </target>
-
- <target name="pde-init" depends="pde-properties">
-
- <property name="bundleId" value="org.argouml.activity2" />
-
- <!-- This property is magic and will have its value substituted by PDE -->
- <property name="version.suffix" value="0.28.0.200904210336"/>
- <property name="bundleVersion" value="${version.suffix}" />
-
- <!-- Compiler settings. -->
- <condition property="dir_bootclasspath" value="${java.home}/../Classes">
- <os family="mac" />
- </condition>
- <property name="dir_bootclasspath" value="${java.home}/lib" />
- <path id="path_bootclasspath">
- <fileset dir="${dir_bootclasspath}">
- <include name="*.jar" />
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath" />
- <property name="bundleBootClasspath" value="${bootclasspath}" />
-
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder" />
- </condition>
- <property name="pluginTemp" value="${basedir}" />
- <condition property="build.result.folder" value="${pluginTemp}/${bundleId}_${bundleVersion}">
- <isset property="buildTempFolder" />
- </condition>
- <property name="build.result.folder" value="${basedir}" />
- <property name="plugin.destination" value="${basedir}" />
- </target>
-
- <target name="pde-clean" depends="pde-init">
- <delete file="${plugin.destination}/${bundleId}_*.jar" />
- <delete file="${plugin.destination}/${bundleId}_*.zip" />
- </target>
-
- <target name="build.jars" depends="jar" description="Compile classes and build nested jars for the plug-in: ${bundleId}.">
- <mkdir dir="${build.result.folder}/@dot"/>
- <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
- <fileset dir="${build.classes}" includes="org/argouml/**" excludes="*.txt,*.bat,*.xml,*.sh" />
- </copy>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}" />
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
- <fileset dir="${build.result.folder}/@dot" includes="**"/>
- </copy>
-
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
- <fileset dir="${basedir}">
- <include name="META-INF/"/>
- <include name="plugin.xml"/>
- <include name="plugin.properties"/>
- </fileset>
- </copy>
-
- <eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
- <fileset dir="${build.dir}">
- <include name="compile.log"/>
- </fileset>
- </copy>
- </target>
-
-</project>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$
+
+ Ant build file for argouml-core-diagrams-activity2.
+
+ This is designed to work:
+ - in the subdirectory named argouml-core-diagrams-activity2,
+ as stored in the repository.
+ Used when compiling, running tests from the command line.
+ - When checked out from within Eclipse (project named
+ argouml-core-diagrams-activity2)
+ Used for generating code.
+
+Building this requires:
+ argouml-core-infra
+ argouml-core-model
+ argouml-app
+
+ -->
+
+<project basedir="." default="compile" name="argouml-core-diagrams-activity2">
+
+ <!-- =================================================================== -->
+ <!-- Initialization target -->
+ <!-- =================================================================== -->
+
+ <target name="init" depends="pde-init">
+
+ <property name="build.dir" location="build" />
+ <property name="build.classes" value="${build.dir}/classes" />
+
+ <path id="src.compile.classpath">
+ <fileset dir="../argouml-core-infra/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-app/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- This runtime classpath is used for tests and other things started
+ from this file.
+ -->
+ <path id="src.run.classpath">
+ <path refid="src.compile.classpath"/>
+ <!-- only one of the following will be used at a time -->
+ <!-- we put them together because there's little risk of crosstalk -->
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model-euml/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Try to figure out where our tools directory is. Done after overrides
+ are loaded so user can override, but before defaults -->
+ <property name="tool.test.file" value="checkstyle/java.header"/>
+ <available file="../argouml-core-tools/${tool.test.file}" type="file"
+ value="../argouml-core-tools"
+ property="argo.tools.dir"
+ />
+ <available file="../../tools/${tool.test.file}" type="file"
+ value="../../tools"
+ property="argo.tools.dir"
+ />
+
+ <path id="tests.compile.classpath">
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ <path refid="src.compile.classpath"/>
+ </path>
+
+ <path id="tests.run.classpath">
+ <path refid="tests.compile.classpath"/>
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="tests.all.classpath">
+ <pathelement location="${build.classes}"/>
+ <pathelement location="build/tests/classes"/>
+ <path refid="tests.run.classpath"/>
+ </path>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Initialization target for optional ant tasks -->
+ <!-- =================================================================== -->
+ <target name="ant.optional.init" depends="init">
+ <path id="ant.optional.classpath">
+ <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ </path>
+
+ <taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
+ <classpath>
+ <path refid="ant.optional.classpath"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Prepares the build directory -->
+ <!-- =================================================================== -->
+
+ <target name="prepare" depends="init">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.classes}"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Compiles the source directory -->
+ <!-- =================================================================== -->
+ <target name="compile" depends="prepare"
+ description="Compile the sources.">
+
+ <echo message="Compiling the sources in argouml-core-diagrams-activity2"/>
+
+ <javac debug="on"
+ deprecation="on"
+ destdir="${build.classes}"
+ includes="org/argouml/**/*.java"
+ optimize="on"
+ includeAntRuntime="no"
+ bootclasspath="${bundleBootClasspath}"
+ srcdir="src"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <compilerarg line="-log '${build.dir}/compile.log'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ <classpath>
+ <path refid="src.compile.classpath"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Creates the jar file -->
+ <!-- =================================================================== -->
+ <target name="jar" depends="compile"
+ description="Build the main jar file.">
+ <jar basedir="${build.classes}"
+ excludes="*.txt,*.bat,*.xml,*.sh"
+ includes="org/argouml/**"
+ manifest="src/META-INF/MANIFEST.MF"
+ jarfile="${build.dir}/argouml-diagrams-sequence.jar" />
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Clean targets -->
+ <!-- =================================================================== -->
+ <target name="clean" depends="init"
+ description="Clean out all built files.">
+ <delete dir="${build.dir}"/>
+ <antcall target="pde-clean" />
+ </target>
+
+
+
+ <!-- ################################################################### -->
+ <!-- Section with tests. -->
+ <!-- ################################################################### -->
+
+
+ <!-- =================================================================== -->
+ <!-- Compiles the tests -->
+ <!-- =================================================================== -->
+
+ <target name="compile-tests" depends="prepare">
+
+ <!-- create directories -->
+ <mkdir dir="build/tests/classes"/>
+
+ <javac debug="true"
+ deprecation="on"
+ optimize="false"
+ destdir="build/tests/classes"
+ srcdir="tests"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <classpath>
+ <path refid="tests.compile.classpath"/>
+ </classpath>
+ </javac>
+
+ <!-- copy test files -->
+ <copy todir="build/tests/classes/testmodels">
+ <fileset dir="tests/testmodels" includes="**/**"/>
+ </copy>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Run the junit tests. -->
+ <!-- =================================================================== -->
+ <target name="tests" depends="compile,compile-tests"
+ description="Run all tests that don't require any GUI components in headleass mode.">
+
+ <mkdir dir="build/tests/reports"/>
+
+ <junit errorproperty="junit.failure" failureproperty="junit.failure"
+ fork="yes" dir="${basedir}" forkmode="perTest"
+ haltonfailure="false"
+ maxmemory="48M" printsummary="true">
+ <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>
+ <sysproperty key="java.awt.headless" value="true"/>
+ <sysproperty key="argouml.tests.dir" value="tests"/>
+ <assertions>
+ <enable/>
+ </assertions>
+ <classpath refid="tests.all.classpath"/>
+ <formatter type="xml"/>
+ <batchtest todir="build/tests/reports">
+ <fileset dir="tests">
+ <include name="org/argouml/**/Test*.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Eclipse PDE targets from here to end of file -->
+ <!-- =================================================================== -->
+ <!--
+ Required targets (called in this order) are:
+ build.jars
+ gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
+ gather.logs
+ -->
+
+ <target name="pde-properties" if="eclipse.running">
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ </target>
+
+ <target name="pde-init" depends="pde-properties">
+
+ <property name="bundleId" value="org.argouml.activity2" />
+
+ <!-- This property is magic and will have its value substituted by PDE -->
+ <property name="version.suffix" value="0.28.0.200904210336"/>
+ <property name="bundleVersion" value="${version.suffix}" />
+
+ <!-- Compiler settings. -->
+ <condition property="dir_bootclasspath" value="${java.home}/../Classes">
+ <os family="mac" />
+ </condition>
+ <property name="dir_bootclasspath" value="${java.home}/lib" />
+ <path id="path_bootclasspath">
+ <fileset dir="${dir_bootclasspath}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+ <property name="bootclasspath" refid="path_bootclasspath" />
+ <property name="bundleBootClasspath" value="${bootclasspath}" />
+
+ <condition property="pluginTemp" value="${buildTempFolder}/plugins">
+ <isset property="buildTempFolder" />
+ </condition>
+ <property name="pluginTemp" value="${basedir}" />
+ <condition property="build.result.folder" value="${pluginTemp}/${bundleId}_${bundleVersion}">
+ <isset property="buildTempFolder" />
+ </condition>
+ <property name="build.result.folder" value="${basedir}" />
+ <property name="plugin.destination" value="${basedir}" />
+ </target>
+
+ <target name="pde-clean" depends="pde-init">
+ <delete file="${plugin.destination}/${bundleId}_*.jar" />
+ <delete file="${plugin.destination}/${bundleId}_*.zip" />
+ </target>
+
+ <target name="build.jars" depends="jar" description="Compile classes and build nested jars for the plug-in: ${bundleId}.">
+ <mkdir dir="${build.result.folder}/@dot"/>
+ <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
+ <fileset dir="${build.classes}" includes="org/argouml/**" excludes="*.txt,*.bat,*.xml,*.sh" />
+ </copy>
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}" />
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${build.result.folder}/@dot" includes="**"/>
+ </copy>
+
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}">
+ <include name="META-INF/"/>
+ <include name="plugin.xml"/>
+ <include name="plugin.properties"/>
+ </fileset>
+ </copy>
+
+ <eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
+ </target>
+
+ <target name="gather.logs" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
+ <fileset dir="${build.dir}">
+ <include name="compile.log"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
+
+
Modified: trunk/src/argouml-core-diagrams-class2/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-class2/build.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/src/argouml-core-diagrams-class2/build.xml (original)
+++ trunk/src/argouml-core-diagrams-class2/build.xml 2010-01-12 10:21:28-0800
@@ -1,316 +1,316 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml 17140 2009-05-05 04:56:19Z linus $
-
- Ant build file for argouml-core-diagrams-sequence2.
-
- This is designed to work:
- - in the subdirectory named argouml-core-diagrams-sequence2,
- as stored in the repository.
- Used when compiling, running tests from the command line.
- - When checked out from within Eclipse (project named
- argouml-core-diagrams-sequence2)
- Used for generating code.
-
-Building this requires:
- argouml-core-infra
- argouml-core-model
- argouml-app
-
- -->
-
-<project basedir="." default="compile" name="argouml-core-diagrams-sequence2">
-
- <!-- =================================================================== -->
- <!-- Initialization target -->
- <!-- =================================================================== -->
-
- <target name="init" depends="pde-init">
-
- <property name="build.dir" location="build" />
- <property name="build.classes" value="${build.dir}/classes" />
-
- <path id="src.compile.classpath">
- <fileset dir="../argouml-core-infra/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-core-model/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-app/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- This runtime classpath is used for tests and other things started
- from this file.
- -->
- <path id="src.run.classpath">
- <path refid="src.compile.classpath"/>
- <!-- only one of the following will be used at a time -->
- <!-- we put them together because there's little risk of crosstalk -->
- <fileset dir="../argouml-core-model-mdr/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-core-model-euml/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- Try to figure out where our tools directory is. Done after overrides
- are loaded so user can override, but before defaults -->
- <property name="tool.test.file" value="checkstyle/java.header"/>
- <available file="../argouml-core-tools/${tool.test.file}" type="file"
- value="../argouml-core-tools"
- property="argo.tools.dir"
- />
- <available file="../../tools/${tool.test.file}" type="file"
- value="../../tools"
- property="argo.tools.dir"
- />
-
- <path id="tests.compile.classpath">
- <pathelement location="${build.classes}"/>
- <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
- <path refid="src.compile.classpath"/>
- </path>
-
- <path id="tests.run.classpath">
- <path refid="tests.compile.classpath"/>
- <fileset dir="../argouml-core-model-mdr/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="tests.all.classpath">
- <pathelement location="${build.classes}"/>
- <pathelement location="build/tests/classes"/>
- <path refid="tests.run.classpath"/>
- </path>
-
- </target>
-
- <!-- =================================================================== -->
- <!-- Initialization target for optional ant tasks -->
- <!-- =================================================================== -->
- <target name="ant.optional.init" depends="init">
- <path id="ant.optional.classpath">
- <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
- <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
- </path>
-
- <taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
- <classpath>
- <path refid="ant.optional.classpath"/>
- </classpath>
- </taskdef>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Prepares the build directory -->
- <!-- =================================================================== -->
-
- <target name="prepare" depends="init">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.classes}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compiles the source directory -->
- <!-- =================================================================== -->
- <target name="compile" depends="prepare"
- description="Compile the sources.">
-
- <echo message="Compiling the sources in argouml-core-diagrams-sequence2"/>
-
- <javac debug="on"
- deprecation="on"
- destdir="${build.classes}"
- includes="org/argouml/**/*.java"
- optimize="on"
- includeAntRuntime="no"
- bootclasspath="${bundleBootClasspath}"
- srcdir="src"
- source="1.5"
- target="1.5">
- <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
- <compilerarg line="-log '${build.dir}/compile.log'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
- <classpath>
- <path refid="src.compile.classpath"/>
- </classpath>
- </javac>
- </target>
-
- <!-- =================================================================== -->
- <!-- Creates the jar file -->
- <!-- =================================================================== -->
- <target name="jar" depends="compile"
- description="Build the main jar file.">
- <jar basedir="${build.classes}"
- excludes="*.txt,*.bat,*.xml,*.sh"
- includes="org/argouml/**"
- manifest="src/META-INF/MANIFEST.MF"
- jarfile="${build.dir}/argouml-diagrams-sequence.jar" />
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Clean targets -->
- <!-- =================================================================== -->
- <target name="clean" depends="init"
- description="Clean out all built files.">
- <delete dir="${build.dir}"/>
- <antcall target="pde-clean" />
- </target>
-
-
-
- <!-- ################################################################### -->
- <!-- Section with tests. -->
- <!-- ################################################################### -->
-
-
- <!-- =================================================================== -->
- <!-- Compiles the tests -->
- <!-- =================================================================== -->
-
- <target name="compile-tests" depends="prepare">
-
- <!-- create directories -->
- <mkdir dir="build/tests/classes"/>
-
- <javac debug="true"
- deprecation="on"
- optimize="false"
- destdir="build/tests/classes"
- srcdir="tests"
- source="1.5"
- target="1.5">
- <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
- <classpath>
- <path refid="tests.compile.classpath"/>
- </classpath>
- </javac>
-
- <!-- copy test files -->
- <copy todir="build/tests/classes/testmodels">
- <fileset dir="tests/testmodels" includes="**/**"/>
- </copy>
- </target>
-
- <!-- =================================================================== -->
- <!-- Run the junit tests. -->
- <!-- =================================================================== -->
- <target name="tests" depends="compile,compile-tests"
- description="Run all tests that don't require any GUI components in headleass mode.">
-
- <mkdir dir="build/tests/reports"/>
-
- <junit errorproperty="junit.failure" failureproperty="junit.failure"
- fork="yes" dir="${basedir}" forkmode="perTest"
- haltonfailure="false"
- maxmemory="48M" printsummary="true">
- <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>
- <sysproperty key="java.awt.headless" value="true"/>
- <sysproperty key="argouml.tests.dir" value="tests"/>
- <assertions>
- <enable/>
- </assertions>
- <classpath refid="tests.all.classpath"/>
- <formatter type="xml"/>
- <batchtest todir="build/tests/reports">
- <fileset dir="tests">
- <include name="org/argouml/**/Test*.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Eclipse PDE targets from here to end of file -->
- <!-- =================================================================== -->
- <!--
- Required targets (called in this order) are:
- build.jars
- gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
- gather.logs
- -->
-
- <target name="pde-properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
- </target>
-
- <target name="pde-init" depends="pde-properties">
-
- <property name="bundleId" value="org.argouml.sequence2" />
-
- <!-- This property is magic and will have its value substituted by PDE -->
- <property name="version.suffix" value="0.28.0.200904210336"/>
- <property name="bundleVersion" value="${version.suffix}" />
-
- <!-- Compiler settings. -->
- <condition property="dir_bootclasspath" value="${java.home}/../Classes">
- <os family="mac" />
- </condition>
- <property name="dir_bootclasspath" value="${java.home}/lib" />
- <path id="path_bootclasspath">
- <fileset dir="${dir_bootclasspath}">
- <include name="*.jar" />
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath" />
- <property name="bundleBootClasspath" value="${bootclasspath}" />
-
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder" />
- </condition>
- <property name="pluginTemp" value="${basedir}" />
- <condition property="build.result.folder" value="${pluginTemp}/${bundleId}_${bundleVersion}">
- <isset property="buildTempFolder" />
- </condition>
- <property name="build.result.folder" value="${basedir}" />
- <property name="plugin.destination" value="${basedir}" />
- </target>
-
- <target name="pde-clean" depends="pde-init">
- <delete file="${plugin.destination}/${bundleId}_*.jar" />
- <delete file="${plugin.destination}/${bundleId}_*.zip" />
- </target>
-
- <target name="build.jars" depends="jar" description="Compile classes and build nested jars for the plug-in: ${bundleId}.">
- <mkdir dir="${build.result.folder}/@dot"/>
- <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
- <fileset dir="${build.classes}" includes="org/argouml/**" excludes="*.txt,*.bat,*.xml,*.sh" />
- </copy>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}" />
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
- <fileset dir="${build.result.folder}/@dot" includes="**"/>
- </copy>
-
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
- <fileset dir="${basedir}">
- <include name="META-INF/"/>
- <include name="plugin.xml"/>
- <include name="plugin.properties"/>
- </fileset>
- </copy>
-
- <eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
- <fileset dir="${build.dir}">
- <include name="compile.log"/>
- </fileset>
- </copy>
- </target>
-
-</project>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$
+
+ Ant build file for argouml-core-diagrams-sequence2.
+
+ This is designed to work:
+ - in the subdirectory named argouml-core-diagrams-sequence2,
+ as stored in the repository.
+ Used when compiling, running tests from the command line.
+ - When checked out from within Eclipse (project named
+ argouml-core-diagrams-sequence2)
+ Used for generating code.
+
+Building this requires:
+ argouml-core-infra
+ argouml-core-model
+ argouml-app
+
+ -->
+
+<project basedir="." default="compile" name="argouml-core-diagrams-sequence2">
+
+ <!-- =================================================================== -->
+ <!-- Initialization target -->
+ <!-- =================================================================== -->
+
+ <target name="init" depends="pde-init">
+
+ <property name="build.dir" location="build" />
+ <property name="build.classes" value="${build.dir}/classes" />
+
+ <path id="src.compile.classpath">
+ <fileset dir="../argouml-core-infra/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-app/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- This runtime classpath is used for tests and other things started
+ from this file.
+ -->
+ <path id="src.run.classpath">
+ <path refid="src.compile.classpath"/>
+ <!-- only one of the following will be used at a time -->
+ <!-- we put them together because there's little risk of crosstalk -->
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model-euml/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Try to figure out where our tools directory is. Done after overrides
+ are loaded so user can override, but before defaults -->
+ <property name="tool.test.file" value="checkstyle/java.header"/>
+ <available file="../argouml-core-tools/${tool.test.file}" type="file"
+ value="../argouml-core-tools"
+ property="argo.tools.dir"
+ />
+ <available file="../../tools/${tool.test.file}" type="file"
+ value="../../tools"
+ property="argo.tools.dir"
+ />
+
+ <path id="tests.compile.classpath">
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ <path refid="src.compile.classpath"/>
+ </path>
+
+ <path id="tests.run.classpath">
+ <path refid="tests.compile.classpath"/>
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="tests.all.classpath">
+ <pathelement location="${build.classes}"/>
+ <pathelement location="build/tests/classes"/>
+ <path refid="tests.run.classpath"/>
+ </path>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Initialization target for optional ant tasks -->
+ <!-- =================================================================== -->
+ <target name="ant.optional.init" depends="init">
+ <path id="ant.optional.classpath">
+ <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ </path>
+
+ <taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
+ <classpath>
+ <path refid="ant.optional.classpath"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Prepares the build directory -->
+ <!-- =================================================================== -->
+
+ <target name="prepare" depends="init">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.classes}"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Compiles the source directory -->
+ <!-- =================================================================== -->
+ <target name="compile" depends="prepare"
+ description="Compile the sources.">
+
+ <echo message="Compiling the sources in argouml-core-diagrams-sequence2"/>
+
+ <javac debug="on"
+ deprecation="on"
+ destdir="${build.classes}"
+ includes="org/argouml/**/*.java"
+ optimize="on"
+ includeAntRuntime="no"
+ bootclasspath="${bundleBootClasspath}"
+ srcdir="src"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <compilerarg line="-log '${build.dir}/compile.log'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ <classpath>
+ <path refid="src.compile.classpath"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Creates the jar file -->
+ <!-- =================================================================== -->
+ <target name="jar" depends="compile"
+ description="Build the main jar file.">
+ <jar basedir="${build.classes}"
+ excludes="*.txt,*.bat,*.xml,*.sh"
+ includes="org/argouml/**"
+ manifest="src/META-INF/MANIFEST.MF"
+ jarfile="${build.dir}/argouml-diagrams-sequence.jar" />
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Clean targets -->
+ <!-- =================================================================== -->
+ <target name="clean" depends="init"
+ description="Clean out all built files.">
+ <delete dir="${build.dir}"/>
+ <antcall target="pde-clean" />
+ </target>
+
+
+
+ <!-- ################################################################### -->
+ <!-- Section with tests. -->
+ <!-- ################################################################### -->
+
+
+ <!-- =================================================================== -->
+ <!-- Compiles the tests -->
+ <!-- =================================================================== -->
+
+ <target name="compile-tests" depends="prepare">
+
+ <!-- create directories -->
+ <mkdir dir="build/tests/classes"/>
+
+ <javac debug="true"
+ deprecation="on"
+ optimize="false"
+ destdir="build/tests/classes"
+ srcdir="tests"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <classpath>
+ <path refid="tests.compile.classpath"/>
+ </classpath>
+ </javac>
+
+ <!-- copy test files -->
+ <copy todir="build/tests/classes/testmodels">
+ <fileset dir="tests/testmodels" includes="**/**"/>
+ </copy>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Run the junit tests. -->
+ <!-- =================================================================== -->
+ <target name="tests" depends="compile,compile-tests"
+ description="Run all tests that don't require any GUI components in headleass mode.">
+
+ <mkdir dir="build/tests/reports"/>
+
+ <junit errorproperty="junit.failure" failureproperty="junit.failure"
+ fork="yes" dir="${basedir}" forkmode="perTest"
+ haltonfailure="false"
+ maxmemory="48M" printsummary="true">
+ <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>
+ <sysproperty key="java.awt.headless" value="true"/>
+ <sysproperty key="argouml.tests.dir" value="tests"/>
+ <assertions>
+ <enable/>
+ </assertions>
+ <classpath refid="tests.all.classpath"/>
+ <formatter type="xml"/>
+ <batchtest todir="build/tests/reports">
+ <fileset dir="tests">
+ <include name="org/argouml/**/Test*.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Eclipse PDE targets from here to end of file -->
+ <!-- =================================================================== -->
+ <!--
+ Required targets (called in this order) are:
+ build.jars
+ gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
+ gather.logs
+ -->
+
+ <target name="pde-properties" if="eclipse.running">
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ </target>
+
+ <target name="pde-init" depends="pde-properties">
+
+ <property name="bundleId" value="org.argouml.sequence2" />
+
+ <!-- This property is magic and will have its value substituted by PDE -->
+ <property name="version.suffix" value="0.28.0.200904210336"/>
+ <property name="bundleVersion" value="${version.suffix}" />
+
+ <!-- Compiler settings. -->
+ <condition property="dir_bootclasspath" value="${java.home}/../Classes">
+ <os family="mac" />
+ </condition>
+ <property name="dir_bootclasspath" value="${java.home}/lib" />
+ <path id="path_bootclasspath">
+ <fileset dir="${dir_bootclasspath}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+ <property name="bootclasspath" refid="path_bootclasspath" />
+ <property name="bundleBootClasspath" value="${bootclasspath}" />
+
+ <condition property="pluginTemp" value="${buildTempFolder}/plugins">
+ <isset property="buildTempFolder" />
+ </condition>
+ <property name="pluginTemp" value="${basedir}" />
+ <condition property="build.result.folder" value="${pluginTemp}/${bundleId}_${bundleVersion}">
+ <isset property="buildTempFolder" />
+ </condition>
+ <property name="build.result.folder" value="${basedir}" />
+ <property name="plugin.destination" value="${basedir}" />
+ </target>
+
+ <target name="pde-clean" depends="pde-init">
+ <delete file="${plugin.destination}/${bundleId}_*.jar" />
+ <delete file="${plugin.destination}/${bundleId}_*.zip" />
+ </target>
+
+ <target name="build.jars" depends="jar" description="Compile classes and build nested jars for the plug-in: ${bundleId}.">
+ <mkdir dir="${build.result.folder}/@dot"/>
+ <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
+ <fileset dir="${build.classes}" includes="org/argouml/**" excludes="*.txt,*.bat,*.xml,*.sh" />
+ </copy>
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}" />
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${build.result.folder}/@dot" includes="**"/>
+ </copy>
+
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}">
+ <include name="META-INF/"/>
+ <include name="plugin.xml"/>
+ <include name="plugin.properties"/>
+ </fileset>
+ </copy>
+
+ <eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
+ </target>
+
+ <target name="gather.logs" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
+ <fileset dir="${build.dir}">
+ <include name="compile.log"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
+
+
Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/i18n/button.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/i18n/button.properties?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/i18n/button.properties (original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/i18n/button.properties 2010-01-12 10:21:28-0800
@@ -1,4 +1,4 @@
-# $Id: button.properties 97 2007-07-29 00:45:28Z penyaskito $
+# $Id$
# Copyright (c) 2003-2007 The Regents of the University of California. All
# Rights Reserved. Permission to use, copy, modify, and distribute this
# software and its documentation without fee, and without a written
Modified: trunk/src/argouml-core-diagrams-structure2/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-structure2/build.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/src/argouml-core-diagrams-structure2/build.xml (original)
+++ trunk/src/argouml-core-diagrams-structure2/build.xml 2010-01-12 10:21:28-0800
@@ -1,316 +1,316 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml 17140 2009-05-05 04:56:19Z linus $
-
- Ant build file for argouml-core-diagrams-structure2.
-
- This is designed to work:
- - in the subdirectory named argouml-core-diagrams-structure2,
- as stored in the repository.
- Used when compiling, running tests from the command line.
- - When checked out from within Eclipse (project named
- argouml-core-diagrams-structure2)
- Used for generating code.
-
-Building this requires:
- argouml-core-infra
- argouml-core-model
- argouml-app
-
- -->
-
-<project basedir="." default="compile" name="argouml-core-diagrams-structure2">
-
- <!-- =================================================================== -->
- <!-- Initialization target -->
- <!-- =================================================================== -->
-
- <target name="init" depends="pde-init">
-
- <property name="build.dir" location="build" />
- <property name="build.classes" value="${build.dir}/classes" />
-
- <path id="src.compile.classpath">
- <fileset dir="../argouml-core-infra/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-core-model/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-app/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- This runtime classpath is used for tests and other things started
- from this file.
- -->
- <path id="src.run.classpath">
- <path refid="src.compile.classpath"/>
- <!-- only one of the following will be used at a time -->
- <!-- we put them together because there's little risk of crosstalk -->
- <fileset dir="../argouml-core-model-mdr/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-core-model-euml/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- Try to figure out where our tools directory is. Done after overrides
- are loaded so user can override, but before defaults -->
- <property name="tool.test.file" value="checkstyle/java.header"/>
- <available file="../argouml-core-tools/${tool.test.file}" type="file"
- value="../argouml-core-tools"
- property="argo.tools.dir"
- />
- <available file="../../tools/${tool.test.file}" type="file"
- value="../../tools"
- property="argo.tools.dir"
- />
-
- <path id="tests.compile.classpath">
- <pathelement location="${build.classes}"/>
- <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
- <path refid="src.compile.classpath"/>
- </path>
-
- <path id="tests.run.classpath">
- <path refid="tests.compile.classpath"/>
- <fileset dir="../argouml-core-model-mdr/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="tests.all.classpath">
- <pathelement location="${build.classes}"/>
- <pathelement location="build/tests/classes"/>
- <path refid="tests.run.classpath"/>
- </path>
-
- </target>
-
- <!-- =================================================================== -->
- <!-- Initialization target for optional ant tasks -->
- <!-- =================================================================== -->
- <target name="ant.optional.init" depends="init">
- <path id="ant.optional.classpath">
- <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
- <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
- </path>
-
- <taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
- <classpath>
- <path refid="ant.optional.classpath"/>
- </classpath>
- </taskdef>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Prepares the build directory -->
- <!-- =================================================================== -->
-
- <target name="prepare" depends="init">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.classes}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compiles the source directory -->
- <!-- =================================================================== -->
- <target name="compile" depends="prepare"
- description="Compile the sources.">
-
- <echo message="Compiling the sources in argouml-core-diagrams-structure2"/>
-
- <javac debug="on"
- deprecation="on"
- destdir="${build.classes}"
- includes="org/argouml/**/*.java"
- optimize="on"
- includeAntRuntime="no"
- bootclasspath="${bundleBootClasspath}"
- srcdir="src"
- source="1.5"
- target="1.5">
- <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
- <compilerarg line="-log '${build.dir}/compile.log'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
- <classpath>
- <path refid="src.compile.classpath"/>
- </classpath>
- </javac>
- </target>
-
- <!-- =================================================================== -->
- <!-- Creates the jar file -->
- <!-- =================================================================== -->
- <target name="jar" depends="compile"
- description="Build the main jar file.">
- <jar basedir="${build.classes}"
- excludes="*.txt,*.bat,*.xml,*.sh"
- includes="org/argouml/**"
- manifest="src/META-INF/MANIFEST.MF"
- jarfile="${build.dir}/argouml-diagrams-sequence.jar" />
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Clean targets -->
- <!-- =================================================================== -->
- <target name="clean" depends="init"
- description="Clean out all built files.">
- <delete dir="${build.dir}"/>
- <antcall target="pde-clean" />
- </target>
-
-
-
- <!-- ################################################################### -->
- <!-- Section with tests. -->
- <!-- ################################################################### -->
-
-
- <!-- =================================================================== -->
- <!-- Compiles the tests -->
- <!-- =================================================================== -->
-
- <target name="compile-tests" depends="prepare">
-
- <!-- create directories -->
- <mkdir dir="build/tests/classes"/>
-
- <javac debug="true"
- deprecation="on"
- optimize="false"
- destdir="build/tests/classes"
- srcdir="tests"
- source="1.5"
- target="1.5">
- <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
- <classpath>
- <path refid="tests.compile.classpath"/>
- </classpath>
- </javac>
-
- <!-- copy test files -->
- <copy todir="build/tests/classes/testmodels">
- <fileset dir="tests/testmodels" includes="**/**"/>
- </copy>
- </target>
-
- <!-- =================================================================== -->
- <!-- Run the junit tests. -->
- <!-- =================================================================== -->
- <target name="tests" depends="compile,compile-tests"
- description="Run all tests that don't require any GUI components in headleass mode.">
-
- <mkdir dir="build/tests/reports"/>
-
- <junit errorproperty="junit.failure" failureproperty="junit.failure"
- fork="yes" dir="${basedir}" forkmode="perTest"
- haltonfailure="false"
- maxmemory="48M" printsummary="true">
- <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>
- <sysproperty key="java.awt.headless" value="true"/>
- <sysproperty key="argouml.tests.dir" value="tests"/>
- <assertions>
- <enable/>
- </assertions>
- <classpath refid="tests.all.classpath"/>
- <formatter type="xml"/>
- <batchtest todir="build/tests/reports">
- <fileset dir="tests">
- <include name="org/argouml/**/Test*.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Eclipse PDE targets from here to end of file -->
- <!-- =================================================================== -->
- <!--
- Required targets (called in this order) are:
- build.jars
- gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
- gather.logs
- -->
-
- <target name="pde-properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
- </target>
-
- <target name="pde-init" depends="pde-properties">
-
- <property name="bundleId" value="org.argouml.structure2" />
-
- <!-- This property is magic and will have its value substituted by PDE -->
- <property name="version.suffix" value="0.28.0.200904210336"/>
- <property name="bundleVersion" value="${version.suffix}" />
-
- <!-- Compiler settings. -->
- <condition property="dir_bootclasspath" value="${java.home}/../Classes">
- <os family="mac" />
- </condition>
- <property name="dir_bootclasspath" value="${java.home}/lib" />
- <path id="path_bootclasspath">
- <fileset dir="${dir_bootclasspath}">
- <include name="*.jar" />
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath" />
- <property name="bundleBootClasspath" value="${bootclasspath}" />
-
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder" />
- </condition>
- <property name="pluginTemp" value="${basedir}" />
- <condition property="build.result.folder" value="${pluginTemp}/${bundleId}_${bundleVersion}">
- <isset property="buildTempFolder" />
- </condition>
- <property name="build.result.folder" value="${basedir}" />
- <property name="plugin.destination" value="${basedir}" />
- </target>
-
- <target name="pde-clean" depends="pde-init">
- <delete file="${plugin.destination}/${bundleId}_*.jar" />
- <delete file="${plugin.destination}/${bundleId}_*.zip" />
- </target>
-
- <target name="build.jars" depends="jar" description="Compile classes and build nested jars for the plug-in: ${bundleId}.">
- <mkdir dir="${build.result.folder}/@dot"/>
- <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
- <fileset dir="${build.classes}" includes="org/argouml/**" excludes="*.txt,*.bat,*.xml,*.sh" />
- </copy>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}" />
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
- <fileset dir="${build.result.folder}/@dot" includes="**"/>
- </copy>
-
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
- <fileset dir="${basedir}">
- <include name="META-INF/"/>
- <include name="plugin.xml"/>
- <include name="plugin.properties"/>
- </fileset>
- </copy>
-
- <eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
- <fileset dir="${build.dir}">
- <include name="compile.log"/>
- </fileset>
- </copy>
- </target>
-
-</project>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$
+
+ Ant build file for argouml-core-diagrams-structure2.
+
+ This is designed to work:
+ - in the subdirectory named argouml-core-diagrams-structure2,
+ as stored in the repository.
+ Used when compiling, running tests from the command line.
+ - When checked out from within Eclipse (project named
+ argouml-core-diagrams-structure2)
+ Used for generating code.
+
+Building this requires:
+ argouml-core-infra
+ argouml-core-model
+ argouml-app
+
+ -->
+
+<project basedir="." default="compile" name="argouml-core-diagrams-structure2">
+
+ <!-- =================================================================== -->
+ <!-- Initialization target -->
+ <!-- =================================================================== -->
+
+ <target name="init" depends="pde-init">
+
+ <property name="build.dir" location="build" />
+ <property name="build.classes" value="${build.dir}/classes" />
+
+ <path id="src.compile.classpath">
+ <fileset dir="../argouml-core-infra/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-app/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- This runtime classpath is used for tests and other things started
+ from this file.
+ -->
+ <path id="src.run.classpath">
+ <path refid="src.compile.classpath"/>
+ <!-- only one of the following will be used at a time -->
+ <!-- we put them together because there's little risk of crosstalk -->
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model-euml/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Try to figure out where our tools directory is. Done after overrides
+ are loaded so user can override, but before defaults -->
+ <property name="tool.test.file" value="checkstyle/java.header"/>
+ <available file="../argouml-core-tools/${tool.test.file}" type="file"
+ value="../argouml-core-tools"
+ property="argo.tools.dir"
+ />
+ <available file="../../tools/${tool.test.file}" type="file"
+ value="../../tools"
+ property="argo.tools.dir"
+ />
+
+ <path id="tests.compile.classpath">
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ <path refid="src.compile.classpath"/>
+ </path>
+
+ <path id="tests.run.classpath">
+ <path refid="tests.compile.classpath"/>
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="tests.all.classpath">
+ <pathelement location="${build.classes}"/>
+ <pathelement location="build/tests/classes"/>
+ <path refid="tests.run.classpath"/>
+ </path>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Initialization target for optional ant tasks -->
+ <!-- =================================================================== -->
+ <target name="ant.optional.init" depends="init">
+ <path id="ant.optional.classpath">
+ <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ </path>
+
+ <taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
+ <classpath>
+ <path refid="ant.optional.classpath"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Prepares the build directory -->
+ <!-- =================================================================== -->
+
+ <target name="prepare" depends="init">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.classes}"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Compiles the source directory -->
+ <!-- =================================================================== -->
+ <target name="compile" depends="prepare"
+ description="Compile the sources.">
+
+ <echo message="Compiling the sources in argouml-core-diagrams-structure2"/>
+
+ <javac debug="on"
+ deprecation="on"
+ destdir="${build.classes}"
+ includes="org/argouml/**/*.java"
+ optimize="on"
+ includeAntRuntime="no"
+ bootclasspath="${bundleBootClasspath}"
+ srcdir="src"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <compilerarg line="-log '${build.dir}/compile.log'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ <classpath>
+ <path refid="src.compile.classpath"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Creates the jar file -->
+ <!-- =================================================================== -->
+ <target name="jar" depends="compile"
+ description="Build the main jar file.">
+ <jar basedir="${build.classes}"
+ excludes="*.txt,*.bat,*.xml,*.sh"
+ includes="org/argouml/**"
+ manifest="src/META-INF/MANIFEST.MF"
+ jarfile="${build.dir}/argouml-diagrams-sequence.jar" />
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Clean targets -->
+ <!-- =================================================================== -->
+ <target name="clean" depends="init"
+ description="Clean out all built files.">
+ <delete dir="${build.dir}"/>
+ <antcall target="pde-clean" />
+ </target>
+
+
+
+ <!-- ################################################################### -->
+ <!-- Section with tests. -->
+ <!-- ################################################################### -->
+
+
+ <!-- =================================================================== -->
+ <!-- Compiles the tests -->
+ <!-- =================================================================== -->
+
+ <target name="compile-tests" depends="prepare">
+
+ <!-- create directories -->
+ <mkdir dir="build/tests/classes"/>
+
+ <javac debug="true"
+ deprecation="on"
+ optimize="false"
+ destdir="build/tests/classes"
+ srcdir="tests"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <classpath>
+ <path refid="tests.compile.classpath"/>
+ </classpath>
+ </javac>
+
+ <!-- copy test files -->
+ <copy todir="build/tests/classes/testmodels">
+ <fileset dir="tests/testmodels" includes="**/**"/>
+ </copy>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Run the junit tests. -->
+ <!-- =================================================================== -->
+ <target name="tests" depends="compile,compile-tests"
+ description="Run all tests that don't require any GUI components in headleass mode.">
+
+ <mkdir dir="build/tests/reports"/>
+
+ <junit errorproperty="junit.failure" failureproperty="junit.failure"
+ fork="yes" dir="${basedir}" forkmode="perTest"
+ haltonfailure="false"
+ maxmemory="48M" printsummary="true">
+ <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>
+ <sysproperty key="java.awt.headless" value="true"/>
+ <sysproperty key="argouml.tests.dir" value="tests"/>
+ <assertions>
+ <enable/>
+ </assertions>
+ <classpath refid="tests.all.classpath"/>
+ <formatter type="xml"/>
+ <batchtest todir="build/tests/reports">
+ <fileset dir="tests">
+ <include name="org/argouml/**/Test*.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Eclipse PDE targets from here to end of file -->
+ <!-- =================================================================== -->
+ <!--
+ Required targets (called in this order) are:
+ build.jars
+ gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
+ gather.logs
+ -->
+
+ <target name="pde-properties" if="eclipse.running">
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ </target>
+
+ <target name="pde-init" depends="pde-properties">
+
+ <property name="bundleId" value="org.argouml.structure2" />
+
+ <!-- This property is magic and will have its value substituted by PDE -->
+ <property name="version.suffix" value="0.28.0.200904210336"/>
+ <property name="bundleVersion" value="${version.suffix}" />
+
+ <!-- Compiler settings. -->
+ <condition property="dir_bootclasspath" value="${java.home}/../Classes">
+ <os family="mac" />
+ </condition>
+ <property name="dir_bootclasspath" value="${java.home}/lib" />
+ <path id="path_bootclasspath">
+ <fileset dir="${dir_bootclasspath}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+ <property name="bootclasspath" refid="path_bootclasspath" />
+ <property name="bundleBootClasspath" value="${bootclasspath}" />
+
+ <condition property="pluginTemp" value="${buildTempFolder}/plugins">
+ <isset property="buildTempFolder" />
+ </condition>
+ <property name="pluginTemp" value="${basedir}" />
+ <condition property="build.result.folder" value="${pluginTemp}/${bundleId}_${bundleVersion}">
+ <isset property="buildTempFolder" />
+ </condition>
+ <property name="build.result.folder" value="${basedir}" />
+ <property name="plugin.destination" value="${basedir}" />
+ </target>
+
+ <target name="pde-clean" depends="pde-init">
+ <delete file="${plugin.destination}/${bundleId}_*.jar" />
+ <delete file="${plugin.destination}/${bundleId}_*.zip" />
+ </target>
+
+ <target name="build.jars" depends="jar" description="Compile classes and build nested jars for the plug-in: ${bundleId}.">
+ <mkdir dir="${build.result.folder}/@dot"/>
+ <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
+ <fileset dir="${build.classes}" includes="org/argouml/**" excludes="*.txt,*.bat,*.xml,*.sh" />
+ </copy>
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}" />
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${build.result.folder}/@dot" includes="**"/>
+ </copy>
+
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}">
+ <include name="META-INF/"/>
+ <include name="plugin.xml"/>
+ <include name="plugin.properties"/>
+ </fileset>
+ </copy>
+
+ <eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
+ </target>
+
+ <target name="gather.logs" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
+ <fileset dir="${build.dir}">
+ <include name="compile.log"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
+
+
Modified: trunk/src/argouml-core-diagrams-uml2/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-uml2/build.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/src/argouml-core-diagrams-uml2/build.xml (original)
+++ trunk/src/argouml-core-diagrams-uml2/build.xml 2010-01-12 10:21:28-0800
@@ -1,316 +1,316 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml 17140 2009-05-05 04:56:19Z linus $
-
- Ant build file for argouml-core-diagrams-uml2.
-
- This is designed to work:
- - in the subdirectory named argouml-core-diagrams-uml2,
- as stored in the repository.
- Used when compiling, running tests from the command line.
- - When checked out from within Eclipse (project named
- argouml-core-diagrams-uml2)
- Used for generating code.
-
-Building this requires:
- argouml-core-infra
- argouml-core-model
- argouml-app
-
- -->
-
-<project basedir="." default="compile" name="argouml-core-diagrams-uml2">
-
- <!-- =================================================================== -->
- <!-- Initialization target -->
- <!-- =================================================================== -->
-
- <target name="init" depends="pde-init">
-
- <property name="build.dir" location="build" />
- <property name="build.classes" value="${build.dir}/classes" />
-
- <path id="src.compile.classpath">
- <fileset dir="../argouml-core-infra/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-core-model/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-app/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- This runtime classpath is used for tests and other things started
- from this file.
- -->
- <path id="src.run.classpath">
- <path refid="src.compile.classpath"/>
- <!-- only one of the following will be used at a time -->
- <!-- we put them together because there's little risk of crosstalk -->
- <fileset dir="../argouml-core-model-mdr/build/">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="../argouml-core-model-euml/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- Try to figure out where our tools directory is. Done after overrides
- are loaded so user can override, but before defaults -->
- <property name="tool.test.file" value="checkstyle/java.header"/>
- <available file="../argouml-core-tools/${tool.test.file}" type="file"
- value="../argouml-core-tools"
- property="argo.tools.dir"
- />
- <available file="../../tools/${tool.test.file}" type="file"
- value="../../tools"
- property="argo.tools.dir"
- />
-
- <path id="tests.compile.classpath">
- <pathelement location="${build.classes}"/>
- <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
- <path refid="src.compile.classpath"/>
- </path>
-
- <path id="tests.run.classpath">
- <path refid="tests.compile.classpath"/>
- <fileset dir="../argouml-core-model-mdr/build/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="tests.all.classpath">
- <pathelement location="${build.classes}"/>
- <pathelement location="build/tests/classes"/>
- <path refid="tests.run.classpath"/>
- </path>
-
- </target>
-
- <!-- =================================================================== -->
- <!-- Initialization target for optional ant tasks -->
- <!-- =================================================================== -->
- <target name="ant.optional.init" depends="init">
- <path id="ant.optional.classpath">
- <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
- <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
- </path>
-
- <taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
- <classpath>
- <path refid="ant.optional.classpath"/>
- </classpath>
- </taskdef>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Prepares the build directory -->
- <!-- =================================================================== -->
-
- <target name="prepare" depends="init">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.classes}"/>
- </target>
-
- <!-- =================================================================== -->
- <!-- Compiles the source directory -->
- <!-- =================================================================== -->
- <target name="compile" depends="prepare"
- description="Compile the sources.">
-
- <echo message="Compiling the sources in argouml-core-diagrams-uml2"/>
-
- <javac debug="on"
- deprecation="on"
- destdir="${build.classes}"
- includes="org/argouml/**/*.java"
- optimize="on"
- includeAntRuntime="no"
- bootclasspath="${bundleBootClasspath}"
- srcdir="src"
- source="1.5"
- target="1.5">
- <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
- <compilerarg line="-log '${build.dir}/compile.log'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
- <classpath>
- <path refid="src.compile.classpath"/>
- </classpath>
- </javac>
- </target>
-
- <!-- =================================================================== -->
- <!-- Creates the jar file -->
- <!-- =================================================================== -->
- <target name="jar" depends="compile"
- description="Build the main jar file.">
- <jar basedir="${build.classes}"
- excludes="*.txt,*.bat,*.xml,*.sh"
- includes="org/argouml/**"
- manifest="src/META-INF/MANIFEST.MF"
- jarfile="${build.dir}/argouml-diagrams-sequence.jar" />
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Clean targets -->
- <!-- =================================================================== -->
- <target name="clean" depends="init"
- description="Clean out all built files.">
- <delete dir="${build.dir}"/>
- <antcall target="pde-clean" />
- </target>
-
-
-
- <!-- ################################################################### -->
- <!-- Section with tests. -->
- <!-- ################################################################### -->
-
-
- <!-- =================================================================== -->
- <!-- Compiles the tests -->
- <!-- =================================================================== -->
-
- <target name="compile-tests" depends="prepare">
-
- <!-- create directories -->
- <mkdir dir="build/tests/classes"/>
-
- <javac debug="true"
- deprecation="on"
- optimize="false"
- destdir="build/tests/classes"
- srcdir="tests"
- source="1.5"
- target="1.5">
- <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
- <classpath>
- <path refid="tests.compile.classpath"/>
- </classpath>
- </javac>
-
- <!-- copy test files -->
- <copy todir="build/tests/classes/testmodels">
- <fileset dir="tests/testmodels" includes="**/**"/>
- </copy>
- </target>
-
- <!-- =================================================================== -->
- <!-- Run the junit tests. -->
- <!-- =================================================================== -->
- <target name="tests" depends="compile,compile-tests"
- description="Run all tests that don't require any GUI components in headleass mode.">
-
- <mkdir dir="build/tests/reports"/>
-
- <junit errorproperty="junit.failure" failureproperty="junit.failure"
- fork="yes" dir="${basedir}" forkmode="perTest"
- haltonfailure="false"
- maxmemory="48M" printsummary="true">
- <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>
- <sysproperty key="java.awt.headless" value="true"/>
- <sysproperty key="argouml.tests.dir" value="tests"/>
- <assertions>
- <enable/>
- </assertions>
- <classpath refid="tests.all.classpath"/>
- <formatter type="xml"/>
- <batchtest todir="build/tests/reports">
- <fileset dir="tests">
- <include name="org/argouml/**/Test*.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Eclipse PDE targets from here to end of file -->
- <!-- =================================================================== -->
- <!--
- Required targets (called in this order) are:
- build.jars
- gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
- gather.logs
- -->
-
- <target name="pde-properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
- </target>
-
- <target name="pde-init" depends="pde-properties">
-
- <property name="bundleId" value="org.argouml.uml2" />
-
- <!-- This property is magic and will have its value substituted by PDE -->
- <property name="version.suffix" value="0.28.0.200904210336"/>
- <property name="bundleVersion" value="${version.suffix}" />
-
- <!-- Compiler settings. -->
- <condition property="dir_bootclasspath" value="${java.home}/../Classes">
- <os family="mac" />
- </condition>
- <property name="dir_bootclasspath" value="${java.home}/lib" />
- <path id="path_bootclasspath">
- <fileset dir="${dir_bootclasspath}">
- <include name="*.jar" />
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath" />
- <property name="bundleBootClasspath" value="${bootclasspath}" />
-
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder" />
- </condition>
- <property name="pluginTemp" value="${basedir}" />
- <condition property="build.result.folder" value="${pluginTemp}/${bundleId}_${bundleVersion}">
- <isset property="buildTempFolder" />
- </condition>
- <property name="build.result.folder" value="${basedir}" />
- <property name="plugin.destination" value="${basedir}" />
- </target>
-
- <target name="pde-clean" depends="pde-init">
- <delete file="${plugin.destination}/${bundleId}_*.jar" />
- <delete file="${plugin.destination}/${bundleId}_*.zip" />
- </target>
-
- <target name="build.jars" depends="jar" description="Compile classes and build nested jars for the plug-in: ${bundleId}.">
- <mkdir dir="${build.result.folder}/@dot"/>
- <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
- <fileset dir="${build.classes}" includes="org/argouml/**" excludes="*.txt,*.bat,*.xml,*.sh" />
- </copy>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}" />
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
- <fileset dir="${build.result.folder}/@dot" includes="**"/>
- </copy>
-
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
- <fileset dir="${basedir}">
- <include name="META-INF/"/>
- <include name="plugin.xml"/>
- <include name="plugin.properties"/>
- </fileset>
- </copy>
-
- <eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
- <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
- <fileset dir="${build.dir}">
- <include name="compile.log"/>
- </fileset>
- </copy>
- </target>
-
-</project>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$
+
+ Ant build file for argouml-core-diagrams-uml2.
+
+ This is designed to work:
+ - in the subdirectory named argouml-core-diagrams-uml2,
+ as stored in the repository.
+ Used when compiling, running tests from the command line.
+ - When checked out from within Eclipse (project named
+ argouml-core-diagrams-uml2)
+ Used for generating code.
+
+Building this requires:
+ argouml-core-infra
+ argouml-core-model
+ argouml-app
+
+ -->
+
+<project basedir="." default="compile" name="argouml-core-diagrams-uml2">
+
+ <!-- =================================================================== -->
+ <!-- Initialization target -->
+ <!-- =================================================================== -->
+
+ <target name="init" depends="pde-init">
+
+ <property name="build.dir" location="build" />
+ <property name="build.classes" value="${build.dir}/classes" />
+
+ <path id="src.compile.classpath">
+ <fileset dir="../argouml-core-infra/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-app/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- This runtime classpath is used for tests and other things started
+ from this file.
+ -->
+ <path id="src.run.classpath">
+ <path refid="src.compile.classpath"/>
+ <!-- only one of the following will be used at a time -->
+ <!-- we put them together because there's little risk of crosstalk -->
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model-euml/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Try to figure out where our tools directory is. Done after overrides
+ are loaded so user can override, but before defaults -->
+ <property name="tool.test.file" value="checkstyle/java.header"/>
+ <available file="../argouml-core-tools/${tool.test.file}" type="file"
+ value="../argouml-core-tools"
+ property="argo.tools.dir"
+ />
+ <available file="../../tools/${tool.test.file}" type="file"
+ value="../../tools"
+ property="argo.tools.dir"
+ />
+
+ <path id="tests.compile.classpath">
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ <path refid="src.compile.classpath"/>
+ </path>
+
+ <path id="tests.run.classpath">
+ <path refid="tests.compile.classpath"/>
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <path id="tests.all.classpath">
+ <pathelement location="${build.classes}"/>
+ <pathelement location="build/tests/classes"/>
+ <path refid="tests.run.classpath"/>
+ </path>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Initialization target for optional ant tasks -->
+ <!-- =================================================================== -->
+ <target name="ant.optional.init" depends="init">
+ <path id="ant.optional.classpath">
+ <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ </path>
+
+ <taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
+ <classpath>
+ <path refid="ant.optional.classpath"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Prepares the build directory -->
+ <!-- =================================================================== -->
+
+ <target name="prepare" depends="init">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.classes}"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Compiles the source directory -->
+ <!-- =================================================================== -->
+ <target name="compile" depends="prepare"
+ description="Compile the sources.">
+
+ <echo message="Compiling the sources in argouml-core-diagrams-uml2"/>
+
+ <javac debug="on"
+ deprecation="on"
+ destdir="${build.classes}"
+ includes="org/argouml/**/*.java"
+ optimize="on"
+ includeAntRuntime="no"
+ bootclasspath="${bundleBootClasspath}"
+ srcdir="src"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <compilerarg line="-log '${build.dir}/compile.log'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ <classpath>
+ <path refid="src.compile.classpath"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Creates the jar file -->
+ <!-- =================================================================== -->
+ <target name="jar" depends="compile"
+ description="Build the main jar file.">
+ <jar basedir="${build.classes}"
+ excludes="*.txt,*.bat,*.xml,*.sh"
+ includes="org/argouml/**"
+ manifest="src/META-INF/MANIFEST.MF"
+ jarfile="${build.dir}/argouml-diagrams-sequence.jar" />
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Clean targets -->
+ <!-- =================================================================== -->
+ <target name="clean" depends="init"
+ description="Clean out all built files.">
+ <delete dir="${build.dir}"/>
+ <antcall target="pde-clean" />
+ </target>
+
+
+
+ <!-- ################################################################### -->
+ <!-- Section with tests. -->
+ <!-- ################################################################### -->
+
+
+ <!-- =================================================================== -->
+ <!-- Compiles the tests -->
+ <!-- =================================================================== -->
+
+ <target name="compile-tests" depends="prepare">
+
+ <!-- create directories -->
+ <mkdir dir="build/tests/classes"/>
+
+ <javac debug="true"
+ deprecation="on"
+ optimize="false"
+ destdir="build/tests/classes"
+ srcdir="tests"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <classpath>
+ <path refid="tests.compile.classpath"/>
+ </classpath>
+ </javac>
+
+ <!-- copy test files -->
+ <copy todir="build/tests/classes/testmodels">
+ <fileset dir="tests/testmodels" includes="**/**"/>
+ </copy>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Run the junit tests. -->
+ <!-- =================================================================== -->
+ <target name="tests" depends="compile,compile-tests"
+ description="Run all tests that don't require any GUI components in headleass mode.">
+
+ <mkdir dir="build/tests/reports"/>
+
+ <junit errorproperty="junit.failure" failureproperty="junit.failure"
+ fork="yes" dir="${basedir}" forkmode="perTest"
+ haltonfailure="false"
+ maxmemory="48M" printsummary="true">
+ <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>
+ <sysproperty key="java.awt.headless" value="true"/>
+ <sysproperty key="argouml.tests.dir" value="tests"/>
+ <assertions>
+ <enable/>
+ </assertions>
+ <classpath refid="tests.all.classpath"/>
+ <formatter type="xml"/>
+ <batchtest todir="build/tests/reports">
+ <fileset dir="tests">
+ <include name="org/argouml/**/Test*.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Eclipse PDE targets from here to end of file -->
+ <!-- =================================================================== -->
+ <!--
+ Required targets (called in this order) are:
+ build.jars
+ gather.bin.parts - must create and populate "${destination.temp.folder}/<Bundle-SymbolicName>_<Bundle-Version>
+ gather.logs
+ -->
+
+ <target name="pde-properties" if="eclipse.running">
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ </target>
+
+ <target name="pde-init" depends="pde-properties">
+
+ <property name="bundleId" value="org.argouml.uml2" />
+
+ <!-- This property is magic and will have its value substituted by PDE -->
+ <property name="version.suffix" value="0.28.0.200904210336"/>
+ <property name="bundleVersion" value="${version.suffix}" />
+
+ <!-- Compiler settings. -->
+ <condition property="dir_bootclasspath" value="${java.home}/../Classes">
+ <os family="mac" />
+ </condition>
+ <property name="dir_bootclasspath" value="${java.home}/lib" />
+ <path id="path_bootclasspath">
+ <fileset dir="${dir_bootclasspath}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
+ <property name="bootclasspath" refid="path_bootclasspath" />
+ <property name="bundleBootClasspath" value="${bootclasspath}" />
+
+ <condition property="pluginTemp" value="${buildTempFolder}/plugins">
+ <isset property="buildTempFolder" />
+ </condition>
+ <property name="pluginTemp" value="${basedir}" />
+ <condition property="build.result.folder" value="${pluginTemp}/${bundleId}_${bundleVersion}">
+ <isset property="buildTempFolder" />
+ </condition>
+ <property name="build.result.folder" value="${basedir}" />
+ <property name="plugin.destination" value="${basedir}" />
+ </target>
+
+ <target name="pde-clean" depends="pde-init">
+ <delete file="${plugin.destination}/${bundleId}_*.jar" />
+ <delete file="${plugin.destination}/${bundleId}_*.zip" />
+ </target>
+
+ <target name="build.jars" depends="jar" description="Compile classes and build nested jars for the plug-in: ${bundleId}.">
+ <mkdir dir="${build.result.folder}/@dot"/>
+ <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
+ <fileset dir="${build.classes}" includes="org/argouml/**" excludes="*.txt,*.bat,*.xml,*.sh" />
+ </copy>
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}" />
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${build.result.folder}/@dot" includes="**"/>
+ </copy>
+
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}">
+ <include name="META-INF/"/>
+ <include name="plugin.xml"/>
+ <include name="plugin.properties"/>
+ </fileset>
+ </copy>
+
+ <eclipse.versionReplacer path="${destination.temp.folder}/${bundleId}_${bundleVersion}" version="${bundleVersion}" />
+ </target>
+
+ <target name="gather.logs" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/${bundleId}_${bundleVersion}"/>
+ <copy todir="${destination.temp.folder}/${bundleId}_${bundleVersion}" failonerror="false" overwrite="false">
+ <fileset dir="${build.dir}">
+ <include name="compile.log"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
+
+
Modified: trunk/src/argouml-core-model-euml/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/build.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/src/argouml-core-model-euml/build.xml (original)
+++ trunk/src/argouml-core-model-euml/build.xml 2010-01-12 10:21:28-0800
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: build.xml 12413 2007-04-21 15:44:59Z linus $
+<!-- $Id$
Build file for the eUML implementation of the Model subsystem.
Modified: trunk/tools/checkstyle-4.3/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/checkstyle-4.3/build.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/tools/checkstyle-4.3/build.xml (original)
+++ trunk/tools/checkstyle-4.3/build.xml 2010-01-12 10:21:28-0800
@@ -1,798 +1,798 @@
-<project name="checkstyle" default="compile.checkstyle" basedir=".">
-
- <!-- set global properties for this build -->
- <!-- Give user a chance to override without editing this file -->
- <!-- (and without typing -D each time it compiles it) -->
- <property name="target.dir" value="${basedir}/target" />
- <property file="checkstyle.buildproperties" />
- <property file="${user.home}/checkstyle.buildproperties" />
-
- <property name="version" value="4.3" />
- <property name="ant.jar" value="${ant.home}/lib/ant.jar" />
- <property name="xerces.jar" value="${ant.home}/lib/xercesImpl.jar" />
- <property name="xml-apis.jar" value="${ant.home}/lib/xml-apis.jar" />
- <property name="antlr.jar" value="lib/antlr.jar" />
- <property name="velocity.jar" value="lib/velocity-dep-1.4.jar" />
- <property name="jdom.jar" value="lib/jdom-b9.jar" />
- <property name="junit.jar" value="lib/junit.jar" />
- <property name="beanutils.jar" value="lib/commons-beanutils-core.jar" />
- <property name="collections.jar" value="lib/commons-collections.jar" />
- <property name="cli.jar" value="lib/commons-cli.jar" />
- <property name="logging.jar" value="lib/commons-logging.jar" />
- <property name="tools.jar" value="${java.home}/../lib/tools.jar" />
- <property name="emma.enabled" value="true" />
-
- <property name="checkstyle.dir"
- value="src/checkstyle/com/puppycrawl/tools/checkstyle" />
- <property name="checkstyle.grammar.dir"
- value="${checkstyle.dir}/grammars" />
- <property name="testreport.dir" value="${target.dir}/testreports"/>
- <property name="dist.dir" value="${target.dir}/dist"/>
- <property name="checkstyle.dest" value="${target.dir}/checkstyle" />
- <property name="tests.dest" value="${target.dir}/tests" />
- <property name="testinputs.dest" value="${target.dir}/testinputs" />
- <property name="emma.dest" value="${target.dir}/emma" />
-
- <property name="xdocs.src" value="src/xdocs"/>
- <property name="xdocs.dest" value="${target.dir}/docs"/>
- <property name="checkstyle.minimum.javaversion" value="1.4" />
- <property name="checkstyle.testinputs.minimum.javaversion" value="1.5" />
- <property name="testcases" value="**/*Test.java"/>
-
- <path id="build.classpath">
- <pathelement location="${antlr.jar}" />
- <pathelement location="${collections.jar}" />
- <pathelement location="${cli.jar}" />
- <pathelement location="${beanutils.jar}" />
- <pathelement location="${logging.jar}" />
- <pathelement location="${ant.jar}" />
- <pathelement location="${tools.jar}" />
- </path>
-
- <path id="run.classpath">
- <pathelement location="${checkstyle.dest}" />
- <pathelement location="${antlr.jar}" />
- <path refid="build.classpath" />
- </path>
-
- <!-- add classes to generate Javadoc -->
- <path id="javadoc.classpath">
- <path refid="run.classpath" />
- </path>
-
- <path id="tests.buildpath">
- <pathelement location="${junit.jar}" />
- <path refid="run.classpath" />
- </path>
-
- <path id="tests.runpath">
- <!-- Need the instrumented classes first -->
- <pathelement location="${emma.dest}/classes" />
- <pathelement location="${tests.dest}" />
- <pathelement location="${testinputs.dest}" />
- <pathelement path="${xerces.jar}"/>
- <pathelement path="${xml-apis.jar}"/>
- <pathelement location="lib/emma.jar"/>
- <path refid="tests.buildpath" />
- </path>
-
- <path id="velocity.classpath">
- <pathelement location="${velocity.jar}"/>
- <pathelement location="${jdom.jar}" />
- </path>
-
- <target name="display.classpath" description="Displays the run classpath">
- <property name="asd" refid="run.classpath" />
- <echo message="Classpath is ${asd}" />
- </target>
-
- <!-- -->
- <!-- Cleanup targets -->
- <!-- -->
- <target name="clean" description="Cleans any directories and generated files">
- <delete>
- <fileset dir="src/checkstyle">
- <include name="**/Generated*"/>
- <include name="**/expandedjava*.g"/>
- </fileset>
- </delete>
- <delete dir="${target.dir}" />
- <delete file="velocity.log" />
- </target>
-
- <!-- -->
- <!-- ANTLR targets -->
- <!-- -->
-
- <!-- Checks whether the grammar file is newer that the generated code -->
- <target name="-check.antlr"
- description="Checks whether the grammar file is newer that the generated code">
- <uptodate property="uptodate.antlr"
- targetfile="${checkstyle.grammar.dir}/GeneratedJavaLexer.java" >
- <srcfiles dir= "${checkstyle.grammar.dir}" includes="java.g"/>
- </uptodate>
- </target>
-
- <!-- Conditionally will compile the grammar. Deliberately do not use the -->
- <!-- antlr task as it requirs the ANTLR classes to be in the classpath -->
- <!-- which creates lots of problems. -->
- <target name="build.antlr" depends="-check.antlr" unless="uptodate.antlr"
- description="Conditionally compiles the grammar files">
- <java classname="antlr.Tool"
- classpath="${antlr.jar}"
- fork="yes"
- failonerror="true"
- dir="${checkstyle.grammar.dir}">
- <arg value="java.g" />
- </java>
- </target>
-
- <!-- -->
- <!-- COMPILE TARGETS -->
- <!-- -->
- <target name="compile.checkstyle" depends="build.antlr"
- description="Compiles the source code">
- <mkdir dir="${checkstyle.dest}" />
- <depend srcdir="src/checkstyle"
- destdir="${checkstyle.dest}" closure="yes"/>
- <javac srcdir="src/checkstyle"
- destdir="${checkstyle.dest}"
- includes="**/*.java"
- deprecation="on" debug="on"
- source="${checkstyle.minimum.javaversion}"
- target="${checkstyle.minimum.javaversion}"
- classpathref="build.classpath"
- encoding="iso-8859-1"
- includeAntRuntime="false"/>
-
- <propertyfile file="${checkstyle.dest}/checkstylecompilation.properties">
- <entry key="checkstyle.compile.version" value="${version}"/>
- <entry key="checkstyle.compile.timestamp" type="date" value="now" pattern="E MMMM dd yyyy, HH:mm z"/>
- </propertyfile>
-
- <native2ascii src="src/checkstyle"
- dest="${checkstyle.dest}"
- encoding="EUC-JP"
- includes="**/*_ja.properties" />
-
- <copy todir="${checkstyle.dest}">
- <fileset dir="src/checkstyle" includes="**/*.properties"/>
- <fileset dir="src/checkstyle" includes="**/*.xml"/>
- <fileset dir="src/checkstyle" includes="**/*.dtd"/>
- </copy>
-
- <!-- fix for bug #594469:
- create a copy of the english property file, necessary to run
- the tests in an environment that has a supported language (e.g. de)
- in the default locale. See algorithm in ResourceBundle.getBundle() -->
-
- <copy todir="${checkstyle.dest}" >
- <fileset dir="src/checkstyle" includes="**/messages.properties"/>
- <mapper type="glob" from="*messages.properties" to="*messages_en.properties"/>
- </copy>
-
- <javadoc sourcefiles="src/checkstyle/com/puppycrawl/tools/checkstyle/api/TokenTypes.java"
- classpathref="javadoc.classpath"
- encoding="iso-8859-1"
- source="${checkstyle.minimum.javaversion}"
- failonerror="yes">
- <doclet name="com.puppycrawl.tools.checkstyle.doclets.TokenTypesDoclet"
- path="${checkstyle.dest}">
- <param name="-destfile" value="${checkstyle.dest}/com/puppycrawl/tools/checkstyle/api/tokentypes.properties"/>
- </doclet>
- </javadoc>
- </target>
-
- <target name="compile.testinputs" description="Compile test inputs">
- <mkdir dir="${testinputs.dest}" />
- <depend srcdir="src/testinputs" destdir="${testinputs.dest}" closure="yes"/>
- <!-- start of a change to turn on compilation of all input files -->
- <!-- under JDK1.5. -->
- <javac srcdir="src/testinputs"
- destdir="${testinputs.dest}"
- deprecation="on" debug="on"
- source="${checkstyle.testinputs.minimum.javaversion}"
- target="${checkstyle.testinputs.minimum.javaversion}"
- includeAntRuntime="false">
- <exclude name="**/j2ee/*" />
- <exclude name="**/InputAssertIdentifier.java" />
- <exclude name="**/InputClone.java" />
- <exclude name="**/InputCovariant.java" />
- <exclude name="**/InputGrammar.java" />
- <exclude name="**/InputImport.java" />
- <exclude name="**/InputJUnitTest.java" />
- <exclude name="**/InputSetterGetter.java" />
- <exclude name="**/InputSimple.java" />
- <exclude name="**/InputValidMethodIndent.java" />
- <exclude name="**/Post13KeywordsAsIdentifiersOK.java" />
- </javac>
- </target>
-
- <!-- Compiles only the test code. Input files are excluded from
- compilation, they contain code like assert statements
- that does not compile on all JDKs -->
- <target name="compile.tests" depends="compile.checkstyle, setup.emma"
- description="Compiles the test code">
-
- <mkdir dir="${tests.dest}" />
- <depend srcdir="src/tests" destdir="${tests.dest}" closure="yes"/>
- <javac srcdir="src/tests"
- destdir="${tests.dest}"
- deprecation="on" debug="on"
- classpathref="tests.buildpath"
- encoding="iso-8859-1"
- source="${checkstyle.minimum.javaversion}"
- target="${checkstyle.minimum.javaversion}"
- includeAntRuntime="false"/>
-
- <!-- now instrument the classes -->
- <mkdir dir="${emma.dest}/classes"/>
- <emma enabled="${emma.enabled}">
- <instr destdir="${emma.dest}/classes"
- metadatafile="${emma.dest}/metadata.emma"
- >
- <instrpath>
- <pathelement location="${checkstyle.dest}"/>
- </instrpath>
- <filter excludes="com.puppycrawl.tools.checkstyle.doclets.*"/>
- <filter excludes="com.puppycrawl.tools.checkstyle.gui.*"/>
- <filter excludes="com.puppycrawl.tools.checkstyle.grammars.*"/>
- </instr>
- </emma>
- </target>
-
- <!-- -->
- <!-- TEST TARGETS -->
- <!-- -->
-
- <!-- Run the GUI -->
- <target name="run.gui" depends="compile.checkstyle"
- description="Run the GUI for displaying a tree">
- <java classname="com.puppycrawl.tools.checkstyle.gui.Main"
- fork="yes" classpathref="run.classpath">
- </java>
- </target>
-
- <!-- runs the command line version on a file -->
- <target name="run.checkstyle" depends="compile.tests"
- description="Runs the command line version on a file">
- <java classname="com.puppycrawl.tools.checkstyle.Main"
- fork="yes"
- dir="."
- classpathref="run.classpath">
- <sysproperty key="checkstyle.allow.tabs" value="yes"/>
- <arg value="-c"/>
- <arg file="checkstyle_checks.xml"/>
- <arg value="src/testinputs/com/puppycrawl/tools/checkstyle/InputSimple.java"/>
- </java>
- <java classname="com.puppycrawl.tools.checkstyle.Main"
- fork="yes"
- dir="."
- classpathref="run.classpath">
- <arg value="-c"/>
- <arg file="checkstyle_checks.xml"/>
- <arg value="-r"/>
- <arg file="src/checkstyle/com/puppycrawl/tools/checkstyle/api"/>
- </java>
- </target>
-
- <target name="enable.todo" description="Will enable checking for TODO's">
- <property name="todo.pattern" value="TODO:"/>
- </target>
-
- <target name="checkstyle.checkstyle" depends="compile.checkstyle"
- description="Runs checkstyle against it's own sources">
- <taskdef name="checkstyle"
- classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
- <classpath refid="run.classpath"/>
- </taskdef>
- <delete file="${target.dir}/cachefile" />
-
- <property name="checkstyle.pattern.todo" value="NOTHingWillMatCH_-"/>
- <property name="check.config" location="checkstyle_checks.xml"/>
- <property name="translation.severity" value="ignore"/>
- <checkstyle config="${check.config}">
- <fileset dir="src/checkstyle"
- includes="**/*.java,**/*.properties"
- excludes="**/Generated*.java,**/gui/*,**/transmogrify/*"/>
- <formatter type="plain"/>
- <formatter type="xml" toFile="${target.dir}/cs_errors.xml"/>
- <classpath refid="run.classpath"/>
- <property key="checkstyle.cache.file" file="${target.dir}/cachefile"/>
- <property key="checkstyle.header.file" file="java.header"/>
- <property key="checkstyle.importcontrol.file" file="import-control.xml"/>
- <property key="checkstyle.suppressions.file"
- file="suppressions.xml"/>
- </checkstyle>
- </target>
-
- <target name="checkstyle.style" depends="compile.checkstyle"
- description="Runs checkstyle against it's own sources to test generation of error reports">
- <taskdef name="checkstyle"
- classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
- <classpath refid="run.classpath"/>
- </taskdef>
- <delete file="${target.dir}/cachefile" />
-
- <property name="checkstyle.pattern.todo" value="NOTHingWillMatCH_-"/>
- <property name="check.config" location="checkstyle_checks.xml"/>
- <property name="translation.severity" value="ignore"/>
- <checkstyle failonviolation="false" config="${check.config}">
- <fileset dir="src/checkstyle"
- includes="**/*.java,**/*.properties"
- excludes="**/Generated*.java,**/gui/*,,**/transmogrify/*"/>
- <formatter type="xml" toFile="${target.dir}/cs_errors.xml"/>
- <classpath refid="run.classpath"/>
- <property key="checkstyle.cache.file" file="${target.dir}/cachefile"/>
- <property key="checkstyle.header.file" file="java.header"/>
- <property key="checkstyle.importcontrol.file" file="import-control.xml"/>
- <property key="checkstyle.suppressions.file"
- file="suppressions.xml"/>
- </checkstyle>
- <mkdir dir="${target.dir}/style/frames"/>
- <mkdir dir="${target.dir}/style/noframes"/>
- <mkdir dir="${target.dir}/style/simple"/>
- <mkdir dir="${target.dir}/style/csv"/>
- <mkdir dir="target/style/author"/>
- <style basedir="${target.dir}"
- destdir="${target.dir}/style/noframes"
- includes="cs_errors.xml"
- style="contrib/checkstyle-noframes.xsl"/>
- <style basedir="${target.dir}"
- destdir="${target.dir}/style/frames"
- includes="cs_errors.xml"
- style="contrib/checkstyle-frames.xsl"/>
- <style basedir="${target.dir}"
- destdir="${target.dir}/style/simple"
- includes="cs_errors.xml"
- style="contrib/checkstyle-simple.xsl"/>
- <style out="${target.dir}/style/csv/report-csv.txt"
- in="${target.dir}/cs_errors.xml"
- style="contrib/checkstyle-csv.xsl"/>
- <style basedir="target"
- destdir="target/style/author"
- includes="cs_errors.xml"
- style="contrib/checkstyle-author.xsl"/>
- </target>
-
- <!-- Targets to verify that JUnit is in the classpath -->
- <target name="-check.junit"
- description="Checks whether JUnit is in the classpath">
- <available property="have.junit"
- classname="junit.framework.TestListener"/>
- </target>
-
- <target name="-require.junit" depends="-check.junit" unless="have.junit"
- description="Fails if JUnit is not present in the classpath">
- <fail message="Need to have JUnit in your CLASSPATH to run the tests. Consider using the one in the lib directory."/>
- </target>
-
- <!-- Targets to verify that Xalan is in the classpath -->
- <target name="-check.xalan"
- description="Checks whether xalan is in the classpath">
- <condition property="have.xalan">
- <or>
- <!-- jdk 1.3 with modern Xalan -->
- <available classname="org.apache.xalan.Version" />
- <!-- Xalan classes in jdk 1.4 (beta 3) are OK for running -->
- <!-- the tests, but there is no Version class in jdk 1.4: -->
- <!-- fallback to stable jaxp implementation class -->
- <available classname="org.apache.xalan.transformer.TransformerImpl"/>
- <!--
- In JDK 1.5 Sun has decided to repackage Xalan in it's own
- package com.sun.org.apache..., see Java bug 4740355.
- Additionally at least Ant 1.6.2 is required to make junitreport
- work with Xalan XSLTC and/or JDK 1.5 (Ant bug 27541)
- -->
- <and>
- <equals arg1="${ant.java.version}" arg2="1.5" />
- <!-- TODO: find a more elegant way to specify *minimum* version -->
- <not>
- <or>
- <contains string="${ant.version}" substring="version 1.4" />
- <contains string="${ant.version}" substring="version 1.5" />
- <contains string="${ant.version}" substring="version 1.6.0" />
- <contains string="${ant.version}" substring="version 1.6.1" />
- </or>
- </not>
- </and>
- </or>
- </condition>
- </target>
-
- <target name="-require.xalan" depends="-check.xalan" unless="have.xalan"
- description="Fails if xalan is not present in the classpath">
- <fail>
-Need to have Xalan in your CLASSPATH to run the tests.
-You can download it from http://xml.apache.org/.
-Alternatively you can upgrade JDK 1.4 or higher.
-For users of JDK 1.5 at least version 1.6.2 of Ant is required.
- </fail>
- </target>
-
- <!-- To run the tests need Xalan in the classpath -->
- <target name="run.tests"
- depends="compile.tests,-require.ant15,-require.junit,-require.xalan,compile.testinputs"
- description="Runs the tests for checkstyle">
-
- <mkdir dir="${testreport.dir}"/>
- <property name="testinputs.dir"
- location="${basedir}/src/testinputs/com/puppycrawl/tools/checkstyle"/>
-
- <junit printsummary="yes"
- fork="yes"
- forkmode="perBatch"
- haltonfailure="no"
- showoutput="yes"
- failureProperty="tests.have.failed">
-
- <sysproperty key="testinputs.dir" value="${testinputs.dir}"/>
- <sysproperty key="checkstyle.use.recursive.algorithm"
- value="${checkstyle.use.recursive.algorithm}"/>
- <sysproperty key="checkstyle.root" value="${basedir}" />
-
- <sysproperty key="emma.coverage.out.file"
- file="${emma.coverage.out.file}"
- />
- <sysproperty key="emma.coverage.out.merge"
- value="true" />
-
- <formatter type="xml" />
- <classpath refid="tests.runpath"/>
- <batchtest todir="${testreport.dir}">
- <fileset dir="src/tests">
- <include name="${testcases}" />
- </fileset>
- </batchtest>
- </junit>
-
- <junitreport todir="${testreport.dir}">
- <fileset dir="${testreport.dir}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report todir="${testreport.dir}"/>
- </junitreport>
-
- <property name="report"
- value="${basedir}/${testreport.dir}/index.html"/>
-
- <!-- generate the emma report -->
- <emma enabled="${emma.enabled}">
- <report sourcepath="src/checkstyle">
- <fileset dir="${emma.dest}" includes="*.emma"/>
- <html outfile="${emma.report.dir}/index.html"/>
- </report>
- </emma>
-
- <fail if="tests.have.failed"
- message="Unit tests failed - Report is available in ${report}"/>
- </target>
-
- <!-- -->
- <!-- DIST TARGETS -->
- <!-- -->
- <target name="build.bindist" depends="compile.checkstyle, javadoc, xdocs"
- description="Builds the compressed distribution files">
- <delete dir="${dist.dir}/checkstyle-${version}" />
- <mkdir dir="${dist.dir}/checkstyle-${version}" />
- <copy file="config/manifest.mf" todir="${target.dir}">
- <filterset>
- <filter token="CHECKSTYLE_VERSION" value="${version}" />
- </filterset>
- </copy>
- <jar jarfile="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar"
- basedir="${checkstyle.dest}"
- excludes="**/j2ee/**"
- manifest="${target.dir}/manifest.mf" />
- <jar jarfile="${dist.dir}/checkstyle-${version}/checkstyle-optional-${version}.jar"
- basedir="${checkstyle.dest}"
- includes="**/j2ee/**"/>
- <!-- copy the JARS and make a mega JAR out of them -->
- <copy file="${antlr.jar}" todir="${dist.dir}/checkstyle-${version}" />
- <copy file="${beanutils.jar}" todir="${dist.dir}/checkstyle-${version}" />
- <copy file="${collections.jar}" todir="${dist.dir}/checkstyle-${version}" />
- <copy file="${cli.jar}" todir="${dist.dir}/checkstyle-${version}" />
- <copy file="${logging.jar}" todir="${dist.dir}/checkstyle-${version}" />
- <jar jarfile="${dist.dir}/checkstyle-${version}/checkstyle-all-${version}.jar"
- manifest="${target.dir}/manifest.mf"
- filesetmanifest="skip">
- <zipfileset src="${dist.dir}/checkstyle-${version}/antlr.jar" excludes="META-INF/*"/>
- <zipfileset src="${dist.dir}/checkstyle-${version}/commons-beanutils-core.jar" excludes="META-INF/*,overview.html"/>
- <zipfileset src="${dist.dir}/checkstyle-${version}/commons-collections.jar" excludes="META-INF/*"/>
- <zipfileset src="${dist.dir}/checkstyle-${version}/commons-cli.jar" excludes="META-INF/*"/>
- <zipfileset src="${dist.dir}/checkstyle-${version}/commons-logging.jar" excludes="META-INF/*"/>
- <zipfileset src="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar" excludes="META-INF/*"/>
- </jar>
- <!-- copy stuff without filtering -->
- <copy todir="${dist.dir}/checkstyle-${version}">
- <fileset dir=".">
- <include name="**/.cvsignore"/>
- <include name="**/CVS"/>
- <include name="*.xml"/>
- <include name="LICENSE*"/>
- <include name="README"/>
- <include name="RIGHTS.antlr"/>
- <include name="TODO"/>
- <include name="contrib/**"/>
- <include name="java.header"/>
- </fileset>
- </copy>
-
- <!-- Make the docs directory -->
- <mkdir dir="${dist.dir}/checkstyle-${version}/docs" />
- <copy todir="${dist.dir}/checkstyle-${version}/docs">
- <fileset dir="${xdocs.dest}"/>
- </copy>
-
- <!-- create the final zip & tar/gzip files -->
- <zip zipfile="${dist.dir}/checkstyle-${version}.zip">
- <fileset dir="${dist.dir}">
- <include name="checkstyle-${version}/**"/>
- </fileset>
- </zip>
- <tar tarfile="${dist.dir}/checkstyle-${version}.tar" longfile="gnu"
- basedir="${dist.dir}" includes="checkstyle-${version}/**" />
- <gzip zipfile="${dist.dir}/checkstyle-${version}.tar.gz"
- src="${dist.dir}/checkstyle-${version}.tar" />
- </target>
-
- <target name="build.srcdist" depends="checkstyle.checkstyle"
- description="Builds the compressed source files for distribution">
- <delete dir="${dist.dir}/checkstyle-src-${version}" />
- <mkdir dir="${dist.dir}/checkstyle-src-${version}" />
- <copy todir="${dist.dir}/checkstyle-src-${version}">
- <fileset dir=".">
- <exclude name="src/checkstyle/**/Generated*"/>
- <include name="*.xml"/>
- <include name="LICENSE*"/>
- <include name="README"/>
- <include name="RIGHTS.antlr"/>
- <include name="TODO"/>
- <include name="build.xml"/>
- <include name="config/**"/>
- <include name="contrib/**"/>
- <include name="java.header"/>
- <include name="lib/**"/>
- <include name="src/**"/>
- </fileset>
- </copy>
-
- <!-- Produce the final distributions -->
- <zip zipfile="${dist.dir}/checkstyle-src-${version}.zip">
- <fileset dir="${dist.dir}">
- <include name="checkstyle-src-${version}/**"/>
- </fileset>
- </zip>
- <tar tarfile="${dist.dir}/checkstyle-src-${version}.tar" longfile="gnu"
- basedir="${dist.dir}" includes="checkstyle-src-${version}/**" />
- <gzip zipfile="${dist.dir}/checkstyle-src-${version}.tar.gz"
- src="${dist.dir}/checkstyle-src-${version}.tar" />
- </target>
-
- <!-- -->
- <!-- DOC TARGETS -->
- <!-- -->
- <target name="javadoc" depends="compile.checkstyle"
- description="Creates the javadoc html files">
- <mkdir dir="${xdocs.dest}/api" />
- <javadoc sourcepath="src/checkstyle" destdir="${xdocs.dest}/api"
- Windowtitle="Checkstyle API"
- classpathref="javadoc.classpath"
- Use="true"
- Footer="<a target="_top" href="./{@docRoot}/../index.html">Back to the Checkstyle Home Page</a>"
- useExternalFile="yes"
- encoding="iso-8859-1"
- source="${checkstyle.minimum.javaversion}"
- failonerror="yes" >
- <link packagelistLoc="${basedir}/config/jdk-package-list"
- offline="yes"
- href="http://java.sun.com/j2se/1.4.2/docs/api/" />
- <link packagelistLoc="${basedir}/config/antlr-package-list"
- offline="yes"
- href="http://www.antlr.org/javadoc/" />
- <fileset dir="src/checkstyle">
- <include name="**/*.java"/>
- <exclude name="**/Generated*.java" />
- <exclude name="**/gui/*.java" />
- <exclude name="**/checks/**"/>
- </fileset>
- </javadoc>
- </target>
-
- <target name="xdocs" depends="compile.checkstyle"
- description="generate documentation">
-
- <mkdir dir="${xdocs.dest}"/>
-
- <mkdir dir="${target.dir}/xdocs"/>
-
- <copy todir="${target.dir}/xdocs">
- <fileset dir="${xdocs.src}">
- <exclude name="**/*.css"/>
- <exclude name="**/*.gif"/>
- <exclude name="**/*.png"/>
- </fileset>
- <filterset>
- <filter token="CHECKSTYLE_VERSION" value="${version}" />
- </filterset>
- </copy>
-
- <javadoc sourcepath="src/checkstyle" destdir="${target.dir}/xdocs"
- classpathref="build.classpath"
- source="${checkstyle.minimum.javaversion}"
- failonerror="yes">
- <doclet name="com.puppycrawl.tools.checkstyle.doclets.CheckDocsDoclet"
- path="${checkstyle.dest}">
- </doclet>
- <fileset dir="src/checkstyle">
- <include name="**/checks/**/*Check.java" />
- <exclude name="**/checks/j2ee/AbstractInterfaceCheck.java" />
- </fileset>
- </javadoc>
-
- <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
- <classpath refid="velocity.classpath"/>
- </taskdef>
-
- <copy todir="${xdocs.dest}">
- <fileset dir="${xdocs.src}">
- <include name="**/*.css"/>
- <include name="**/*.gif"/>
- <include name="**/*.png"/>
- </fileset>
- </copy>
-
- <anakia basedir="${target.dir}/xdocs"
- destdir="${xdocs.dest}/"
- extension=".html"
- style="site.vsl"
- projectFile="stylesheets/project.xml"
- excludes="**/stylesheets/**"
- includes="**/*.xml"
- lastModifiedCheck="true"
- templatePath="${xdocs.src}/stylesheets">
- </anakia>
-
- </target>
-
- <target name="report.translation"
- description="Sets up reporting on translation errors"
- >
- <property name="translation.severity" value="error"/>
- </target>
-
- <target name="gump" depends="build.bindist,build.srcdist,run.tests"
- description="Runs the test for GUMP testing"/>
-
-
- <!-- Targets to verify that Xerces is in the classpath -->
- <target name="-check.xerces"
- description="Checks whether xerces is in the classpath">
- <condition property="have.xerces">
- <available classname="org.apache.xerces.parsers.SAXParser"/>
- </condition>
- </target>
-
- <target name="-require.xerces" depends="-check.xerces" unless="have.xerces"
- description="Fails if xerces is not present in the classpath">
- <fail message="Need to have Xerces-J in your CLASSPATH to run the tests. You can download it from http://xml.apache.org/."/>
- </target>
-
- <target name="validate.xml"
- depends="-require.xerces"
- description="Validates checkstyle XML file">
- <xmlvalidate file="checkstyle_checks.xml">
- <xmlcatalog>
- <dtd
- publicId="-//Puppy Crawl//DTD Check Configuration 1.1//EN"
- location="${checkstyle.dir}/configuration_1_1.dtd"/>
- </xmlcatalog>
- </xmlvalidate>
- </target>
-
- <!-- Targets to verify that ANT version if at least 1.5 -->
- <target name="-check.ant15">
- <echo>version is ${ant.version}</echo>
- <condition property="have.ant15">
- <not>
- <or>
- <equals arg1="${ant.version}"
- arg2="Ant version 1.4.1 compiled on October 11 2001"/>
- </or>
- </not>
- </condition>
- </target>
-
- <target name="-require.ant15" depends="-check.ant15" unless="have.ant15">
- <fail message="Need at least version 1.5 of ANT - you have ${ant.version}"/>
- </target>
-
- <target name="checkstyle.run" depends="compile.checkstyle"
- description="Runs checkstyle.">
- <taskdef name="checkstyle"
- classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
- <classpath refid="run.classpath"/>
- </taskdef>
- <delete file="${target.dir}/cachefile" />
-
- <property name="checkstyle.pattern.todo" value="NOTHingWillMatCH_-"/>
- <property name="check.config" location="checkstyle_checks.xml"/>
- <property name="translation.severity" value="ignore"/>
- <checkstyle config="${custom.config}" file="${file.to.check}">
- <formatter type="plain"/>
- <formatter type="xml" toFile="${target.dir}/cs_errors.xml"/>
- <classpath refid="run.classpath"/>
- </checkstyle>
- </target>
-
- <target name="setup.emma">
- <taskdef resource="emma_ant.properties">
- <classpath>
- <fileset dir="lib" includes="emma*.jar"/>
- </classpath>
- </taskdef>
-
- <property name="emma.coverage.out.file"
- value="${emma.dest}/coverage.emma"/>
- <property name="emma.report.dir" value="${emma.dest}/report"/>
- <mkdir dir="${emma.report.dir}"/>
- </target>
-
- <!-- contrib related targets -->
- <property name="bcel.dest" value="${target.dir}/bcel" />
- <property name="bcel.src" value="contrib/bcel/src/checkstyle/" />
-
- <path id="bcel.classpath">
- <pathelement location="${bcel.jar}" />
- <path refid="run.classpath" />
- </path>
-
- <target name="compile.bcel" depends="compile.checkstyle"
- description="Compiles bcel-checks">
- <echo message="${bcel.jar}" />
- <mkdir dir="${bcel.dest}" />
- <depend srcdir="${bcel.src}"
- destdir="${bcel.dest}" closure="yes"/>
- <javac srcdir="${bcel.src}"
- destdir="${bcel.dest}"
- includes="**/*.java"
- deprecation="on" debug="on"
- source="${checkstyle.minimum.javaversion}"
- target="${checkstyle.minimum.javaversion}"
- classpathref="bcel.classpath"
- encoding="iso-8859-1"
- includeAntRuntime="false"/>
-
- <copy todir="${bcel.dest}">
- <fileset dir="${bcel.src}" includes="**/*.properties"/>
- <fileset dir="${bcel.src}" includes="**/*.xml"/>
- <fileset dir="${bcel.src}" includes="**/*.dtd"/>
- </copy>
- </target>
-
- <target name="build.mavenbundles" depends="build.bindist"
- description="Builds bundles that can be uploaded to Maven's central repository"
- >
- <mkdir dir="${dist.dir}/maven-bundles" />
- <!-- Bundle for checkstyle -->
- <jar jarfile="${dist.dir}/maven-bundles/checkstyle-${version}-bundle.jar">
- <fileset dir="${basedir}" includes="pom.xml"/>
- <fileset dir="${dist.dir}/checkstyle-${version}">
- <include name="checkstyle-${version}.jar"/>
- </fileset>
- </jar>
- <!-- Bundle for checkstyle-optional -->
- <mkdir dir="${dist.dir}/maven-bundles/temp" />
- <!-- Create a temporary copy of the optional pom with another name so that
- it can be included in the optional-bundle -->
- <copy file="${basedir}/pom-optional.xml" tofile="${dist.dir}/maven-bundles/temp/pom.xml" />
- <jar jarfile="${dist.dir}/maven-bundles/checkstyle-optional-${version}-bundle.jar">
- <fileset dir="${dist.dir}/maven-bundles/temp" includes="pom.xml"/>
- <fileset dir="${dist.dir}/checkstyle-${version}">
- <include name="checkstyle-optional-${version}.jar"/>
- </fileset>
- </jar>
- <!-- Remove the temporary directory -->
- <delete dir="${dist.dir}/maven-bundles/temp"/>
- </target>
-</project>
+<project name="checkstyle" default="compile.checkstyle" basedir=".">
+
+ <!-- set global properties for this build -->
+ <!-- Give user a chance to override without editing this file -->
+ <!-- (and without typing -D each time it compiles it) -->
+ <property name="target.dir" value="${basedir}/target" />
+ <property file="checkstyle.buildproperties" />
+ <property file="${user.home}/checkstyle.buildproperties" />
+
+ <property name="version" value="4.3" />
+ <property name="ant.jar" value="${ant.home}/lib/ant.jar" />
+ <property name="xerces.jar" value="${ant.home}/lib/xercesImpl.jar" />
+ <property name="xml-apis.jar" value="${ant.home}/lib/xml-apis.jar" />
+ <property name="antlr.jar" value="lib/antlr.jar" />
+ <property name="velocity.jar" value="lib/velocity-dep-1.4.jar" />
+ <property name="jdom.jar" value="lib/jdom-b9.jar" />
+ <property name="junit.jar" value="lib/junit.jar" />
+ <property name="beanutils.jar" value="lib/commons-beanutils-core.jar" />
+ <property name="collections.jar" value="lib/commons-collections.jar" />
+ <property name="cli.jar" value="lib/commons-cli.jar" />
+ <property name="logging.jar" value="lib/commons-logging.jar" />
+ <property name="tools.jar" value="${java.home}/../lib/tools.jar" />
+ <property name="emma.enabled" value="true" />
+
+ <property name="checkstyle.dir"
+ value="src/checkstyle/com/puppycrawl/tools/checkstyle" />
+ <property name="checkstyle.grammar.dir"
+ value="${checkstyle.dir}/grammars" />
+ <property name="testreport.dir" value="${target.dir}/testreports"/>
+ <property name="dist.dir" value="${target.dir}/dist"/>
+ <property name="checkstyle.dest" value="${target.dir}/checkstyle" />
+ <property name="tests.dest" value="${target.dir}/tests" />
+ <property name="testinputs.dest" value="${target.dir}/testinputs" />
+ <property name="emma.dest" value="${target.dir}/emma" />
+
+ <property name="xdocs.src" value="src/xdocs"/>
+ <property name="xdocs.dest" value="${target.dir}/docs"/>
+ <property name="checkstyle.minimum.javaversion" value="1.4" />
+ <property name="checkstyle.testinputs.minimum.javaversion" value="1.5" />
+ <property name="testcases" value="**/*Test.java"/>
+
+ <path id="build.classpath">
+ <pathelement location="${antlr.jar}" />
+ <pathelement location="${collections.jar}" />
+ <pathelement location="${cli.jar}" />
+ <pathelement location="${beanutils.jar}" />
+ <pathelement location="${logging.jar}" />
+ <pathelement location="${ant.jar}" />
+ <pathelement location="${tools.jar}" />
+ </path>
+
+ <path id="run.classpath">
+ <pathelement location="${checkstyle.dest}" />
+ <pathelement location="${antlr.jar}" />
+ <path refid="build.classpath" />
+ </path>
+
+ <!-- add classes to generate Javadoc -->
+ <path id="javadoc.classpath">
+ <path refid="run.classpath" />
+ </path>
+
+ <path id="tests.buildpath">
+ <pathelement location="${junit.jar}" />
+ <path refid="run.classpath" />
+ </path>
+
+ <path id="tests.runpath">
+ <!-- Need the instrumented classes first -->
+ <pathelement location="${emma.dest}/classes" />
+ <pathelement location="${tests.dest}" />
+ <pathelement location="${testinputs.dest}" />
+ <pathelement path="${xerces.jar}"/>
+ <pathelement path="${xml-apis.jar}"/>
+ <pathelement location="lib/emma.jar"/>
+ <path refid="tests.buildpath" />
+ </path>
+
+ <path id="velocity.classpath">
+ <pathelement location="${velocity.jar}"/>
+ <pathelement location="${jdom.jar}" />
+ </path>
+
+ <target name="display.classpath" description="Displays the run classpath">
+ <property name="asd" refid="run.classpath" />
+ <echo message="Classpath is ${asd}" />
+ </target>
+
+ <!-- -->
+ <!-- Cleanup targets -->
+ <!-- -->
+ <target name="clean" description="Cleans any directories and generated files">
+ <delete>
+ <fileset dir="src/checkstyle">
+ <include name="**/Generated*"/>
+ <include name="**/expandedjava*.g"/>
+ </fileset>
+ </delete>
+ <delete dir="${target.dir}" />
+ <delete file="velocity.log" />
+ </target>
+
+ <!-- -->
+ <!-- ANTLR targets -->
+ <!-- -->
+
+ <!-- Checks whether the grammar file is newer that the generated code -->
+ <target name="-check.antlr"
+ description="Checks whether the grammar file is newer that the generated code">
+ <uptodate property="uptodate.antlr"
+ targetfile="${checkstyle.grammar.dir}/GeneratedJavaLexer.java" >
+ <srcfiles dir= "${checkstyle.grammar.dir}" includes="java.g"/>
+ </uptodate>
+ </target>
+
+ <!-- Conditionally will compile the grammar. Deliberately do not use the -->
+ <!-- antlr task as it requirs the ANTLR classes to be in the classpath -->
+ <!-- which creates lots of problems. -->
+ <target name="build.antlr" depends="-check.antlr" unless="uptodate.antlr"
+ description="Conditionally compiles the grammar files">
+ <java classname="antlr.Tool"
+ classpath="${antlr.jar}"
+ fork="yes"
+ failonerror="true"
+ dir="${checkstyle.grammar.dir}">
+ <arg value="java.g" />
+ </java>
+ </target>
+
+ <!-- -->
+ <!-- COMPILE TARGETS -->
+ <!-- -->
+ <target name="compile.checkstyle" depends="build.antlr"
+ description="Compiles the source code">
+ <mkdir dir="${checkstyle.dest}" />
+ <depend srcdir="src/checkstyle"
+ destdir="${checkstyle.dest}" closure="yes"/>
+ <javac srcdir="src/checkstyle"
+ destdir="${checkstyle.dest}"
+ includes="**/*.java"
+ deprecation="on" debug="on"
+ source="${checkstyle.minimum.javaversion}"
+ target="${checkstyle.minimum.javaversion}"
+ classpathref="build.classpath"
+ encoding="iso-8859-1"
+ includeAntRuntime="false"/>
+
+ <propertyfile file="${checkstyle.dest}/checkstylecompilation.properties">
+ <entry key="checkstyle.compile.version" value="${version}"/>
+ <entry key="checkstyle.compile.timestamp" type="date" value="now" pattern="E MMMM dd yyyy, HH:mm z"/>
+ </propertyfile>
+
+ <native2ascii src="src/checkstyle"
+ dest="${checkstyle.dest}"
+ encoding="EUC-JP"
+ includes="**/*_ja.properties" />
+
+ <copy todir="${checkstyle.dest}">
+ <fileset dir="src/checkstyle" includes="**/*.properties"/>
+ <fileset dir="src/checkstyle" includes="**/*.xml"/>
+ <fileset dir="src/checkstyle" includes="**/*.dtd"/>
+ </copy>
+
+ <!-- fix for bug #594469:
+ create a copy of the english property file, necessary to run
+ the tests in an environment that has a supported language (e.g. de)
+ in the default locale. See algorithm in ResourceBundle.getBundle() -->
+
+ <copy todir="${checkstyle.dest}" >
+ <fileset dir="src/checkstyle" includes="**/messages.properties"/>
+ <mapper type="glob" from="*messages.properties" to="*messages_en.properties"/>
+ </copy>
+
+ <javadoc sourcefiles="src/checkstyle/com/puppycrawl/tools/checkstyle/api/TokenTypes.java"
+ classpathref="javadoc.classpath"
+ encoding="iso-8859-1"
+ source="${checkstyle.minimum.javaversion}"
+ failonerror="yes">
+ <doclet name="com.puppycrawl.tools.checkstyle.doclets.TokenTypesDoclet"
+ path="${checkstyle.dest}">
+ <param name="-destfile" value="${checkstyle.dest}/com/puppycrawl/tools/checkstyle/api/tokentypes.properties"/>
+ </doclet>
+ </javadoc>
+ </target>
+
+ <target name="compile.testinputs" description="Compile test inputs">
+ <mkdir dir="${testinputs.dest}" />
+ <depend srcdir="src/testinputs" destdir="${testinputs.dest}" closure="yes"/>
+ <!-- start of a change to turn on compilation of all input files -->
+ <!-- under JDK1.5. -->
+ <javac srcdir="src/testinputs"
+ destdir="${testinputs.dest}"
+ deprecation="on" debug="on"
+ source="${checkstyle.testinputs.minimum.javaversion}"
+ target="${checkstyle.testinputs.minimum.javaversion}"
+ includeAntRuntime="false">
+ <exclude name="**/j2ee/*" />
+ <exclude name="**/InputAssertIdentifier.java" />
+ <exclude name="**/InputClone.java" />
+ <exclude name="**/InputCovariant.java" />
+ <exclude name="**/InputGrammar.java" />
+ <exclude name="**/InputImport.java" />
+ <exclude name="**/InputJUnitTest.java" />
+ <exclude name="**/InputSetterGetter.java" />
+ <exclude name="**/InputSimple.java" />
+ <exclude name="**/InputValidMethodIndent.java" />
+ <exclude name="**/Post13KeywordsAsIdentifiersOK.java" />
+ </javac>
+ </target>
+
+ <!-- Compiles only the test code. Input files are excluded from
+ compilation, they contain code like assert statements
+ that does not compile on all JDKs -->
+ <target name="compile.tests" depends="compile.checkstyle, setup.emma"
+ description="Compiles the test code">
+
+ <mkdir dir="${tests.dest}" />
+ <depend srcdir="src/tests" destdir="${tests.dest}" closure="yes"/>
+ <javac srcdir="src/tests"
+ destdir="${tests.dest}"
+ deprecation="on" debug="on"
+ classpathref="tests.buildpath"
+ encoding="iso-8859-1"
+ source="${checkstyle.minimum.javaversion}"
+ target="${checkstyle.minimum.javaversion}"
+ includeAntRuntime="false"/>
+
+ <!-- now instrument the classes -->
+ <mkdir dir="${emma.dest}/classes"/>
+ <emma enabled="${emma.enabled}">
+ <instr destdir="${emma.dest}/classes"
+ metadatafile="${emma.dest}/metadata.emma"
+ >
+ <instrpath>
+ <pathelement location="${checkstyle.dest}"/>
+ </instrpath>
+ <filter excludes="com.puppycrawl.tools.checkstyle.doclets.*"/>
+ <filter excludes="com.puppycrawl.tools.checkstyle.gui.*"/>
+ <filter excludes="com.puppycrawl.tools.checkstyle.grammars.*"/>
+ </instr>
+ </emma>
+ </target>
+
+ <!-- -->
+ <!-- TEST TARGETS -->
+ <!-- -->
+
+ <!-- Run the GUI -->
+ <target name="run.gui" depends="compile.checkstyle"
+ description="Run the GUI for displaying a tree">
+ <java classname="com.puppycrawl.tools.checkstyle.gui.Main"
+ fork="yes" classpathref="run.classpath">
+ </java>
+ </target>
+
+ <!-- runs the command line version on a file -->
+ <target name="run.checkstyle" depends="compile.tests"
+ description="Runs the command line version on a file">
+ <java classname="com.puppycrawl.tools.checkstyle.Main"
+ fork="yes"
+ dir="."
+ classpathref="run.classpath">
+ <sysproperty key="checkstyle.allow.tabs" value="yes"/>
+ <arg value="-c"/>
+ <arg file="checkstyle_checks.xml"/>
+ <arg value="src/testinputs/com/puppycrawl/tools/checkstyle/InputSimple.java"/>
+ </java>
+ <java classname="com.puppycrawl.tools.checkstyle.Main"
+ fork="yes"
+ dir="."
+ classpathref="run.classpath">
+ <arg value="-c"/>
+ <arg file="checkstyle_checks.xml"/>
+ <arg value="-r"/>
+ <arg file="src/checkstyle/com/puppycrawl/tools/checkstyle/api"/>
+ </java>
+ </target>
+
+ <target name="enable.todo" description="Will enable checking for TODO's">
+ <property name="todo.pattern" value="TODO:"/>
+ </target>
+
+ <target name="checkstyle.checkstyle" depends="compile.checkstyle"
+ description="Runs checkstyle against it's own sources">
+ <taskdef name="checkstyle"
+ classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
+ <classpath refid="run.classpath"/>
+ </taskdef>
+ <delete file="${target.dir}/cachefile" />
+
+ <property name="checkstyle.pattern.todo" value="NOTHingWillMatCH_-"/>
+ <property name="check.config" location="checkstyle_checks.xml"/>
+ <property name="translation.severity" value="ignore"/>
+ <checkstyle config="${check.config}">
+ <fileset dir="src/checkstyle"
+ includes="**/*.java,**/*.properties"
+ excludes="**/Generated*.java,**/gui/*,**/transmogrify/*"/>
+ <formatter type="plain"/>
+ <formatter type="xml" toFile="${target.dir}/cs_errors.xml"/>
+ <classpath refid="run.classpath"/>
+ <property key="checkstyle.cache.file" file="${target.dir}/cachefile"/>
+ <property key="checkstyle.header.file" file="java.header"/>
+ <property key="checkstyle.importcontrol.file" file="import-control.xml"/>
+ <property key="checkstyle.suppressions.file"
+ file="suppressions.xml"/>
+ </checkstyle>
+ </target>
+
+ <target name="checkstyle.style" depends="compile.checkstyle"
+ description="Runs checkstyle against it's own sources to test generation of error reports">
+ <taskdef name="checkstyle"
+ classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
+ <classpath refid="run.classpath"/>
+ </taskdef>
+ <delete file="${target.dir}/cachefile" />
+
+ <property name="checkstyle.pattern.todo" value="NOTHingWillMatCH_-"/>
+ <property name="check.config" location="checkstyle_checks.xml"/>
+ <property name="translation.severity" value="ignore"/>
+ <checkstyle failonviolation="false" config="${check.config}">
+ <fileset dir="src/checkstyle"
+ includes="**/*.java,**/*.properties"
+ excludes="**/Generated*.java,**/gui/*,,**/transmogrify/*"/>
+ <formatter type="xml" toFile="${target.dir}/cs_errors.xml"/>
+ <classpath refid="run.classpath"/>
+ <property key="checkstyle.cache.file" file="${target.dir}/cachefile"/>
+ <property key="checkstyle.header.file" file="java.header"/>
+ <property key="checkstyle.importcontrol.file" file="import-control.xml"/>
+ <property key="checkstyle.suppressions.file"
+ file="suppressions.xml"/>
+ </checkstyle>
+ <mkdir dir="${target.dir}/style/frames"/>
+ <mkdir dir="${target.dir}/style/noframes"/>
+ <mkdir dir="${target.dir}/style/simple"/>
+ <mkdir dir="${target.dir}/style/csv"/>
+ <mkdir dir="target/style/author"/>
+ <style basedir="${target.dir}"
+ destdir="${target.dir}/style/noframes"
+ includes="cs_errors.xml"
+ style="contrib/checkstyle-noframes.xsl"/>
+ <style basedir="${target.dir}"
+ destdir="${target.dir}/style/frames"
+ includes="cs_errors.xml"
+ style="contrib/checkstyle-frames.xsl"/>
+ <style basedir="${target.dir}"
+ destdir="${target.dir}/style/simple"
+ includes="cs_errors.xml"
+ style="contrib/checkstyle-simple.xsl"/>
+ <style out="${target.dir}/style/csv/report-csv.txt"
+ in="${target.dir}/cs_errors.xml"
+ style="contrib/checkstyle-csv.xsl"/>
+ <style basedir="target"
+ destdir="target/style/author"
+ includes="cs_errors.xml"
+ style="contrib/checkstyle-author.xsl"/>
+ </target>
+
+ <!-- Targets to verify that JUnit is in the classpath -->
+ <target name="-check.junit"
+ description="Checks whether JUnit is in the classpath">
+ <available property="have.junit"
+ classname="junit.framework.TestListener"/>
+ </target>
+
+ <target name="-require.junit" depends="-check.junit" unless="have.junit"
+ description="Fails if JUnit is not present in the classpath">
+ <fail message="Need to have JUnit in your CLASSPATH to run the tests. Consider using the one in the lib directory."/>
+ </target>
+
+ <!-- Targets to verify that Xalan is in the classpath -->
+ <target name="-check.xalan"
+ description="Checks whether xalan is in the classpath">
+ <condition property="have.xalan">
+ <or>
+ <!-- jdk 1.3 with modern Xalan -->
+ <available classname="org.apache.xalan.Version" />
+ <!-- Xalan classes in jdk 1.4 (beta 3) are OK for running -->
+ <!-- the tests, but there is no Version class in jdk 1.4: -->
+ <!-- fallback to stable jaxp implementation class -->
+ <available classname="org.apache.xalan.transformer.TransformerImpl"/>
+ <!--
+ In JDK 1.5 Sun has decided to repackage Xalan in it's own
+ package com.sun.org.apache..., see Java bug 4740355.
+ Additionally at least Ant 1.6.2 is required to make junitreport
+ work with Xalan XSLTC and/or JDK 1.5 (Ant bug 27541)
+ -->
+ <and>
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ <!-- TODO: find a more elegant way to specify *minimum* version -->
+ <not>
+ <or>
+ <contains string="${ant.version}" substring="version 1.4" />
+ <contains string="${ant.version}" substring="version 1.5" />
+ <contains string="${ant.version}" substring="version 1.6.0" />
+ <contains string="${ant.version}" substring="version 1.6.1" />
+ </or>
+ </not>
+ </and>
+ </or>
+ </condition>
+ </target>
+
+ <target name="-require.xalan" depends="-check.xalan" unless="have.xalan"
+ description="Fails if xalan is not present in the classpath">
+ <fail>
+Need to have Xalan in your CLASSPATH to run the tests.
+You can download it from http://xml.apache.org/.
+Alternatively you can upgrade JDK 1.4 or higher.
+For users of JDK 1.5 at least version 1.6.2 of Ant is required.
+ </fail>
+ </target>
+
+ <!-- To run the tests need Xalan in the classpath -->
+ <target name="run.tests"
+ depends="compile.tests,-require.ant15,-require.junit,-require.xalan,compile.testinputs"
+ description="Runs the tests for checkstyle">
+
+ <mkdir dir="${testreport.dir}"/>
+ <property name="testinputs.dir"
+ location="${basedir}/src/testinputs/com/puppycrawl/tools/checkstyle"/>
+
+ <junit printsummary="yes"
+ fork="yes"
+ forkmode="perBatch"
+ haltonfailure="no"
+ showoutput="yes"
+ failureProperty="tests.have.failed">
+
+ <sysproperty key="testinputs.dir" value="${testinputs.dir}"/>
+ <sysproperty key="checkstyle.use.recursive.algorithm"
+ value="${checkstyle.use.recursive.algorithm}"/>
+ <sysproperty key="checkstyle.root" value="${basedir}" />
+
+ <sysproperty key="emma.coverage.out.file"
+ file="${emma.coverage.out.file}"
+ />
+ <sysproperty key="emma.coverage.out.merge"
+ value="true" />
+
+ <formatter type="xml" />
+ <classpath refid="tests.runpath"/>
+ <batchtest todir="${testreport.dir}">
+ <fileset dir="src/tests">
+ <include name="${testcases}" />
+ </fileset>
+ </batchtest>
+ </junit>
+
+ <junitreport todir="${testreport.dir}">
+ <fileset dir="${testreport.dir}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report todir="${testreport.dir}"/>
+ </junitreport>
+
+ <property name="report"
+ value="${basedir}/${testreport.dir}/index.html"/>
+
+ <!-- generate the emma report -->
+ <emma enabled="${emma.enabled}">
+ <report sourcepath="src/checkstyle">
+ <fileset dir="${emma.dest}" includes="*.emma"/>
+ <html outfile="${emma.report.dir}/index.html"/>
+ </report>
+ </emma>
+
+ <fail if="tests.have.failed"
+ message="Unit tests failed - Report is available in ${report}"/>
+ </target>
+
+ <!-- -->
+ <!-- DIST TARGETS -->
+ <!-- -->
+ <target name="build.bindist" depends="compile.checkstyle, javadoc, xdocs"
+ description="Builds the compressed distribution files">
+ <delete dir="${dist.dir}/checkstyle-${version}" />
+ <mkdir dir="${dist.dir}/checkstyle-${version}" />
+ <copy file="config/manifest.mf" todir="${target.dir}">
+ <filterset>
+ <filter token="CHECKSTYLE_VERSION" value="${version}" />
+ </filterset>
+ </copy>
+ <jar jarfile="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar"
+ basedir="${checkstyle.dest}"
+ excludes="**/j2ee/**"
+ manifest="${target.dir}/manifest.mf" />
+ <jar jarfile="${dist.dir}/checkstyle-${version}/checkstyle-optional-${version}.jar"
+ basedir="${checkstyle.dest}"
+ includes="**/j2ee/**"/>
+ <!-- copy the JARS and make a mega JAR out of them -->
+ <copy file="${antlr.jar}" todir="${dist.dir}/checkstyle-${version}" />
+ <copy file="${beanutils.jar}" todir="${dist.dir}/checkstyle-${version}" />
+ <copy file="${collections.jar}" todir="${dist.dir}/checkstyle-${version}" />
+ <copy file="${cli.jar}" todir="${dist.dir}/checkstyle-${version}" />
+ <copy file="${logging.jar}" todir="${dist.dir}/checkstyle-${version}" />
+ <jar jarfile="${dist.dir}/checkstyle-${version}/checkstyle-all-${version}.jar"
+ manifest="${target.dir}/manifest.mf"
+ filesetmanifest="skip">
+ <zipfileset src="${dist.dir}/checkstyle-${version}/antlr.jar" excludes="META-INF/*"/>
+ <zipfileset src="${dist.dir}/checkstyle-${version}/commons-beanutils-core.jar" excludes="META-INF/*,overview.html"/>
+ <zipfileset src="${dist.dir}/checkstyle-${version}/commons-collections.jar" excludes="META-INF/*"/>
+ <zipfileset src="${dist.dir}/checkstyle-${version}/commons-cli.jar" excludes="META-INF/*"/>
+ <zipfileset src="${dist.dir}/checkstyle-${version}/commons-logging.jar" excludes="META-INF/*"/>
+ <zipfileset src="${dist.dir}/checkstyle-${version}/checkstyle-${version}.jar" excludes="META-INF/*"/>
+ </jar>
+ <!-- copy stuff without filtering -->
+ <copy todir="${dist.dir}/checkstyle-${version}">
+ <fileset dir=".">
+ <include name="**/.cvsignore"/>
+ <include name="**/CVS"/>
+ <include name="*.xml"/>
+ <include name="LICENSE*"/>
+ <include name="README"/>
+ <include name="RIGHTS.antlr"/>
+ <include name="TODO"/>
+ <include name="contrib/**"/>
+ <include name="java.header"/>
+ </fileset>
+ </copy>
+
+ <!-- Make the docs directory -->
+ <mkdir dir="${dist.dir}/checkstyle-${version}/docs" />
+ <copy todir="${dist.dir}/checkstyle-${version}/docs">
+ <fileset dir="${xdocs.dest}"/>
+ </copy>
+
+ <!-- create the final zip & tar/gzip files -->
+ <zip zipfile="${dist.dir}/checkstyle-${version}.zip">
+ <fileset dir="${dist.dir}">
+ <include name="checkstyle-${version}/**"/>
+ </fileset>
+ </zip>
+ <tar tarfile="${dist.dir}/checkstyle-${version}.tar" longfile="gnu"
+ basedir="${dist.dir}" includes="checkstyle-${version}/**" />
+ <gzip zipfile="${dist.dir}/checkstyle-${version}.tar.gz"
+ src="${dist.dir}/checkstyle-${version}.tar" />
+ </target>
+
+ <target name="build.srcdist" depends="checkstyle.checkstyle"
+ description="Builds the compressed source files for distribution">
+ <delete dir="${dist.dir}/checkstyle-src-${version}" />
+ <mkdir dir="${dist.dir}/checkstyle-src-${version}" />
+ <copy todir="${dist.dir}/checkstyle-src-${version}">
+ <fileset dir=".">
+ <exclude name="src/checkstyle/**/Generated*"/>
+ <include name="*.xml"/>
+ <include name="LICENSE*"/>
+ <include name="README"/>
+ <include name="RIGHTS.antlr"/>
+ <include name="TODO"/>
+ <include name="build.xml"/>
+ <include name="config/**"/>
+ <include name="contrib/**"/>
+ <include name="java.header"/>
+ <include name="lib/**"/>
+ <include name="src/**"/>
+ </fileset>
+ </copy>
+
+ <!-- Produce the final distributions -->
+ <zip zipfile="${dist.dir}/checkstyle-src-${version}.zip">
+ <fileset dir="${dist.dir}">
+ <include name="checkstyle-src-${version}/**"/>
+ </fileset>
+ </zip>
+ <tar tarfile="${dist.dir}/checkstyle-src-${version}.tar" longfile="gnu"
+ basedir="${dist.dir}" includes="checkstyle-src-${version}/**" />
+ <gzip zipfile="${dist.dir}/checkstyle-src-${version}.tar.gz"
+ src="${dist.dir}/checkstyle-src-${version}.tar" />
+ </target>
+
+ <!-- -->
+ <!-- DOC TARGETS -->
+ <!-- -->
+ <target name="javadoc" depends="compile.checkstyle"
+ description="Creates the javadoc html files">
+ <mkdir dir="${xdocs.dest}/api" />
+ <javadoc sourcepath="src/checkstyle" destdir="${xdocs.dest}/api"
+ Windowtitle="Checkstyle API"
+ classpathref="javadoc.classpath"
+ Use="true"
+ Footer="<a target="_top" href="./{@docRoot}/../index.html">Back to the Checkstyle Home Page</a>"
+ useExternalFile="yes"
+ encoding="iso-8859-1"
+ source="${checkstyle.minimum.javaversion}"
+ failonerror="yes" >
+ <link packagelistLoc="${basedir}/config/jdk-package-list"
+ offline="yes"
+ href="http://java.sun.com/j2se/1.4.2/docs/api/" />
+ <link packagelistLoc="${basedir}/config/antlr-package-list"
+ offline="yes"
+ href="http://www.antlr.org/javadoc/" />
+ <fileset dir="src/checkstyle">
+ <include name="**/*.java"/>
+ <exclude name="**/Generated*.java" />
+ <exclude name="**/gui/*.java" />
+ <exclude name="**/checks/**"/>
+ </fileset>
+ </javadoc>
+ </target>
+
+ <target name="xdocs" depends="compile.checkstyle"
+ description="generate documentation">
+
+ <mkdir dir="${xdocs.dest}"/>
+
+ <mkdir dir="${target.dir}/xdocs"/>
+
+ <copy todir="${target.dir}/xdocs">
+ <fileset dir="${xdocs.src}">
+ <exclude name="**/*.css"/>
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.png"/>
+ </fileset>
+ <filterset>
+ <filter token="CHECKSTYLE_VERSION" value="${version}" />
+ </filterset>
+ </copy>
+
+ <javadoc sourcepath="src/checkstyle" destdir="${target.dir}/xdocs"
+ classpathref="build.classpath"
+ source="${checkstyle.minimum.javaversion}"
+ failonerror="yes">
+ <doclet name="com.puppycrawl.tools.checkstyle.doclets.CheckDocsDoclet"
+ path="${checkstyle.dest}">
+ </doclet>
+ <fileset dir="src/checkstyle">
+ <include name="**/checks/**/*Check.java" />
+ <exclude name="**/checks/j2ee/AbstractInterfaceCheck.java" />
+ </fileset>
+ </javadoc>
+
+ <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
+ <classpath refid="velocity.classpath"/>
+ </taskdef>
+
+ <copy todir="${xdocs.dest}">
+ <fileset dir="${xdocs.src}">
+ <include name="**/*.css"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.png"/>
+ </fileset>
+ </copy>
+
+ <anakia basedir="${target.dir}/xdocs"
+ destdir="${xdocs.dest}/"
+ extension=".html"
+ style="site.vsl"
+ projectFile="stylesheets/project.xml"
+ excludes="**/stylesheets/**"
+ includes="**/*.xml"
+ lastModifiedCheck="true"
+ templatePath="${xdocs.src}/stylesheets">
+ </anakia>
+
+ </target>
+
+ <target name="report.translation"
+ description="Sets up reporting on translation errors"
+ >
+ <property name="translation.severity" value="error"/>
+ </target>
+
+ <target name="gump" depends="build.bindist,build.srcdist,run.tests"
+ description="Runs the test for GUMP testing"/>
+
+
+ <!-- Targets to verify that Xerces is in the classpath -->
+ <target name="-check.xerces"
+ description="Checks whether xerces is in the classpath">
+ <condition property="have.xerces">
+ <available classname="org.apache.xerces.parsers.SAXParser"/>
+ </condition>
+ </target>
+
+ <target name="-require.xerces" depends="-check.xerces" unless="have.xerces"
+ description="Fails if xerces is not present in the classpath">
+ <fail message="Need to have Xerces-J in your CLASSPATH to run the tests. You can download it from http://xml.apache.org/."/>
+ </target>
+
+ <target name="validate.xml"
+ depends="-require.xerces"
+ description="Validates checkstyle XML file">
+ <xmlvalidate file="checkstyle_checks.xml">
+ <xmlcatalog>
+ <dtd
+ publicId="-//Puppy Crawl//DTD Check Configuration 1.1//EN"
+ location="${checkstyle.dir}/configuration_1_1.dtd"/>
+ </xmlcatalog>
+ </xmlvalidate>
+ </target>
+
+ <!-- Targets to verify that ANT version if at least 1.5 -->
+ <target name="-check.ant15">
+ <echo>version is ${ant.version}</echo>
+ <condition property="have.ant15">
+ <not>
+ <or>
+ <equals arg1="${ant.version}"
+ arg2="Ant version 1.4.1 compiled on October 11 2001"/>
+ </or>
+ </not>
+ </condition>
+ </target>
+
+ <target name="-require.ant15" depends="-check.ant15" unless="have.ant15">
+ <fail message="Need at least version 1.5 of ANT - you have ${ant.version}"/>
+ </target>
+
+ <target name="checkstyle.run" depends="compile.checkstyle"
+ description="Runs checkstyle.">
+ <taskdef name="checkstyle"
+ classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
+ <classpath refid="run.classpath"/>
+ </taskdef>
+ <delete file="${target.dir}/cachefile" />
+
+ <property name="checkstyle.pattern.todo" value="NOTHingWillMatCH_-"/>
+ <property name="check.config" location="checkstyle_checks.xml"/>
+ <property name="translation.severity" value="ignore"/>
+ <checkstyle config="${custom.config}" file="${file.to.check}">
+ <formatter type="plain"/>
+ <formatter type="xml" toFile="${target.dir}/cs_errors.xml"/>
+ <classpath refid="run.classpath"/>
+ </checkstyle>
+ </target>
+
+ <target name="setup.emma">
+ <taskdef resource="emma_ant.properties">
+ <classpath>
+ <fileset dir="lib" includes="emma*.jar"/>
+ </classpath>
+ </taskdef>
+
+ <property name="emma.coverage.out.file"
+ value="${emma.dest}/coverage.emma"/>
+ <property name="emma.report.dir" value="${emma.dest}/report"/>
+ <mkdir dir="${emma.report.dir}"/>
+ </target>
+
+ <!-- contrib related targets -->
+ <property name="bcel.dest" value="${target.dir}/bcel" />
+ <property name="bcel.src" value="contrib/bcel/src/checkstyle/" />
+
+ <path id="bcel.classpath">
+ <pathelement location="${bcel.jar}" />
+ <path refid="run.classpath" />
+ </path>
+
+ <target name="compile.bcel" depends="compile.checkstyle"
+ description="Compiles bcel-checks">
+ <echo message="${bcel.jar}" />
+ <mkdir dir="${bcel.dest}" />
+ <depend srcdir="${bcel.src}"
+ destdir="${bcel.dest}" closure="yes"/>
+ <javac srcdir="${bcel.src}"
+ destdir="${bcel.dest}"
+ includes="**/*.java"
+ deprecation="on" debug="on"
+ source="${checkstyle.minimum.javaversion}"
+ target="${checkstyle.minimum.javaversion}"
+ classpathref="bcel.classpath"
+ encoding="iso-8859-1"
+ includeAntRuntime="false"/>
+
+ <copy todir="${bcel.dest}">
+ <fileset dir="${bcel.src}" includes="**/*.properties"/>
+ <fileset dir="${bcel.src}" includes="**/*.xml"/>
+ <fileset dir="${bcel.src}" includes="**/*.dtd"/>
+ </copy>
+ </target>
+
+ <target name="build.mavenbundles" depends="build.bindist"
+ description="Builds bundles that can be uploaded to Maven's central repository"
+ >
+ <mkdir dir="${dist.dir}/maven-bundles" />
+ <!-- Bundle for checkstyle -->
+ <jar jarfile="${dist.dir}/maven-bundles/checkstyle-${version}-bundle.jar">
+ <fileset dir="${basedir}" includes="pom.xml"/>
+ <fileset dir="${dist.dir}/checkstyle-${version}">
+ <include name="checkstyle-${version}.jar"/>
+ </fileset>
+ </jar>
+ <!-- Bundle for checkstyle-optional -->
+ <mkdir dir="${dist.dir}/maven-bundles/temp" />
+ <!-- Create a temporary copy of the optional pom with another name so that
+ it can be included in the optional-bundle -->
+ <copy file="${basedir}/pom-optional.xml" tofile="${dist.dir}/maven-bundles/temp/pom.xml" />
+ <jar jarfile="${dist.dir}/maven-bundles/checkstyle-optional-${version}-bundle.jar">
+ <fileset dir="${dist.dir}/maven-bundles/temp" includes="pom.xml"/>
+ <fileset dir="${dist.dir}/checkstyle-${version}">
+ <include name="checkstyle-optional-${version}.jar"/>
+ </fileset>
+ </jar>
+ <!-- Remove the temporary directory -->
+ <delete dir="${dist.dir}/maven-bundles/temp"/>
+ </target>
+</project>
Modified: trunk/tools/checkstyle-4.3/checkstyle_checks.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/checkstyle-4.3/checkstyle_checks.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/tools/checkstyle-4.3/checkstyle_checks.xml (original)
+++ trunk/tools/checkstyle-4.3/checkstyle_checks.xml 2010-01-12 10:21:28-0800
@@ -1,149 +1,149 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module name="Checker">
-
- <metadata name="com.atlas-sw.eclipse" value="I like Sydney"/>
-
- <property name="severity" value="error"/>
-
- <module name="SuppressionFilter">
- <property name="file" value="${checkstyle.suppressions.file}"/>
- </module>
-
- <module name="PackageHtml"/>
-
- <module name="Translation">
- <property name="severity" value="${translation.severity}"/>
- </module>
-
- <module name="TreeWalker">
-
- <property name="tabWidth" value="4" />
-
- <module name="Regexp">
- <property name="id" value="trailing"/>
- <property name="format" value="[ \t]+$"/>
- <property name="illegalPattern" value="true"/>
- <property name="message" value="trailing whitespace"/>
- </module>
-
- <module name="AvoidStarImport"/>
- <module name="ConstantName"/>
- <module name="EmptyBlock"/>
- <module name="EmptyForIteratorPad"/>
- <module name="EqualsHashCode"/>
- <module name="FileLength" />
- <module name="Header">
- <property name="headerFile" value="${checkstyle.header.file}"/>
- </module>
-
- <!-- module name="IllegalCatch"/ -->
- <module name="ImportControl">
- <property name="file" value="${checkstyle.importcontrol.file}"/>
- </module>
- <module name="IllegalImport"/>
- <module name="IllegalInstantiation"/>
- <module name="IllegalThrows"/>
- <module name="InnerAssignment"/>
- <module name="JavadocType">
- <property name="authorFormat" value="\S"/>
- </module>
- <module name="JavadocMethod">
- <property name="allowUndeclaredRTE" value="true"/>
- <property name="allowThrowsTagsForSubclasses" value="true"/>
- </module>
- <module name="JavadocVariable"/>
- <module name="JavadocStyle">
- <property name="scope" value="public"/>
- </module>
-
- <module name="LeftCurly">
- <property name="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
- <property name="option" value="nl"/>
- </module>
- <module name="LeftCurly">
- <property name="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
- <property name="option" value="nlow"/>
- </module>
-
- <module name="LineLength">
- <property name="ignorePattern" value="^ *\* *[^ ]+$"/>
- </module>
-
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName">
- <property name="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
- </module>
- <module name="MethodLength"/>
- <module name="MethodName"/>
- <module name="MethodParamPad"/>
- <module name="ModifierOrder"/>
- <module name="NeedBraces"/>
- <module name="NoWhitespaceAfter">
- <property name="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
- </module>
-
- <module name="NoWhitespaceBefore"/>
- <module name="NoWhitespaceBefore">
- <property name="tokens" value="DOT"/>
- <property name="allowLineBreaks" value="true"/>
- </module>
-
- <module name="OperatorWrap"/>
- <module name="OperatorWrap">
- <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
- <property name="option" value="eol"/>
- </module>
- <module name="PackageName"/>
- <module name="ParameterName">
- <property name="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
- </module>
- <module name="ParameterNumber">
- <property name="id" value="paramNum"/>
- </module>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="RedundantImport"/>
- <module name="RedundantModifier"/>
- <module name="RightCurly">
- <property name="option" value="alone"/>
- </module>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
- <module name="StaticVariableName">
- <property name="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
- </module>
- <module name="TabCharacter"/>
- <module name="TypeName"/>
- <module name="UnusedImports"/>
- <module name="UpperEll"/>
- <module name="VisibilityModifier"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
- <module name="FinalClass"/>
- <module name="MissingSwitchDefault"/>
- <module name="MagicNumber"/>
- <module name="Indentation">
- <property name="basicOffset" value="4"/>
- <property name="braceAdjustment" value="0"/>
- <property name="caseIndent" value="0"/>
- </module>
- <module name="ArrayTrailingComma"/>
- <!-- module name="FinalLocalVariable"/ -->
-
- <!-- Generates quite a few errors -->
- <module name="CyclomaticComplexity">
- <property name="severity" value="ignore"/>
- </module>
-
- <module name="NestedIfDepth">
- <property name="max" value="3"/>
- </module>
- <module name="NestedTryDepth"/>
- <module name="ExplicitInitialization"/>
- </module>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<module name="Checker">
+
+ <metadata name="com.atlas-sw.eclipse" value="I like Sydney"/>
+
+ <property name="severity" value="error"/>
+
+ <module name="SuppressionFilter">
+ <property name="file" value="${checkstyle.suppressions.file}"/>
+ </module>
+
+ <module name="PackageHtml"/>
+
+ <module name="Translation">
+ <property name="severity" value="${translation.severity}"/>
+ </module>
+
+ <module name="TreeWalker">
+
+ <property name="tabWidth" value="4" />
+
+ <module name="Regexp">
+ <property name="id" value="trailing"/>
+ <property name="format" value="[ \t]+$"/>
+ <property name="illegalPattern" value="true"/>
+ <property name="message" value="trailing whitespace"/>
+ </module>
+
+ <module name="AvoidStarImport"/>
+ <module name="ConstantName"/>
+ <module name="EmptyBlock"/>
+ <module name="EmptyForIteratorPad"/>
+ <module name="EqualsHashCode"/>
+ <module name="FileLength" />
+ <module name="Header">
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ </module>
+
+ <!-- module name="IllegalCatch"/ -->
+ <module name="ImportControl">
+ <property name="file" value="${checkstyle.importcontrol.file}"/>
+ </module>
+ <module name="IllegalImport"/>
+ <module name="IllegalInstantiation"/>
+ <module name="IllegalThrows"/>
+ <module name="InnerAssignment"/>
+ <module name="JavadocType">
+ <property name="authorFormat" value="\S"/>
+ </module>
+ <module name="JavadocMethod">
+ <property name="allowUndeclaredRTE" value="true"/>
+ <property name="allowThrowsTagsForSubclasses" value="true"/>
+ </module>
+ <module name="JavadocVariable"/>
+ <module name="JavadocStyle">
+ <property name="scope" value="public"/>
+ </module>
+
+ <module name="LeftCurly">
+ <property name="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/>
+ <property name="option" value="nl"/>
+ </module>
+ <module name="LeftCurly">
+ <property name="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/>
+ <property name="option" value="nlow"/>
+ </module>
+
+ <module name="LineLength">
+ <property name="ignorePattern" value="^ *\* *[^ ]+$"/>
+ </module>
+
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName">
+ <property name="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="MethodLength"/>
+ <module name="MethodName"/>
+ <module name="MethodParamPad"/>
+ <module name="ModifierOrder"/>
+ <module name="NeedBraces"/>
+ <module name="NoWhitespaceAfter">
+ <property name="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
+ </module>
+
+ <module name="NoWhitespaceBefore"/>
+ <module name="NoWhitespaceBefore">
+ <property name="tokens" value="DOT"/>
+ <property name="allowLineBreaks" value="true"/>
+ </module>
+
+ <module name="OperatorWrap"/>
+ <module name="OperatorWrap">
+ <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
+ <property name="option" value="eol"/>
+ </module>
+ <module name="PackageName"/>
+ <module name="ParameterName">
+ <property name="format" value="^a[A-Z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="id" value="paramNum"/>
+ </module>
+ <module name="ParenPad"/>
+ <module name="TypecastParenPad"/>
+ <module name="RedundantImport"/>
+ <module name="RedundantModifier"/>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ </module>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StaticVariableName">
+ <property name="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="TabCharacter"/>
+ <module name="TypeName"/>
+ <module name="UnusedImports"/>
+ <module name="UpperEll"/>
+ <module name="VisibilityModifier"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
+ <module name="FinalClass"/>
+ <module name="MissingSwitchDefault"/>
+ <module name="MagicNumber"/>
+ <module name="Indentation">
+ <property name="basicOffset" value="4"/>
+ <property name="braceAdjustment" value="0"/>
+ <property name="caseIndent" value="0"/>
+ </module>
+ <module name="ArrayTrailingComma"/>
+ <!-- module name="FinalLocalVariable"/ -->
+
+ <!-- Generates quite a few errors -->
+ <module name="CyclomaticComplexity">
+ <property name="severity" value="ignore"/>
+ </module>
+
+ <module name="NestedIfDepth">
+ <property name="max" value="3"/>
+ </module>
+ <module name="NestedTryDepth"/>
+ <module name="ExplicitInitialization"/>
+ </module>
+</module>
Modified: trunk/tools/checkstyle-4.3/import-control.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/checkstyle-4.3/import-control.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/tools/checkstyle-4.3/import-control.xml (original)
+++ trunk/tools/checkstyle-4.3/import-control.xml 2010-01-12 10:21:28-0800
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
-<!DOCTYPE import-control PUBLIC
- "-//Puppy Crawl//DTD Import Control 1.0//EN"
- "http://www.puppycrawl.com/dtds/import_control_1_0.dtd">
-
-<import-control pkg="com.puppycrawl.tools.checkstyle">
-
- <allow pkg="antlr"/>
- <allow pkg="com.puppycrawl.tools.checkstyle.api"/>
- <allow pkg="java.io"/>
- <allow pkg="java.net"/>
- <allow pkg="java.util"/>
- <allow pkg="javax.xml.parsers"/>
- <allow pkg="org.apache.commons.beanutils"/>
- <allow pkg="org.apache.commons.logging"/>
- <allow pkg="org.apache.commons.collections"/>
- <allow pkg="org.xml.sax"/>
-
- <!-- The local ones -->
- <allow pkg="com.puppycrawl.tools.checkstyle.grammars" local-only="true"/>
- <allow class="java.security.MessageDigest" local-only="true"/>
- <allow pkg="org.apache.commons.cli" local-only="true"/>
- <allow pkg="org.apache.tools.ant" local-only="true"/>
-
- <subpackage name="api">
- <allow pkg="java.beans"/>
- <allow pkg="java.lang.reflect"/>
- <allow pkg="java.text"/>
- <allow class="com.puppycrawl.tools.checkstyle.grammars.CommentListener"
- local-only="true"/>
- <allow class="com.puppycrawl.tools.checkstyle.grammars.GeneratedJavaTokenTypes"
- local-only="true"/>
- </subpackage>
-
- <subpackage name="checks">
- <allow pkg="com.puppycrawl.tools.checkstyle.checks"/>
-
- <subpackage name="indentation">
- <allow pkg="java.lang.reflect"/>
- <allow pkg="org.apache.commons.collections"/>
- </subpackage>
-
- </subpackage>
-
- <subpackage name="doclets">
- <allow pkg="com.sun.javadoc"/>
- </subpackage>
-
- <subpackage name="filters">
- <allow pkg="java.lang.ref"/>
- </subpackage>
-
- <subpackage name="gui">
- <allow pkg="java.awt"/>
- <allow pkg="javax.swing"/>
- </subpackage>
+<?xml version="1.0"?>
+<!DOCTYPE import-control PUBLIC
+ "-//Puppy Crawl//DTD Import Control 1.0//EN"
+ "http://www.puppycrawl.com/dtds/import_control_1_0.dtd">
+
+<import-control pkg="com.puppycrawl.tools.checkstyle">
+
+ <allow pkg="antlr"/>
+ <allow pkg="com.puppycrawl.tools.checkstyle.api"/>
+ <allow pkg="java.io"/>
+ <allow pkg="java.net"/>
+ <allow pkg="java.util"/>
+ <allow pkg="javax.xml.parsers"/>
+ <allow pkg="org.apache.commons.beanutils"/>
+ <allow pkg="org.apache.commons.logging"/>
+ <allow pkg="org.apache.commons.collections"/>
+ <allow pkg="org.xml.sax"/>
+
+ <!-- The local ones -->
+ <allow pkg="com.puppycrawl.tools.checkstyle.grammars" local-only="true"/>
+ <allow class="java.security.MessageDigest" local-only="true"/>
+ <allow pkg="org.apache.commons.cli" local-only="true"/>
+ <allow pkg="org.apache.tools.ant" local-only="true"/>
+
+ <subpackage name="api">
+ <allow pkg="java.beans"/>
+ <allow pkg="java.lang.reflect"/>
+ <allow pkg="java.text"/>
+ <allow class="com.puppycrawl.tools.checkstyle.grammars.CommentListener"
+ local-only="true"/>
+ <allow class="com.puppycrawl.tools.checkstyle.grammars.GeneratedJavaTokenTypes"
+ local-only="true"/>
+ </subpackage>
+
+ <subpackage name="checks">
+ <allow pkg="com.puppycrawl.tools.checkstyle.checks"/>
+
+ <subpackage name="indentation">
+ <allow pkg="java.lang.reflect"/>
+ <allow pkg="org.apache.commons.collections"/>
+ </subpackage>
+
+ </subpackage>
+
+ <subpackage name="doclets">
+ <allow pkg="com.sun.javadoc"/>
+ </subpackage>
+
+ <subpackage name="filters">
+ <allow pkg="java.lang.ref"/>
+ </subpackage>
+
+ <subpackage name="gui">
+ <allow pkg="java.awt"/>
+ <allow pkg="javax.swing"/>
+ </subpackage>
</import-control>
\ No newline at end of file
Modified: trunk/tools/checkstyle-4.3/pom-optional.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/checkstyle-4.3/pom-optional.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/tools/checkstyle-4.3/pom-optional.xml (original)
+++ trunk/tools/checkstyle-4.3/pom-optional.xml 2010-01-12 10:21:28-0800
@@ -1,20 +1,20 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>checkstyle</groupId>
- <artifactId>checkstyle-optional</artifactId>
- <version>4.3</version>
- <packaging>jar</packaging>
- <name>Checkstyle Optional</name>
- <url>http://checkstyle.sourceforge.net/</url>
- <description>Checkstyle is a development tool to help programmers write Java code that adheres to a coding standard</description>
- <scm>
- <url>http://checkstyle.cvs.sourceforge.net/checkstyle/</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>checkstyle</groupId>
- <artifactId>checkstyle</artifactId>
- <version>4.3</version>
- </dependency>
- </dependencies>
-</project>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>checkstyle</groupId>
+ <artifactId>checkstyle-optional</artifactId>
+ <version>4.3</version>
+ <packaging>jar</packaging>
+ <name>Checkstyle Optional</name>
+ <url>http://checkstyle.sourceforge.net/</url>
+ <description>Checkstyle is a development tool to help programmers write Java code that adheres to a coding standard</description>
+ <scm>
+ <url>http://checkstyle.cvs.sourceforge.net/checkstyle/</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>checkstyle</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>4.3</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/tools/checkstyle-4.3/pom.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/checkstyle-4.3/pom.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/tools/checkstyle-4.3/pom.xml (original)
+++ trunk/tools/checkstyle-4.3/pom.xml 2010-01-12 10:21:28-0800
@@ -1,40 +1,40 @@
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>checkstyle</groupId>
- <artifactId>checkstyle</artifactId>
- <version>4.3</version>
- <packaging>jar</packaging>
- <name>Checkstyle</name>
- <url>http://checkstyle.sourceforge.net/</url>
- <description>Checkstyle is a development tool to help programmers write Java code that adheres to a coding standard</description>
- <scm>
- <url>http://checkstyle.cvs.sourceforge.net/checkstyle/</url>
- </scm>
- <dependencies>
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.6</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
- </dependency>
- </dependencies>
-</project>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>checkstyle</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>4.3</version>
+ <packaging>jar</packaging>
+ <name>Checkstyle</name>
+ <url>http://checkstyle.sourceforge.net/</url>
+ <description>Checkstyle is a development tool to help programmers write Java code that adheres to a coding standard</description>
+ <scm>
+ <url>http://checkstyle.cvs.sourceforge.net/checkstyle/</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ </dependencies>
+</project>
Modified: trunk/tools/checkstyle-4.3/sun_checks.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/checkstyle-4.3/sun_checks.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/tools/checkstyle-4.3/sun_checks.xml (original)
+++ trunk/tools/checkstyle-4.3/sun_checks.xml 2010-01-12 10:21:28-0800
@@ -1,171 +1,171 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-
- Checkstyle configuration that checks the sun coding conventions from:
-
- - the Java Language Specification at
- http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
- - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
- - the Javadoc guidelines at
- http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
- - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
- - some best practices
-
- Checkstyle is very configurable. Be sure to read the documentation at
- http://checkstyle.sf.net (or in your downloaded distribution).
-
- Most Checks are configurable, be sure to consult the documentation.
-
- To completely disable a check, just comment it out or delete it from the file.
-
- Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
- <!-- Checks that a package.html file exists for each package. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
- <module name="PackageHtml"/>
-
- <!-- Checks whether files end with a new line. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <module name="NewlineAtEndOfFile"/>
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
- <module name="Translation"/>
-
-
- <module name="TreeWalker">
-
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
- <module name="JavadocMethod"/>
- <module name="JavadocType"/>
- <module name="JavadocVariable"/>
- <module name="JavadocStyle"/>
-
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
-
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <!-- <module name="Header"> -->
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. See property -->
- <!-- expansion, -->
- <!-- http://checkstyle.sf.net/config.html#properties -->
- <!-- <property -->
- <!-- name="headerFile" -->
- <!-- value="${basedir}/java.header"/> -->
- <!-- </module> -->
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
-
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="FileLength"/>
- <module name="LineLength"/>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/>
-
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="EmptyForIteratorPad"/>
- <module name="MethodParamPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap"/>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="TabCharacter"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
-
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
-
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
-
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="AvoidInlineConditionals"/>
- <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE -->
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="HiddenField"/>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber"/>
- <module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
- <module name="DesignForExtension"/>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/>
-
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <module name="ArrayTypeStyle"/>
- <module name="FinalParameters"/>
- <module name="GenericIllegalRegexp">
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- <module name="TodoComment"/>
- <module name="UpperEll"/>
-
- </module>
-
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--
+
+ Checkstyle configuration that checks the sun coding conventions from:
+
+ - the Java Language Specification at
+ http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+ - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+
+ - the Javadoc guidelines at
+ http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+
+ - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+
+ - some best practices
+
+ Checkstyle is very configurable. Be sure to read the documentation at
+ http://checkstyle.sf.net (or in your downloaded distribution).
+
+ Most Checks are configurable, be sure to consult the documentation.
+
+ To completely disable a check, just comment it out or delete it from the file.
+
+ Finally, it is worth reading the documentation.
+
+-->
+
+<module name="Checker">
+
+ <!-- Checks that a package.html file exists for each package. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+ <module name="PackageHtml"/>
+
+ <!-- Checks whether files end with a new line. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+ <module name="NewlineAtEndOfFile"/>
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <module name="Translation"/>
+
+
+ <module name="TreeWalker">
+
+ <!-- Checks for Javadoc comments. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+ <module name="JavadocMethod"/>
+ <module name="JavadocType"/>
+ <module name="JavadocVariable"/>
+ <module name="JavadocStyle"/>
+
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+
+
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <!-- <module name="Header"> -->
+ <!-- The follow property value demonstrates the ability -->
+ <!-- to have access to ANT properties. In this case it uses -->
+ <!-- the ${basedir} property to allow Checkstyle to be run -->
+ <!-- from any directory within a project. See property -->
+ <!-- expansion, -->
+ <!-- http://checkstyle.sf.net/config.html#properties -->
+ <!-- <property -->
+ <!-- name="headerFile" -->
+ <!-- value="${basedir}/java.header"/> -->
+ <!-- </module> -->
+
+ <!-- Following interprets the header file as regular expressions. -->
+ <!-- <module name="RegexpHeader"/> -->
+
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <module name="AvoidStarImport"/>
+ <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="FileLength"/>
+ <module name="LineLength"/>
+ <module name="MethodLength"/>
+ <module name="ParameterNumber"/>
+
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="EmptyForIteratorPad"/>
+ <module name="MethodParamPad"/>
+ <module name="NoWhitespaceAfter"/>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TypecastParenPad"/>
+ <module name="TabCharacter"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock"/>
+ <module name="LeftCurly"/>
+ <module name="NeedBraces"/>
+ <module name="RightCurly"/>
+
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <module name="AvoidInlineConditionals"/>
+ <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE -->
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="HiddenField"/>
+ <module name="IllegalInstantiation"/>
+ <module name="InnerAssignment"/>
+ <module name="MagicNumber"/>
+ <module name="MissingSwitchDefault"/>
+ <module name="RedundantThrows"/>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <module name="DesignForExtension"/>
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="VisibilityModifier"/>
+
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="ArrayTypeStyle"/>
+ <module name="FinalParameters"/>
+ <module name="GenericIllegalRegexp">
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+ <module name="TodoComment"/>
+ <module name="UpperEll"/>
+
+ </module>
+
+</module>
Modified: trunk/tools/checkstyle-4.3/suppressions.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/checkstyle-4.3/suppressions.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/tools/checkstyle-4.3/suppressions.xml (original)
+++ trunk/tools/checkstyle-4.3/suppressions.xml 2010-01-12 10:21:28-0800
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE suppressions PUBLIC
- "-//Puppy Crawl//DTD Suppressions 1.1//EN"
- "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
- <suppress checks="FileLength"
- files="TokenTypes.java"
- lines="1"/>
- <suppress checks="MagicNumber"
- files="UnusedPrivateMethodCheck.java"
- lines="176"/>
- <suppress checks="ImportControl"
- files="NewlineAtEndOfFileCheck.java"
- lines="26"/>
- <suppress checks="ImportControl"
- files="TranslationCheck.java"
- lines="34"/>
- <suppress checks="ImportControl"
- files="SuppressionCommentFilter.java"
- lines="40"/>
- <suppress id="paramNum"
- files="LocalizedMessage.java"
- lines="142"/>
-</suppressions>
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+ <suppress checks="FileLength"
+ files="TokenTypes.java"
+ lines="1"/>
+ <suppress checks="MagicNumber"
+ files="UnusedPrivateMethodCheck.java"
+ lines="176"/>
+ <suppress checks="ImportControl"
+ files="NewlineAtEndOfFileCheck.java"
+ lines="26"/>
+ <suppress checks="ImportControl"
+ files="TranslationCheck.java"
+ lines="34"/>
+ <suppress checks="ImportControl"
+ files="SuppressionCommentFilter.java"
+ lines="40"/>
+ <suppress id="paramNum"
+ files="LocalizedMessage.java"
+ lines="142"/>
+</suppressions>
Modified: trunk/tools/cruisecontrol/build-argouml.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/cruisecontrol/build-argouml.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/tools/cruisecontrol/build-argouml.xml (original)
+++ trunk/tools/cruisecontrol/build-argouml.xml 2010-01-12 10:21:28-0800
@@ -1,36 +1,36 @@
-<!-- Delegating build script, used by cruisecontrol to build ArgoUML.
- Note that the basedir is set to the checked out project -->
-<project name="build-argouml"
- default="build"
- basedir="checkout/argouml">
-
- <property name="svnant.repository.user" value="guest"/>
- <property name="svnant.repository.passwd" value=""/>
- <property name="svnant.latest.url" value="http://argouml.tigris.org/svn/argouml/trunk"/>
- <property name="" value=""/>
- <property name="" value=""/>
-
-<!--
- <path id="svn.classpath">
- <pathelement location="${svnjavahl.jar}" />
- <pathelement location="${svnant.jar}" />
- <pathelement location="${svnClientAdapter.jar}" />
- </path>
-
- <taskdef resource="svntask.properties" classpathref="svn.classpath"/>
--->
-
- <target name="build">
- <!-- Get the latest from SVN -->
- <exec executable="svn">
- <arg line="update ${svnant.latest.url} --username=${svnant.repository.user}"/>
- </exec>
-<!--
- <svn username="${svnant.repository.user}" password="${svnant.repository.passwd}">
- <update file="argouml" />
- </svn>
--->
- <!-- Call the target that does everything -->
- <ant dir="src_new" antfile="build.xml" target="cruisecontrol"/>
- </target>
-</project>
+<!-- Delegating build script, used by cruisecontrol to build ArgoUML.
+ Note that the basedir is set to the checked out project -->
+<project name="build-argouml"
+ default="build"
+ basedir="checkout/argouml">
+
+ <property name="svnant.repository.user" value="guest"/>
+ <property name="svnant.repository.passwd" value=""/>
+ <property name="svnant.latest.url" value="http://argouml.tigris.org/svn/argouml/trunk"/>
+ <property name="" value=""/>
+ <property name="" value=""/>
+
+<!--
+ <path id="svn.classpath">
+ <pathelement location="${svnjavahl.jar}" />
+ <pathelement location="${svnant.jar}" />
+ <pathelement location="${svnClientAdapter.jar}" />
+ </path>
+
+ <taskdef resource="svntask.properties" classpathref="svn.classpath"/>
+-->
+
+ <target name="build">
+ <!-- Get the latest from SVN -->
+ <exec executable="svn">
+ <arg line="update ${svnant.latest.url} --username=${svnant.repository.user}"/>
+ </exec>
+<!--
+ <svn username="${svnant.repository.user}" password="${svnant.repository.passwd}">
+ <update file="argouml" />
+ </svn>
+-->
+ <!-- Call the target that does everything -->
+ <ant dir="src_new" antfile="build.xml" target="cruisecontrol"/>
+ </target>
+</project>
Modified: trunk/tools/cruisecontrol/config.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tools/cruisecontrol/config.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/tools/cruisecontrol/config.xml (original)
+++ trunk/tools/cruisecontrol/config.xml 2010-01-12 10:21:28-0800
@@ -1,50 +1,50 @@
-<cruisecontrol>
- <project name="argouml" buildafterfailed="true">
- <listeners>
- <currentbuildstatuslistener file="logs/argouml/status.txt" />
- </listeners>
-
- <!-- Bootstrappers are run every time the build runs,
- *before* the modification checks -->
- <bootstrappers></bootstrappers>
-
- <!-- Defines where cruise looks for changes, to decide
- whether to run the build -->
- <modificationset quietperiod="300">
- <svn
- RepositoryLocation="http://argouml.tigris.org/svn/argouml/trunk argouml"
- username="guest" />
- </modificationset>
-
- <!-- Configures the actual build loop, how often and which
- build file/target ** values in seconds ** Increase! -->
- <schedule interval="3600">
- <ant anthome="checkout/argouml/tools/apache-ant-1.7.0"
- buildfile="build-argouml.xml" target="build" uselogger="true"
- usedebug="false" />
- </schedule>
-
- <!-- directory to write build logs to -->
- <log logdir="logs/argouml">
- <merge dir="checkout/argouml/build/tests/reports/junit/output/" />
- <merge dir="checkout/argouml/build/tests/reports/checkstyle/" />
- </log>
-
- <!-- Publishers are run *after* a build completes -->
- <publishers>
-
- <!-- TODO: Not operational yet. Needs valid Host and URL -->
- <email mailhost="SMTP_HOST"
- returnaddress="[email protected]"
- buildresultsurl="http://localhost/cc/buildresults/argouml"
- skipusers="false"
- spamwhilebroken="true">
-
- <always address="[email protected]" />
- <failure address="[email protected]" />
- <propertiesmapper file="emailmap.properties" />
- </email>
-
- </publishers>
- </project>
-</cruisecontrol>
+<cruisecontrol>
+ <project name="argouml" buildafterfailed="true">
+ <listeners>
+ <currentbuildstatuslistener file="logs/argouml/status.txt" />
+ </listeners>
+
+ <!-- Bootstrappers are run every time the build runs,
+ *before* the modification checks -->
+ <bootstrappers></bootstrappers>
+
+ <!-- Defines where cruise looks for changes, to decide
+ whether to run the build -->
+ <modificationset quietperiod="300">
+ <svn
+ RepositoryLocation="http://argouml.tigris.org/svn/argouml/trunk argouml"
+ username="guest" />
+ </modificationset>
+
+ <!-- Configures the actual build loop, how often and which
+ build file/target ** values in seconds ** Increase! -->
+ <schedule interval="3600">
+ <ant anthome="checkout/argouml/tools/apache-ant-1.7.0"
+ buildfile="build-argouml.xml" target="build" uselogger="true"
+ usedebug="false" />
+ </schedule>
+
+ <!-- directory to write build logs to -->
+ <log logdir="logs/argouml">
+ <merge dir="checkout/argouml/build/tests/reports/junit/output/" />
+ <merge dir="checkout/argouml/build/tests/reports/checkstyle/" />
+ </log>
+
+ <!-- Publishers are run *after* a build completes -->
+ <publishers>
+
+ <!-- TODO: Not operational yet. Needs valid Host and URL -->
+ <email mailhost="SMTP_HOST"
+ returnaddress="[email protected]"
+ buildresultsurl="http://localhost/cc/buildresults/argouml"
+ skipusers="false"
+ spamwhilebroken="true">
+
+ <always address="[email protected]" />
+ <failure address="[email protected]" />
+ <propertiesmapper file="emailmap.properties" />
+ </email>
+
+ </publishers>
+ </project>
+</cruisecontrol>
Modified: trunk/www/gsoc2007/profiles/index_arquivos/colorschememapping.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/www/gsoc2007/profiles/index_arquivos/colorschememapping.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/www/gsoc2007/profiles/index_arquivos/colorschememapping.xml (original)
+++ trunk/www/gsoc2007/profiles/index_arquivos/colorschememapping.xml 2010-01-12 10:21:28-0800
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<a:clrMap xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/>
\ No newline at end of file
Modified: trunk/www/gsoc2007/profiles/index_arquivos/filelist.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/www/gsoc2007/profiles/index_arquivos/filelist.xml?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/www/gsoc2007/profiles/index_arquivos/filelist.xml (original)
+++ trunk/www/gsoc2007/profiles/index_arquivos/filelist.xml 2010-01-12 10:21:28-0800
@@ -1,6 +1,6 @@
-<xml xmlns:o="urn:schemas-microsoft-com:office:office">
- <o:MainFile HRef="../index.html"/>
- <o:File HRef="themedata.thmx"/>
- <o:File HRef="colorschememapping.xml"/>
- <o:File HRef="filelist.xml"/>
+<xml xmlns:o="urn:schemas-microsoft-com:office:office">
+ <o:MainFile HRef="../index.html"/>
+ <o:File HRef="themedata.thmx"/>
+ <o:File HRef="colorschememapping.xml"/>
+ <o:File HRef="filelist.xml"/>
</xml>
\ No newline at end of file
Modified: trunk/www/gsoc2007/profiles/proposal0/argouml-profiles.txt
Url: http://argouml.tigris.org/source/browse/argouml/trunk/www/gsoc2007/profiles/proposal0/argouml-profiles.txt?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/www/gsoc2007/profiles/proposal0/argouml-profiles.txt (original)
+++ trunk/www/gsoc2007/profiles/proposal0/argouml-profiles.txt 2010-01-12 10:21:28-0800
@@ -91,7 +91,7 @@
--- D:/ArgoUML/argouml/org/argouml/cognitive/Highlightable.java (revision 12607)
+++ D:/ArgoUML/argouml/org/argouml/cognitive/Highlightable.java (working copy)
@@ -1,4 +1,4 @@
--// $Id:$
+-// $Id$
+// $Id$
// Copyright (c) 1996-99 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -800,7 +800,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/ResourceModelLoader.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/ResourceModelLoader.java (revision 0)
@@ -0,0 +1,53 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -858,7 +858,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/Profile.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/Profile.java (revision 0)
@@ -0,0 +1,52 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -1373,7 +1373,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/java/JavaFormatingStrategy.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/java/JavaFormatingStrategy.java (revision 0)
@@ -0,0 +1,233 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -1611,7 +1611,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/StreamModelLoader.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/StreamModelLoader.java (revision 0)
@@ -0,0 +1,74 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -1690,7 +1690,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/FileModelLoader.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/FileModelLoader.java (revision 0)
@@ -0,0 +1,63 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -1758,7 +1758,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/ProfileConfiguration.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/ProfileConfiguration.java (revision 0)
@@ -0,0 +1,87 @@
-+// $Id: Profile.java 11516 2006-11-25 04:30:15Z tfmorris $
++// $Id$
+// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -1850,7 +1850,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/ProfileModelLoader.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/ProfileModelLoader.java (revision 0)
@@ -0,0 +1,41 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -1896,7 +1896,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/FormatingStrategy.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/FormatingStrategy.java (revision 0)
@@ -0,0 +1,54 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -1955,7 +1955,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/ZipModelLoader.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/ZipModelLoader.java (revision 0)
@@ -0,0 +1,105 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -2065,7 +2065,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/ProfileManager.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/ProfileManager.java (revision 0)
@@ -0,0 +1,38 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -2108,7 +2108,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/ProfileManagerImpl.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/ProfileManagerImpl.java (revision 0)
@@ -0,0 +1,62 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -2175,7 +2175,7 @@
--- D:/ArgoUML/argouml/org/argouml/uml/profile/UserDefinedProfile.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/uml/profile/UserDefinedProfile.java (revision 0)
@@ -0,0 +1,61 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
@@ -2484,7 +2484,7 @@
--- D:/ArgoUML/argouml/org/argouml/ui/ProfileSelectionTab.java (revision 0)
+++ D:/ArgoUML/argouml/org/argouml/ui/ProfileSelectionTab.java (revision 0)
@@ -0,0 +1,329 @@
-+// $Id: eclipse-argo-codetemplates.xml 11347 2006-10-26 22:37:44Z linus $
++// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
Modified: trunk/www/gsoc2007/profiles/proposal0/index.html
Url: http://argouml.tigris.org/source/browse/argouml/trunk/www/gsoc2007/profiles/proposal0/index.html?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/www/gsoc2007/profiles/proposal0/index.html (original)
+++ trunk/www/gsoc2007/profiles/proposal0/index.html 2010-01-12 10:21:28-0800
@@ -1,4 +1,4 @@
-<!-- $Id: index.html 12437 2007-04-28 07:11:45Z linus $ -->
+<!-- $Id$ -->
<html>
<head>
Modified: trunk/www/gsoc2008/index.html
Url: http://argouml.tigris.org/source/browse/argouml/trunk/www/gsoc2008/index.html?view=diff&pathrev=17806&r1=17805&r2=17806
==============================================================================
--- trunk/www/gsoc2008/index.html (original)
+++ trunk/www/gsoc2008/index.html 2010-01-12 10:21:28-0800
@@ -1,4 +1,4 @@
-<!-- $Id: index.html 12932 2007-06-30 19:26:59Z penyaskito $ -->
+<!-- $Id$ -->
<html>
<head>
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2436690
To unsubscribe from this discussion, e-mail: [[email protected]].