Commits

Anonymous committed 726bd83

Fix carriage-return line feeds
o all files use eol=lf now
Issue number:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@889e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (64)

src/java/com/opensymphony/xwork/interceptor/I18nInterceptor.java

         localeStr = localeStr.substring(index + 1);
         return new Locale(language, country, localeStr);
     }
-}
+}

src/java/com/opensymphony/xwork/util/InstantiatingNullHandler.java

 
         return ObjectFactory.getObjectFactory().buildBean(clazz, context);
     }
-}
+}

src/java/com/opensymphony/xwork/validator/DefaultActionValidatorManager.java

 
         return retList;
     }
-}
+}

src/java/com/opensymphony/xwork/validator/validators/RegexFieldValidator.java

     public void setExpression(String expression) {
         this.expression = expression;
     }
-}
+}

src/test/PackagelessAction.properties

-actionProperty = action property
+actionProperty = action property

src/test/com/opensymphony/xwork/ModelDrivenAction-validation.xml

             <message>count must be between ${min} and ${max}, current value is ${count}.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/ModelDrivenAction.properties

-invalid.fieldvalue.birth=Invalid date for birth.
+invalid.fieldvalue.birth=Invalid date for birth.

src/test/com/opensymphony/xwork/SimpleAction-subproperty-validation.xml

             <message>bean.count out of range.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/SimpleAction-validation.xml

         <param name="expression">foo > bar</param>
         <message>Foo must be greater than Bar. Foo = ${foo}, Bar = ${bar}.</message>
     </validator>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/SimpleAction-validationAlias-validation.xml

             <message>baz out of range.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/SimpleAction.properties

 foo.range=Foo Range Message
 baz.range=${getText(fieldName)} must be greater than ${min}
-baz=Baz Field
+baz=Baz Field

src/test/com/opensymphony/xwork/TestBean-anotherContext-validation.xml

             <message>Count must be between ${min} and ${max}, current value is ${count}.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/TestBean-beanMessageBundle-validation.xml

             <message key="invalid.count.bad">Smaller Invalid Count: ${count}</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/TestBean-expressionValidation-validation.xml

             <message>Name must be greater than 5 characters, it is currently '${name}'</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/TestBean-validation.xml

             <message>You must enter a name.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/TestBean-visitorValidation-validation.xml

             <message>You must have been born after 1970.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/TestBean.properties

-invalid.count=Count must be between ${min} and ${max}, current value is ${count}.
+invalid.count=Count must be between ${min} and ${max}, current value is ${count}.

src/test/com/opensymphony/xwork/TextProviderSupportTest_en.properties

 hello=Hello World
 hello.0=Hello World {0}
 hello.1=Hello World. This is {0} speaking {1}
+#symbols1="=!@#$%^&*(){qwe}<>?:|}{[]\';/.,<>`~'
+symbols1="=!@#$%^&*()<>?:|[]\';/.,<>`~'
+symbols2="=!@#$%^&*()<>?:|[]\';/.,<>`~'

src/test/com/opensymphony/xwork/config/providers/xwork-test-exception-mappings.xml

         </action>
 
     </package>
-</xwork>
+</xwork>

src/test/com/opensymphony/xwork/config/providers/xwork-test-invalid-file.xml

             </result>
             <interceptor-ref name="debugStack"/>
             <interceptor-ref name="defaultStack"/>
-        </action>
+        </action>

src/test/com/opensymphony/xwork/config/providers/xwork-test-results.xml

             </result>
         </action>
     </package>
-</xwork>
+</xwork>

src/test/com/opensymphony/xwork/spring/ExternalReferenceAction.java

     public void setBar(Bar bar) {
         this.bar = bar;
     }
-}
+}

src/test/com/opensymphony/xwork/spring/InjectSpringObjectFactoryTest.java

                 "ObjectFactory should be an instance of SpringObjectFactory",
                 factory instanceof SpringObjectFactory);
     }
-}
+}

src/test/com/opensymphony/xwork/spring/SpringExternalReferenceResolverTest.java

                 .getExternalRefResolver())
                 .setApplicationContext(applicationContext);
     }
-}
+}

src/test/com/opensymphony/xwork/spring/actionContext-xwork.xml

 
         <action name="autoProxiedAction" class="auto-proxied-action"/>
     </package>
-</xwork>
+</xwork>

src/test/com/opensymphony/xwork/spring/interceptor/ActionAutowiringInterceptorTest.java

     assertEquals(bean, action.getBean());
   }
   
-}
+}

src/test/com/opensymphony/xwork/spring/xwork-ext.xml

         	<external-ref name="foo">myFoo</external-ref>
         </action>
    </package>
-</xwork>
+</xwork>

src/test/com/opensymphony/xwork/test.properties

-xwork.error.action.execution=Testing resource bundle override
+xwork.error.action.execution=Testing resource bundle override

src/test/com/opensymphony/xwork/test/DataAware-validation.xml

             <message>You must enter a value for data.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/test/DataAware-validationAlias-validation.xml

             <message>You must enter a value for data.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/test/DataAware.properties

 test.foo = Foo!
-test.bar = Bar!
+test.bar = Bar!

src/test/com/opensymphony/xwork/test/DataAware2-validation.xml

             <message>You must enter a value for data.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/test/Equidae-validation.xml

         </field-validator>
     </field>
 
-</validators>
+</validators>

src/test/com/opensymphony/xwork/test/SimpleAction2-validation.xml

             <message>count must be between ${min} and ${max}, current value is ${count}.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/test/SimpleAction2-validationAlias-validation.xml

             <message>baz out of range.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/test/TestBean2-conversion.properties

-cat = com.opensymphony.xwork.util.FooBarConverter
+cat = com.opensymphony.xwork.util.FooBarConverter

src/test/com/opensymphony/xwork/test/User-conversion.properties

 Collection_list = java.lang.String
-Collection_map = java.lang.String
+Collection_map = java.lang.String

src/test/com/opensymphony/xwork/test/User-validation.xml

         <message>Email2 does not start with mark</message>
     </validator>
 
-</validators>
+</validators>

src/test/com/opensymphony/xwork/test/UserMarker-validation.xml

         <param name="expression">email.equals(email2)</param>
         <message>Email not the same as email2</message>
     </validator>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/test/package.properties

-package.properties=It works!
+package.properties=It works!

src/test/com/opensymphony/xwork/util/Bar.properties

 title=Title:
-invalid.fieldvalue.title=Title is invalid!
+invalid.fieldvalue.title=Title is invalid!

src/test/com/opensymphony/xwork/util/FindMe.properties

 bean.name=Haha you cant FindMe!
-bean2.name=Okay! You found Me!
+bean2.name=Okay! You found Me!

src/test/com/opensymphony/xwork/util/Indexed.java

         return (String) map.get(key);
     }
 
-}
+}

src/test/com/opensymphony/xwork/util/ListHolder-conversion.properties

 Element_longs = java.lang.Long
 Element_strings = java.lang.String
-Element_dates = java.util.Date
+Element_dates = java.util.Date

src/test/com/opensymphony/xwork/util/LocalizedTextUtilTest.properties

-test.format.date={0,date,short}
+test.format.date={0,date,short}

src/test/com/opensymphony/xwork/validator/VisitorValidatorModelAction-validation.xml

             <message>model: </message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/validator/VisitorValidatorTestAction-beanMessageBundle-validation.xml

             <message>bean: </message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/validator/VisitorValidatorTestAction-validateArray-validation.xml

             <message>testBeanArray: </message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/validator/VisitorValidatorTestAction-validateList-validation.xml

             <message>testBeanList: </message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/validator/VisitorValidatorTestAction-validation.xml

             <message>You must enter a context.</message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/validator/VisitorValidatorTestAction-visitorValidation-validation.xml

             <message>bean: </message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/validator/VisitorValidatorTestAction-visitorValidationAlias-validation.xml

             <message>bean: </message>
         </field-validator>
     </field>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/validator/validator-parser-test.xml

         <param name="expression">email.startsWith('mark')</param>
         <message>Email does not start with mark</message>
     </validator>
-</validators>
+</validators>

src/test/com/opensymphony/xwork/validator/validator-parser-test2.xml

    </validator>
 </validators>
               
-       
+       

src/test/includeTest.xml

     <package name="includeTest" extends="default" namespace="includeTest">
         <action name="includeTest" class="com.opensymphony.xwork.SimpleAction"></action>
     </package>
-</xwork>
+</xwork>

src/test/validators.xml

     <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
     <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
     <validator name="regex" class="com.opensymphony.xwork.validator.validators.RegexFieldValidator"/>
-</validators>
+</validators>

src/test/xwork-default.xml

             </interceptor-stack>
         </interceptors>
     </package>
-</xwork>
+</xwork>

tiger/src/java/com/opensymphony/xwork/interceptor/annotations/After.java

 @Target({ElementType.METHOD})
 public @interface After {
 
-}
+}

tiger/src/java/com/opensymphony/xwork/interceptor/annotations/Before.java

 @Target({ElementType.METHOD})
 public @interface Before {
 
-}
+}

tiger/src/java/com/opensymphony/xwork/interceptor/annotations/BeforeResult.java

 @Target({ElementType.METHOD})
 public @interface BeforeResult {
 
-}
+}

tiger/src/test/com/opensymphony/xwork/ModelDrivenAnnotationAction.properties

 # All rights reserved.
 #
 
-invalid.fieldvalue.birth=Invalid date for birth.
+invalid.fieldvalue.birth=Invalid date for birth.

tiger/src/test/com/opensymphony/xwork/SimpleAnnotationAction.properties

 
 foo.range=Foo Range Message
 baz.range=${getText(fieldName)} must be greater than ${min}
-baz=Baz Field
+baz=Baz Field

tiger/src/test/com/opensymphony/xwork/TestBean.properties

 # All rights reserved.
 #
 
-invalid.count=Count must be between ${min} and ${max}, current value is ${count}.
+invalid.count=Count must be between ${min} and ${max}, current value is ${count}.

tiger/src/test/validators.xml

     <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
     <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
     <validator name="regex" class="com.opensymphony.xwork.validator.validators.RegexFieldValidator"/>
-</validators>
+</validators>