typo in XSL + organize imports

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches@630783 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 40042cde15ee5288d6d9bba34da2a20d842ede3b..5aa8188f3ab152517cbb489c66de5cc4f4e43eed 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
@@ -39,7 +39,6 @@ import org.springframework.beans.factory.BeanFactoryAware;
 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.RuntimeBeanReference;\r
 import org.springframework.util.ReflectionUtils;\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 808b30f390fe405e4d7dc01b03538bf9e318797a..03081a05f852b29b87ae9e716d605f8830fbe431 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
@@ -38,7 +38,7 @@ import org.w3c.dom.Element;
 /**\r
  * A spring namespace handler to support plexus components creation and direct field-injection in a spring\r
  * XmlApplicationContext.\r
- * \r
+ *\r
  * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>\r
  * @since 1.1\r
  */\r
@@ -77,6 +77,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
 \r
             Map dependencies = new HashMap();\r
 \r

diff --git a/springy/plexus-spring/src/main/resources/org/codehaus/plexus/spring/PlexusBeanDefinitionDocumentReader.xsl b/springy/plexus-spring/src/main/resources/org/codehaus/plexus/spring/PlexusBeanDefinitionDocumentReader.xsl
index 3eb1b61ab080749e7aafa9aef233334762f41305..d766a0f47b9b9233ba7e6487ac8de9854515e1e2 100644 (file)
--- a/springy/plexus-spring/src/main/resources/org/codehaus/plexus/spring/PlexusBeanDefinitionDocumentReader.xsl
+++ b/springy/plexus-spring/src/main/resources/org/codehaus/plexus/spring/PlexusBeanDefinitionDocumentReader.xsl
@@ -24,9 +24,9 @@
 \r
 <xsl:output method="xml"/>\r
 \r
-<!-- \r
+<!--\r
   Convert a plexus descriptor to a spring XML context with help of the custom <plexus: namespace\r
-  to handle IoC containers incompatibilities. \r
+  to handle IoC containers incompatibilities.\r
  -->\r
 \r
 <xsl:template match="/component-set">\r
@@ -49,9 +49,9 @@
       <xsl:attribute name="implementation">\r
         <xsl:value-of select="implementation" />\r
       </xsl:attribute>\r
-      <xsl:if test="instanciation-strategy">\r
-        <xsl:attribute name="instanciation-strategy">\r
-          <xsl:value-of select="instanciation-strategy" />\r
+      <xsl:if test="instantiation-strategy">\r
+        <xsl:attribute name="instantiation-strategy">\r
+          <xsl:value-of select="instantiation-strategy" />\r
         </xsl:attribute>\r
       </xsl:if>\r
       <xsl:for-each select="requirements/requirement">\r

diff --git a/springy/plexus-spring/src/test/java/org/codehaus/plexus/spring/PlexusBeanImpl.java b/springy/plexus-spring/src/test/java/org/codehaus/plexus/spring/PlexusBeanImpl.java
index 46f4def788d936127daa866ce7b68d95ba212d43..c810542c5ae3c33722b39f056c8aae97506a75a9 100644 (file)
--- a/springy/plexus-spring/src/test/java/org/codehaus/plexus/spring/PlexusBeanImpl.java
+++ b/springy/plexus-spring/src/test/java/org/codehaus/plexus/spring/PlexusBeanImpl.java
@@ -1,11 +1,9 @@
 package org.codehaus.plexus.spring;\r
 \r
 import org.codehaus.plexus.logging.AbstractLogEnabled;\r
-import org.codehaus.plexus.logging.LogEnabled;\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.codehaus.plexus.personality.plexus.lifecycle.phase.LogEnablePhase;\r
 \r
 /*\r
  * Licensed to the Apache Software Foundation (ASF) under one\r
@@ -28,7 +26,7 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.LogEnablePhase;
 \r
 /**\r
  * A typical plexus component implementation\r
- * \r
+ *\r
  * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>\r
  */\r
 public class PlexusBeanImpl\r
@@ -36,7 +34,7 @@ public class PlexusBeanImpl
     implements PlexusBean, Initializable, Disposable\r
 {\r
     private String message;\r
-    \r
+\r
     private String state = "undefined";\r
 \r
     /**\r
@@ -52,9 +50,9 @@ public class PlexusBeanImpl
 \r
     public void dispose()\r
     {\r
-        state = DISPOSED;        \r
+        state = DISPOSED;\r
     }\r
-    \r
+\r
     /**\r
      * @see org.codehaus.plexus.spring.PlexusBean#toString()\r
      */\r