archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nico...@apache.org
Subject svn commit: r630783 - in /maven/archiva/branches/springy/plexus-spring/src: main/java/org/codehaus/plexus/spring/ main/resources/org/codehaus/plexus/spring/ test/java/org/codehaus/plexus/spring/
Date Mon, 25 Feb 2008 09:44:33 GMT
Author: nicolas
Date: Mon Feb 25 01:44:30 2008
New Revision: 630783

URL: http://svn.apache.org/viewvc?rev=630783&view=rev
Log:
typo in XSL + organize imports

Modified:
    maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusComponentFactoryBean.java
    maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusNamespaceHandler.java
    maven/archiva/branches/springy/plexus-spring/src/main/resources/org/codehaus/plexus/spring/PlexusBeanDefinitionDocumentReader.xsl
    maven/archiva/branches/springy/plexus-spring/src/test/java/org/codehaus/plexus/spring/PlexusBeanImpl.java

Modified: maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusComponentFactoryBean.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusComponentFactoryBean.java?rev=630783&r1=630782&r2=630783&view=diff
==============================================================================
--- maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusComponentFactoryBean.java
(original)
+++ maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusComponentFactoryBean.java
Mon Feb 25 01:44:30 2008
@@ -39,7 +39,6 @@
 import org.springframework.beans.factory.BeanInitializationException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.util.ReflectionUtils;

Modified: maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusNamespaceHandler.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusNamespaceHandler.java?rev=630783&r1=630782&r2=630783&view=diff
==============================================================================
--- maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusNamespaceHandler.java
(original)
+++ maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring/PlexusNamespaceHandler.java
Mon Feb 25 01:44:30 2008
@@ -38,7 +38,7 @@
 /**
  * A spring namespace handler to support plexus components creation and direct field-injection
in a spring
  * XmlApplicationContext.
- * 
+ *
  * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
  * @since 1.1
  */
@@ -77,6 +77,7 @@
             builder.addPropertyValue( "role", element.getAttribute( "role" ) );
             String implementation = element.getAttribute( "implementation" );
             builder.addPropertyValue( "implementation", implementation );
+            builder.addPropertyValue( "instanciationStrategy", element.getAttribute( "instantiation-strategy"
) );
 
             Map dependencies = new HashMap();
 

Modified: maven/archiva/branches/springy/plexus-spring/src/main/resources/org/codehaus/plexus/spring/PlexusBeanDefinitionDocumentReader.xsl
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/plexus-spring/src/main/resources/org/codehaus/plexus/spring/PlexusBeanDefinitionDocumentReader.xsl?rev=630783&r1=630782&r2=630783&view=diff
==============================================================================
--- maven/archiva/branches/springy/plexus-spring/src/main/resources/org/codehaus/plexus/spring/PlexusBeanDefinitionDocumentReader.xsl
(original)
+++ maven/archiva/branches/springy/plexus-spring/src/main/resources/org/codehaus/plexus/spring/PlexusBeanDefinitionDocumentReader.xsl
Mon Feb 25 01:44:30 2008
@@ -24,9 +24,9 @@
 
 <xsl:output method="xml"/>
 
-<!-- 
+<!--
   Convert a plexus descriptor to a spring XML context with help of the custom <plexus:
namespace
-  to handle IoC containers incompatibilities. 
+  to handle IoC containers incompatibilities.
  -->
 
 <xsl:template match="/component-set">
@@ -49,9 +49,9 @@
       <xsl:attribute name="implementation">
         <xsl:value-of select="implementation" />
       </xsl:attribute>
-      <xsl:if test="instanciation-strategy">
-        <xsl:attribute name="instanciation-strategy">
-          <xsl:value-of select="instanciation-strategy" />
+      <xsl:if test="instantiation-strategy">
+        <xsl:attribute name="instantiation-strategy">
+          <xsl:value-of select="instantiation-strategy" />
         </xsl:attribute>
       </xsl:if>
       <xsl:for-each select="requirements/requirement">

Modified: maven/archiva/branches/springy/plexus-spring/src/test/java/org/codehaus/plexus/spring/PlexusBeanImpl.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/springy/plexus-spring/src/test/java/org/codehaus/plexus/spring/PlexusBeanImpl.java?rev=630783&r1=630782&r2=630783&view=diff
==============================================================================
--- maven/archiva/branches/springy/plexus-spring/src/test/java/org/codehaus/plexus/spring/PlexusBeanImpl.java
(original)
+++ maven/archiva/branches/springy/plexus-spring/src/test/java/org/codehaus/plexus/spring/PlexusBeanImpl.java
Mon Feb 25 01:44:30 2008
@@ -1,11 +1,9 @@
 package org.codehaus.plexus.spring;
 
 import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Disposable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.LogEnablePhase;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +26,7 @@
 
 /**
  * A typical plexus component implementation
- * 
+ *
  * @author <a href="mailto:nicolas@apache.org">Nicolas De Loof</a>
  */
 public class PlexusBeanImpl
@@ -36,7 +34,7 @@
     implements PlexusBean, Initializable, Disposable
 {
     private String message;
-    
+
     private String state = "undefined";
 
     /**
@@ -52,9 +50,9 @@
 
     public void dispose()
     {
-        state = DISPOSED;        
+        state = DISPOSED;
     }
-    
+
     /**
      * @see org.codehaus.plexus.spring.PlexusBean#toString()
      */



Mime
View raw message