Author: martinc
Date: Thu Aug 4 20:21:15 2005
New Revision: 230388
URL: http://svn.apache.org/viewcvs?rev=230388&view=rev
Log:
Clean up imports.
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/ProcessTags.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/ProcessTagsTask.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/XDocletParser.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/mapper/ServletActionMapper.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/BaseResult.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerAction.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerContext.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ProcessorException.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/RequestProcessor.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/SpringActionProxyFactory.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/SpringObjectFactory.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainRequestProcessor.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java
struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java
struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java
struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/config/ProcessTags.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/config/ProcessTags.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/config/ProcessTags.java
(original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/config/ProcessTags.java Thu
Aug 4 20:21:15 2005
@@ -17,11 +17,16 @@
*/
package org.apache.ti.config;
-import org.apache.commons.logging.*;
-import java.util.*;
-import java.io.*;
-import xjavadoc.*;
-import xjavadoc.filesystem.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Crawls a directory, processing all found Java source files.
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/ProcessTagsTask.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/config/ProcessTagsTask.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/config/ProcessTagsTask.java
(original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/config/ProcessTagsTask.java
Thu Aug 4 20:21:15 2005
@@ -17,10 +17,11 @@
*/
package org.apache.ti.config;
-import org.apache.commons.logging.*;
-import org.apache.tools.ant.*;
-import java.util.*;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Ant task that wraps ProcessTags
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/XDocletParser.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/config/XDocletParser.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/config/XDocletParser.java
(original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/config/XDocletParser.java
Thu Aug 4 20:21:15 2005
@@ -17,14 +17,22 @@
*/
package org.apache.ti.config;
-import org.apache.velocity.*;
-import org.apache.velocity.app.*;
-import org.apache.velocity.exception.*;
-import org.apache.commons.logging.*;
-import java.util.*;
-import java.io.*;
-import xjavadoc.*;
-import xjavadoc.filesystem.*;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.exception.ResourceNotFoundException;
+
+import xjavadoc.XClass;
+import xjavadoc.XJavaDoc;
+import xjavadoc.filesystem.ReaderFile;
/**
* Processes xdoclet-style tags and uses a velocity template to generate
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/mapper/ServletActionMapper.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/config/mapper/ServletActionMapper.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/mapper/ServletActionMapper.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/mapper/ServletActionMapper.java
Thu Aug 4 20:21:15 2005
@@ -1,12 +1,15 @@
package org.apache.ti.config.mapper;
-import java.util.*;
-import javax.servlet.http.*;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.commons.chain.web.WebContext;
import org.apache.commons.chain.web.servlet.ServletWebContext;
-import org.apache.ti.servlet.*;
-
-import org.apache.commons.logging.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ti.servlet.StrutsTiServlet;
/**
* Handles creation of ActionMapping and reconstruction of URI's from one.
Uses
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/BaseResult.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/BaseResult.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/BaseResult.java
(original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/BaseResult.java
Thu Aug 4 20:21:15 2005
@@ -4,7 +4,8 @@
*/
package org.apache.ti.processor;
-import com.opensymphony.xwork.*;
+import com.opensymphony.xwork.ActionInvocation;
+import com.opensymphony.xwork.Result;
/**
* Wraps a controller
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerAction.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerAction.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerAction.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerAction.java
Thu Aug 4 20:21:15 2005
@@ -4,8 +4,7 @@
*/
package org.apache.ti.processor;
-import com.opensymphony.xwork.*;
-import com.opensymphony.xwork.config.entities.*;
+import com.opensymphony.xwork.Action;
/**
* Wraps a controller
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java
Thu Aug 4 20:21:15 2005
@@ -4,24 +4,20 @@
*/
package org.apache.ti.processor;
-import com.opensymphony.xwork.config.entities.ActionConfig;
-import com.opensymphony.xwork.config.entities.ResultConfig;
-import com.opensymphony.xwork.interceptor.Interceptor;
-import com.opensymphony.xwork.interceptor.PreResultListener;
-import com.opensymphony.xwork.util.OgnlValueStack;
-import com.opensymphony.xwork.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
-import org.springframework.beans.factory.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.BeanFactory;
+
+import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork.ActionProxy;
+import com.opensymphony.xwork.DefaultActionInvocation;
+import com.opensymphony.xwork.config.entities.ActionConfig;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerContext.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerContext.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerContext.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerContext.java
Thu Aug 4 20:21:15 2005
@@ -18,9 +18,10 @@
package org.apache.ti.processor;
-import org.apache.commons.chain.web.*;
-import com.opensymphony.xwork.*;
-import org.apache.ti.config.mapper.*;
+import org.apache.commons.chain.web.WebContext;
+import org.apache.ti.config.mapper.ActionMapping;
+
+import com.opensymphony.xwork.ActionContext;
/**
* Context that adds Controller methods, using ActionContext for storage.
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ProcessorException.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ProcessorException.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ProcessorException.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ProcessorException.java
Thu Aug 4 20:21:15 2005
@@ -18,7 +18,6 @@
package org.apache.ti.processor;
-import org.apache.commons.chain.web.*;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/RequestProcessor.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/RequestProcessor.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/RequestProcessor.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/RequestProcessor.java
Thu Aug 4 20:21:15 2005
@@ -18,8 +18,9 @@
package org.apache.ti.processor;
-import org.apache.commons.chain.web.*;
import java.util.Map;
+
+import org.apache.commons.chain.web.WebContext;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/SpringActionProxyFactory.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/SpringActionProxyFactory.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/SpringActionProxyFactory.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/SpringActionProxyFactory.java
Thu Aug 4 20:21:15 2005
@@ -4,11 +4,14 @@
*/
package org.apache.ti.processor;
-import com.opensymphony.xwork.*;
-import com.opensymphony.xwork.config.entities.ActionConfig;
-import org.springframework.beans.factory.*;
-
import java.util.Map;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+
+import com.opensymphony.xwork.ActionInvocation;
+import com.opensymphony.xwork.ActionProxy;
+import com.opensymphony.xwork.DefaultActionProxyFactory;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/SpringObjectFactory.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/SpringObjectFactory.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/SpringObjectFactory.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/SpringObjectFactory.java
Thu Aug 4 20:21:15 2005
@@ -4,11 +4,12 @@
*/
package org.apache.ti.processor;
-import com.opensymphony.xwork.config.entities.ActionConfig;
-import com.opensymphony.xwork.ObjectFactory;
-import com.opensymphony.xwork.Action;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.*;
+import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork.ObjectFactory;
+import com.opensymphony.xwork.config.entities.ActionConfig;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainRequestProcessor.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainRequestProcessor.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainRequestProcessor.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ChainRequestProcessor.java
Thu Aug 4 20:21:15 2005
@@ -18,19 +18,24 @@
package org.apache.ti.processor.chain;
-import org.apache.commons.chain.*;
-import org.apache.commons.chain.web.*;
-import org.apache.commons.chain.config.*;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+
+import org.apache.commons.chain.Catalog;
+import org.apache.commons.chain.CatalogFactory;
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.config.ConfigParser;
+import org.apache.commons.chain.web.WebContext;
+import org.apache.commons.digester.RuleSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.digester.*;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import java.util.*;
-import java.net.*;
-import java.io.*;
-import org.apache.ti.processor.*;
-import org.apache.ti.util.*;
+import org.apache.ti.processor.ProcessorException;
+import org.apache.ti.processor.RequestProcessor;
+import org.apache.ti.util.SourceResolver;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionMapping.java
Thu Aug 4 20:21:15 2005
@@ -18,10 +18,11 @@
package org.apache.ti.processor.chain;
-import org.apache.commons.chain.web.*;
-import org.apache.commons.chain.*;
-import org.apache.ti.config.mapper.*;
-import com.opensymphony.xwork.*;
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+import org.apache.commons.chain.web.WebContext;
+import org.apache.ti.config.mapper.ActionMapper;
+import org.apache.ti.config.mapper.ActionMapping;
/**
* Creates an ActionMapping and stores it in the context.
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/CreateActionProxy.java
Thu Aug 4 20:21:15 2005
@@ -18,16 +18,21 @@
package org.apache.ti.processor.chain;
-import org.apache.commons.chain.web.*;
-import org.apache.commons.chain.*;
-import org.apache.commons.logging.*;
-import org.apache.ti.config.mapper.*;
-import org.apache.ti.config.*;
-import org.apache.ti.processor.*;
-import com.opensymphony.xwork.*;
-import com.opensymphony.xwork.config.*;
+import java.util.HashMap;
+import java.util.Map;
-import java.util.*;
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+import org.apache.commons.chain.web.WebContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ti.config.mapper.ActionMapping;
+import org.apache.ti.processor.ProcessorException;
+
+import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork.ActionProxy;
+import com.opensymphony.xwork.ActionProxyFactory;
+import com.opensymphony.xwork.config.ConfigurationException;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ExecuteAction.java
Thu Aug 4 20:21:15 2005
@@ -18,10 +18,11 @@
package org.apache.ti.processor.chain;
-import org.apache.commons.chain.web.*;
-import org.apache.commons.chain.*;
-import org.apache.ti.config.mapper.*;
-import com.opensymphony.xwork.*;
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+
+import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork.ActionProxy;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitControllerContext.java
Thu Aug 4 20:21:15 2005
@@ -18,12 +18,11 @@
package org.apache.ti.processor.chain;
-import org.apache.commons.chain.web.*;
-import org.apache.commons.chain.*;
-import org.apache.commons.logging.*;
-import org.apache.ti.config.mapper.*;
-import org.apache.ti.processor.*;
-import com.opensymphony.xwork.*;
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ti.processor.ControllerContext;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/InitXWork.java
Thu Aug 4 20:21:15 2005
@@ -18,10 +18,12 @@
package org.apache.ti.processor.chain;
-import org.apache.commons.chain.web.*;
-import org.apache.commons.chain.*;
-import org.apache.ti.config.mapper.*;
-import com.opensymphony.xwork.*;
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
+import org.apache.commons.chain.web.WebContext;
+
+import com.opensymphony.xwork.ActionProxyFactory;
+import com.opensymphony.xwork.ObjectFactory;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/ProcessActionChain.java
Thu Aug 4 20:21:15 2005
@@ -18,11 +18,11 @@
package org.apache.ti.processor.chain;
-import org.apache.commons.chain.web.*;
-import org.apache.commons.chain.*;
-import org.apache.commons.chain.impl.*;
-import org.apache.ti.config.mapper.*;
-import com.opensymphony.xwork.*;
+import org.apache.commons.chain.Context;
+import org.apache.commons.chain.impl.ChainBase;
+
+import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork.ActionProxy;
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/chain/SpringConfigRuleSet.java
Thu Aug 4 20:21:15 2005
@@ -16,11 +16,15 @@
package org.apache.ti.processor.chain;
-import org.apache.commons.digester.*;
-import org.apache.commons.chain.config.*;
-import org.springframework.beans.factory.*;
+import java.util.List;
+
+import org.apache.commons.chain.config.ConfigRuleSet;
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.ObjectCreateRule;
+import org.apache.commons.digester.Rule;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
import org.xml.sax.Attributes;
-import java.util.*;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/ServletDispatcherResult.java
Thu Aug 4 20:21:15 2005
@@ -4,18 +4,17 @@
*/
package org.apache.ti.servlet;
-import com.opensymphony.xwork.*;
-import org.apache.ti.processor.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.chain.*;
-import org.apache.commons.chain.web.*;
-import org.apache.commons.chain.web.servlet.*;
+import org.apache.commons.chain.web.servlet.ServletWebContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ti.processor.BaseResult;
+import org.apache.ti.processor.ControllerContext;
+
+import com.opensymphony.xwork.ActionInvocation;
/**
* Includes or forwards a view. There are three possible ways the result can
be executed: <ul>
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java
(original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/servlet/StrutsTiServlet.java
Thu Aug 4 20:21:15 2005
@@ -20,39 +20,28 @@
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.*;
import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.MissingResourceException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
-import org.apache.commons.chain.*;
-import org.apache.commons.chain.web.*;
-import org.apache.commons.chain.web.servlet.*;
-
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.chain.CatalogFactory;
-import org.apache.commons.chain.config.ConfigParser;
+import org.apache.commons.chain.web.servlet.ServletWebContext;
+import org.apache.commons.digester.Digester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import org.springframework.beans.factory.xml.*;
-import org.springframework.beans.factory.*;
-import org.springframework.core.io.*;
-
-import org.apache.commons.digester.*;
-
import org.apache.ti.processor.RequestProcessor;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.core.io.UrlResource;
+import org.xml.sax.SAXException;
/**
* <p><strong>StrutsTiServlet</strong> is the entry point into Struts Ti.</p>
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java
(original)
+++
struts/sandbox/trunk/ti/src/java/org/apache/ti/util/ServletSourceResolver.java
Thu Aug 4 20:21:15 2005
@@ -19,32 +19,18 @@
package org.apache.ti.util;
import java.io.IOException;
-import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.List;
import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.MissingResourceException;
-
-import org.apache.commons.chain.*;
-import org.apache.commons.chain.web.*;
-import org.apache.commons.chain.web.servlet.*;
+import java.util.List;
import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.chain.CatalogFactory;
-import org.apache.commons.chain.config.ConfigParser;
+import org.apache.commons.chain.web.WebContext;
+import org.apache.commons.chain.web.servlet.ServletWebContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
/**
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java
(original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/util/SourceResolver.java Thu
Aug 4 20:21:15 2005
@@ -18,9 +18,11 @@
package org.apache.ti.util;
-import java.net.*;
-import java.io.*;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.List;
+
import org.apache.commons.chain.web.WebContext;
Modified:
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java
(original)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestProcessTags.java
Thu Aug 4 20:21:15 2005
@@ -18,12 +18,15 @@
package org.apache.ti.config;
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.HashSet;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
-import java.io.*;
-import java.util.*;
/**
* Unit tests for the <code>org.apache.ti.config.ProcessTags</code> class.
Modified:
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java
(original)
+++
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/TestXDocletParser.java
Thu Aug 4 20:21:15 2005
@@ -18,15 +18,18 @@
package org.apache.ti.config;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import java.io.*;
-
-import org.jdom.*;
+import org.jdom.Document;
+import org.jdom.input.SAXBuilder;
import org.jdom.xpath.XPath;
-import org.jdom.input.*;
/**
* Unit tests for the <code>org.apache.ti.config.XDocletParser</code> class.
Modified:
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java
(original)
+++
struts/sandbox/trunk/ti/src/test/org/apache/ti/config/mapper/TestServletActionMapper.java
Thu Aug 4 20:21:15 2005
@@ -18,12 +18,12 @@
package org.apache.ti.config.mapper;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
-import java.io.*;
-import java.util.*;
/**
* Unit tests for the <code>org.apache.ti.config.ServletActionMapper</code>
class.
Modified:
struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java
(original)
+++ struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/Bean.java
Thu Aug 4 20:21:15 2005
@@ -18,7 +18,8 @@
package org.apache.ti.processor.chain;
-import org.apache.commons.chain.*;
+import org.apache.commons.chain.Command;
+import org.apache.commons.chain.Context;
public class Bean implements Command {
public boolean execute(Context ctx) {return true;}
Modified:
struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java?rev=230388&r1=230387&r2=230388&view=diff
==============================================================================
---
struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java
(original)
+++
struts/sandbox/trunk/ti/src/test/org/apache/ti/processor/chain/TestSpringConfigRuleSet.java
Thu Aug 4 20:21:15 2005
@@ -22,14 +22,11 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import java.io.*;
-import java.util.*;
-
-import org.apache.commons.chain.config.*;
-import org.apache.commons.chain.*;
-import org.apache.commons.chain.impl.*;
-import org.springframework.beans.factory.*;
-import org.springframework.beans.factory.support.*;
+import org.apache.commons.chain.Catalog;
+import org.apache.commons.chain.CatalogFactory;
+import org.apache.commons.chain.config.ConfigParser;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
/**
* Unit tests for the <code>org.apache.ti.config.SpringConfigRuleSet</code>
class.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
