You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2011/12/01 08:27:13 UTC
svn commit: r1208981 [19/24] - in /struts/struts2/branches/STRUTS_3_X:
apps/blank/src/main/java/example/ apps/blank/src/test/java/example/
apps/jboss-blank/src/main/java/example/
apps/jboss-blank/src/test/java/example/ apps/mailreader/src/main/java/mai...
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/metadata/ValidatorDescription.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/metadata/ValidatorDescription.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/metadata/ValidatorDescription.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/metadata/ValidatorDescription.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.metadata;
+package org.apache.struts2.xwork2.validator.metadata;
/**
* <code>ValidatorDescription</code>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/metadata/VisitorFieldValidatorDescription.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/metadata/VisitorFieldValidatorDescription.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/metadata/VisitorFieldValidatorDescription.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/metadata/VisitorFieldValidatorDescription.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.metadata;
+package org.apache.struts2.xwork2.validator.metadata;
import java.io.PrintWriter;
import java.io.StringWriter;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ConditionalVisitorFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ConditionalVisitorFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ConditionalVisitorFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ConditionalVisitorFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -1,6 +1,6 @@
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.validator.ValidationException;
/**
* <code>ConditionalVisitorFieldValidator</code>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ConversionErrorFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ConversionErrorFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ConversionErrorFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ConversionErrorFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.conversion.impl.XWorkConverter;
+import org.apache.struts2.xwork2.validator.ValidationException;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/DateRangeFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/DateRangeFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/DateRangeFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/DateRangeFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
import java.util.Date;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/DoubleRangeFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/DoubleRangeFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/DoubleRangeFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/DoubleRangeFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.validator.ValidationException;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/EmailValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/EmailValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/EmailValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/EmailValidator.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ExpressionValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ExpressionValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ExpressionValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ExpressionValidator.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.validator.ValidationException;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/FieldExpressionValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/FieldExpressionValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/FieldExpressionValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/FieldExpressionValidator.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.validator.ValidationException;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/FieldValidatorSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/FieldValidatorSupport.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/FieldValidatorSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/FieldValidatorSupport.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.validator.FieldValidator;
+import org.apache.struts2.xwork2.validator.FieldValidator;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/IntRangeFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/IntRangeFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/IntRangeFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/IntRangeFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/LongRangeFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/LongRangeFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/LongRangeFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/LongRangeFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RegexFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RegexFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RegexFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RegexFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.validator.ValidationException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RepopulateConversionErrorFieldValidatorSupport.java Thu Dec 1 07:18:07 2011
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.PreResultListener;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.interceptor.PreResultListener;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.validator.ValidationException;
import org.apache.commons.lang.StringEscapeUtils;
import java.util.LinkedHashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RequiredFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RequiredFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RequiredFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RequiredFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.validator.ValidationException;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RequiredStringValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RequiredStringValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RequiredStringValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/RequiredStringValidator.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.validator.ValidationException;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ShortRangeFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ShortRangeFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ShortRangeFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ShortRangeFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/StringLengthFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/StringLengthFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/StringLengthFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/StringLengthFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.validator.ValidationException;
/**
* <!-- START SNIPPET: javadoc -->
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/URLValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/URLValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/URLValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/URLValidator.java Thu Dec 1 07:18:07 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.validator.ValidationException;
-import com.opensymphony.xwork2.util.URLUtil;
+import org.apache.struts2.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.util.URLUtil;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ValidatorSupport.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ValidatorSupport.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ValidatorSupport.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/ValidatorSupport.java Thu Dec 1 07:18:07 2011
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.util.TextParseUtil;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.validator.DelegatingValidatorContext;
-import com.opensymphony.xwork2.validator.ShortCircuitableValidator;
-import com.opensymphony.xwork2.validator.ValidationException;
-import com.opensymphony.xwork2.validator.Validator;
-import com.opensymphony.xwork2.validator.ValidatorContext;
+import org.apache.struts2.xwork2.util.TextParseUtil;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.logging.Logger;
+import org.apache.struts2.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.xwork2.validator.DelegatingValidatorContext;
+import org.apache.struts2.xwork2.validator.ShortCircuitableValidator;
+import org.apache.struts2.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.validator.Validator;
+import org.apache.struts2.xwork2.validator.ValidatorContext;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/VisitorFieldValidator.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/VisitorFieldValidator.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/VisitorFieldValidator.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/org/apache/struts2/xwork2/validator/validators/VisitorFieldValidator.java Thu Dec 1 07:18:07 2011
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.validator.validators;
+package org.apache.struts2.xwork2.validator.validators;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.validator.ActionValidatorManager;
-import com.opensymphony.xwork2.validator.DelegatingValidatorContext;
-import com.opensymphony.xwork2.validator.ValidationException;
-import com.opensymphony.xwork2.validator.ValidatorContext;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.validator.ActionValidatorManager;
+import org.apache.struts2.xwork2.validator.DelegatingValidatorContext;
+import org.apache.struts2.xwork2.validator.ValidationException;
+import org.apache.struts2.xwork2.validator.ValidatorContext;
import java.util.Collection;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/resources/xwork-default.xml
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/resources/xwork-default.xml?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/resources/xwork-default.xml (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/resources/xwork-default.xml Thu Dec 1 07:18:07 2011
@@ -7,7 +7,7 @@
<!-- START SNIPPET: xwork2-default-result-types -->
<result-types>
- <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult"/>
+ <result-type name="chain" class="org.apache.struts2.xwork2.ActionChainResult"/>
</result-types>
<!-- END SNIPPET: xwork2-default-result-types -->
@@ -15,23 +15,23 @@
<interceptors>
<!-- START SNIPPET: xwork2-default-interceptors -->
- <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
- <interceptor name="logger" class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
- <interceptor name="chain" class="com.opensymphony.xwork2.interceptor.ChainingInterceptor"/>
- <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
- <interceptor name="params" class="com.opensymphony.xwork2.interceptor.ParametersInterceptor"/>
- <interceptor name="filterParams" class="com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor"/>
- <interceptor name="removeParams" class="com.opensymphony.xwork2.interceptor.ParameterRemoverInterceptor"/>
- <interceptor name="modelDriven" class="com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor"/>
+ <interceptor name="timer" class="org.apache.struts2.xwork2.interceptor.TimerInterceptor"/>
+ <interceptor name="logger" class="org.apache.struts2.xwork2.interceptor.LoggingInterceptor"/>
+ <interceptor name="chain" class="org.apache.struts2.xwork2.interceptor.ChainingInterceptor"/>
+ <interceptor name="staticParams" class="org.apache.struts2.xwork2.interceptor.StaticParametersInterceptor"/>
+ <interceptor name="params" class="org.apache.struts2.xwork2.interceptor.ParametersInterceptor"/>
+ <interceptor name="filterParams" class="org.apache.struts2.xwork2.interceptor.ParameterFilterInterceptor"/>
+ <interceptor name="removeParams" class="org.apache.struts2.xwork2.interceptor.ParameterRemoverInterceptor"/>
+ <interceptor name="modelDriven" class="org.apache.struts2.xwork2.interceptor.ModelDrivenInterceptor"/>
<interceptor name="scopedModelDriven"
- class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor"/>
- <interceptor name="validation" class="com.opensymphony.xwork2.validator.ValidationInterceptor"/>
- <interceptor name="workflow" class="com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor"/>
- <interceptor name="prepare" class="com.opensymphony.xwork2.interceptor.PrepareInterceptor"/>
- <interceptor name="conversionError" class="com.opensymphony.xwork2.interceptor.ConversionErrorInterceptor"/>
- <interceptor name="alias" class="com.opensymphony.xwork2.interceptor.AliasInterceptor"/>
- <interceptor name="exception" class="com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor"/>
- <interceptor name="i18n" class="com.opensymphony.xwork2.interceptor.I18nInterceptor"/>
+ class="org.apache.struts2.xwork2.interceptor.ScopedModelDrivenInterceptor"/>
+ <interceptor name="validation" class="org.apache.struts2.xwork2.validator.ValidationInterceptor"/>
+ <interceptor name="workflow" class="org.apache.struts2.xwork2.interceptor.DefaultWorkflowInterceptor"/>
+ <interceptor name="prepare" class="org.apache.struts2.xwork2.interceptor.PrepareInterceptor"/>
+ <interceptor name="conversionError" class="org.apache.struts2.xwork2.interceptor.ConversionErrorInterceptor"/>
+ <interceptor name="alias" class="org.apache.struts2.xwork2.interceptor.AliasInterceptor"/>
+ <interceptor name="exception" class="org.apache.struts2.xwork2.interceptor.ExceptionMappingInterceptor"/>
+ <interceptor name="i18n" class="org.apache.struts2.xwork2.interceptor.I18nInterceptor"/>
<!-- END SNIPPET: xwork2-default-interceptors -->
@@ -61,7 +61,7 @@
</interceptors>
- <default-class-ref class="com.opensymphony.xwork2.ActionSupport"/>
+ <default-class-ref class="org.apache.struts2.xwork2.ActionSupport"/>
</package>
</xwork>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/PackagelessAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/PackagelessAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/PackagelessAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/PackagelessAction.java Thu Dec 1 07:18:07 2011
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.xwork2.ActionSupport;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ChainResultTest.java Thu Dec 1 07:18:07 2011
@@ -19,11 +19,11 @@
* To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.util.ValueStack;
import junit.framework.TestCase;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/CompositeTextProviderTest.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.util.ArrayList;
import java.util.Locale;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultActionInvocationTest.java Thu Dec 1 07:18:07 2011
@@ -1,8 +1,8 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.mock.MockActionProxy;
-import com.opensymphony.xwork2.mock.MockInterceptor;
+import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
+import org.apache.struts2.xwork2.mock.MockActionProxy;
+import org.apache.struts2.xwork2.mock.MockInterceptor;
import java.util.ArrayList;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultClasstTest.java Thu Dec 1 07:18:07 2011
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
/**
* <code>WildCardResultTest</code>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/DefaultTextProviderTest.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import org.apache.struts2.xwork2.util.LocalizedTextUtil;
import junit.framework.TestCase;
import java.util.*;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ExternalReferenceAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ExternalReferenceAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ExternalReferenceAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ExternalReferenceAction.java Thu Dec 1 07:18:07 2011
@@ -19,7 +19,7 @@
* To change the template for this generated file go to Window - Preferences -
* Java - Code Generation - Code and Comments
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/Foo.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/Foo.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/Foo.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/Foo.java Thu Dec 1 07:18:07 2011
@@ -19,7 +19,7 @@
* To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/GenericsBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/GenericsBean.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/GenericsBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/GenericsBean.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.util.ArrayList;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/LocaleAwareTest.java Thu Dec 1 07:18:07 2011
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStackFactory;
import java.util.Locale;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAction.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ModelDrivenAnnotationAction.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
* ModelDrivenAnnotationAction
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/NestedAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/NestedAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/NestedAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/NestedAction.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.ValueStack;
import junit.framework.Assert;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationAction.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
* Need by the ProxyInvocationTest
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationInterface.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationInterface.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationInterface.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationInterface.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
* Need by the ProxyInvocationTest
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyInvocationTest.java Thu Dec 1 07:18:07 2011
@@ -1,6 +1,6 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
import java.util.HashMap;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyObjectFactory.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyObjectFactory.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ProxyObjectFactory.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAction.java Thu Dec 1 07:18:07 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.inject.Inject;
import java.util.*;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAnnotationAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAnnotationAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAnnotationAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleAnnotationAction.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.validator.annotations.*;
+import org.apache.struts2.xwork2.validator.annotations.*;
import java.util.ArrayList;
import java.util.Date;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleFooAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleFooAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleFooAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/SimpleFooAction.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java Thu Dec 1 07:18:07 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.util.CompoundRoot;
-import com.opensymphony.xwork2.util.ValueStack;
+import org.apache.struts2.xwork2.util.CompoundRoot;
+import org.apache.struts2.xwork2.util.ValueStack;
import java.util.HashMap;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestBean.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestBean.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.util.Date;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestChildBean.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestChildBean.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestChildBean.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestChildBean.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.util.Calendar;
import java.util.Date;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestInterceptor.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
import junit.framework.Assert;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestNGXWorkTestCaseTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestNGXWorkTestCaseTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestNGXWorkTestCaseTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TestNGXWorkTestCaseTest.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.ConfigurationManager;
+import org.apache.struts2.xwork2.config.ConfigurationManager;
import junit.framework.TestCase;
import org.testng.TestListenerAdapter;
import org.testng.TestNG;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/TextProviderSupportTest.java Thu Dec 1 07:18:07 2011
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
import java.util.ArrayList;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/UnknownHandlerManagerMock.java Thu Dec 1 07:18:07 2011
@@ -1,6 +1,4 @@
-package com.opensymphony.xwork2;
-
-import com.opensymphony.xwork2.DefaultUnknownHandlerManager;
+package org.apache.struts2.xwork2;
import java.util.ArrayList;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/UserSpecifiedDefaultAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/UserSpecifiedDefaultAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/UserSpecifiedDefaultAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/UserSpecifiedDefaultAction.java Thu Dec 1 07:18:07 2011
@@ -1,4 +1,4 @@
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
* <code>UserSpecifiedDefaultAction</code>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ValidationOrderAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ValidationOrderAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ValidationOrderAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/ValidationOrderAction.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
* A sample action to test validation order.
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/VoidResult.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/VoidResult.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/VoidResult.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/VoidResult.java Thu Dec 1 07:18:07 2011
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
/**
*/
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/WildCardResultTest.java Thu Dec 1 07:18:07 2011
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.mock.MockResult;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.mock.MockResult;
/**
* <code>WildCardResultTest</code>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/XWorkExceptionTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/XWorkExceptionTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/XWorkExceptionTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/XWorkExceptionTest.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2;
+package org.apache.struts2.xwork2;
-import com.opensymphony.xwork2.util.location.Location;
+import org.apache.struts2.xwork2.util.location.Location;
public class XWorkExceptionTest extends XWorkTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationManagerTest.java Thu Dec 1 07:18:07 2011
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config;
+package org.apache.struts2.xwork2.config;
//import org.easymock.MockControl;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.util.FileManager;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.providers.XWorkConfigurationProvider;
+import org.apache.struts2.xwork2.inject.ContainerBuilder;
+import org.apache.struts2.xwork2.util.FileManager;
+import org.apache.struts2.xwork2.util.location.LocatableProperties;
import java.util.Properties;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/ConfigurationTest.java Thu Dec 1 07:18:07 2011
@@ -13,22 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config;
+package org.apache.struts2.xwork2.config;
import com.mockobjects.dynamic.C;
import com.mockobjects.dynamic.Mock;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionProxy;
-import com.opensymphony.xwork2.SimpleAction;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.providers.MockConfigurationProvider;
-import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.mock.MockInterceptor;
-import com.opensymphony.xwork2.test.StubConfigurationProvider;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.ActionProxy;
+import org.apache.struts2.xwork2.SimpleAction;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
+import org.apache.struts2.xwork2.config.providers.MockConfigurationProvider;
+import org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider;
+import org.apache.struts2.xwork2.inject.ContainerBuilder;
+import org.apache.struts2.xwork2.mock.MockInterceptor;
+import org.apache.struts2.xwork2.test.StubConfigurationProvider;
+import org.apache.struts2.xwork2.util.location.LocatableProperties;
import java.util.HashMap;
import java.util.Map;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/entities/PackageConfigTest.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config.entities;
+package org.apache.struts2.xwork2.config.entities;
-import com.opensymphony.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.XWorkTestCase;
public class PackageConfigTest extends XWorkTestCase {
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/impl/NamespaceMatcherTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/impl/NamespaceMatcherTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/impl/NamespaceMatcherTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/impl/NamespaceMatcherTest.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config.impl;
+package org.apache.struts2.xwork2.config.impl;
-import com.opensymphony.xwork2.util.WildcardHelper;
+import org.apache.struts2.xwork2.util.WildcardHelper;
import junit.framework.TestCase;
import java.util.HashSet;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/ConfigurationTestBase.java Thu Dec 1 07:18:07 2011
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.impl.MockConfiguration;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import org.apache.struts2.xwork2.config.impl.MockConfiguration;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorBuilderTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorBuilderTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorBuilderTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorBuilderTest.java Thu Dec 1 07:18:07 2011
@@ -1,13 +1,13 @@
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.entities.InterceptorConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.entities.InterceptorStackConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.entities.InterceptorConfig;
+import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
+import org.apache.struts2.xwork2.config.entities.InterceptorStackConfig;
+import org.apache.struts2.xwork2.config.entities.PackageConfig;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
import java.util.LinkedHashMap;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorForTestPurpose.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorForTestPurpose.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorForTestPurpose.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/InterceptorForTestPurpose.java Thu Dec 1 07:18:07 2011
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.Interceptor;
+import org.apache.struts2.xwork2.ActionInvocation;
+import org.apache.struts2.xwork2.interceptor.Interceptor;
/**
*
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/MockConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/MockConfigurationProvider.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/MockConfigurationProvider.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/MockConfigurationProvider.java Thu Dec 1 07:18:07 2011
@@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.*;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.*;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor;
-import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
-import com.opensymphony.xwork2.interceptor.StaticParametersInterceptor;
-import com.opensymphony.xwork2.mock.MockResult;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
-import com.opensymphony.xwork2.validator.ValidationInterceptor;
+import org.apache.struts2.xwork2.*;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import org.apache.struts2.xwork2.config.entities.*;
+import org.apache.struts2.xwork2.inject.ContainerBuilder;
+import org.apache.struts2.xwork2.inject.Inject;
+import org.apache.struts2.xwork2.interceptor.ModelDrivenInterceptor;
+import org.apache.struts2.xwork2.interceptor.ParametersInterceptor;
+import org.apache.struts2.xwork2.interceptor.StaticParametersInterceptor;
+import org.apache.struts2.xwork2.mock.MockResult;
+import org.apache.struts2.xwork2.util.location.LocatableProperties;
+import org.apache.struts2.xwork2.validator.ValidationInterceptor;
import java.util.ArrayList;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/NoNoArgsConstructorAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/NoNoArgsConstructorAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/NoNoArgsConstructorAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/NoNoArgsConstructorAction.java Thu Dec 1 07:18:07 2011
@@ -1,11 +1,11 @@
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.Action;
/**
* Action with no public constructor taking no args.
* <p/>
- * Used for unit test of {@link com.opensymphony.xwork2.config.providers.XmlConfigurationProvider}.
+ * Used for unit test of {@link org.apache.struts2.xwork2.config.providers.XmlConfigurationProvider}.
*
* @author Claus Ibsen
*/
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/PrivateConstructorAction.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/PrivateConstructorAction.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/PrivateConstructorAction.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/PrivateConstructorAction.java Thu Dec 1 07:18:07 2011
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.Action;
+import org.apache.struts2.xwork2.Action;
/**
* Action with nu public constructor.
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/SomeUnknownHandler.java Thu Dec 1 07:18:07 2011
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.Result;
-import com.opensymphony.xwork2.UnknownHandler;
-import com.opensymphony.xwork2.XWorkException;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.ActionContext;
+import org.apache.struts2.xwork2.Result;
+import org.apache.struts2.xwork2.UnknownHandler;
+import org.apache.struts2.xwork2.XWorkException;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
public class SomeUnknownHandler implements UnknownHandler{
private ActionConfig actionConfig;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderActionsTest.java Thu Dec 1 07:18:07 2011
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.SimpleAction;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.*;
-import com.opensymphony.xwork2.interceptor.TimerInterceptor;
-import com.opensymphony.xwork2.mock.MockInterceptor;
-import com.opensymphony.xwork2.mock.MockResult;
+import org.apache.struts2.xwork2.ObjectFactory;
+import org.apache.struts2.xwork2.SimpleAction;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import org.apache.struts2.xwork2.config.entities.*;
+import org.apache.struts2.xwork2.interceptor.TimerInterceptor;
+import org.apache.struts2.xwork2.mock.MockInterceptor;
+import org.apache.struts2.xwork2.mock.MockResult;
import java.util.ArrayList;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderAllowedMethodsTest.java Thu Dec 1 07:18:07 2011
@@ -1,18 +1,10 @@
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
+
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.ActionChainResult;
-import com.opensymphony.xwork2.SimpleAction;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.mock.MockResult;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
/**
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderExceptionMappingsTest.java Thu Dec 1 07:18:07 2011
@@ -1,14 +1,14 @@
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.ActionChainResult;
-import com.opensymphony.xwork2.SimpleAction;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
-import com.opensymphony.xwork2.mock.MockResult;
+import org.apache.struts2.xwork2.ActionChainResult;
+import org.apache.struts2.xwork2.SimpleAction;
+import org.apache.struts2.xwork2.config.ConfigurationException;
+import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.ExceptionMappingConfig;
+import org.apache.struts2.xwork2.config.entities.PackageConfig;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.mock.MockResult;
import java.util.ArrayList;
import java.util.HashMap;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderGlobalResultInheritenceTest.java Thu Dec 1 07:18:07 2011
@@ -1,11 +1,11 @@
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.ResultConfig;
+import org.apache.struts2.xwork2.config.Configuration;
+import org.apache.struts2.xwork2.config.ConfigurationManager;
+import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.ResultConfig;
/**
* <code>XmlConfigurationProviderGlobalResultInheritenceTest</code>
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorParamOverridingTest.java Thu Dec 1 07:18:07 2011
@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import org.apache.struts2.xwork2.config.RuntimeConfiguration;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
+import org.apache.struts2.xwork2.config.impl.DefaultConfiguration;
import java.util.ArrayList;
import java.util.List;
Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java?rev=1208981&r1=1208980&r2=1208981&view=diff
==============================================================================
--- struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java (original)
+++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderInterceptorStackParamOverridingTest.java Thu Dec 1 07:18:07 2011
@@ -1,11 +1,11 @@
-package com.opensymphony.xwork2.config.providers;
+package org.apache.struts2.xwork2.config.providers;
-import com.opensymphony.xwork2.XWorkTestCase;
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.InterceptorMapping;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import org.apache.struts2.xwork2.XWorkTestCase;
+import org.apache.struts2.xwork2.config.ConfigurationProvider;
+import org.apache.struts2.xwork2.config.RuntimeConfiguration;
+import org.apache.struts2.xwork2.config.entities.ActionConfig;
+import org.apache.struts2.xwork2.config.entities.InterceptorMapping;
+import org.apache.struts2.xwork2.config.impl.DefaultConfiguration;
import java.util.ArrayList;
import java.util.List;