Author: musachy Date: Wed Mar 18 18:00:45 2009 New Revision: 755679 URL: http://svn.apache.org/viewvc?rev=755679&view=rev Log: WW-3044 Replace code by similar code in commons lang
Modified: struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java Modified: struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=755679&r1=755678&r2=755679&view=diff ============================================================================== --- struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java (original) +++ struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java Wed Mar 18 18:00:45 2009 @@ -20,34 +20,6 @@ */ package org.apache.struts2.convention; -import java.io.IOException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Pattern; -import java.net.URL; - -import org.apache.struts2.convention.annotation.Action; -import org.apache.struts2.convention.annotation.Actions; -import org.apache.struts2.convention.annotation.AnnotationTools; -import org.apache.struts2.convention.annotation.DefaultInterceptorRef; -import org.apache.struts2.convention.annotation.ExceptionMapping; -import org.apache.struts2.convention.annotation.ExceptionMappings; -import org.apache.struts2.convention.annotation.Namespace; -import org.apache.struts2.convention.annotation.Namespaces; -import org.apache.struts2.convention.annotation.ParentPackage; -import org.apache.struts2.convention.classloader.ReloadingClassLoader; -import org.apache.struts2.StrutsConstants; -import org.apache.struts2.StrutsException; -import org.apache.commons.lang.xwork.StringUtils; - import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationException; @@ -56,16 +28,42 @@ import com.opensymphony.xwork2.config.entities.InterceptorMapping; import com.opensymphony.xwork2.config.entities.PackageConfig; import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.inject.Inject; import com.opensymphony.xwork2.inject.Container; +import com.opensymphony.xwork2.inject.Inject; +import com.opensymphony.xwork2.util.FileManager; +import com.opensymphony.xwork2.util.TextParseUtil; import com.opensymphony.xwork2.util.finder.ClassFinder; import com.opensymphony.xwork2.util.finder.Test; import com.opensymphony.xwork2.util.finder.UrlSet; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; -import com.opensymphony.xwork2.util.FileManager; -import com.opensymphony.xwork2.util.TextUtils; -import com.opensymphony.xwork2.util.TextParseUtil; +import org.apache.commons.lang.xwork.StringUtils; +import org.apache.struts2.StrutsConstants; +import org.apache.struts2.StrutsException; +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.Actions; +import org.apache.struts2.convention.annotation.AnnotationTools; +import org.apache.struts2.convention.annotation.DefaultInterceptorRef; +import org.apache.struts2.convention.annotation.ExceptionMapping; +import org.apache.struts2.convention.annotation.ExceptionMappings; +import org.apache.struts2.convention.annotation.Namespace; +import org.apache.struts2.convention.annotation.Namespaces; +import org.apache.struts2.convention.annotation.ParentPackage; +import org.apache.struts2.convention.classloader.ReloadingClassLoader; + +import java.io.IOException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; /** * <p>