You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by bf...@apache.org on 2011/11/10 18:27:30 UTC
svn commit: r1200439 [2/2] - in /oodt/trunk/cli/src:
main/java/org/apache/oodt/cas/cli/ main/java/org/apache/oodt/cas/cli/action/
main/java/org/apache/oodt/cas/cli/action/store/
main/java/org/apache/oodt/cas/cli/action/store/spring/ main/java/org/apach...
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/TestCmdLineUtility.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/TestCmdLineUtility.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/TestCmdLineUtility.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/TestCmdLineUtility.java Thu Nov 10 17:27:28 2011
@@ -17,13 +17,16 @@
package org.apache.oodt.cas.cli;
//OODT static imports
+import static org.apache.oodt.cas.cli.CmdLineUtility.validate;
import static org.apache.oodt.cas.cli.test.util.TestUtils.createActionOption;
import static org.apache.oodt.cas.cli.test.util.TestUtils.createAdvancedOption;
import static org.apache.oodt.cas.cli.test.util.TestUtils.createApplyToActionHandler;
import static org.apache.oodt.cas.cli.test.util.TestUtils.createOptionInstance;
+import static org.apache.oodt.cas.cli.util.CmdLineUtils.determineFailedValidation;
import static org.apache.oodt.cas.cli.util.CmdLineUtils.getOptionByName;
//JDK imports
+import java.util.List;
import java.util.Set;
//OODT imports
@@ -37,7 +40,9 @@ import org.apache.oodt.cas.cli.option.Cm
import org.apache.oodt.cas.cli.option.HelpCmdLineOption;
import org.apache.oodt.cas.cli.option.PrintSupportedActionsCmdLineOption;
import org.apache.oodt.cas.cli.option.validator.ArgRegExpCmdLineOptionValidator;
+import org.apache.oodt.cas.cli.option.validator.CmdLineOptionValidator.Result;
import org.apache.oodt.cas.cli.test.util.TestUtils;
+import org.apache.oodt.cas.cli.util.CmdLineUtils;
//Google imports
import com.google.common.collect.Lists;
@@ -69,7 +74,9 @@ public class TestCmdLineUtility extends
CmdLineArgs args = getArgs();
// Expect pass.
- assertEquals(0, CmdLineUtility.validate(args).size());
+ assertEquals(1, CmdLineUtility.validate(args).size());
+ assertEquals(Result.Grade.PASS, CmdLineUtility.validate(args).get(0)
+ .getGrade());
// Add validator which will cause fail.
AdvancedCmdLineOption option = (AdvancedCmdLineOption) getOptionByName("message", args.getSupportedOptions());
@@ -78,7 +85,7 @@ public class TestCmdLineUtility extends
option.addValidator(validator);
// Expect fail.
- assertEquals(1, CmdLineUtility.validate(args).size());
+ assertFalse(determineFailedValidation(validate(args)).isEmpty());
}
public void testHandle() {
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/action/store/spring/TestSpringCmdLineActionStore.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/action/store/spring/TestSpringCmdLineActionStore.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/action/store/spring/TestSpringCmdLineActionStore.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/action/store/spring/TestSpringCmdLineActionStore.java Thu Nov 10 17:27:28 2011
@@ -31,6 +31,7 @@ import junit.framework.TestCase;
import org.apache.oodt.cas.cli.action.CmdLineAction;
import org.apache.oodt.cas.cli.action.PrintMessageAction;
import org.apache.oodt.cas.cli.action.store.spring.SpringCmdLineActionStore;
+import org.apache.oodt.cas.cli.exception.CmdLineActionStoreException;
import org.apache.oodt.cas.cli.test.util.TestSetContextInjectTypeAction;
//Spring imports
@@ -57,7 +58,7 @@ public class TestSpringCmdLineActionStor
}
}
- public void testApplicationContextAutoSet() {
+ public void testApplicationContextAutoSet() throws CmdLineActionStoreException {
SpringCmdLineActionStore store = new SpringCmdLineActionStore(
SPRING_CONFIG);
TestSetContextInjectTypeAction action = (TestSetContextInjectTypeAction) findAction(
@@ -65,7 +66,7 @@ public class TestSpringCmdLineActionStor
assertEquals(action.getContext(), store.getApplicationContext());
}
- public void testLoadSupportedActions() {
+ public void testLoadSupportedActions() throws CmdLineActionStoreException {
SpringCmdLineActionStore store = new SpringCmdLineActionStore(
SPRING_CONFIG);
Set<CmdLineAction> actions = store.loadSupportedActions();
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/store/spring/TestSpringCmdLineOptionStore.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/store/spring/TestSpringCmdLineOptionStore.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/store/spring/TestSpringCmdLineOptionStore.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/store/spring/TestSpringCmdLineOptionStore.java Thu Nov 10 17:27:28 2011
@@ -28,6 +28,8 @@ import java.util.Set;
import org.apache.oodt.cas.cli.action.CmdLineAction;
import org.apache.oodt.cas.cli.action.PrintMessageAction;
import org.apache.oodt.cas.cli.action.store.spring.SpringCmdLineActionStore;
+import org.apache.oodt.cas.cli.exception.CmdLineActionStoreException;
+import org.apache.oodt.cas.cli.exception.CmdLineOptionStoreException;
import org.apache.oodt.cas.cli.option.AdvancedCmdLineOption;
import org.apache.oodt.cas.cli.option.CmdLineOption;
import org.apache.oodt.cas.cli.option.handler.ApplyToActionHandler;
@@ -49,7 +51,8 @@ public class TestSpringCmdLineOptionStor
private static final String SPRING_OPTION_CONFIG = "src/testdata/cmd-line-options.xml";
private static final String SPRING_ACTION_CONFIG = "src/testdata/cmd-line-actions.xml";
- public void testLoadSupportedOptions() {
+ public void testLoadSupportedOptions() throws CmdLineActionStoreException,
+ CmdLineOptionStoreException {
SpringCmdLineOptionStore optionStore = new SpringCmdLineOptionStore(
SPRING_OPTION_CONFIG);
Set<CmdLineOption> options = optionStore.loadSupportedOptions();
@@ -105,7 +108,8 @@ public class TestSpringCmdLineOptionStor
.getApplyToActions().get(0).getMethodName());
}
- public void testHandlers() {
+ public void testHandlers() throws CmdLineActionStoreException,
+ CmdLineOptionStoreException {
SpringCmdLineOptionStore store = new SpringCmdLineOptionStore(
SPRING_OPTION_CONFIG);
Set<CmdLineOption> options = store.loadSupportedOptions();
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestAllowedArgsCmdLineOptionValidator.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestAllowedArgsCmdLineOptionValidator.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestAllowedArgsCmdLineOptionValidator.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestAllowedArgsCmdLineOptionValidator.java Thu Nov 10 17:27:28 2011
@@ -26,6 +26,7 @@ import junit.framework.TestCase;
//OODT imports
import org.apache.oodt.cas.cli.option.CmdLineOptionInstance;
import org.apache.oodt.cas.cli.option.validator.AllowedArgsCmdLineOptionValidator;
+import org.apache.oodt.cas.cli.option.validator.CmdLineOptionValidator.Result;
//Google imports
import com.google.common.collect.Lists;
@@ -48,7 +49,8 @@ public class TestAllowedArgsCmdLineOptio
// Test no allowed args set and valid option instance
CmdLineOptionInstance instance = createOptionInstance(
createSimpleOption("test", false), "value");
- assertFalse(new AllowedArgsCmdLineOptionValidator().validate(instance));
+ assertEquals(Result.Grade.FAIL, new AllowedArgsCmdLineOptionValidator()
+ .validate(instance).getGrade());
}
public void testValidate() {
@@ -65,11 +67,11 @@ public class TestAllowedArgsCmdLineOptio
// Test should fail case.
CmdLineOptionInstance instance = createOptionInstance(
createSimpleOption("test", false), "value");
- assertFalse(validator.validate(instance));
+ assertEquals(Result.Grade.FAIL, validator.validate(instance).getGrade());
// Test should pass case.
instance = createOptionInstance(createSimpleOption("test", false),
"value1");
- assertTrue(validator.validate(instance));
+ assertEquals(Result.Grade.PASS, validator.validate(instance).getGrade());
}
}
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestArgRegExpCmdLineOptionValidator.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestArgRegExpCmdLineOptionValidator.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestArgRegExpCmdLineOptionValidator.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestArgRegExpCmdLineOptionValidator.java Thu Nov 10 17:27:28 2011
@@ -27,6 +27,7 @@ import junit.framework.TestCase;
import org.apache.oodt.cas.cli.option.CmdLineOptionInstance;
import org.apache.oodt.cas.cli.option.validator.AllowedArgsCmdLineOptionValidator;
import org.apache.oodt.cas.cli.option.validator.ArgRegExpCmdLineOptionValidator;
+import org.apache.oodt.cas.cli.option.validator.CmdLineOptionValidator.Result;
//Google imports
import com.google.common.collect.Lists;
@@ -49,7 +50,8 @@ public class TestArgRegExpCmdLineOptionV
// Test no allowed args set and valid option instance
CmdLineOptionInstance instance = createOptionInstance(
createSimpleOption("test", false), "value");
- assertFalse(new AllowedArgsCmdLineOptionValidator().validate(instance));
+ assertEquals(Result.Grade.FAIL, new AllowedArgsCmdLineOptionValidator()
+ .validate(instance).getGrade());
}
public void testValidate() {
@@ -66,11 +68,11 @@ public class TestArgRegExpCmdLineOptionV
// Test should fail case.
CmdLineOptionInstance instance = createOptionInstance(
createSimpleOption("test", false), "value");
- assertFalse(validator.validate(instance));
+ assertEquals(Result.Grade.FAIL, validator.validate(instance).getGrade());
// Test should pass case.
instance = createOptionInstance(createSimpleOption("test", false),
"value1");
- assertTrue(validator.validate(instance));
+ assertEquals(Result.Grade.PASS, validator.validate(instance).getGrade());
}
}
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestClassExistsCmdLineOptionValidator.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestClassExistsCmdLineOptionValidator.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestClassExistsCmdLineOptionValidator.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestClassExistsCmdLineOptionValidator.java Thu Nov 10 17:27:28 2011
@@ -26,6 +26,7 @@ import junit.framework.TestCase;
//OODT imports
import org.apache.oodt.cas.cli.option.CmdLineOptionInstance;
import org.apache.oodt.cas.cli.option.validator.ClassExistsCmdLineOptionValidator;
+import org.apache.oodt.cas.cli.option.validator.CmdLineOptionValidator.Result;
/**
* Test class for {@link ClassExistsCmdLineOptionValidator}.
@@ -44,11 +45,13 @@ public class TestClassExistsCmdLineOptio
// Check fail case.
CmdLineOptionInstance instance = createOptionInstance(
createSimpleOption("test", false), "bogus");
- assertFalse(new ClassExistsCmdLineOptionValidator().validate(instance));
+ assertEquals(Result.Grade.FAIL, new ClassExistsCmdLineOptionValidator()
+ .validate(instance).getGrade());
// Check pass case.
instance = createOptionInstance(createSimpleOption("test", false),
"java.lang.String");
- assertTrue(new ClassExistsCmdLineOptionValidator().validate(instance));
+ assertEquals(Result.Grade.PASS, new ClassExistsCmdLineOptionValidator()
+ .validate(instance).getGrade());
}
}
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestFileExistCmdLineOptionValidator.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestFileExistCmdLineOptionValidator.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestFileExistCmdLineOptionValidator.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestFileExistCmdLineOptionValidator.java Thu Nov 10 17:27:28 2011
@@ -30,6 +30,7 @@ import junit.framework.TestCase;
//OODT imports
import org.apache.oodt.cas.cli.option.CmdLineOptionInstance;
import org.apache.oodt.cas.cli.option.validator.FileExistCmdLineOptionValidator;
+import org.apache.oodt.cas.cli.option.validator.CmdLineOptionValidator.Result;
/**
* Test class for {@link FileExistCmdLineOptionValidator}.
@@ -49,13 +50,15 @@ public class TestFileExistCmdLineOptionV
// Test fail case.
CmdLineOptionInstance instance = createOptionInstance(
createSimpleOption("test", false), "bogus");
- assertFalse(new FileExistCmdLineOptionValidator().validate(instance));
+ assertEquals(Result.Grade.FAIL, new FileExistCmdLineOptionValidator()
+ .validate(instance).getGrade());
// Test pass case.
File tempFile = File.createTempFile("bogus", "bogus");
tempFile.deleteOnExit();
instance = createOptionInstance(createSimpleOption("test", false),
tempFile.getAbsolutePath());
- assertTrue(new FileExistCmdLineOptionValidator().validate(instance));
+ assertEquals(Result.Grade.PASS, new FileExistCmdLineOptionValidator()
+ .validate(instance).getGrade());
}
}
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestNoRestrictionsCmdLineOptionValidator.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestNoRestrictionsCmdLineOptionValidator.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestNoRestrictionsCmdLineOptionValidator.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/option/validator/TestNoRestrictionsCmdLineOptionValidator.java Thu Nov 10 17:27:28 2011
@@ -26,6 +26,7 @@ import junit.framework.TestCase;
//OODT imports
import org.apache.oodt.cas.cli.option.CmdLineOptionInstance;
import org.apache.oodt.cas.cli.option.validator.NoRestrictionsCmdLineOptionValidator;
+import org.apache.oodt.cas.cli.option.validator.CmdLineOptionValidator.Result;
/**
* Test class for {@link NoRestrictionsCmdLineOptionValidator}.
@@ -36,11 +37,15 @@ public class TestNoRestrictionsCmdLineOp
public void testValidate() {
// Test pass for null option instance.
- assertTrue(new NoRestrictionsCmdLineOptionValidator().validate(null));
+ assertEquals(Result.Grade.PASS,
+ new NoRestrictionsCmdLineOptionValidator().validate(null)
+ .getGrade());
// Test pass for not null option instance.
CmdLineOptionInstance instance = createOptionInstance(
createSimpleOption("test", false), "bogus");
- assertTrue(new NoRestrictionsCmdLineOptionValidator().validate(instance));
+ assertEquals(Result.Grade.PASS,
+ new NoRestrictionsCmdLineOptionValidator().validate(instance)
+ .getGrade());
}
}
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/parser/TestStdCmdLineOptionParser.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/parser/TestStdCmdLineOptionParser.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/parser/TestStdCmdLineOptionParser.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/parser/TestStdCmdLineOptionParser.java Thu Nov 10 17:27:28 2011
@@ -17,10 +17,10 @@
package org.apache.oodt.cas.cli.parser;
//JDK imports
-import java.io.IOException;
import java.util.List;
//OODT imports
+import org.apache.oodt.cas.cli.exception.CmdLineParserException;
import org.apache.oodt.cas.cli.util.ParsedArg;
//JUnit imports
@@ -33,7 +33,7 @@ import junit.framework.TestCase;
*/
public class TestStdCmdLineOptionParser extends TestCase {
- public void testParser() throws IOException {
+ public void testParser() throws CmdLineParserException {
String[] args =
"--group --list one two three four --scalar one --none --group --list one --scalar one"
.split(" ");
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/util/TestCmdLineIterable.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/util/TestCmdLineIterable.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/util/TestCmdLineIterable.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/util/TestCmdLineIterable.java Thu Nov 10 17:27:28 2011
@@ -17,10 +17,10 @@
package org.apache.oodt.cas.cli.util;
//JDK imports
-import java.io.IOException;
import java.util.Arrays;
//OODT imports
+import org.apache.oodt.cas.cli.exception.CmdLineParserException;
import org.apache.oodt.cas.cli.parser.StdCmdLineParser;
//JUnit imports
@@ -35,7 +35,7 @@ public class TestCmdLineIterable extends
private static final String ARGS_STRING = "--operation download --url http://somewhere.com --user foo --pass bar --toDir /tmp";
- public void testIteration() throws IOException {
+ public void testIteration() throws CmdLineParserException {
StringBuffer argsString = new StringBuffer("");
CmdLineIterable<ParsedArg> args = createArgs();
for (ParsedArg arg : args) {
@@ -53,7 +53,7 @@ public class TestCmdLineIterable extends
break;
}
}
- arg = args.getAndIncrement();
+ arg = args.incrementAndGet();
if (arg.getType().equals(ParsedArg.Type.OPTION)) {
argsString.append("--");
}
@@ -64,7 +64,7 @@ public class TestCmdLineIterable extends
Arrays.asList(argsString.toString().split(" ")));
}
- public void testIndexOutOfBoundsException() throws IOException {
+ public void testIndexOutOfBoundsException() throws CmdLineParserException {
CmdLineIterable<ParsedArg> args = new CmdLineIterable<ParsedArg>(
new StdCmdLineParser().parse(new String[] {}));
try {
@@ -74,7 +74,7 @@ public class TestCmdLineIterable extends
}
}
- private CmdLineIterable<ParsedArg> createArgs() throws IOException {
+ private CmdLineIterable<ParsedArg> createArgs() throws CmdLineParserException {
return new CmdLineIterable<ParsedArg>(
new StdCmdLineParser().parse(ARGS_STRING.split(" ")));
}
Modified: oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/util/TestCmdLineUtils.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/util/TestCmdLineUtils.java?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/util/TestCmdLineUtils.java (original)
+++ oodt/trunk/cli/src/test/org/apache/oodt/cas/cli/util/TestCmdLineUtils.java Thu Nov 10 17:27:28 2011
@@ -24,9 +24,12 @@ import static org.apache.oodt.cas.cli.te
import static org.apache.oodt.cas.cli.test.util.TestUtils.createOptionalRequirementRule;
import static org.apache.oodt.cas.cli.test.util.TestUtils.createRequiredRequirementRule;
import static org.apache.oodt.cas.cli.test.util.TestUtils.createSimpleOption;
+import static org.apache.oodt.cas.cli.util.CmdLineUtils.determineFailedValidation;
+import static org.apache.oodt.cas.cli.util.CmdLineUtils.findFirstActionOption;
import static org.apache.oodt.cas.cli.util.CmdLineUtils.findSpecifiedActionOption;
import static org.apache.oodt.cas.cli.util.CmdLineUtils.findSpecifiedHelpOption;
import static org.apache.oodt.cas.cli.util.CmdLineUtils.findSpecifiedPrintSupportedActionsOption;
+import static org.apache.oodt.cas.cli.util.CmdLineUtils.validate;
//JDK imports
import java.util.ArrayList;
@@ -366,9 +369,9 @@ public class TestCmdLineUtils extends Te
(CmdLineOption) createSimpleOption("test", false),
createSimpleOption("test", false));
- assertNull(CmdLineUtils.findActionOption(options));
+ assertNull(findFirstActionOption(options));
options.add(actionOption);
- assertEquals(actionOption, CmdLineUtils.findActionOption(options));
+ assertEquals(actionOption, findFirstActionOption(options));
}
public void testFindSpecifiedActionOption() {
@@ -451,8 +454,10 @@ public class TestCmdLineUtils extends Te
option.setValidators(Lists
.newArrayList((CmdLineOptionValidator) validator));
- assertFalse(CmdLineUtils.validate(createOptionInstance(option, "value1")));
- assertTrue(CmdLineUtils.validate(createOptionInstance(option, "value")));
+ // Test case fail.
+ assertFalse(determineFailedValidation(validate(createOptionInstance(option, "value1"))).isEmpty());
+ // Test case pass.
+ assertTrue(determineFailedValidation(validate(createOptionInstance(option, "value"))).isEmpty());
}
public void testHandle() {
Modified: oodt/trunk/cli/src/testdata/cmd-line-actions.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/testdata/cmd-line-actions.xml?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/testdata/cmd-line-actions.xml (original)
+++ oodt/trunk/cli/src/testdata/cmd-line-actions.xml Thu Nov 10 17:27:28 2011
@@ -19,7 +19,7 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean id="PrintMessageAction" class="org.apache.oodt.cas.cli.action.PrintMessageAction">
<property name="description" value="Prints out a given message" />
Modified: oodt/trunk/cli/src/testdata/cmd-line-options.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/testdata/cmd-line-options.xml?rev=1200439&r1=1200438&r2=1200439&view=diff
==============================================================================
--- oodt/trunk/cli/src/testdata/cmd-line-options.xml (original)
+++ oodt/trunk/cli/src/testdata/cmd-line-options.xml Thu Nov 10 17:27:28 2011
@@ -19,7 +19,7 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
<bean id="outputStream" class="org.apache.oodt.cas.cli.option.AdvancedCmdLineOption">
<property name="shortOption" value="utos" />