notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1823 - in trunk/main/util: . cli cli/src/main cli/src/main/dpml/cli cli/src/main/dpml/cli/builder cli/src/main/dpml/cli/commandline cli/src/main/dpml/cli/option cli/src/main/dpml/cli/resource cli/src/main/dpml/cli/util cli/src/main/dpml/cli/validation cli/src/main/net cli/src/test cli/src/test/dpml cli/src/test/dpml/cli cli/src/test/dpml/cli/application cli/src/test/dpml/cli/bug cli/src/test/dpml/cli/builder cli/src/test/dpml/cli/commandline cli/src/test/dpml/cli/option cli/src/test/dpml/cli/resource cli/src/test/dpml/cli/util cli/src/test/dpml/cli/validation cli/src/test/dpml/cli/validation/protect cli/src/test/net
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1823 - in trunk/main/util: . cli cli/src/main cli/src/main/dpml/cli cli/src/main/dpml/cli/builder cli/src/main/dpml/cli/commandline cli/src/main/dpml/cli/option cli/src/main/dpml/cli/resource cli/src/main/dpml/cli/util cli/src/main/dpml/cli/validation cli/src/main/net cli/src/test cli/src/test/dpml cli/src/test/dpml/cli cli/src/test/dpml/cli/application cli/src/test/dpml/cli/bug cli/src/test/dpml/cli/builder cli/src/test/dpml/cli/commandline cli/src/test/dpml/cli/option cli/src/test/dpml/cli/resource cli/src/test/dpml/cli/util cli/src/test/dpml/cli/validation cli/src/test/dpml/cli/validation/protect cli/src/test/net
- Date: Fri, 9 Feb 2007 00:35:08 +0100
Author: mcconnell
Date: 2007-02-09 00:35:00 +0100 (Fri, 09 Feb 2007)
New Revision: 1823
Added:
trunk/main/util/cli/bootstrap.xml
trunk/main/util/cli/project.xml
trunk/main/util/cli/src/main/dpml/
trunk/main/util/cli/src/main/dpml/cli/TooManyArgumentsException.java
trunk/main/util/cli/src/test/dpml/
trunk/main/util/cli/src/test/dpml/cli/
Removed:
trunk/main/util/cli/src/main/net/dpml/
trunk/main/util/cli/src/test/dpml/cli/
trunk/main/util/cli/src/test/net/dpml/
trunk/main/util/i18n/
trunk/main/util/logging/
Modified:
trunk/main/util/cli/build.xml
trunk/main/util/cli/src/main/dpml/cli/Argument.java
trunk/main/util/cli/src/main/dpml/cli/CommandLine.java
trunk/main/util/cli/src/main/dpml/cli/DisplaySetting.java
trunk/main/util/cli/src/main/dpml/cli/Group.java
trunk/main/util/cli/src/main/dpml/cli/HelpLine.java
trunk/main/util/cli/src/main/dpml/cli/Option.java
trunk/main/util/cli/src/main/dpml/cli/OptionException.java
trunk/main/util/cli/src/main/dpml/cli/Parent.java
trunk/main/util/cli/src/main/dpml/cli/WriteableCommandLine.java
trunk/main/util/cli/src/main/dpml/cli/builder/ArgumentBuilder.java
trunk/main/util/cli/src/main/dpml/cli/builder/CommandBuilder.java
trunk/main/util/cli/src/main/dpml/cli/builder/DefaultOptionBuilder.java
trunk/main/util/cli/src/main/dpml/cli/builder/GroupBuilder.java
trunk/main/util/cli/src/main/dpml/cli/builder/PatternBuilder.java
trunk/main/util/cli/src/main/dpml/cli/builder/SwitchBuilder.java
trunk/main/util/cli/src/main/dpml/cli/commandline/CommandLineImpl.java
trunk/main/util/cli/src/main/dpml/cli/commandline/DefaultingCommandLine.java
trunk/main/util/cli/src/main/dpml/cli/commandline/Parser.java
trunk/main/util/cli/src/main/dpml/cli/commandline/PreferencesCommandLine.java
trunk/main/util/cli/src/main/dpml/cli/commandline/PropertiesCommandLine.java
trunk/main/util/cli/src/main/dpml/cli/commandline/WriteableCommandLineImpl.java
trunk/main/util/cli/src/main/dpml/cli/option/ArgumentImpl.java
trunk/main/util/cli/src/main/dpml/cli/option/Command.java
trunk/main/util/cli/src/main/dpml/cli/option/DefaultOption.java
trunk/main/util/cli/src/main/dpml/cli/option/GroupImpl.java
trunk/main/util/cli/src/main/dpml/cli/option/HelpLineImpl.java
trunk/main/util/cli/src/main/dpml/cli/option/OptionImpl.java
trunk/main/util/cli/src/main/dpml/cli/option/ParentImpl.java
trunk/main/util/cli/src/main/dpml/cli/option/PropertyOption.java
trunk/main/util/cli/src/main/dpml/cli/option/SourceDestArgument.java
trunk/main/util/cli/src/main/dpml/cli/option/Switch.java
trunk/main/util/cli/src/main/dpml/cli/resource/ResourceConstants.java
trunk/main/util/cli/src/main/dpml/cli/resource/ResourceHelper.java
trunk/main/util/cli/src/main/dpml/cli/util/Comparators.java
trunk/main/util/cli/src/main/dpml/cli/util/HelpFormatter.java
trunk/main/util/cli/src/main/dpml/cli/validation/ClassValidator.java
trunk/main/util/cli/src/main/dpml/cli/validation/DateValidator.java
trunk/main/util/cli/src/main/dpml/cli/validation/EnumValidator.java
trunk/main/util/cli/src/main/dpml/cli/validation/FileValidator.java
trunk/main/util/cli/src/main/dpml/cli/validation/InvalidArgumentException.java
trunk/main/util/cli/src/main/dpml/cli/validation/NumberValidator.java
trunk/main/util/cli/src/main/dpml/cli/validation/URIValidator.java
trunk/main/util/cli/src/main/dpml/cli/validation/URLValidator.java
trunk/main/util/cli/src/main/dpml/cli/validation/Validator.java
trunk/main/util/cli/src/test/dpml/cli/AbstractCLITestCase.java
trunk/main/util/cli/src/test/dpml/cli/AbstractCommandLineTestCase.java
trunk/main/util/cli/src/test/dpml/cli/AbstractWriteableCommandLineTestCase.java
trunk/main/util/cli/src/test/dpml/cli/CommandLineDefaultsTest.java
trunk/main/util/cli/src/test/dpml/cli/DocumentationTest.java
trunk/main/util/cli/src/test/dpml/cli/PrecedenceTest.java
trunk/main/util/cli/src/test/dpml/cli/application/AntTest.java
trunk/main/util/cli/src/test/dpml/cli/application/CpTest.java
trunk/main/util/cli/src/test/dpml/cli/application/CvsTest.java
trunk/main/util/cli/src/test/dpml/cli/application/LsTest.java
trunk/main/util/cli/src/test/dpml/cli/bug/Bug13886Test.java
trunk/main/util/cli/src/test/dpml/cli/bug/Bug13935Test.java
trunk/main/util/cli/src/test/dpml/cli/bug/Bug15046Test.java
trunk/main/util/cli/src/test/dpml/cli/bug/Bug15648Test.java
trunk/main/util/cli/src/test/dpml/cli/bug/Bug27575Test.java
trunk/main/util/cli/src/test/dpml/cli/bug/Bug28005Test.java
trunk/main/util/cli/src/test/dpml/cli/bug/Bug32533Test.java
trunk/main/util/cli/src/test/dpml/cli/bug/BugLoopingOptionLookAlikeTest.java
trunk/main/util/cli/src/test/dpml/cli/builder/ArgumentBuilderTest.java
trunk/main/util/cli/src/test/dpml/cli/builder/DefaultOptionBuilderTest.java
trunk/main/util/cli/src/test/dpml/cli/commandline/DefaultingCommandLineTest.java
trunk/main/util/cli/src/test/dpml/cli/commandline/ParserTest.java
trunk/main/util/cli/src/test/dpml/cli/commandline/PreferencesCommandLineTest.java
trunk/main/util/cli/src/test/dpml/cli/commandline/PropertiesCommandLineTest.java
trunk/main/util/cli/src/test/dpml/cli/commandline/WriteableCommandLineImplTest.java
trunk/main/util/cli/src/test/dpml/cli/option/AbstractArgumentTestCase.java
trunk/main/util/cli/src/test/dpml/cli/option/AbstractGroupTestCase.java
trunk/main/util/cli/src/test/dpml/cli/option/AbstractOptionTestCase.java
trunk/main/util/cli/src/test/dpml/cli/option/AbstractParentTestCase.java
trunk/main/util/cli/src/test/dpml/cli/option/ArgumentTest.java
trunk/main/util/cli/src/test/dpml/cli/option/CommandTest.java
trunk/main/util/cli/src/test/dpml/cli/option/DefaultOptionTest.java
trunk/main/util/cli/src/test/dpml/cli/option/GroupTest.java
trunk/main/util/cli/src/test/dpml/cli/option/NestedGroupTest.java
trunk/main/util/cli/src/test/dpml/cli/option/ParentTest.java
trunk/main/util/cli/src/test/dpml/cli/option/PropertyOptionTest.java
trunk/main/util/cli/src/test/dpml/cli/option/SwitchTest.java
trunk/main/util/cli/src/test/dpml/cli/resource/ResourceHelperTest.java
trunk/main/util/cli/src/test/dpml/cli/util/ComparatorsTest.java
trunk/main/util/cli/src/test/dpml/cli/util/HelpFormatterTest.java
trunk/main/util/cli/src/test/dpml/cli/validation/ClassValidatorTest.java
trunk/main/util/cli/src/test/dpml/cli/validation/DateValidatorTest.java
trunk/main/util/cli/src/test/dpml/cli/validation/EnumValidatorTest.java
trunk/main/util/cli/src/test/dpml/cli/validation/FileValidatorTest.java
trunk/main/util/cli/src/test/dpml/cli/validation/NumberValidatorTest.java
trunk/main/util/cli/src/test/dpml/cli/validation/TimeZoneTestSuite.java
trunk/main/util/cli/src/test/dpml/cli/validation/URLValidatorTest.java
trunk/main/util/cli/src/test/dpml/cli/validation/protect/ProtectedClass.java
trunk/main/util/module.xml
Log:
SDK 2.X staged commit.
Added: trunk/main/util/cli/bootstrap.xml
===================================================================
--- trunk/main/util/cli/bootstrap.xml 2007-02-08 23:34:21 UTC (rev 1822)
+++ trunk/main/util/cli/bootstrap.xml 2007-02-08 23:35:00 UTC (rev 1823)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2005-2006 Stephen J McConnell
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
+
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project name="dpml-util-cli" default="install" basedir=".">
+
+ <property name="project.group" value="dpml/util"/>
+ <property name="project.name" value="dpml-util-cli"/>
+
+ <property name="home" value="../.."/>
+ <import file="${home}/bootstrap.xml"/>
+
+</project>
Modified: trunk/main/util/cli/build.xml
===================================================================
--- trunk/main/util/cli/build.xml 2007-02-08 23:34:21 UTC (rev 1822)
+++ trunk/main/util/cli/build.xml 2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<project name="dpml-cli" default="install" basedir="."
- xmlns:transit="antlib:net.dpml.transit">
+ xmlns:x="antlib:dpml.tools">
- <transit:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/tools/standard"/>
</project>
Added: trunk/main/util/cli/project.xml
===================================================================
--- trunk/main/util/cli/project.xml 2007-02-08 23:34:21 UTC (rev 1822)
+++ trunk/main/util/cli/project.xml 2007-02-08 23:35:00 UTC (rev 1823)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<project xmlns="dpml:library" name="dpml-util-cli">
+
+ <info title="DPML CLI Utility">
+ <description>Commandline handling utility.</description>
+ </info>
+
+ <properties>
+ <property name="project.javac.lint" value=""/>
+ </properties>
+
+ <types>
+ <type id="jar"/>
+ </types>
+
+ <dependencies>
+ <test>
+ <include ref="org/apache/ant/ant-junit"/>
+ </test>
+ </dependencies>
+
+</project>
Copied: trunk/main/util/cli/src/main/dpml (from rev 1789,
trunk/main/util/cli/src/main/net/dpml)
Modified: trunk/main/util/cli/src/main/dpml/cli/Argument.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/Argument.java 2006-11-30
21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/Argument.java 2007-02-08 23:35:00
UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import java.util.ListIterator;
Modified: trunk/main/util/cli/src/main/dpml/cli/CommandLine.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/CommandLine.java 2006-11-30
21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/CommandLine.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import java.util.List;
import java.util.Set;
Modified: trunk/main/util/cli/src/main/dpml/cli/DisplaySetting.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/DisplaySetting.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/DisplaySetting.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import java.util.Collections;
import java.util.HashSet;
Modified: trunk/main/util/cli/src/main/dpml/cli/Group.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/Group.java 2006-11-30
21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/Group.java 2007-02-08 23:35:00
UTC (rev 1823)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import java.util.Comparator;
import java.util.Set;
Modified: trunk/main/util/cli/src/main/dpml/cli/HelpLine.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/HelpLine.java 2006-11-30
21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/HelpLine.java 2007-02-08 23:35:00
UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import java.util.Comparator;
import java.util.Set;
Modified: trunk/main/util/cli/src/main/dpml/cli/Option.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/Option.java 2006-11-30
21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/Option.java 2007-02-08 23:35:00
UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import java.util.Comparator;
import java.util.List;
@@ -115,7 +115,7 @@
* Builds up a list of HelpLineImpl instances to be presented by
HelpFormatter.
*
* @see HelpLine
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.util.HelpFormatter
* @param depth the initial indent depth
* @param helpSettings the HelpSettings that should be applied
* @param comp a comparator used to sort options when applicable.
@@ -144,7 +144,7 @@
* Returns a description of the option. This string is used to build help
* messages as in the HelpFormatter.
*
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.util.HelpFormatter
* @return a description of the option.
*/
String getDescription();
Modified: trunk/main/util/cli/src/main/dpml/cli/OptionException.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/OptionException.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/OptionException.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import java.util.Collections;
import java.util.Set;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceHelper;
/**
* A problem found while dealing with command line options.
Modified: trunk/main/util/cli/src/main/dpml/cli/Parent.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/Parent.java 2006-11-30
21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/Parent.java 2007-02-08 23:35:00
UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import java.util.ListIterator;
Added: trunk/main/util/cli/src/main/dpml/cli/TooManyArgumentsException.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/TooManyArgumentsException.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/TooManyArgumentsException.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2004-2005 Stephen J. McConnell.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dpml.cli;
+
+/**
+ * Exception throw when too many arguments are supplied on a command line.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class TooManyArgumentsException extends IllegalStateException
+{
+ /**
+ * Serial version identifier.
+ */
+ static final long serialVersionUID = 1L;
+
+ //
------------------------------------------------------------------------
+ // constructor
+ //
------------------------------------------------------------------------
+
+ /**
+ * Construct a new <code>TooManyArgumentsException</code> instance.
+ *
+ * @param message the exception message
+ */
+ public TooManyArgumentsException( final String message )
+ {
+ super( message );
+ }
+}
+
Modified: trunk/main/util/cli/src/main/dpml/cli/WriteableCommandLine.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/WriteableCommandLine.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/WriteableCommandLine.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import java.util.List;
Modified: trunk/main/util/cli/src/main/dpml/cli/builder/ArgumentBuilder.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/builder/ArgumentBuilder.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/builder/ArgumentBuilder.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.builder;
+package dpml.cli.builder;
import java.util.ArrayList;
import java.util.List;
-import net.dpml.cli.Argument;
-import net.dpml.cli.option.ArgumentImpl;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
-import net.dpml.cli.validation.Validator;
+import dpml.cli.Argument;
+import dpml.cli.option.ArgumentImpl;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
+import dpml.cli.validation.Validator;
/**
* Builds Argument instances.
@@ -123,7 +123,7 @@
* Sets the name of the argument. The name is used when displaying usage
* information and to allow lookups in the CommandLine object.
*
- * @see net.dpml.cli.CommandLine#getValue(String)
+ * @see dpml.cli.CommandLine#getValue(String)
*
* @param newName the name of the argument
* @return this ArgumentBuilder
Modified: trunk/main/util/cli/src/main/dpml/cli/builder/CommandBuilder.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/builder/CommandBuilder.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/builder/CommandBuilder.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.builder;
+package dpml.cli.builder;
import java.util.HashSet;
import java.util.Set;
-import net.dpml.cli.Argument;
-import net.dpml.cli.Group;
-import net.dpml.cli.option.Command;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.Argument;
+import dpml.cli.Group;
+import dpml.cli.option.Command;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* Builds Command instances
Modified:
trunk/main/util/cli/src/main/dpml/cli/builder/DefaultOptionBuilder.java
===================================================================
---
trunk/main/util/cli/src/main/net/dpml/cli/builder/DefaultOptionBuilder.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/builder/DefaultOptionBuilder.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.builder;
+package dpml.cli.builder;
import java.util.HashSet;
import java.util.Set;
-import net.dpml.cli.Argument;
-import net.dpml.cli.Group;
-import net.dpml.cli.option.DefaultOption;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.Argument;
+import dpml.cli.Group;
+import dpml.cli.option.DefaultOption;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* Builds DefaultOption instances.
Modified: trunk/main/util/cli/src/main/dpml/cli/builder/GroupBuilder.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/builder/GroupBuilder.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/builder/GroupBuilder.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.builder;
+package dpml.cli.builder;
import java.util.ArrayList;
import java.util.List;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.option.GroupImpl;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.option.GroupImpl;
/**
* Builds Group instances.
Modified: trunk/main/util/cli/src/main/dpml/cli/builder/PatternBuilder.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/builder/PatternBuilder.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/builder/PatternBuilder.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.builder;
+package dpml.cli.builder;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import net.dpml.cli.Argument;
-import net.dpml.cli.Option;
-import net.dpml.cli.validation.ClassValidator;
-import net.dpml.cli.validation.DateValidator;
-import net.dpml.cli.validation.FileValidator;
-import net.dpml.cli.validation.NumberValidator;
-import net.dpml.cli.validation.URLValidator;
-import net.dpml.cli.validation.Validator;
+import dpml.cli.Argument;
+import dpml.cli.Option;
+import dpml.cli.validation.ClassValidator;
+import dpml.cli.validation.DateValidator;
+import dpml.cli.validation.FileValidator;
+import dpml.cli.validation.NumberValidator;
+import dpml.cli.validation.URLValidator;
+import dpml.cli.validation.Validator;
/**
* Builds Options using a String pattern
Modified: trunk/main/util/cli/src/main/dpml/cli/builder/SwitchBuilder.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/builder/SwitchBuilder.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/builder/SwitchBuilder.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.builder;
+package dpml.cli.builder;
import java.util.HashSet;
import java.util.Set;
-import net.dpml.cli.Argument;
-import net.dpml.cli.Group;
-import net.dpml.cli.option.Switch;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.Argument;
+import dpml.cli.Group;
+import dpml.cli.option.Switch;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* Builds Switch instance.
Modified:
trunk/main/util/cli/src/main/dpml/cli/commandline/CommandLineImpl.java
===================================================================
---
trunk/main/util/cli/src/main/net/dpml/cli/commandline/CommandLineImpl.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/commandline/CommandLineImpl.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,16 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Option;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.CommandLine;
+import dpml.cli.Option;
+import dpml.cli.TooManyArgumentsException;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* Instances of CommandLine represent a command line that has been processed
@@ -141,7 +142,7 @@
}
if( values.size() > 1 )
{
- throw new IllegalStateException(
+ throw new TooManyArgumentsException(
ResourceHelper.getResourceHelper().getMessage(
ResourceConstants.ARGUMENT_TOO_MANY_VALUES ) );
}
Modified:
trunk/main/util/cli/src/main/dpml/cli/commandline/DefaultingCommandLine.java
===================================================================
---
trunk/main/util/cli/src/main/net/dpml/cli/commandline/DefaultingCommandLine.java
2006-11-30 21:08:46 UTC (rev 1789)
+++
trunk/main/util/cli/src/main/dpml/cli/commandline/DefaultingCommandLine.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
import java.util.ArrayList;
import java.util.Collections;
@@ -23,8 +23,8 @@
import java.util.List;
import java.util.Set;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Option;
+import dpml.cli.CommandLine;
+import dpml.cli.Option;
/**
* Manages a queue of default CommandLines. This CommandLine implementation
is
Modified: trunk/main/util/cli/src/main/dpml/cli/commandline/Parser.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/commandline/Parser.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/commandline/Parser.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
import java.io.IOException;
@@ -22,13 +22,13 @@
import java.util.List;
import java.util.ListIterator;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.util.HelpFormatter;
+import dpml.cli.CommandLine;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.util.HelpFormatter;
/**
* A class that implements the <code>Parser</code> interface can parse a
Modified:
trunk/main/util/cli/src/main/dpml/cli/commandline/PreferencesCommandLine.java
===================================================================
---
trunk/main/util/cli/src/main/net/dpml/cli/commandline/PreferencesCommandLine.java
2006-11-30 21:08:46 UTC (rev 1789)
+++
trunk/main/util/cli/src/main/dpml/cli/commandline/PreferencesCommandLine.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
import java.util.ArrayList;
import java.util.Arrays;
@@ -27,7 +27,7 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
-import net.dpml.cli.Option;
+import dpml.cli.Option;
/**
* A CommandLine implementation using the Preferences API, useful when
@@ -45,8 +45,8 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
* @see java.util.prefs.Preferences
- * @see net.dpml.cli.commandline.DefaultingCommandLine
- * @see net.dpml.cli.Option#getPreferredName()
+ * @see dpml.cli.commandline.DefaultingCommandLine
+ * @see dpml.cli.Option#getPreferredName()
*/
public class PreferencesCommandLine extends CommandLineImpl
{
Modified:
trunk/main/util/cli/src/main/dpml/cli/commandline/PropertiesCommandLine.java
===================================================================
---
trunk/main/util/cli/src/main/net/dpml/cli/commandline/PropertiesCommandLine.java
2006-11-30 21:08:46 UTC (rev 1789)
+++
trunk/main/util/cli/src/main/dpml/cli/commandline/PropertiesCommandLine.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,7 +25,7 @@
import java.util.Set;
import java.util.StringTokenizer;
-import net.dpml.cli.Option;
+import dpml.cli.Option;
/**
* A CommandLine implementation using a java Properties instance, useful for
@@ -41,8 +41,8 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
* @see java.util.Properties
- * @see net.dpml.cli.commandline.DefaultingCommandLine
- * @see net.dpml.cli.Option#getPreferredName()
+ * @see dpml.cli.commandline.DefaultingCommandLine
+ * @see dpml.cli.Option#getPreferredName()
*/
public class PropertiesCommandLine extends CommandLineImpl
{
Modified:
trunk/main/util/cli/src/main/dpml/cli/commandline/WriteableCommandLineImpl.java
===================================================================
---
trunk/main/util/cli/src/main/net/dpml/cli/commandline/WriteableCommandLineImpl.java
2006-11-30 21:08:46 UTC (rev 1789)
+++
trunk/main/util/cli/src/main/dpml/cli/commandline/WriteableCommandLineImpl.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,11 +25,11 @@
import java.util.Properties;
import java.util.Set;
-import net.dpml.cli.Argument;
-import net.dpml.cli.Option;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.Argument;
+import dpml.cli.Option;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* A WriteableCommandLine implementation allowing Options to write their
Modified: trunk/main/util/cli/src/main/dpml/cli/option/ArgumentImpl.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/option/ArgumentImpl.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/option/ArgumentImpl.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
import java.util.Collections;
import java.util.Comparator;
@@ -23,16 +23,16 @@
import java.util.Set;
import java.util.StringTokenizer;
-import net.dpml.cli.Argument;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.HelpLine;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
-import net.dpml.cli.validation.InvalidArgumentException;
-import net.dpml.cli.validation.Validator;
+import dpml.cli.Argument;
+import dpml.cli.DisplaySetting;
+import dpml.cli.HelpLine;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
+import dpml.cli.validation.InvalidArgumentException;
+import dpml.cli.validation.Validator;
/**
* An implementation of an Argument.
@@ -336,7 +336,7 @@
* value can be replaced by another Object such as a Number
* instance or a File instance.
*
- * @see net.dpml.cli.CommandLine#getValues(Option)
+ * @see dpml.cli.CommandLine#getValues(Option)
*
* @param commandLine The CommandLine object to query.
* @throws OptionException if any problems occur.
@@ -356,7 +356,7 @@
* value can be replaced by another Object such as a Number
* instance or a File instance.
*
- * @see net.dpml.cli.CommandLine#getValues(Option)
+ * @see dpml.cli.CommandLine#getValues(Option)
*
* @param commandLine The CommandLine object to query.
* @param option The option to lookup values with.
@@ -482,7 +482,7 @@
* Returns a description of the option. This string is used to build help
* messages as in the HelpFormatter.
*
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.util.HelpFormatter
* @return a description of the option.
*/
public String getDescription()
@@ -494,7 +494,7 @@
* Builds up a list of HelpLineImpl instances to be presented by
HelpFormatter.
*
* @see HelpLine
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.util.HelpFormatter
* @param depth the initial indent depth
* @param helpSettings the HelpSettings that should be applied
* @param comp a comparator used to sort options when applicable.
Modified: trunk/main/util/cli/src/main/dpml/cli/option/Command.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/option/Command.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/option/Command.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,13 +25,13 @@
import java.util.ListIterator;
import java.util.Set;
-import net.dpml.cli.Argument;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Group;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.Argument;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Group;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* Represents a cvs "update" style command line option.
Modified: trunk/main/util/cli/src/main/dpml/cli/option/DefaultOption.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/option/DefaultOption.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/option/DefaultOption.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,12 +25,12 @@
import java.util.ListIterator;
import java.util.Set;
-import net.dpml.cli.Argument;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Group;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.resource.ResourceConstants;
+import dpml.cli.Argument;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Group;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.resource.ResourceConstants;
/**
* A Parent implementation representing normal options.
Modified: trunk/main/util/cli/src/main/dpml/cli/option/GroupImpl.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/option/GroupImpl.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/option/GroupImpl.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
import java.util.ArrayList;
import java.util.Collection;
@@ -29,14 +29,14 @@
import java.util.SortedMap;
import java.util.TreeMap;
-import net.dpml.cli.Argument;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Group;
-import net.dpml.cli.HelpLine;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.resource.ResourceConstants;
+import dpml.cli.Argument;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Group;
+import dpml.cli.HelpLine;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.resource.ResourceConstants;
/**
* An implementation of Group
@@ -373,7 +373,7 @@
* Returns a description of the option. This string is used to build help
* messages as in the HelpFormatter.
*
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.util.HelpFormatter
* @return a description of the option.
*/
public String getDescription()
@@ -527,7 +527,7 @@
* Builds up a list of HelpLineImpl instances to be presented by
HelpFormatter.
*
* @see HelpLine
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.util.HelpFormatter
* @param depth the initial indent depth
* @param helpSettings the HelpSettings that should be applied
* @param comp a comparator used to sort options when applicable.
Modified: trunk/main/util/cli/src/main/dpml/cli/option/HelpLineImpl.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/option/HelpLineImpl.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/option/HelpLineImpl.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
import java.util.Comparator;
import java.util.Set;
-import net.dpml.cli.HelpLine;
-import net.dpml.cli.Option;
+import dpml.cli.HelpLine;
+import dpml.cli.Option;
/**
* Represents a line in the help screen.
Modified: trunk/main/util/cli/src/main/dpml/cli/option/OptionImpl.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/option/OptionImpl.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/option/OptionImpl.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
import java.util.Iterator;
import java.util.ListIterator;
import java.util.Set;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Option;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Option;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* A base implementation of Option providing limited ground work for further
Modified: trunk/main/util/cli/src/main/dpml/cli/option/ParentImpl.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/option/ParentImpl.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/option/ParentImpl.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
import java.util.ArrayList;
import java.util.Collections;
@@ -23,13 +23,13 @@
import java.util.ListIterator;
import java.util.Set;
-import net.dpml.cli.Argument;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.Parent;
-import net.dpml.cli.WriteableCommandLine;
+import dpml.cli.Argument;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.Parent;
+import dpml.cli.WriteableCommandLine;
/**
* A base implementation of Parent providing limited ground work for further
@@ -206,7 +206,7 @@
* Returns a description of the option. This string is used to build help
* messages as in the HelpFormatter.
*
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.util.HelpFormatter
* @return a description of the option.
*/
public String getDescription()
@@ -217,8 +217,8 @@
/**
* Builds up a list of HelpLineImpl instances to be presented by
HelpFormatter.
*
- * @see net.dpml.cli.HelpLine
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.HelpLine
+ * @see dpml.cli.util.HelpFormatter
* @param depth the initial indent depth
* @param helpSettings the HelpSettings that should be applied
* @param comp a comparator used to sort options when applicable.
Modified: trunk/main/util/cli/src/main/dpml/cli/option/PropertyOption.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/option/PropertyOption.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/option/PropertyOption.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
import java.util.Collections;
import java.util.Comparator;
@@ -22,11 +22,11 @@
import java.util.ListIterator;
import java.util.Set;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.HelpLine;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.resource.ResourceConstants;
+import dpml.cli.DisplaySetting;
+import dpml.cli.HelpLine;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.resource.ResourceConstants;
/**
* Handles the java style "-Dprop=value" opions
@@ -232,7 +232,7 @@
* Returns a description of the option. This string is used to build help
* messages as in the HelpFormatter.
*
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.util.HelpFormatter
* @return a description of the option.
*/
public String getDescription()
@@ -244,7 +244,7 @@
* Builds up a list of HelpLineImpl instances to be presented by
HelpFormatter.
*
* @see HelpLine
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.util.HelpFormatter
* @param depth the initial indent depth
* @param helpSettings the HelpSettings that should be applied
* @param comp a comparator used to sort options when applicable.
Modified: trunk/main/util/cli/src/main/dpml/cli/option/SourceDestArgument.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/option/SourceDestArgument.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/option/SourceDestArgument.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
import java.util.ArrayList;
import java.util.Comparator;
@@ -22,12 +22,12 @@
import java.util.List;
import java.util.Set;
-import net.dpml.cli.Argument;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.Argument;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* An Argument implementation that allows a variable size Argument to
precede a
@@ -121,8 +121,8 @@
/**
* Builds up a list of HelpLineImpl instances to be presented by
HelpFormatter.
*
- * @see net.dpml.cli.HelpLine
- * @see net.dpml.cli.util.HelpFormatter
+ * @see dpml.cli.HelpLine
+ * @see dpml.cli.util.HelpFormatter
* @param depth the initial indent depth
* @param helpSettings the HelpSettings that should be applied
* @param comp a comparator used to sort options when applicable.
Modified: trunk/main/util/cli/src/main/dpml/cli/option/Switch.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/option/Switch.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/option/Switch.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
import java.util.ArrayList;
import java.util.Collections;
@@ -25,13 +25,13 @@
import java.util.ListIterator;
import java.util.Set;
-import net.dpml.cli.Argument;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Group;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.Argument;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Group;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* A Parent implementation representing normal switch options.
@@ -158,7 +158,7 @@
/**
* Processes the parent part of the Option. The combination of parent,
* argument and children is handled by the process method.
- * @see net.dpml.cli.Option#process(WriteableCommandLine, ListIterator)
+ * @see dpml.cli.Option#process(WriteableCommandLine, ListIterator)
*
* @param commandLine the CommandLine to write results to
* @param arguments a ListIterator over argument strings positioned at
the next
Modified:
trunk/main/util/cli/src/main/dpml/cli/resource/ResourceConstants.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/resource/ResourceConstants.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/resource/ResourceConstants.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.resource;
+package dpml.cli.resource;
/**
* Common resurce constants.
Modified: trunk/main/util/cli/src/main/dpml/cli/resource/ResourceHelper.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/resource/ResourceHelper.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/resource/ResourceHelper.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.resource;
+package dpml.cli.resource;
import java.text.MessageFormat;
@@ -31,11 +31,11 @@
public final class ResourceHelper
{
/** system property */
- private static final String PROP_LOCALE = "net.dpml.cli.resource.bundle";
+ private static final String PROP_LOCALE = "dpml.cli.resource.bundle";
/** default package name */
private static final String DEFAULT_BUNDLE =
- "net.dpml.cli.resource.CLIMessageBundle_en_US";
+ "dpml.cli.resource.CLIMessageBundle_en_US";
private static ResourceHelper m_HELPER;
Modified: trunk/main/util/cli/src/main/dpml/cli/util/Comparators.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/util/Comparators.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/util/Comparators.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.util;
+package dpml.cli.util;
import java.util.Comparator;
import java.util.List;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.option.Command;
-import net.dpml.cli.option.DefaultOption;
-import net.dpml.cli.option.Switch;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.option.Command;
+import dpml.cli.option.DefaultOption;
+import dpml.cli.option.Switch;
/**
* A collection of Comparators suitable for use with Option instances.
Modified: trunk/main/util/cli/src/main/dpml/cli/util/HelpFormatter.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/util/HelpFormatter.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/util/HelpFormatter.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.util;
+package dpml.cli.util;
import java.io.IOException;
import java.io.PrintWriter;
@@ -28,13 +28,13 @@
import java.util.List;
import java.util.Set;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Group;
-import net.dpml.cli.HelpLine;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Group;
+import dpml.cli.HelpLine;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* Presents on screen help based on the application's Options
Modified: trunk/main/util/cli/src/main/dpml/cli/validation/ClassValidator.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/validation/ClassValidator.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/validation/ClassValidator.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import java.util.List;
import java.util.ListIterator;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* The <code>ClassValidator</code> validates the string argument
@@ -66,7 +66,7 @@
* replaced with it's <code>Class</code> value or instance.
*
* @param values the list of values to validate
- * @see net.dpml.cli.validation.Validator#validate(java.util.List)
+ * @see dpml.cli.validation.Validator#validate(java.util.List)
* @exception InvalidArgumentException if a value is invalid
*/
public void validate( final List values ) throws
InvalidArgumentException
Modified: trunk/main/util/cli/src/main/dpml/cli/validation/DateValidator.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/validation/DateValidator.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/validation/DateValidator.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import java.text.DateFormat;
import java.text.ParsePosition;
@@ -24,8 +24,8 @@
import java.util.List;
import java.util.ListIterator;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* The <code>DateValidator</code> validates the argument values
@@ -151,7 +151,7 @@
*
* @param values the list of values to validate
* @exception InvalidArgumentException if a value is invalid
- * @see net.dpml.cli.validation.Validator#validate(java.util.List)
+ * @see dpml.cli.validation.Validator#validate(java.util.List)
*/
public void validate( final List values ) throws InvalidArgumentException
{
Modified: trunk/main/util/cli/src/main/dpml/cli/validation/EnumValidator.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/validation/EnumValidator.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/validation/EnumValidator.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* The <code>EnumValidator</code> validates the string argument
@@ -65,7 +65,7 @@
*
* @param values the list of values to validate
* @exception InvalidArgumentException if a value is invalid
- * @see net.dpml.cli.validation.Validator#validate(java.util.List)
+ * @see dpml.cli.validation.Validator#validate(java.util.List)
*/
public void validate( final List values ) throws InvalidArgumentException
{
Modified: trunk/main/util/cli/src/main/dpml/cli/validation/FileValidator.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/validation/FileValidator.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/validation/FileValidator.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import java.io.File;
import java.util.List;
@@ -105,7 +105,7 @@
*
* @param values the list of values to validate
* @exception InvalidArgumentException if a value is invalid
- * @see net.dpml.cli.validation.Validator#validate(java.util.List)
+ * @see dpml.cli.validation.Validator#validate(java.util.List)
*/
public void validate( final List values ) throws
InvalidArgumentException
{
Modified:
trunk/main/util/cli/src/main/dpml/cli/validation/InvalidArgumentException.java
===================================================================
---
trunk/main/util/cli/src/main/net/dpml/cli/validation/InvalidArgumentException.java
2006-11-30 21:08:46 UTC (rev 1789)
+++
trunk/main/util/cli/src/main/dpml/cli/validation/InvalidArgumentException.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
/**
* An exception indicating validation failure.
Modified:
trunk/main/util/cli/src/main/dpml/cli/validation/NumberValidator.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/validation/NumberValidator.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/validation/NumberValidator.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import java.text.NumberFormat;
import java.text.ParsePosition;
@@ -22,8 +22,8 @@
import java.util.List;
import java.util.ListIterator;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* The <code>NumberValidator</code> validates the string argument
@@ -125,7 +125,7 @@
*
* @param values the list of values to validate
* @exception InvalidArgumentException if a value is invalid
- * @see net.dpml.cli.validation.Validator#validate(java.util.List)
+ * @see dpml.cli.validation.Validator#validate(java.util.List)
*/
public void validate( final List values ) throws
InvalidArgumentException
{
Modified: trunk/main/util/cli/src/main/dpml/cli/validation/URIValidator.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/validation/URIValidator.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/validation/URIValidator.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import java.net.URISyntaxException;
import java.net.URI;
@@ -79,7 +79,7 @@
*
* @param values the list of values to validate
* @exception InvalidArgumentException if a value is invalid
- * @see net.dpml.cli.validation.Validator#validate(java.util.List)
+ * @see dpml.cli.validation.Validator#validate(java.util.List)
*/
public void validate( final List values )
throws InvalidArgumentException
Modified: trunk/main/util/cli/src/main/dpml/cli/validation/URLValidator.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/validation/URLValidator.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/validation/URLValidator.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import java.net.MalformedURLException;
import java.net.URL;
@@ -22,8 +22,8 @@
import java.util.List;
import java.util.ListIterator;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* The <code>URLValidator</code> validates the string argument
@@ -77,7 +77,7 @@
*
* @param values the list of values to validate
* @exception InvalidArgumentException if a value is invalid
- * @see net.dpml.cli.validation.Validator#validate(java.util.List)
+ * @see dpml.cli.validation.Validator#validate(java.util.List)
*/
public void validate( final List values ) throws InvalidArgumentException
{
Modified: trunk/main/util/cli/src/main/dpml/cli/validation/Validator.java
===================================================================
--- trunk/main/util/cli/src/main/net/dpml/cli/validation/Validator.java
2006-11-30 21:08:46 UTC (rev 1789)
+++ trunk/main/util/cli/src/main/dpml/cli/validation/Validator.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import java.util.List;
Copied: trunk/main/util/cli/src/test/dpml (from rev 1789,
trunk/main/util/cli/src/test/net/dpml)
Copied: trunk/main/util/cli/src/test/dpml/cli (from rev 1814,
trunk/main/util/cli/src/test/net/dpml/cli)
Modified: trunk/main/util/cli/src/test/dpml/cli/AbstractCLITestCase.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/AbstractCLITestCase.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/AbstractCLITestCase.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import junit.framework.TestCase;
Modified:
trunk/main/util/cli/src/test/dpml/cli/AbstractCommandLineTestCase.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/AbstractCommandLineTestCase.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/AbstractCommandLineTestCase.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
-import net.dpml.cli.option.AbstractOptionTestCase;
-import net.dpml.cli.option.ArgumentTest;
-import net.dpml.cli.option.CommandTest;
-import net.dpml.cli.option.DefaultOptionTest;
-import net.dpml.cli.option.PropertyOption;
-import net.dpml.cli.option.SwitchTest;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
+import dpml.cli.option.AbstractOptionTestCase;
+import dpml.cli.option.ArgumentTest;
+import dpml.cli.option.CommandTest;
+import dpml.cli.option.DefaultOptionTest;
+import dpml.cli.option.PropertyOption;
+import dpml.cli.option.SwitchTest;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
import java.util.Collections;
import java.util.Iterator;
Modified:
trunk/main/util/cli/src/test/dpml/cli/AbstractWriteableCommandLineTestCase.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/AbstractWriteableCommandLineTestCase.java
2007-01-29 14:50:58 UTC (rev 1814)
+++
trunk/main/util/cli/src/test/dpml/cli/AbstractWriteableCommandLineTestCase.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
-import net.dpml.cli.option.ArgumentTest;
+import dpml.cli.option.ArgumentTest;
/**
* @author Rob Oxspring
@@ -37,7 +37,7 @@
protected abstract WriteableCommandLine createWriteableCommandLine( );
/* (non-Javadoc)
- * @see net.dpml.cli.CommandLineTest#createCommandLine()
+ * @see dpml.cli.CommandLineTest#createCommandLine()
*/
/**
* DOCUMENT ME!
Modified: trunk/main/util/cli/src/test/dpml/cli/CommandLineDefaultsTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/CommandLineDefaultsTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/CommandLineDefaultsTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import junit.framework.TestCase;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.SwitchBuilder;
-import net.dpml.cli.commandline.WriteableCommandLineImpl;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.SwitchBuilder;
+import dpml.cli.commandline.WriteableCommandLineImpl;
import java.util.Arrays;
import java.util.Collections;
Modified: trunk/main/util/cli/src/test/dpml/cli/DocumentationTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/DocumentationTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/DocumentationTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import junit.framework.TestCase;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
-import net.dpml.cli.commandline.WriteableCommandLineImpl;
-import net.dpml.cli.option.DefaultOption;
-import net.dpml.cli.option.PropertyOption;
-import net.dpml.cli.util.HelpFormatter;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
+import dpml.cli.commandline.WriteableCommandLineImpl;
+import dpml.cli.option.DefaultOption;
+import dpml.cli.option.PropertyOption;
+import dpml.cli.util.HelpFormatter;
import java.io.IOException;
import java.io.PrintWriter;
Modified: trunk/main/util/cli/src/test/dpml/cli/PrecedenceTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/PrecedenceTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/PrecedenceTest.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli;
+package dpml.cli;
import junit.framework.TestCase;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
import java.util.Arrays;
import java.util.List;
Modified: trunk/main/util/cli/src/test/dpml/cli/application/AntTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/application/AntTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/application/AntTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.application;
+package dpml.cli.application;
import junit.framework.TestCase;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Group;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
-import net.dpml.cli.option.PropertyOption;
+import dpml.cli.CommandLine;
+import dpml.cli.Group;
+import dpml.cli.OptionException;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
+import dpml.cli.option.PropertyOption;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/main/util/cli/src/test/dpml/cli/application/CpTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/application/CpTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/application/CpTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,24 +14,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.application;
+package dpml.cli.application;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import net.dpml.cli.Argument;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
-import net.dpml.cli.option.ArgumentImpl;
-import net.dpml.cli.option.SourceDestArgument;
-import net.dpml.cli.util.HelpFormatter;
+import dpml.cli.Argument;
+import dpml.cli.CommandLine;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
+import dpml.cli.option.ArgumentImpl;
+import dpml.cli.option.SourceDestArgument;
+import dpml.cli.util.HelpFormatter;
import java.io.BufferedReader;
import java.io.IOException;
Modified: trunk/main/util/cli/src/test/dpml/cli/application/CvsTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/application/CvsTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/application/CvsTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.application;
+package dpml.cli.application;
import junit.framework.TestCase;
-import net.dpml.cli.Group;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.CommandBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.option.ArgumentTest;
+import dpml.cli.Group;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.CommandBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.option.ArgumentTest;
//TODO Build up CvsTest like CpTest
/**
Modified: trunk/main/util/cli/src/test/dpml/cli/application/LsTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/application/LsTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/application/LsTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,21 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.application;
+package dpml.cli.application;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
-import net.dpml.cli.validation.EnumValidator;
+import dpml.cli.CommandLine;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
+import dpml.cli.validation.EnumValidator;
import java.util.HashSet;
import java.util.Set;
Modified: trunk/main/util/cli/src/test/dpml/cli/bug/Bug13886Test.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/bug/Bug13886Test.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/bug/Bug13886Test.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.bug;
+package dpml.cli.bug;
import junit.framework.TestCase;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
/**
* @author John Keyes
Modified: trunk/main/util/cli/src/test/dpml/cli/bug/Bug13935Test.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/bug/Bug13935Test.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/bug/Bug13935Test.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.bug;
+package dpml.cli.bug;
import junit.framework.TestCase;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
+import dpml.cli.CommandLine;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
/**
* @author John Keyes
Modified: trunk/main/util/cli/src/test/dpml/cli/bug/Bug15046Test.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/bug/Bug15046Test.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/bug/Bug15046Test.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.bug;
+package dpml.cli.bug;
import junit.framework.TestCase;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
+import dpml.cli.CommandLine;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
/**
* @author John Keyes
Modified: trunk/main/util/cli/src/test/dpml/cli/bug/Bug15648Test.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/bug/Bug15648Test.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/bug/Bug15648Test.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.bug;
+package dpml.cli.bug;
import junit.framework.TestCase;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
+import dpml.cli.CommandLine;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
/**
* @author John Keyes
Modified: trunk/main/util/cli/src/test/dpml/cli/bug/Bug27575Test.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/bug/Bug27575Test.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/bug/Bug27575Test.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.bug;
+package dpml.cli.bug;
import junit.framework.TestCase;
-import net.dpml.cli.Option;
-import net.dpml.cli.builder.PatternBuilder;
-import net.dpml.cli.option.GroupImpl;
+import dpml.cli.Option;
+import dpml.cli.builder.PatternBuilder;
+import dpml.cli.option.GroupImpl;
import java.util.List;
//import java.util.Iterator;
Modified: trunk/main/util/cli/src/test/dpml/cli/bug/Bug28005Test.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/bug/Bug28005Test.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/bug/Bug28005Test.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.bug;
+package dpml.cli.bug;
import junit.framework.TestCase;
-import net.dpml.cli.Argument;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.CommandBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
+import dpml.cli.Argument;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.CommandBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
/**
* DOCUMENT ME!
Modified: trunk/main/util/cli/src/test/dpml/cli/bug/Bug32533Test.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/bug/Bug32533Test.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/bug/Bug32533Test.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.bug;
+package dpml.cli.bug;
import junit.framework.TestCase;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
/**
* @author roxspring
Modified:
trunk/main/util/cli/src/test/dpml/cli/bug/BugLoopingOptionLookAlikeTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/bug/BugLoopingOptionLookAlikeTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++
trunk/main/util/cli/src/test/dpml/cli/bug/BugLoopingOptionLookAlikeTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.bug;
+package dpml.cli.bug;
import junit.framework.TestCase;
-import net.dpml.cli.Argument;
-import net.dpml.cli.Group;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
-import net.dpml.cli.option.SourceDestArgument;
+import dpml.cli.Argument;
+import dpml.cli.Group;
+import dpml.cli.OptionException;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
+import dpml.cli.option.SourceDestArgument;
/**
* The first is a loop in Parser.parse() if I set a non-declared option. This
Modified:
trunk/main/util/cli/src/test/dpml/cli/builder/ArgumentBuilderTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/builder/ArgumentBuilderTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/builder/ArgumentBuilderTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2004-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.builder;
+package dpml.cli.builder;
import junit.framework.TestCase;
-import net.dpml.cli.option.ArgumentImpl;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.option.ArgumentImpl;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
-//import net.dpml.cli.validation.DateValidator;
-//import net.dpml.cli.validation.Validator;
+//import dpml.cli.validation.DateValidator;
+//import dpml.cli.validation.Validator;
import java.util.ArrayList;
import java.util.List;
Modified:
trunk/main/util/cli/src/test/dpml/cli/builder/DefaultOptionBuilderTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/builder/DefaultOptionBuilderTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++
trunk/main/util/cli/src/test/dpml/cli/builder/DefaultOptionBuilderTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2004-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.builder;
+package dpml.cli.builder;
import junit.framework.TestCase;
-import net.dpml.cli.Argument;
-import net.dpml.cli.Group;
-import net.dpml.cli.option.DefaultOption;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.Argument;
+import dpml.cli.Group;
+import dpml.cli.option.DefaultOption;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* DOCUMENT ME!
Modified:
trunk/main/util/cli/src/test/dpml/cli/commandline/DefaultingCommandLineTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/commandline/DefaultingCommandLineTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++
trunk/main/util/cli/src/test/dpml/cli/commandline/DefaultingCommandLineTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2004-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
-import net.dpml.cli.AbstractCommandLineTestCase;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Option;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.AbstractCommandLineTestCase;
+import dpml.cli.CommandLine;
+import dpml.cli.Option;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.builder.DefaultOptionBuilder;
import java.util.ArrayList;
import java.util.Collections;
@@ -42,7 +42,7 @@
"insecond" ).create( );
/* (non-Javadoc)
- * @see net.dpml.cli.CommandLineTest#createCommandLine()
+ * @see dpml.cli.CommandLineTest#createCommandLine()
*/
/**
* DOCUMENT ME!
Modified: trunk/main/util/cli/src/test/dpml/cli/commandline/ParserTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/commandline/ParserTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/commandline/ParserTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2004-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
import junit.framework.TestCase;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Group;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.option.DefaultOption;
-import net.dpml.cli.util.HelpFormatter;
+import dpml.cli.CommandLine;
+import dpml.cli.Group;
+import dpml.cli.OptionException;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.option.DefaultOption;
+import dpml.cli.util.HelpFormatter;
import java.io.BufferedReader;
import java.io.IOException;
Modified:
trunk/main/util/cli/src/test/dpml/cli/commandline/PreferencesCommandLineTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/commandline/PreferencesCommandLineTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++
trunk/main/util/cli/src/test/dpml/cli/commandline/PreferencesCommandLineTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2004-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
-import net.dpml.cli.AbstractCommandLineTestCase;
-import net.dpml.cli.CommandLine;
+import dpml.cli.AbstractCommandLineTestCase;
+import dpml.cli.CommandLine;
import java.util.Iterator;
import java.util.Set;
@@ -29,7 +29,7 @@
public class PreferencesCommandLineTest extends AbstractCommandLineTestCase
{
/* (non-Javadoc)
- * @see net.dpml.cli.CommandLineTest#createCommandLine()
+ * @see dpml.cli.CommandLineTest#createCommandLine()
*/
/**
* DOCUMENT ME!
Modified:
trunk/main/util/cli/src/test/dpml/cli/commandline/PropertiesCommandLineTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/commandline/PropertiesCommandLineTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++
trunk/main/util/cli/src/test/dpml/cli/commandline/PropertiesCommandLineTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2004-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
-import net.dpml.cli.AbstractCommandLineTestCase;
-import net.dpml.cli.CommandLine;
+import dpml.cli.AbstractCommandLineTestCase;
+import dpml.cli.CommandLine;
import java.util.Iterator;
import java.util.Properties;
Modified:
trunk/main/util/cli/src/test/dpml/cli/commandline/WriteableCommandLineImplTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/commandline/WriteableCommandLineImplTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++
trunk/main/util/cli/src/test/dpml/cli/commandline/WriteableCommandLineImplTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2004-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.commandline;
+package dpml.cli.commandline;
-import net.dpml.cli.AbstractWriteableCommandLineTestCase;
-import net.dpml.cli.WriteableCommandLine;
+import dpml.cli.AbstractWriteableCommandLineTestCase;
+import dpml.cli.WriteableCommandLine;
import java.util.ArrayList;
@@ -31,7 +31,7 @@
extends AbstractWriteableCommandLineTestCase
{
/* (non-Javadoc)
- * @see
net.dpml.cli.WriteableCommandLineTest#createWriteableCommandLine()
+ * @see dpml.cli.WriteableCommandLineTest#createWriteableCommandLine()
*/
/**
* DOCUMENT ME!
Modified:
trunk/main/util/cli/src/test/dpml/cli/option/AbstractArgumentTestCase.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/option/AbstractArgumentTestCase.java
2007-01-29 14:50:58 UTC (rev 1814)
+++
trunk/main/util/cli/src/test/dpml/cli/option/AbstractArgumentTestCase.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.OptionException;
+import dpml.cli.OptionException;
/**
* @author Rob Oxspring
Modified:
trunk/main/util/cli/src/test/dpml/cli/option/AbstractGroupTestCase.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/option/AbstractGroupTestCase.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/AbstractGroupTestCase.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.OptionException;
+import dpml.cli.OptionException;
/**
* @author Rob Oxspring
Modified:
trunk/main/util/cli/src/test/dpml/cli/option/AbstractOptionTestCase.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/option/AbstractOptionTestCase.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/AbstractOptionTestCase.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.AbstractCLITestCase;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.commandline.WriteableCommandLineImpl;
+import dpml.cli.AbstractCLITestCase;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.commandline.WriteableCommandLineImpl;
import java.util.List;
Modified:
trunk/main/util/cli/src/test/dpml/cli/option/AbstractParentTestCase.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/option/AbstractParentTestCase.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/AbstractParentTestCase.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.OptionException;
+import dpml.cli.OptionException;
/**
* @author Rob Oxspring
Modified: trunk/main/util/cli/src/test/dpml/cli/option/ArgumentTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/option/ArgumentTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/ArgumentTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.Argument;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.HelpLine;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.WriteableCommandLineImpl;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.Argument;
+import dpml.cli.DisplaySetting;
+import dpml.cli.HelpLine;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.WriteableCommandLineImpl;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
import java.util.ArrayList;
import java.util.Collections;
@@ -36,8 +36,8 @@
import java.util.ListIterator;
import java.util.Set;
-//import net.dpml.cli.validation.DateValidator;
-//import net.dpml.cli.validation.DateValidatorTest;
+//import dpml.cli.validation.DateValidator;
+//import dpml.cli.validation.DateValidatorTest;
/**
* @author Rob Oxspring
@@ -136,7 +136,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.ArgumentTestCase#testProcessValues()
+ * @see dpml.cli.ArgumentTestCase#testProcessValues()
*/
/**
* DOCUMENT ME!
@@ -309,7 +309,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testCanProcess()
+ * @see dpml.cli.OptionTestCase#testCanProcess()
*/
/**
* DOCUMENT ME!
@@ -324,7 +324,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testPrefixes()
+ * @see dpml.cli.OptionTestCase#testPrefixes()
*/
/**
* DOCUMENT ME!
@@ -338,7 +338,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testProcess()
+ * @see dpml.cli.OptionTestCase#testProcess()
*/
/**
* DOCUMENT ME!
@@ -363,7 +363,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testTriggers()
+ * @see dpml.cli.OptionTestCase#testTriggers()
*/
/**
* DOCUMENT ME!
@@ -377,7 +377,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testValidate()
+ * @see dpml.cli.OptionTestCase#testValidate()
*/
/**
* DOCUMENT ME!
@@ -536,7 +536,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetPreferredName()
+ * @see dpml.cli.OptionTestCase#testGetPreferredName()
*/
/**
* DOCUMENT ME!
@@ -550,7 +550,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetDescription()
+ * @see dpml.cli.OptionTestCase#testGetDescription()
*/
/**
* DOCUMENT ME!
@@ -564,7 +564,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testHelpLines()
+ * @see dpml.cli.OptionTestCase#testHelpLines()
*/
/**
* DOCUMENT ME!
Modified: trunk/main/util/cli/src/test/dpml/cli/option/CommandTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/option/CommandTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/CommandTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.Parent;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.commandline.WriteableCommandLineImpl;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.Parent;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.commandline.WriteableCommandLineImpl;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
import java.util.Collections;
import java.util.HashSet;
@@ -75,7 +75,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.ParentTestCase#testProcessParent()
+ * @see dpml.cli.ParentTestCase#testProcessParent()
*/
/**
* DOCUMENT ME!
@@ -120,7 +120,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testCanProcess()
+ * @see dpml.cli.OptionTestCase#testCanProcess()
*/
/**
* DOCUMENT ME!
@@ -155,7 +155,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testPrefixes()
+ * @see dpml.cli.OptionTestCase#testPrefixes()
*/
/**
* DOCUMENT ME!
@@ -169,7 +169,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testProcess()
+ * @see dpml.cli.OptionTestCase#testProcess()
*/
/**
* DOCUMENT ME!
@@ -193,7 +193,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testTriggers()
+ * @see dpml.cli.OptionTestCase#testTriggers()
*/
/**
* DOCUMENT ME!
@@ -208,7 +208,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testValidate()
+ * @see dpml.cli.OptionTestCase#testValidate()
*/
/**
* DOCUMENT ME!
@@ -232,7 +232,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testAppendUsage()
+ * @see dpml.cli.OptionTestCase#testAppendUsage()
*/
/**
* DOCUMENT ME!
@@ -315,7 +315,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetPreferredName()
+ * @see dpml.cli.OptionTestCase#testGetPreferredName()
*/
/**
* DOCUMENT ME!
@@ -329,7 +329,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetDescription()
+ * @see dpml.cli.OptionTestCase#testGetDescription()
*/
/**
* DOCUMENT ME!
@@ -344,7 +344,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testHelpLines()
+ * @see dpml.cli.OptionTestCase#testHelpLines()
*/
/**
* DOCUMENT ME!
Modified: trunk/main/util/cli/src/test/dpml/cli/option/DefaultOptionTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/option/DefaultOptionTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/DefaultOptionTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.Parent;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.commandline.WriteableCommandLineImpl;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.Parent;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.commandline.WriteableCommandLineImpl;
import java.util.HashSet;
import java.util.List;
@@ -63,7 +63,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.ParentTestCase#testProcessParent()
+ * @see dpml.cli.ParentTestCase#testProcessParent()
*/
/**
* DOCUMENT ME!
@@ -109,7 +109,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testCanProcess()
+ * @see dpml.cli.OptionTestCase#testCanProcess()
*/
/**
* DOCUMENT ME!
@@ -134,7 +134,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testPrefixes()
+ * @see dpml.cli.OptionTestCase#testPrefixes()
*/
/**
* DOCUMENT ME!
@@ -148,7 +148,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testProcess()
+ * @see dpml.cli.OptionTestCase#testProcess()
*/
/**
* DOCUMENT ME!
@@ -161,7 +161,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testTriggers()
+ * @see dpml.cli.OptionTestCase#testTriggers()
*/
/**
* DOCUMENT ME!
@@ -176,7 +176,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testValidate()
+ * @see dpml.cli.OptionTestCase#testValidate()
*/
/**
* DOCUMENT ME!
@@ -200,7 +200,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testAppendUsage()
+ * @see dpml.cli.OptionTestCase#testAppendUsage()
*/
/**
* DOCUMENT ME!
@@ -245,7 +245,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetPreferredName()
+ * @see dpml.cli.OptionTestCase#testGetPreferredName()
*/
/**
* DOCUMENT ME!
@@ -259,7 +259,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetDescription()
+ * @see dpml.cli.OptionTestCase#testGetDescription()
*/
/**
* DOCUMENT ME!
Modified: trunk/main/util/cli/src/test/dpml/cli/option/GroupTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/option/GroupTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/GroupTest.java 2007-02-08
23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Group;
-import net.dpml.cli.HelpLine;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.WriteableCommandLineImpl;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Group;
+import dpml.cli.HelpLine;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.WriteableCommandLineImpl;
import java.util.ArrayList;
import java.util.HashSet;
@@ -113,7 +113,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.GroupTestCase#testProcessAnonymousArguments()
+ * @see dpml.cli.GroupTestCase#testProcessAnonymousArguments()
*/
/**
* DOCUMENT ME!
@@ -137,7 +137,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.GroupTestCase#testProcessOptions()
+ * @see dpml.cli.GroupTestCase#testProcessOptions()
*/
/**
* DOCUMENT ME!
@@ -162,7 +162,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testCanProcess()
+ * @see dpml.cli.OptionTestCase#testCanProcess()
*/
/**
* DOCUMENT ME!
@@ -197,7 +197,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testPrefixes()
+ * @see dpml.cli.OptionTestCase#testPrefixes()
*/
/**
* DOCUMENT ME!
@@ -211,7 +211,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testProcess()
+ * @see dpml.cli.OptionTestCase#testProcess()
*/
/**
* DOCUMENT ME!
@@ -257,7 +257,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testTriggers()
+ * @see dpml.cli.OptionTestCase#testTriggers()
*/
/**
* DOCUMENT ME!
@@ -272,7 +272,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testValidate()
+ * @see dpml.cli.OptionTestCase#testValidate()
*/
/**
* DOCUMENT ME!
@@ -380,7 +380,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testAppendUsage()
+ * @see dpml.cli.OptionTestCase#testAppendUsage()
*/
/**
* DOCUMENT ME!
@@ -474,7 +474,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetPreferredName()
+ * @see dpml.cli.OptionTestCase#testGetPreferredName()
*/
/**
* DOCUMENT ME!
@@ -488,7 +488,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetDescription()
+ * @see dpml.cli.OptionTestCase#testGetDescription()
*/
/**
* DOCUMENT ME!
@@ -503,7 +503,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testHelpLines()
+ * @see dpml.cli.OptionTestCase#testHelpLines()
*/
/**
* DOCUMENT ME!
@@ -540,7 +540,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testHelpLines()
+ * @see dpml.cli.OptionTestCase#testHelpLines()
*/
/**
* DOCUMENT ME!
@@ -564,7 +564,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testHelpLines()
+ * @see dpml.cli.OptionTestCase#testHelpLines()
*/
/**
* DOCUMENT ME!
Modified: trunk/main/util/cli/src/test/dpml/cli/option/NestedGroupTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/option/NestedGroupTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/NestedGroupTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.AbstractCLITestCase;
-import net.dpml.cli.CommandLine;
-import net.dpml.cli.Group;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.Parser;
-import net.dpml.cli.util.HelpFormatter;
+import dpml.cli.AbstractCLITestCase;
+import dpml.cli.CommandLine;
+import dpml.cli.Group;
+import dpml.cli.OptionException;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.Parser;
+import dpml.cli.util.HelpFormatter;
import java.io.BufferedReader;
import java.io.IOException;
Modified: trunk/main/util/cli/src/test/dpml/cli/option/ParentTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/option/ParentTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/ParentTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,23 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.Argument;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Group;
-import net.dpml.cli.HelpLine;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.Parent;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.builder.ArgumentBuilder;
-import net.dpml.cli.builder.CommandBuilder;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.commandline.WriteableCommandLineImpl;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.Argument;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Group;
+import dpml.cli.HelpLine;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.Parent;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.builder.ArgumentBuilder;
+import dpml.cli.builder.CommandBuilder;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.commandline.WriteableCommandLineImpl;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
import java.util.HashSet;
import java.util.Iterator;
@@ -117,7 +117,7 @@
}
/* (non-Javadoc)
- * @see net.dpml.cli.ParentTestCase#testProcessParent()
+ * @see dpml.cli.ParentTestCase#testProcessParent()
*/
/**
* DOCUMENT ME!
@@ -140,7 +140,7 @@
}
/* (non-Javadoc)
- * @see net.dpml.cli.OptionTestCase#testCanProcess()
+ * @see dpml.cli.OptionTestCase#testCanProcess()
*/
/**
* DOCUMENT ME!
@@ -173,7 +173,7 @@
}
/* (non-Javadoc)
- * @see net.dpml.cli.OptionTestCase#testPrefixes()
+ * @see dpml.cli.OptionTestCase#testPrefixes()
*/
/**
* DOCUMENT ME!
@@ -185,7 +185,7 @@
}
/* (non-Javadoc)
- * @see net.dpml.cli.OptionTestCase#testProcess()
+ * @see dpml.cli.OptionTestCase#testProcess()
*/
/**
* DOCUMENT ME!
@@ -278,7 +278,7 @@
}
/* (non-Javadoc)
- * @see net.dpml.cli.OptionTestCase#testTriggers()
+ * @see dpml.cli.OptionTestCase#testTriggers()
*/
/**
* DOCUMENT ME!
@@ -290,7 +290,7 @@
}
/* (non-Javadoc)
- * @see net.dpml.cli.OptionTestCase#testValidate()
+ * @see dpml.cli.OptionTestCase#testValidate()
*/
/**
* DOCUMENT ME!
@@ -360,7 +360,7 @@
}
/* (non-Javadoc)
- * @see net.dpml.cli.OptionTestCase#testAppendUsage()
+ * @see dpml.cli.OptionTestCase#testAppendUsage()
*/
/**
* DOCUMENT ME!
@@ -427,7 +427,7 @@
}
/* (non-Javadoc)
- * @see net.dpml.cli.OptionTestCase#testGetPreferredName()
+ * @see dpml.cli.OptionTestCase#testGetPreferredName()
*/
/**
* DOCUMENT ME!
@@ -439,7 +439,7 @@
}
/* (non-Javadoc)
- * @see net.dpml.cli.OptionTestCase#testGetDescription()
+ * @see dpml.cli.OptionTestCase#testGetDescription()
*/
/**
* DOCUMENT ME!
@@ -451,7 +451,7 @@
}
/* (non-Javadoc)
- * @see net.dpml.cli.OptionTestCase#testHelpLines()
+ * @see dpml.cli.OptionTestCase#testHelpLines()
*/
/**
* DOCUMENT ME!
Modified: trunk/main/util/cli/src/test/dpml/cli/option/PropertyOptionTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/option/PropertyOptionTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/PropertyOptionTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.HelpLine;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.commandline.WriteableCommandLineImpl;
+import dpml.cli.DisplaySetting;
+import dpml.cli.HelpLine;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.commandline.WriteableCommandLineImpl;
import java.util.HashSet;
import java.util.Iterator;
@@ -37,7 +37,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testCanProcess()
+ * @see dpml.cli.OptionTestCase#testCanProcess()
*/
/**
* DOCUMENT ME!
@@ -82,7 +82,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testPrefixes()
+ * @see dpml.cli.OptionTestCase#testPrefixes()
*/
/**
* DOCUMENT ME!
@@ -96,7 +96,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testProcess()
+ * @see dpml.cli.OptionTestCase#testProcess()
*/
/**
* DOCUMENT ME!
@@ -177,7 +177,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testTriggers()
+ * @see dpml.cli.OptionTestCase#testTriggers()
*/
/**
* DOCUMENT ME!
@@ -192,7 +192,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testValidate()
+ * @see dpml.cli.OptionTestCase#testValidate()
*/
/**
* DOCUMENT ME!
@@ -214,7 +214,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testAppendUsage()
+ * @see dpml.cli.OptionTestCase#testAppendUsage()
*/
/**
* DOCUMENT ME!
@@ -245,7 +245,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetPreferredName()
+ * @see dpml.cli.OptionTestCase#testGetPreferredName()
*/
/**
* DOCUMENT ME!
@@ -259,7 +259,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetDescription()
+ * @see dpml.cli.OptionTestCase#testGetDescription()
*/
/**
* DOCUMENT ME!
@@ -274,7 +274,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testHelpLines()
+ * @see dpml.cli.OptionTestCase#testHelpLines()
*/
/**
* DOCUMENT ME!
@@ -295,7 +295,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testHelpLines()
+ * @see dpml.cli.OptionTestCase#testHelpLines()
*/
/**
* DOCUMENT ME!
Modified: trunk/main/util/cli/src/test/dpml/cli/option/SwitchTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/option/SwitchTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/option/SwitchTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.option;
+package dpml.cli.option;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.Parent;
-import net.dpml.cli.WriteableCommandLine;
-import net.dpml.cli.commandline.WriteableCommandLineImpl;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.Parent;
+import dpml.cli.WriteableCommandLine;
+import dpml.cli.commandline.WriteableCommandLineImpl;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
import java.util.HashSet;
import java.util.List;
@@ -56,7 +56,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.ParentTestCase#testProcessParent()
+ * @see dpml.cli.ParentTestCase#testProcessParent()
*/
/**
* DOCUMENT ME!
@@ -103,7 +103,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testCanProcess()
+ * @see dpml.cli.OptionTestCase#testCanProcess()
*/
/**
* DOCUMENT ME!
@@ -128,7 +128,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testPrefixes()
+ * @see dpml.cli.OptionTestCase#testPrefixes()
*/
/**
* DOCUMENT ME!
@@ -142,7 +142,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testProcess()
+ * @see dpml.cli.OptionTestCase#testProcess()
*/
/**
* DOCUMENT ME!
@@ -155,7 +155,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testTriggers()
+ * @see dpml.cli.OptionTestCase#testTriggers()
*/
/**
* DOCUMENT ME!
@@ -170,7 +170,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testValidate()
+ * @see dpml.cli.OptionTestCase#testValidate()
*/
/**
* DOCUMENT ME!
@@ -194,7 +194,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testAppendUsage()
+ * @see dpml.cli.OptionTestCase#testAppendUsage()
*/
/**
* DOCUMENT ME!
@@ -269,7 +269,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetPreferredName()
+ * @see dpml.cli.OptionTestCase#testGetPreferredName()
*/
/**
* DOCUMENT ME!
@@ -283,7 +283,7 @@
/*
* (non-Javadoc)
*
- * @see net.dpml.cli.OptionTestCase#testGetDescription()
+ * @see dpml.cli.OptionTestCase#testGetDescription()
*/
/**
* DOCUMENT ME!
@@ -430,7 +430,7 @@
/**
* Test help lines.
- * @see net.dpml.cli.OptionTestCase#testHelpLines()
+ * @see dpml.cli.OptionTestCase#testHelpLines()
*/
public void testHelpLines()
{
Modified:
trunk/main/util/cli/src/test/dpml/cli/resource/ResourceHelperTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/resource/ResourceHelperTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/resource/ResourceHelperTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.resource;
+package dpml.cli.resource;
import junit.framework.TestCase;
@@ -28,7 +28,7 @@
public class ResourceHelperTest extends TestCase
{
/** system property */
- private static final String PROP_LOCALE = "net.dpml.cli.resource.bundle";
+ private static final String PROP_LOCALE = "dpml.cli.resource.bundle";
private static ResourceHelper m_HELPER;
/** resource m_bundle */
@@ -47,7 +47,7 @@
*/
public void setUp( )
{
- System.setProperty( PROP_LOCALE, "net.dpml.cli.resource.TestBundle"
);
+ System.setProperty( PROP_LOCALE, "dpml.cli.resource.TestBundle" );
m_HELPER = ResourceHelper.getResourceHelper( );
}
@@ -57,7 +57,7 @@
public void tearDown( )
{
System.setProperty( PROP_LOCALE,
- "net.dpml.cli.resource.CLIMessageBundle_en_US.properties" );
+ "dpml.cli.resource.CLIMessageBundle_en_US.properties" );
}
/**
Modified: trunk/main/util/cli/src/test/dpml/cli/util/ComparatorsTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/util/ComparatorsTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/util/ComparatorsTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.util;
+package dpml.cli.util;
-import net.dpml.cli.AbstractCLITestCase;
-import net.dpml.cli.Option;
-import net.dpml.cli.option.CommandTest;
-import net.dpml.cli.option.DefaultOptionTest;
-import net.dpml.cli.option.GroupTest;
-import net.dpml.cli.option.ParentTest;
-import net.dpml.cli.option.SwitchTest;
+import dpml.cli.AbstractCLITestCase;
+import dpml.cli.Option;
+import dpml.cli.option.CommandTest;
+import dpml.cli.option.DefaultOptionTest;
+import dpml.cli.option.GroupTest;
+import dpml.cli.option.ParentTest;
+import dpml.cli.option.SwitchTest;
import java.util.Collections;
import java.util.List;
Modified: trunk/main/util/cli/src/test/dpml/cli/util/HelpFormatterTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/util/HelpFormatterTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/util/HelpFormatterTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.util;
+package dpml.cli.util;
import java.io.BufferedReader;
import java.io.IOException;
@@ -29,16 +29,16 @@
import junit.framework.TestCase;
-import net.dpml.cli.DisplaySetting;
-import net.dpml.cli.Group;
-import net.dpml.cli.Option;
-import net.dpml.cli.OptionException;
-import net.dpml.cli.builder.DefaultOptionBuilder;
-import net.dpml.cli.builder.GroupBuilder;
-import net.dpml.cli.option.ArgumentTest;
-import net.dpml.cli.option.DefaultOptionTest;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.DisplaySetting;
+import dpml.cli.Group;
+import dpml.cli.Option;
+import dpml.cli.OptionException;
+import dpml.cli.builder.DefaultOptionBuilder;
+import dpml.cli.builder.GroupBuilder;
+import dpml.cli.option.ArgumentTest;
+import dpml.cli.option.DefaultOptionTest;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
/**
* DOCUMENT ME!
Modified:
trunk/main/util/cli/src/test/dpml/cli/validation/ClassValidatorTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/validation/ClassValidatorTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/validation/ClassValidatorTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import junit.framework.TestCase;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceHelper;
import java.net.URL;
import java.net.URLClassLoader;
@@ -174,7 +174,7 @@
{
final Object[] array = new Object[]
{
- "net.dpml.cli.Option", "java.util.Vector"
+ "dpml.cli.Option", "java.util.Vector"
};
final List list = Arrays.asList( array );
@@ -182,7 +182,7 @@
m_validator.validate( list );
final Iterator i = list.iterator( );
- assertEquals( "net.dpml.cli.Option", ( (Class) i.next( ) ).getName(
) );
+ assertEquals( "dpml.cli.Option", ( (Class) i.next( ) ).getName( )
);
assertEquals( "java.util.Vector", ( (Class) i.next( ) ).getName( )
);
assertFalse( i.hasNext( ) );
}
@@ -192,7 +192,7 @@
*/
public void testLoadInvalid( )
{
- final String className = "net.dpml.cli.NonOption";
+ final String className = "dpml.cli.NonOption";
final Object[] array = new Object[]{className, "java.util.Vectors"};
final List list = Arrays.asList( array );
@@ -270,7 +270,7 @@
*/
public void testCreateProtectedInstance( )
{
- final String className =
"net.dpml.cli.validation.protect.ProtectedClass";
+ final String className =
"dpml.cli.validation.protect.ProtectedClass";
final Object[] array = new Object[]{className};
final List list = Arrays.asList( array );
@@ -285,9 +285,9 @@
{
assertEquals( RESOURCES.getMessage(
"ClassValidator.class.access",
className,
- "Class net.dpml.cli.validation.ClassValidator "
+ "Class dpml.cli.validation.ClassValidator "
+ "can not access a member of class "
- + "net.dpml.cli.validation.protect.ProtectedClass "
+ + "dpml.cli.validation.protect.ProtectedClass "
+ "with modifiers \"protected\"" ),
ive.getMessage() );
}
Modified:
trunk/main/util/cli/src/test/dpml/cli/validation/DateValidatorTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/validation/DateValidatorTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/validation/DateValidatorTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
Modified:
trunk/main/util/cli/src/test/dpml/cli/validation/EnumValidatorTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/validation/EnumValidatorTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/validation/EnumValidatorTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2004-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import junit.framework.TestCase;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
import java.util.Arrays;
import java.util.Iterator;
Modified:
trunk/main/util/cli/src/test/dpml/cli/validation/FileValidatorTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/validation/FileValidatorTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/validation/FileValidatorTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2004-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import java.io.File;
import java.util.Arrays;
Modified:
trunk/main/util/cli/src/test/dpml/cli/validation/NumberValidatorTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/validation/NumberValidatorTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/validation/NumberValidatorTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/*
* Copyright 2003-2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import junit.framework.TestCase;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
import java.text.NumberFormat;
Modified:
trunk/main/util/cli/src/test/dpml/cli/validation/TimeZoneTestSuite.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/validation/TimeZoneTestSuite.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/validation/TimeZoneTestSuite.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2005 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import junit.extensions.TestDecorator;
Modified:
trunk/main/util/cli/src/test/dpml/cli/validation/URLValidatorTest.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/validation/URLValidatorTest.java
2007-01-29 14:50:58 UTC (rev 1814)
+++ trunk/main/util/cli/src/test/dpml/cli/validation/URLValidatorTest.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation;
+package dpml.cli.validation;
import junit.framework.TestCase;
-import net.dpml.cli.resource.ResourceConstants;
-import net.dpml.cli.resource.ResourceHelper;
+import dpml.cli.resource.ResourceConstants;
+import dpml.cli.resource.ResourceHelper;
import java.net.MalformedURLException;
import java.net.URL;
Modified:
trunk/main/util/cli/src/test/dpml/cli/validation/protect/ProtectedClass.java
===================================================================
---
trunk/main/util/cli/src/test/net/dpml/cli/validation/protect/ProtectedClass.java
2007-01-29 14:50:58 UTC (rev 1814)
+++
trunk/main/util/cli/src/test/dpml/cli/validation/protect/ProtectedClass.java
2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,6 +1,6 @@
/**
* Copyright 2003-2004 The Apache Software Foundation
- * Copyright 2005-2006 Stephen McConnell, The Digital Product Meta Library
+ * Copyright 2005-2006 Stephen McConnell, The Digital Product Management
Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.cli.validation.protect;
+package dpml.cli.validation.protect;
/**
* Dummy class declared as package private.
Modified: trunk/main/util/module.xml
===================================================================
--- trunk/main/util/module.xml 2007-02-08 23:34:21 UTC (rev 1822)
+++ trunk/main/util/module.xml 2007-02-08 23:35:00 UTC (rev 1823)
@@ -1,58 +1,14 @@
<?xml version="1.0"?>
<module name="util" basedir="."
- xmlns="link:xsd:dpml/lang/dpml-module#1.0"
+ xmlns="dpml:library"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >
- <properties>
- <property name="project.major.version" value="1"/>
- <property name="project.minor.version" value="0"/>
- <property name="project.micro.version" value="0"/>
- </properties>
-
<dependencies>
<build>
<include key="transit"/>
</build>
</dependencies>
- <project name="dpml-util-i18n" basedir="i18n">
- <info title="DPML I18N Utility">
- <description>Internationalization utility.</description>
- </info>
- <types>
- <type id="jar"/>
- </types>
- <dependencies>
- <test>
- <include ref="ant/ant-junit"/>
- </test>
- </dependencies>
- </project>
-
- <project name="dpml-util-cli" basedir="cli">
- <info title="DPML CLI Utility">
- <description>Commandline handling utility.</description>
- </info>
- <properties>
- <property name="project.test.fork" value="true"/>
- </properties>
- <types>
- <type id="jar"/>
- </types>
- <dependencies>
- <test>
- <include ref="ant/ant-junit"/>
- </test>
- </dependencies>
- </project>
-
- <project name="dpml-logging-api" basedir="logging">
- <info title="DPML Logging Utility">
- <description>Logging API Wrapper.</description>
- </info>
- <types>
- <type id="jar" alias="true"/>
- </types>
- </project>
+ <project file="cli/project.xml"/>
</module>
- r1823 - in trunk/main/util: . cli cli/src/main cli/src/main/dpml/cli cli/src/main/dpml/cli/builder cli/src/main/dpml/cli/commandline cli/src/main/dpml/cli/option cli/src/main/dpml/cli/resource cli/src/main/dpml/cli/util cli/src/main/dpml/cli/validation cli/src/main/net cli/src/test cli/src/test/dpml cli/src/test/dpml/cli cli/src/test/dpml/cli/application cli/src/test/dpml/cli/bug cli/src/test/dpml/cli/builder cli/src/test/dpml/cli/commandline cli/src/test/dpml/cli/option cli/src/test/dpml/cli/resource cli/src/test/dpml/cli/util cli/src/test/dpml/cli/validation cli/src/test/dpml/cli/validation/protect cli/src/test/net, mcconnell at BerliOS, 02/08/2007
Archive powered by MHonArc 2.6.24.