You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ri...@apache.org on 2008/03/01 00:26:51 UTC
svn commit: r632495 - in
/maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring:
PlexusComponentFactoryBean.java PlexusNamespaceHandler.java
Author: rinku
Date: Fri Feb 29 15:26:27 2008
New Revision: 632495
URL: http://svn.apache.org/viewvc?rev=632495&view=rev
Log:
o fixed minor typo.
o organised imports in PlexusComponentFactoryBean and PlexusNamespaceHandler.
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
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=632495&r1=632494&r2=632495&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 Fri Feb 29 15:26:27 2008
@@ -22,33 +22,18 @@
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.logging.LogEnabled;
-import org.codehaus.plexus.logging.LoggerManager;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-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.springframework.beans.BeansException;
import org.springframework.beans.SimpleTypeConverter;
import org.springframework.beans.TypeConverter;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
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.AbstractFactoryBean;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.util.ReflectionUtils;
@@ -278,19 +263,19 @@
}
/**
- * @param instanciationStrategy the instanciationStrategy to set
+ * @param instantiationStrategy the instantiationStrategy to set
*/
- public void setInstanciationStrategy( String instanciationStrategy )
+ public void setInstantiationStrategy( String instantiationStrategy )
{
- if ( instanciationStrategy.length() == 0 )
+ if ( instantiationStrategy.length() == 0 )
{
- instanciationStrategy = SINGLETON;
+ instantiationStrategy = SINGLETON;
}
- if ( "poolable".equals( instanciationStrategy ) )
+ if ( "poolable".equals( instantiationStrategy ) )
{
- throw new BeanCreationException( "Plexus poolable instanciation-strategy is not supported" );
+ throw new BeanCreationException( "Plexus poolable instantiation-strategy is not supported" );
}
- this.instantiationStrategy = instanciationStrategy;
+ this.instantiationStrategy = instantiationStrategy;
}
/**
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=632495&r1=632494&r2=632495&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 Fri Feb 29 15:26:27 2008
@@ -21,34 +21,20 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.io.Writer;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
import org.apache.commons.lang.StringUtils;
-import org.dom4j.io.DOMReader;
-import org.dom4j.io.SAXReader;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.RuntimeBeanReference;
-import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
-import org.springframework.beans.factory.parsing.Problem;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.ApplicationContextException;
import org.springframework.util.xml.DomUtils;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -100,7 +86,7 @@
builder.addPropertyValue( "role", element.getAttribute( "role" ) );
String implementation = element.getAttribute( "implementation" );
builder.addPropertyValue( "implementation", implementation );
- builder.addPropertyValue( "instanciationStrategy", element.getAttribute( "instantiation-strategy" ) );
+ builder.addPropertyValue( "instantiationStrategy", element.getAttribute( "instantiation-strategy" ) );
Map dependencies = new HashMap();
Re: svn commit: r632495 - in /maven/archiva/branches/springy/plexus-spring/src/main/java/org/codehaus/plexus/spring: PlexusComponentFactoryBean.java PlexusNamespaceHandler.java
Posted by nicolas de loof <ni...@apache.org>.
thanks, Brett allready reported this but I definitly have troubles with the
world "instantiation" ;-)
2008/3/1, rinku@apache.org <ri...@apache.org>:
>
> Author: rinku
> Date: Fri Feb 29 15:26:27 2008
> New Revision: 632495
>
> URL: http://svn.apache.org/viewvc?rev=632495&view=rev
> Log:
> o fixed minor typo.
> o organised imports in PlexusComponentFactoryBean and
> PlexusNamespaceHandler.
>
> 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
>
> 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=632495&r1=632494&r2=632495&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
> Fri Feb 29 15:26:27 2008
> @@ -22,33 +22,18 @@
> import java.lang.reflect.Field;
> import java.util.Collection;
> import java.util.Iterator;
> -import java.util.LinkedList;
> -import java.util.List;
> import java.util.Map;
>
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> -import org.codehaus.plexus.PlexusContainer;
> -import org.codehaus.plexus.context.Context;
> -import org.codehaus.plexus.context.ContextException;
> -import org.codehaus.plexus.logging.LogEnabled;
> -import org.codehaus.plexus.logging.LoggerManager;
> -import
> org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
> -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.springframework.beans.BeansException;
> import org.springframework.beans.SimpleTypeConverter;
> import org.springframework.beans.TypeConverter;
> import org.springframework.beans.factory.BeanCreationException;
> import org.springframework.beans.factory.BeanFactory;
> import org.springframework.beans.factory.BeanFactoryAware;
> 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.AbstractFactoryBean;
> import org.springframework.beans.factory.config.ConfigurableBeanFactory;
> import org.springframework.beans.factory.config.RuntimeBeanReference;
> import org.springframework.util.ReflectionUtils;
> @@ -278,19 +263,19 @@
> }
>
> /**
> - * @param instanciationStrategy the instanciationStrategy to set
> + * @param instantiationStrategy the instantiationStrategy to set
> */
> - public void setInstanciationStrategy( String instanciationStrategy )
> + public void setInstantiationStrategy( String instantiationStrategy )
> {
> - if ( instanciationStrategy.length() == 0 )
> + if ( instantiationStrategy.length() == 0 )
> {
> - instanciationStrategy = SINGLETON;
> + instantiationStrategy = SINGLETON;
> }
> - if ( "poolable".equals( instanciationStrategy ) )
> + if ( "poolable".equals( instantiationStrategy ) )
> {
> - throw new BeanCreationException( "Plexus poolable
> instanciation-strategy is not supported" );
> + throw new BeanCreationException( "Plexus poolable
> instantiation-strategy is not supported" );
> }
> - this.instantiationStrategy = instanciationStrategy;
> + this.instantiationStrategy = instantiationStrategy;
> }
>
> /**
>
> 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=632495&r1=632494&r2=632495&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
> Fri Feb 29 15:26:27 2008
> @@ -21,34 +21,20 @@
>
> import java.io.PrintWriter;
> import java.io.StringWriter;
> -import java.io.Writer;
> import java.util.HashMap;
> import java.util.Iterator;
> import java.util.List;
> import java.util.Map;
>
> -import javax.xml.transform.Transformer;
> -import javax.xml.transform.TransformerConfigurationException;
> -import javax.xml.transform.TransformerException;
> -import javax.xml.transform.TransformerFactory;
> -import javax.xml.transform.TransformerFactoryConfigurationError;
> -import javax.xml.transform.dom.DOMSource;
> -import javax.xml.transform.stream.StreamResult;
> -
> import org.apache.commons.lang.StringUtils;
> -import org.dom4j.io.DOMReader;
> -import org.dom4j.io.SAXReader;
> import org.springframework.beans.factory.BeanDefinitionStoreException;
> import org.springframework.beans.factory.config.RuntimeBeanReference;
> -import
> org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
> -import org.springframework.beans.factory.parsing.Problem;
> import org.springframework.beans.factory.support.AbstractBeanDefinition;
> import org.springframework.beans.factory.support.BeanDefinitionBuilder;
> import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
> import
> org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
> import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
> import org.springframework.beans.factory.xml.ParserContext;
> -import org.springframework.context.ApplicationContextException;
> import org.springframework.util.xml.DomUtils;
> import org.w3c.dom.Element;
> import org.w3c.dom.NamedNodeMap;
> @@ -100,7 +86,7 @@
> builder.addPropertyValue( "role", element.getAttribute( "role"
> ) );
> String implementation = element.getAttribute( "implementation"
> );
> builder.addPropertyValue( "implementation", implementation );
> - builder.addPropertyValue( "instanciationStrategy",
> element.getAttribute( "instantiation-strategy" ) );
> + builder.addPropertyValue( "instantiationStrategy",
> element.getAttribute( "instantiation-strategy" ) );
>
> Map dependencies = new HashMap();
>
>
>
>