Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 617779947 for ; Fri, 2 Dec 2011 11:27:54 +0000 (UTC) Received: (qmail 73144 invoked by uid 500); 2 Dec 2011 11:27:53 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 73115 invoked by uid 500); 2 Dec 2011 11:27:53 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 73104 invoked by uid 99); 2 Dec 2011 11:27:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 11:27:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 11:27:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 95F632388C18 for ; Fri, 2 Dec 2011 11:26:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209415 [13/19] - 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... Date: Fri, 02 Dec 2011 11:25:26 -0000 To: commits@struts.apache.org From: lukaszlenart@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111202112630.95F632388C18@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultConfig.java Fri Dec 2 11:24:48 2011 @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.config.entities; +package com.opensymphony.xwork2.config.entities; -import org.apache.struts2.xwork2.util.location.Located; -import org.apache.struts2.xwork2.util.location.Location; +import com.opensymphony.xwork2.util.location.Located; +import com.opensymphony.xwork2.util.location.Location; import java.io.Serializable; import java.util.Collections; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java Fri Dec 2 11:24:48 2011 @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.config.entities; +package com.opensymphony.xwork2.config.entities; -import org.apache.struts2.xwork2.util.location.Located; -import org.apache.struts2.xwork2.util.location.Location; +import com.opensymphony.xwork2.util.location.Located; +import com.opensymphony.xwork2.util.location.Location; import java.io.Serializable; import java.util.Collections; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/UnknownHandlerConfig.java Fri Dec 2 11:24:48 2011 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.config.entities; +package com.opensymphony.xwork2.config.entities; public class UnknownHandlerConfig { private String name; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java Fri Dec 2 11:24:48 2011 @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.config.impl; +package com.opensymphony.xwork2.config.impl; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.DefaultTextProvider; -import org.apache.struts2.xwork2.ObjectFactory; -import org.apache.struts2.xwork2.TextProvider; -import org.apache.struts2.xwork2.config.*; -import org.apache.struts2.xwork2.config.entities.*; -import org.apache.struts2.xwork2.config.providers.InterceptorBuilder; -import org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer; -import org.apache.struts2.xwork2.conversion.impl.DefaultObjectTypeDeterminer; -import org.apache.struts2.xwork2.conversion.impl.XWorkBasicConverter; -import org.apache.struts2.xwork2.conversion.impl.XWorkConverter; -import org.apache.struts2.xwork2.inject.*; -import org.apache.struts2.xwork2.ognl.OgnlReflectionProvider; -import org.apache.struts2.xwork2.ognl.OgnlUtil; -import org.apache.struts2.xwork2.ognl.OgnlValueStackFactory; -import org.apache.struts2.xwork2.ognl.accessor.CompoundRootAccessor; -import org.apache.struts2.xwork2.util.CompoundRoot; -import org.apache.struts2.xwork2.util.PatternMatcher; -import org.apache.struts2.xwork2.util.ValueStack; -import org.apache.struts2.xwork2.util.ValueStackFactory; -import org.apache.struts2.xwork2.util.location.LocatableProperties; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; -import org.apache.struts2.xwork2.util.reflection.ReflectionProvider; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.DefaultTextProvider; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.TextProvider; +import com.opensymphony.xwork2.config.*; +import com.opensymphony.xwork2.config.entities.*; +import com.opensymphony.xwork2.config.providers.InterceptorBuilder; +import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; +import com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer; +import com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter; +import com.opensymphony.xwork2.conversion.impl.XWorkConverter; +import com.opensymphony.xwork2.inject.*; +import com.opensymphony.xwork2.ognl.OgnlReflectionProvider; +import com.opensymphony.xwork2.ognl.OgnlUtil; +import com.opensymphony.xwork2.ognl.OgnlValueStackFactory; +import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor; +import com.opensymphony.xwork2.util.CompoundRoot; +import com.opensymphony.xwork2.util.PatternMatcher; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.ValueStackFactory; +import com.opensymphony.xwork2.util.location.LocatableProperties; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.reflection.ReflectionProvider; import ognl.PropertyAccessor; import java.util.*; @@ -315,7 +315,7 @@ public class DefaultConfiguration implem * @param baseConfig the ActionConfig which holds only the configuration specific to itself, without the defaults * and inheritance * @return a full ActionConfig for runtime configuration with all of the inherited and default params - * @throws org.apache.struts2.xwork2.config.ConfigurationException + * @throws com.opensymphony.xwork2.config.ConfigurationException * */ private ActionConfig buildFullActionConfig(PackageConfig packageContext, ActionConfig baseConfig) throws ConfigurationException { Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableConstantFactory.java Fri Dec 2 11:24:48 2011 @@ -1,12 +1,12 @@ /** * */ -package org.apache.struts2.xwork2.config.impl; +package com.opensymphony.xwork2.config.impl; -import org.apache.struts2.xwork2.inject.Context; -import org.apache.struts2.xwork2.inject.Factory; -import org.apache.struts2.xwork2.util.location.Located; -import org.apache.struts2.xwork2.util.location.LocationUtils; +import com.opensymphony.xwork2.inject.Context; +import com.opensymphony.xwork2.inject.Factory; +import com.opensymphony.xwork2.util.location.Located; +import com.opensymphony.xwork2.util.location.LocationUtils; /** * Factory that remembers where a constant came from Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/LocatableFactory.java Fri Dec 2 11:24:48 2011 @@ -1,10 +1,10 @@ -package org.apache.struts2.xwork2.config.impl; +package com.opensymphony.xwork2.config.impl; -import org.apache.struts2.xwork2.inject.Context; -import org.apache.struts2.xwork2.inject.Factory; -import org.apache.struts2.xwork2.inject.Scope; -import org.apache.struts2.xwork2.util.location.Located; -import org.apache.struts2.xwork2.util.location.LocationUtils; +import com.opensymphony.xwork2.inject.Context; +import com.opensymphony.xwork2.inject.Factory; +import com.opensymphony.xwork2.inject.Scope; +import com.opensymphony.xwork2.util.location.Located; +import com.opensymphony.xwork2.util.location.LocationUtils; import java.util.LinkedHashMap; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/MockConfiguration.java Fri Dec 2 11:24:48 2011 @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.config.impl; +package com.opensymphony.xwork2.config.impl; -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.ContainerProvider; -import org.apache.struts2.xwork2.config.PackageProvider; -import org.apache.struts2.xwork2.config.RuntimeConfiguration; -import org.apache.struts2.xwork2.config.entities.PackageConfig; -import org.apache.struts2.xwork2.config.entities.UnknownHandlerConfig; -import org.apache.struts2.xwork2.config.providers.XWorkConfigurationProvider; -import org.apache.struts2.xwork2.inject.Container; -import org.apache.struts2.xwork2.inject.ContainerBuilder; -import org.apache.struts2.xwork2.inject.Scope; -import org.apache.struts2.xwork2.util.location.LocatableProperties; +import com.opensymphony.xwork2.config.Configuration; +import com.opensymphony.xwork2.config.ConfigurationException; +import com.opensymphony.xwork2.config.ConfigurationProvider; +import com.opensymphony.xwork2.config.ContainerProvider; +import com.opensymphony.xwork2.config.PackageProvider; +import com.opensymphony.xwork2.config.RuntimeConfiguration; +import com.opensymphony.xwork2.config.entities.PackageConfig; +import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; +import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider; +import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.inject.ContainerBuilder; +import com.opensymphony.xwork2.inject.Scope; +import com.opensymphony.xwork2.util.location.LocatableProperties; import java.util.HashMap; import java.util.HashSet; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatch.java Fri Dec 2 11:24:48 2011 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.config.impl; +package com.opensymphony.xwork2.config.impl; import java.util.Map; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/impl/NamespaceMatcher.java Fri Dec 2 11:24:48 2011 @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.config.impl; +package com.opensymphony.xwork2.config.impl; -import org.apache.struts2.xwork2.util.PatternMatcher; +import com.opensymphony.xwork2.util.PatternMatcher; import java.util.Map; import java.util.Set; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java Fri Dec 2 11:24:48 2011 @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.config.providers; +package com.opensymphony.xwork2.config.providers; -import org.apache.struts2.xwork2.ObjectFactory; -import org.apache.struts2.xwork2.config.ConfigurationException; -import org.apache.struts2.xwork2.config.entities.InterceptorConfig; -import org.apache.struts2.xwork2.config.entities.InterceptorLocator; -import org.apache.struts2.xwork2.config.entities.InterceptorMapping; -import org.apache.struts2.xwork2.config.entities.InterceptorStackConfig; -import org.apache.struts2.xwork2.interceptor.Interceptor; -import org.apache.struts2.xwork2.util.location.Location; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.config.ConfigurationException; +import com.opensymphony.xwork2.config.entities.InterceptorConfig; +import com.opensymphony.xwork2.config.entities.InterceptorLocator; +import com.opensymphony.xwork2.config.entities.InterceptorMapping; +import com.opensymphony.xwork2.config.entities.InterceptorStackConfig; +import com.opensymphony.xwork2.interceptor.Interceptor; +import com.opensymphony.xwork2.util.location.Location; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import java.util.ArrayList; import java.util.LinkedHashMap; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java Fri Dec 2 11:24:48 2011 @@ -1,51 +1,51 @@ -package org.apache.struts2.xwork2.config.providers; +package com.opensymphony.xwork2.config.providers; -import org.apache.struts2.xwork2.ActionProxyFactory; -import org.apache.struts2.xwork2.DefaultActionProxyFactory; -import org.apache.struts2.xwork2.DefaultTextProvider; -import org.apache.struts2.xwork2.DefaultUnknownHandlerManager; -import org.apache.struts2.xwork2.TextProvider; -import org.apache.struts2.xwork2.TextProviderSupport; -import org.apache.struts2.xwork2.UnknownHandlerManager; -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.conversion.NullHandler; -import org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer; -import org.apache.struts2.xwork2.conversion.impl.DefaultObjectTypeDeterminer; -import org.apache.struts2.xwork2.conversion.impl.InstantiatingNullHandler; -import org.apache.struts2.xwork2.conversion.impl.XWorkBasicConverter; -import org.apache.struts2.xwork2.conversion.impl.XWorkConverter; -import org.apache.struts2.xwork2.inject.ContainerBuilder; -import org.apache.struts2.xwork2.inject.Scope; -import org.apache.struts2.xwork2.ognl.ObjectProxy; -import org.apache.struts2.xwork2.ognl.OgnlReflectionContextFactory; -import org.apache.struts2.xwork2.ognl.OgnlReflectionProvider; -import org.apache.struts2.xwork2.ognl.OgnlUtil; -import org.apache.struts2.xwork2.ognl.OgnlValueStackFactory; -import org.apache.struts2.xwork2.ognl.accessor.CompoundRootAccessor; -import org.apache.struts2.xwork2.ognl.accessor.ObjectAccessor; -import org.apache.struts2.xwork2.ognl.accessor.ObjectProxyPropertyAccessor; -import org.apache.struts2.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor; -import org.apache.struts2.xwork2.ognl.accessor.XWorkEnumerationAccessor; -import org.apache.struts2.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor; -import org.apache.struts2.xwork2.ognl.accessor.XWorkListPropertyAccessor; -import org.apache.struts2.xwork2.ognl.accessor.XWorkMapPropertyAccessor; -import org.apache.struts2.xwork2.ognl.accessor.XWorkMethodAccessor; -import org.apache.struts2.xwork2.util.CompoundRoot; -import org.apache.struts2.xwork2.util.PatternMatcher; -import org.apache.struts2.xwork2.util.ValueStackFactory; -import org.apache.struts2.xwork2.util.WildcardHelper; -import org.apache.struts2.xwork2.util.location.LocatableProperties; -import org.apache.struts2.xwork2.util.reflection.ReflectionContextFactory; -import org.apache.struts2.xwork2.util.reflection.ReflectionProvider; -import org.apache.struts2.xwork2.validator.ActionValidatorManager; -import org.apache.struts2.xwork2.validator.AnnotationActionValidatorManager; -import org.apache.struts2.xwork2.validator.DefaultActionValidatorManager; -import org.apache.struts2.xwork2.validator.DefaultValidatorFactory; -import org.apache.struts2.xwork2.validator.DefaultValidatorFileParser; -import org.apache.struts2.xwork2.validator.ValidatorFactory; -import org.apache.struts2.xwork2.validator.ValidatorFileParser; +import com.opensymphony.xwork2.ActionProxyFactory; +import com.opensymphony.xwork2.DefaultActionProxyFactory; +import com.opensymphony.xwork2.DefaultTextProvider; +import com.opensymphony.xwork2.DefaultUnknownHandlerManager; +import com.opensymphony.xwork2.TextProvider; +import com.opensymphony.xwork2.TextProviderSupport; +import com.opensymphony.xwork2.UnknownHandlerManager; +import com.opensymphony.xwork2.config.Configuration; +import com.opensymphony.xwork2.config.ConfigurationException; +import com.opensymphony.xwork2.config.ConfigurationProvider; +import com.opensymphony.xwork2.conversion.NullHandler; +import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; +import com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer; +import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler; +import com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter; +import com.opensymphony.xwork2.conversion.impl.XWorkConverter; +import com.opensymphony.xwork2.inject.ContainerBuilder; +import com.opensymphony.xwork2.inject.Scope; +import com.opensymphony.xwork2.ognl.ObjectProxy; +import com.opensymphony.xwork2.ognl.OgnlReflectionContextFactory; +import com.opensymphony.xwork2.ognl.OgnlReflectionProvider; +import com.opensymphony.xwork2.ognl.OgnlUtil; +import com.opensymphony.xwork2.ognl.OgnlValueStackFactory; +import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor; +import com.opensymphony.xwork2.ognl.accessor.ObjectAccessor; +import com.opensymphony.xwork2.ognl.accessor.ObjectProxyPropertyAccessor; +import com.opensymphony.xwork2.ognl.accessor.XWorkCollectionPropertyAccessor; +import com.opensymphony.xwork2.ognl.accessor.XWorkEnumerationAccessor; +import com.opensymphony.xwork2.ognl.accessor.XWorkIteratorPropertyAccessor; +import com.opensymphony.xwork2.ognl.accessor.XWorkListPropertyAccessor; +import com.opensymphony.xwork2.ognl.accessor.XWorkMapPropertyAccessor; +import com.opensymphony.xwork2.ognl.accessor.XWorkMethodAccessor; +import com.opensymphony.xwork2.util.CompoundRoot; +import com.opensymphony.xwork2.util.PatternMatcher; +import com.opensymphony.xwork2.util.ValueStackFactory; +import com.opensymphony.xwork2.util.WildcardHelper; +import com.opensymphony.xwork2.util.location.LocatableProperties; +import com.opensymphony.xwork2.util.reflection.ReflectionContextFactory; +import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import com.opensymphony.xwork2.validator.ActionValidatorManager; +import com.opensymphony.xwork2.validator.AnnotationActionValidatorManager; +import com.opensymphony.xwork2.validator.DefaultActionValidatorManager; +import com.opensymphony.xwork2.validator.DefaultValidatorFactory; +import com.opensymphony.xwork2.validator.DefaultValidatorFileParser; +import com.opensymphony.xwork2.validator.ValidatorFactory; +import com.opensymphony.xwork2.validator.ValidatorFileParser; import ognl.MethodAccessor; import ognl.PropertyAccessor; @@ -77,7 +77,7 @@ public class XWorkConfigurationProvider public void register(ContainerBuilder builder, LocatableProperties props) throws ConfigurationException { - builder.factory(org.apache.struts2.xwork2.ObjectFactory.class) + builder.factory(com.opensymphony.xwork2.ObjectFactory.class) .factory(ActionProxyFactory.class, DefaultActionProxyFactory.class, Scope.SINGLETON) .factory(ObjectTypeDeterminer.class, DefaultObjectTypeDeterminer.class, Scope.SINGLETON) .factory(XWorkConverter.class, Scope.SINGLETON) Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java Fri Dec 2 11:24:48 2011 @@ -13,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.config.providers; +package com.opensymphony.xwork2.config.providers; -import org.apache.struts2.xwork2.Action; -import org.apache.struts2.xwork2.ObjectFactory; -import org.apache.struts2.xwork2.XWorkException; -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.ConfigurationUtil; -import org.apache.struts2.xwork2.config.entities.*; -import org.apache.struts2.xwork2.config.entities.UnknownHandlerConfig; -import org.apache.struts2.xwork2.config.impl.LocatableFactory; -import org.apache.struts2.xwork2.inject.Container; -import org.apache.struts2.xwork2.inject.ContainerBuilder; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.inject.Scope; -import org.apache.struts2.xwork2.util.*; -import org.apache.struts2.xwork2.util.location.LocatableProperties; -import org.apache.struts2.xwork2.util.location.Location; -import org.apache.struts2.xwork2.util.location.LocationUtils; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.XWorkException; +import com.opensymphony.xwork2.config.Configuration; +import com.opensymphony.xwork2.config.ConfigurationException; +import com.opensymphony.xwork2.config.ConfigurationProvider; +import com.opensymphony.xwork2.config.ConfigurationUtil; +import com.opensymphony.xwork2.config.entities.*; +import com.opensymphony.xwork2.config.entities.UnknownHandlerConfig; +import com.opensymphony.xwork2.config.impl.LocatableFactory; +import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.inject.ContainerBuilder; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.inject.Scope; +import com.opensymphony.xwork2.util.*; +import com.opensymphony.xwork2.util.location.LocatableProperties; +import com.opensymphony.xwork2.util.location.Location; +import com.opensymphony.xwork2.util.location.LocationUtils; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/XmlHelper.java Fri Dec 2 11:24:48 2011 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.config.providers; +package com.opensymphony.xwork2.config.providers; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/NullHandler.java Fri Dec 2 11:24:48 2011 @@ -28,7 +28,7 @@ //THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH //DAMAGE. //-------------------------------------------------------------------------- -package org.apache.struts2.xwork2.conversion; +package com.opensymphony.xwork2.conversion; import java.util.Map; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/ObjectTypeDeterminer.java Fri Dec 2 11:24:48 2011 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion; +package com.opensymphony.xwork2.conversion; /** * Determines what the key and and element class of a Map or Collection should be. For Maps, the elements are the Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java Fri Dec 2 11:24:48 2011 @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion; +package com.opensymphony.xwork2.conversion; -import org.apache.struts2.xwork2.XWorkException; +import com.opensymphony.xwork2.XWorkException; /** Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/TypeConverter.java Fri Dec 2 11:24:48 2011 @@ -28,7 +28,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.apache.struts2.xwork2.conversion; +package com.opensymphony.xwork2.conversion; import java.lang.reflect.Member; import java.util.Map; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/Conversion.java Fri Dec 2 11:24:48 2011 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.annotations; +package com.opensymphony.xwork2.conversion.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionRule.java Fri Dec 2 11:24:48 2011 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.annotations; +package com.opensymphony.xwork2.conversion.annotations; /** * ConversionRule Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/ConversionType.java Fri Dec 2 11:24:48 2011 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.annotations; +package com.opensymphony.xwork2.conversion.annotations; /** * ConversionType Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java Fri Dec 2 11:24:48 2011 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.annotations; +package com.opensymphony.xwork2.conversion.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -157,7 +157,7 @@ public @interface TypeConversion { * The ConversionRule can be a PROPERTY, KEY, KEY_PROPERTY, ELEMENT, COLLECTION (deprecated) or a MAP. * Note: Collection and Map vonversion rules can be determined via com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer. * - * @see org.apache.struts2.xwork2.conversion.impl.DefaultObjectTypeDeterminer + * @see com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer */ ConversionRule rule() default ConversionRule.PROPERTY; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultObjectTypeDeterminer.java Fri Dec 2 11:24:48 2011 @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.impl; +package com.opensymphony.xwork2.conversion.impl; -import org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.CreateIfNull; -import org.apache.struts2.xwork2.util.Element; -import org.apache.struts2.xwork2.util.Key; -import org.apache.struts2.xwork2.util.KeyProperty; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; -import org.apache.struts2.xwork2.util.reflection.ReflectionException; -import org.apache.struts2.xwork2.util.reflection.ReflectionProvider; +import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.CreateIfNull; +import com.opensymphony.xwork2.util.Element; +import com.opensymphony.xwork2.util.Key; +import com.opensymphony.xwork2.util.KeyProperty; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.reflection.ReflectionException; +import com.opensymphony.xwork2.util.reflection.ReflectionProvider; import java.beans.IntrospectionException; import java.lang.annotation.Annotation; @@ -81,7 +81,7 @@ public class DefaultObjectTypeDeterminer * * @param parentClass the Class which contains as a property the Map or Collection we are finding the key for. * @param property the property of the Map or Collection for the given parent class - * @see org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer#getKeyClass(Class, String) + * @see com.opensymphony.xwork2.conversion.ObjectTypeDeterminer#getKeyClass(Class, String) */ public Class getKeyClass(Class parentClass, String property) { Key annotation = getAnnotation(parentClass, property, Key.class); @@ -110,7 +110,7 @@ public class DefaultObjectTypeDeterminer * * @param parentClass the Class which contains as a property the Map or Collection we are finding the key for. * @param property the property of the Map or Collection for the given parent class - * @see org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer#getElementClass(Class, String, Object) + * @see com.opensymphony.xwork2.conversion.ObjectTypeDeterminer#getElementClass(Class, String, Object) */ public Class getElementClass(Class parentClass, String property, Object key) { Element annotation = getAnnotation(parentClass, property, Element.class); @@ -148,7 +148,7 @@ public class DefaultObjectTypeDeterminer * * @param parentClass the Class which contains as a property the Map or Collection we are finding the key for. * @param property the property of the Map or Collection for the given parent class - * @see org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer#getKeyProperty(Class, String) + * @see com.opensymphony.xwork2.conversion.ObjectTypeDeterminer#getKeyProperty(Class, String) */ public String getKeyProperty(Class parentClass, String property) { KeyProperty annotation = getAnnotation(parentClass, property, KeyProperty.class); Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DefaultTypeConverter.java Fri Dec 2 11:24:48 2011 @@ -28,10 +28,10 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH // DAMAGE. //-------------------------------------------------------------------------- -package org.apache.struts2.xwork2.conversion.impl; +package com.opensymphony.xwork2.conversion.impl; -import org.apache.struts2.xwork2.conversion.TypeConverter; -import org.apache.struts2.xwork2.ognl.XWorkTypeConverterWrapper; +import com.opensymphony.xwork2.conversion.TypeConverter; +import com.opensymphony.xwork2.ognl.XWorkTypeConverterWrapper; import java.lang.reflect.Array; import java.lang.reflect.Member; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/EnumTypeConverter.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/EnumTypeConverter.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/EnumTypeConverter.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/EnumTypeConverter.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.impl; +package com.opensymphony.xwork2.conversion.impl; import java.util.Map; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/GenericsObjectTypeDeterminer.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/GenericsObjectTypeDeterminer.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/GenericsObjectTypeDeterminer.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/GenericsObjectTypeDeterminer.java Fri Dec 2 11:24:48 2011 @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.impl; +package com.opensymphony.xwork2.conversion.impl; -import org.apache.struts2.xwork2.util.reflection.ReflectionProvider; +import com.opensymphony.xwork2.util.reflection.ReflectionProvider; /** Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/InstantiatingNullHandler.java Fri Dec 2 11:24:48 2011 @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.impl; +package com.opensymphony.xwork2.conversion.impl; -import org.apache.struts2.xwork2.ObjectFactory; -import org.apache.struts2.xwork2.conversion.NullHandler; -import org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; -import org.apache.struts2.xwork2.util.reflection.ReflectionContextState; -import org.apache.struts2.xwork2.util.reflection.ReflectionProvider; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.conversion.NullHandler; +import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.reflection.ReflectionContextState; +import com.opensymphony.xwork2.util.reflection.ReflectionProvider; import java.beans.PropertyDescriptor; import java.util.*; @@ -32,7 +32,7 @@ import java.util.*; * * * Provided that the key {@link ReflectionContextState#CREATE_NULL_OBJECTS} is in the action context with a value of true (this key is set - * only during the execution of the {@link org.apache.struts2.xwork2.interceptor.ParametersInterceptor}), OGNL expressions + * only during the execution of the {@link com.opensymphony.xwork2.interceptor.ParametersInterceptor}), OGNL expressions * that have caused a NullPointerException will be temporarily stopped for evaluation while the system automatically * tries to solve the null references by automatically creating the object. * Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java Fri Dec 2 11:24:48 2011 @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.impl; +package com.opensymphony.xwork2.conversion.impl; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ObjectFactory; -import org.apache.struts2.xwork2.XWorkException; -import org.apache.struts2.xwork2.conversion.ObjectTypeDeterminer; -import org.apache.struts2.xwork2.conversion.TypeConverter; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.XWorkList; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.XWorkException; +import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer; +import com.opensymphony.xwork2.conversion.TypeConverter; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.XWorkList; import java.lang.reflect.Array; import java.lang.reflect.Constructor; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java Fri Dec 2 11:24:48 2011 @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.impl; +package com.opensymphony.xwork2.conversion.impl; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ObjectFactory; -import org.apache.struts2.xwork2.XWorkMessages; -import org.apache.struts2.xwork2.XWorkException; -import org.apache.struts2.xwork2.conversion.TypeConverter; -import org.apache.struts2.xwork2.conversion.annotations.Conversion; -import org.apache.struts2.xwork2.conversion.annotations.ConversionRule; -import org.apache.struts2.xwork2.conversion.annotations.ConversionType; -import org.apache.struts2.xwork2.conversion.annotations.TypeConversion; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.ognl.XWorkTypeConverterWrapper; -import org.apache.struts2.xwork2.util.*; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; -import org.apache.struts2.xwork2.util.reflection.ReflectionContextState; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ObjectFactory; +import com.opensymphony.xwork2.XWorkMessages; +import com.opensymphony.xwork2.XWorkException; +import com.opensymphony.xwork2.conversion.TypeConverter; +import com.opensymphony.xwork2.conversion.annotations.Conversion; +import com.opensymphony.xwork2.conversion.annotations.ConversionRule; +import com.opensymphony.xwork2.conversion.annotations.ConversionType; +import com.opensymphony.xwork2.conversion.annotations.TypeConversion; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.ognl.XWorkTypeConverterWrapper; +import com.opensymphony.xwork2.util.*; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.reflection.ReflectionContextState; import java.io.IOException; import java.io.InputStream; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/metadata/ConversionDescription.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/metadata/ConversionDescription.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/metadata/ConversionDescription.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/metadata/ConversionDescription.java Fri Dec 2 11:24:48 2011 @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.conversion.metadata; +package com.opensymphony.xwork2.conversion.metadata; -import org.apache.struts2.xwork2.conversion.annotations.ConversionRule; -import org.apache.struts2.xwork2.conversion.impl.DefaultObjectTypeDeterminer; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.conversion.annotations.ConversionRule; +import com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import java.io.PrintWriter; import java.io.StringWriter; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ConstructionContext.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Container.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Container.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Container.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Container.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; import java.io.Serializable; import java.util.Set; @@ -84,7 +84,7 @@ public interface Container extends Seria /** * Gets an instance of the given dependency which was declared in - * {@link org.apache.struts2.xwork2.inject.ContainerBuilder}. + * {@link com.opensymphony.xwork2.inject.ContainerBuilder}. */ T getInstance(Class type, String name); Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerBuilder.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; import java.lang.reflect.Member; import java.util.*; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ContainerImpl.java Fri Dec 2 11:24:48 2011 @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; -import org.apache.struts2.xwork2.inject.util.ReferenceCache; +import com.opensymphony.xwork2.inject.util.ReferenceCache; import java.io.Serializable; import java.lang.annotation.Annotation; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Context.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Context.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Context.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Context.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; import java.lang.reflect.Member; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/DependencyException.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; /** * Thrown when a dependency is misconfigured. Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/ExternalContext.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; import java.lang.reflect.Member; import java.util.LinkedHashMap; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Factory.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Factory.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Factory.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Factory.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; /** * A custom factory. Creates objects which will be injected. Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Inject.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Inject.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Inject.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Inject.java Fri Dec 2 11:24:48 2011 @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; -import static org.apache.struts2.xwork2.inject.Container.DEFAULT_NAME; +import static com.opensymphony.xwork2.inject.Container.DEFAULT_NAME; import static java.lang.annotation.ElementType.*; import java.lang.annotation.Retention; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalContext.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; import java.util.HashMap; import java.util.Map; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/InternalFactory.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; import java.io.Serializable; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Key.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Key.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Key.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Key.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; /** * Dependency mapping key. Uniquely identified by the required type and name. Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scope.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scope.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scope.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scope.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; import java.util.concurrent.Callable; @@ -189,7 +189,7 @@ public enum Scope { * Pluggable scoping strategy. Enables users to provide custom * implementations of request, session, and wizard scopes. Implement and * pass to {@link - * Container#setScopeStrategy(org.apache.struts2.xwork2.inject.Scope.Strategy)}. + * Container#setScopeStrategy(com.opensymphony.xwork2.inject.Scope.Strategy)}. */ public interface Strategy { Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/Scoped.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/package-info.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/package-info.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/package-info.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/package-info.java Fri Dec 2 11:24:48 2011 @@ -27,4 +27,4 @@ *
  • externalize what needs to be and no more
    • * */ -package org.apache.struts2.xwork2.inject; +package com.opensymphony.xwork2.inject; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizablePhantomReference.java Fri Dec 2 11:24:48 2011 @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject.util; +package com.opensymphony.xwork2.inject.util; import java.lang.ref.PhantomReference; /** - * Phantom reference with a {@link org.apache.struts2.xwork2.inject.util.FinalizableReference#finalizeReferent() finalizeReferent()} method which a + * Phantom reference with a {@link com.opensymphony.xwork2.inject.util.FinalizableReference#finalizeReferent() finalizeReferent()} method which a * background thread invokes after the garbage collector reclaims the * referent. This is a simpler alternative to using a {@link * java.lang.ref.ReferenceQueue}. Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReference.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject.util; +package com.opensymphony.xwork2.inject.util; /** * Package-private interface implemented by references that have code to run Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableReferenceQueue.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject.util; +package com.opensymphony.xwork2.inject.util; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableSoftReference.java Fri Dec 2 11:24:48 2011 @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject.util; +package com.opensymphony.xwork2.inject.util; import java.lang.ref.SoftReference; /** - * Soft reference with a {@link org.apache.struts2.xwork2.inject.util.FinalizableReference#finalizeReferent() finalizeReferent()} method which a background + * Soft reference with a {@link com.opensymphony.xwork2.inject.util.FinalizableReference#finalizeReferent() finalizeReferent()} method which a background * thread invokes after the garbage collector reclaims the referent. This is a * simpler alternative to using a {@link java.lang.ref.ReferenceQueue}. * Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/FinalizableWeakReference.java Fri Dec 2 11:24:48 2011 @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject.util; +package com.opensymphony.xwork2.inject.util; import java.lang.ref.WeakReference; /** - * Weak reference with a {@link org.apache.struts2.xwork2.inject.util.FinalizableReference#finalizeReferent() finalizeReferent()} method which a background + * Weak reference with a {@link com.opensymphony.xwork2.inject.util.FinalizableReference#finalizeReferent() finalizeReferent()} method which a background * thread invokes after the garbage collector reclaims the referent. This is a * simpler alternative to using a {@link java.lang.ref.ReferenceQueue}. * Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Function.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject.util; +package com.opensymphony.xwork2.inject.util; /** * A Function provides a transformation on an object and returns the resulting Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceCache.java Fri Dec 2 11:24:48 2011 @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject.util; +package com.opensymphony.xwork2.inject.util; -import static org.apache.struts2.xwork2.inject.util.ReferenceType.STRONG; +import static com.opensymphony.xwork2.inject.util.ReferenceType.STRONG; import java.io.IOException; import java.io.ObjectInputStream; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceMap.java Fri Dec 2 11:24:48 2011 @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject.util; +package com.opensymphony.xwork2.inject.util; -import static org.apache.struts2.xwork2.inject.util.ReferenceType.STRONG; +import static com.opensymphony.xwork2.inject.util.ReferenceType.STRONG; import java.io.IOException; import java.io.ObjectInputStream; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/ReferenceType.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject.util; +package com.opensymphony.xwork2.inject.util; /** * Reference type. Used to specify what type of reference to keep to a Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/inject/util/Strings.java Fri Dec 2 11:24:48 2011 @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.inject.util; +package com.opensymphony.xwork2.inject.util; /** * String utilities. Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ChainingInterceptor.java Fri Dec 2 11:24:48 2011 @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.interceptor; +package com.opensymphony.xwork2.interceptor; -import org.apache.struts2.xwork2.ActionChainResult; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.Result; -import org.apache.struts2.xwork2.Unchainable; -import org.apache.struts2.xwork2.inject.Inject; -import org.apache.struts2.xwork2.util.CompoundRoot; -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.util.reflection.ReflectionProvider; +import com.opensymphony.xwork2.ActionChainResult; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.Result; +import com.opensymphony.xwork2.Unchainable; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.CompoundRoot; +import com.opensymphony.xwork2.util.ValueStack; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.util.reflection.ReflectionProvider; import java.util.*; @@ -96,7 +96,7 @@ import java.util.*; * * @author mrdon * @author tm_jee ( tm_jee(at)yahoo.co.uk ) - * @see org.apache.struts2.xwork2.ActionChainResult + * @see com.opensymphony.xwork2.ActionChainResult */ public class ChainingInterceptor extends AbstractInterceptor { Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ConversionErrorInterceptor.java Fri Dec 2 11:24:48 2011 @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.interceptor; +package com.opensymphony.xwork2.interceptor; -import org.apache.struts2.xwork2.ActionContext; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.ValidationAware; -import org.apache.struts2.xwork2.conversion.impl.XWorkConverter; -import org.apache.struts2.xwork2.util.ValueStack; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ValidationAware; +import com.opensymphony.xwork2.conversion.impl.XWorkConverter; +import com.opensymphony.xwork2.util.ValueStack; import org.apache.commons.lang.StringEscapeUtils; import java.util.HashMap; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java Fri Dec 2 11:24:48 2011 @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.interceptor; +package com.opensymphony.xwork2.interceptor; -import org.apache.struts2.xwork2.Action; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.ValidationAware; -import org.apache.struts2.xwork2.interceptor.annotations.InputConfig; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.ValidationAware; +import com.opensymphony.xwork2.interceptor.annotations.InputConfig; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import java.lang.reflect.Method; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionHolder.java Fri Dec 2 11:24:48 2011 @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.interceptor; +package com.opensymphony.xwork2.interceptor; import java.io.IOException; import java.io.PrintWriter; Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ExceptionMappingInterceptor.java Fri Dec 2 11:24:48 2011 @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.struts2.xwork2.interceptor; +package com.opensymphony.xwork2.interceptor; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.config.entities.ExceptionMappingConfig; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.config.entities.ExceptionMappingConfig; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import java.util.List; @@ -64,7 +64,7 @@ import java.util.List; * * * If you want to add custom handling for publishing the Exception, you may override - * {@link #publishException(org.apache.struts2.xwork2.ActionInvocation, ExceptionHolder)}. The default implementation + * {@link #publishException(com.opensymphony.xwork2.ActionInvocation, ExceptionHolder)}. The default implementation * pushes the given ExceptionHolder on value stack. A custom implementation could add additional logging etc. * * Modified: struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java?rev=1209415&r1=1209414&r2=1209415&view=diff ============================================================================== --- struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java (original) +++ struts/struts2/branches/STRUTS_3_X/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java Fri Dec 2 11:24:48 2011 @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.apache.struts2.xwork2.interceptor; +package com.opensymphony.xwork2.interceptor; -import org.apache.struts2.xwork2.ActionInvocation; -import org.apache.struts2.xwork2.util.LocalizedTextUtil; -import org.apache.struts2.xwork2.util.logging.Logger; -import org.apache.struts2.xwork2.util.logging.LoggerFactory; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.util.LocalizedTextUtil; +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import java.util.Locale; import java.util.Map;