o fixed minor typo.

o  organised imports in PlexusComponentFactoryBean and PlexusNamespaceHandler.

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches@632495 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusComponentFactoryBean.java b/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusComponentFactoryBean.java
index b41b056a6df313b6eb97a0c341afb7aa4a55c188..f255dc1debcc4e41067a663773c5508b2e3d3625 100644 (file)
--- a/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusComponentFactoryBean.java
+++ b/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusComponentFactoryBean.java
@@ -22,33 +22,18 @@ package org.codehaus.plexus.spring;
 import java.lang.reflect.Field;\r
 import java.util.Collection;\r
 import java.util.Iterator;\r
-import java.util.LinkedList;\r
-import java.util.List;\r
 import java.util.Map;\r
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
-import org.codehaus.plexus.PlexusContainer;\r
-import org.codehaus.plexus.context.Context;\r
-import org.codehaus.plexus.context.ContextException;\r
-import org.codehaus.plexus.logging.LogEnabled;\r
-import org.codehaus.plexus.logging.LoggerManager;\r
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;\r
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable;\r
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;\r
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;\r
-import org.springframework.beans.BeansException;\r
 import org.springframework.beans.SimpleTypeConverter;\r
 import org.springframework.beans.TypeConverter;\r
 import org.springframework.beans.factory.BeanCreationException;\r
 import org.springframework.beans.factory.BeanFactory;\r
 import org.springframework.beans.factory.BeanFactoryAware;\r
 import org.springframework.beans.factory.BeanInitializationException;\r
-import org.springframework.beans.factory.DisposableBean;\r
 import org.springframework.beans.factory.FactoryBean;\r
-import org.springframework.beans.factory.InitializingBean;\r
 import org.springframework.beans.factory.ListableBeanFactory;\r
-import org.springframework.beans.factory.config.AbstractFactoryBean;\r
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;\r
 import org.springframework.beans.factory.config.RuntimeBeanReference;\r
 import org.springframework.util.ReflectionUtils;\r
@@ -278,19 +263,19 @@ public class PlexusComponentFactoryBean
     }\r
 \r
     /**\r
-     * @param instanciationStrategy the instanciationStrategy to set\r
+     * @param instantiationStrategy the instantiationStrategy to set\r
      */\r
-    public void setInstanciationStrategy( String instanciationStrategy )\r
+    public void setInstantiationStrategy( String instantiationStrategy )\r
     {\r
-        if ( instanciationStrategy.length() == 0 )\r
+        if ( instantiationStrategy.length() == 0 )\r
         {\r
-            instanciationStrategy = SINGLETON;\r
+            instantiationStrategy = SINGLETON;\r
         }\r
-        if ( "poolable".equals( instanciationStrategy ) )\r
+        if ( "poolable".equals( instantiationStrategy ) )\r
         {\r
-            throw new BeanCreationException( "Plexus poolable instanciation-strategy is not supported" );\r
+            throw new BeanCreationException( "Plexus poolable instantiation-strategy is not supported" );\r
         }\r
-        this.instantiationStrategy = instanciationStrategy;\r
+        this.instantiationStrategy = instantiationStrategy;\r
     }\r
 \r
     /**\r

diff --git a/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusNamespaceHandler.java b/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusNamespaceHandler.java
index 67251782194fce040c59acd4ef1d09b4fc29b2bd..e96a22e9d86aab0ffc51d3a131395c53cb3f828a 100644 (file)
--- a/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusNamespaceHandler.java
+++ b/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusNamespaceHandler.java
@@ -21,34 +21,20 @@ package org.codehaus.plexus.spring;
 \r
 import java.io.PrintWriter;\r
 import java.io.StringWriter;\r
-import java.io.Writer;\r
 import java.util.HashMap;\r
 import java.util.Iterator;\r
 import java.util.List;\r
 import java.util.Map;\r
 \r
-import javax.xml.transform.Transformer;\r
-import javax.xml.transform.TransformerConfigurationException;\r
-import javax.xml.transform.TransformerException;\r
-import javax.xml.transform.TransformerFactory;\r
-import javax.xml.transform.TransformerFactoryConfigurationError;\r
-import javax.xml.transform.dom.DOMSource;\r
-import javax.xml.transform.stream.StreamResult;\r
-\r
 import org.apache.commons.lang.StringUtils;\r
-import org.dom4j.io.DOMReader;\r
-import org.dom4j.io.SAXReader;\r
 import org.springframework.beans.factory.BeanDefinitionStoreException;\r
 import org.springframework.beans.factory.config.RuntimeBeanReference;\r
-import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;\r
-import org.springframework.beans.factory.parsing.Problem;\r
 import org.springframework.beans.factory.support.AbstractBeanDefinition;\r
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;\r
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;\r
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;\r
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;\r
 import org.springframework.beans.factory.xml.ParserContext;\r
-import org.springframework.context.ApplicationContextException;\r
 import org.springframework.util.xml.DomUtils;\r
 import org.w3c.dom.Element;\r
 import org.w3c.dom.NamedNodeMap;\r
@@ -100,7 +86,7 @@ public class PlexusNamespaceHandler
             builder.addPropertyValue( "role", element.getAttribute( "role" ) );\r
             String implementation = element.getAttribute( "implementation" );\r
             builder.addPropertyValue( "implementation", implementation );\r
-            builder.addPropertyValue( "instanciationStrategy", element.getAttribute( "instantiation-strategy" ) );\r
+            builder.addPropertyValue( "instantiationStrategy", element.getAttribute( "instantiation-strategy" ) );\r
 \r
             Map dependencies = new HashMap();\r
 \r