Author: norman
Date: Sat Jan 2 13:59:29 2010
New Revision: 895194
URL: http://svn.apache.org/viewvc?rev=895194&view=rev
Log:
Remove not needed stuff
Added:
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/JSR250LoaderService.java
- copied, changed from r895059,
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/SpringLoaderService.java
Removed:
james/server/sandbox/active/pure_spring_deployment/avalon-spring-bridge-library/
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/SpringLoaderService.java
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/JamesApplicationContext.java
james/server/sandbox/active/pure_spring_deployment/stage/avalon-phoenix/
james/server/sandbox/active/pure_spring_deployment/stage/spice/
Modified:
james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml
james/server/sandbox/active/pure_spring_deployment/include.properties
james/server/sandbox/active/pure_spring_deployment/pom.xml
james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/config/james/spring-beans.xml
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonWebApplicationContext.java
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java
james/server/sandbox/active/pure_spring_deployment/stage/pom.xml
Modified:
james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml?rev=895194&r1=895193&r2=895194&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/build-tools/common-build.xml
Sat Jan 2 13:59:29 2010
@@ -237,7 +237,6 @@
<include name="${jcr.jar}"/>
<include name="${spring.jar}"/>
<include name="${log4j.jar}"/>
- <include name="${avalon-phoenix.jar}"/>
<include name="${jsr250.jar}"/>
<include name='${path.lib.james}/apache-james-imap*.jar'/>
<include name="${mina-core.jar}"/>
Modified: james/server/sandbox/active/pure_spring_deployment/include.properties
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/include.properties?rev=895194&r1=895193&r2=895194&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/include.properties
(original)
+++ james/server/sandbox/active/pure_spring_deployment/include.properties Sat
Jan 2 13:59:29 2010
@@ -102,7 +102,6 @@
path.lib.backport-util-concurrent=backport-util-concurrent/jars
# Spring bridge
path.lib.spring=org.springframework/jars
-path.lib.avalon-phoenix=avalon-phoenix/jars
path.lib.log4j=log4j/jars
path.lib.h2=com.h2database/jars
path.lib.lucene=org.apache.lucene/jars
@@ -110,17 +109,11 @@
path.lib.serp=net.sourceforge.serp/jars
path.lib.openjpa=org.apache.openjpa/jars
path.lib.mina=org.apache.mina/jars
-path.lib.guice=com.google.code.guice/jars
-path.lib.guiceyfruit=org.guiceyfruit/jars
-path.lib.springaopalliance=spring-aopalliance/jars
# ----- Spring -----
jarname.spring.jar=spring-2.5.6.jar
spring.jar=${path.lib.spring}/${jarname.spring.jar}
-jarname.avalon-phoenix.jar=avalon-phoenix-client-4.2-SNAPSHOT.jar
-avalon-phoenix.jar=${path.lib.avalon-phoenix}/${jarname.avalon-phoenix.jar}
-
jarname.log4j.jar=log4j-1.2.14.jar
log4j.jar=${path.lib.log4j}/${jarname.log4j.jar}
Modified: james/server/sandbox/active/pure_spring_deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/pom.xml?rev=895194&r1=895193&r2=895194&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/pom.xml Sat Jan 2
13:59:29 2010
@@ -45,7 +45,6 @@
<module>core-library</module>
<module>management-library</module>
<module>smtp-protocol-library</module>
- <module>avalon-spring-bridge-library</module>
<module>avalon-socket-library</module>
<module>core-function</module>
<module>imapserver-function</module>
@@ -400,11 +399,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-spring-bridge-library</artifactId>
- <version>3.0-M1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-avalon-socket-library</artifactId>
<version>3.0-M1</version>
</dependency>
@@ -1072,23 +1066,7 @@
<artifactId>jcr</artifactId>
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>avalon-phoenix</groupId>
- <artifactId>avalon-phoenix-client</artifactId>
- <version>4.2-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- phoenix runtime -->
- <dependency>
- <groupId>spice</groupId>
- <artifactId>spice-configkit</artifactId>
- <version>1.1.2</version>
- </dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
Modified:
james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml?rev=895194&r1=895193&r2=895194&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/spring-deployment/pom.xml
Sat Jan 2 13:59:29 2010
@@ -45,9 +45,17 @@
<artifactId>james-server-core-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-avalon-spring-bridge-library</artifactId>
- </dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
@@ -56,5 +64,9 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified:
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/config/james/spring-beans.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/config/james/spring-beans.xml?rev=895194&r1=895193&r2=895194&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/config/james/spring-beans.xml
(original)
+++
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/config/james/spring-beans.xml
Sat Jan 2 13:59:29 2010
@@ -180,8 +180,7 @@
class="org.apache.james.container.spring.lifecycle.SpringLogProvider" />
- <bean id="jsr250"
-
class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor">
+ <bean id="org.apache.james.LoaderService"
class="org.apache.james.container.spring.lifecycle.JSR250LoaderService">
<property name="order" value="3" />
</bean>
@@ -367,5 +366,4 @@
<bean id="thread-manager"
class="org.apache.avalon.cornerstone.blocks.threads.DefaultThreadManager" />
- <bean id="org.apache.james.LoaderService"
class="org.apache.james.container.spring.SpringLoaderService" />
</beans>
\ No newline at end of file
Modified:
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonWebApplicationContext.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonWebApplicationContext.java?rev=895194&r1=895193&r2=895194&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonWebApplicationContext.java
(original)
+++
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/beanfactory/AvalonWebApplicationContext.java
Sat Jan 2 13:59:29 2010
@@ -41,7 +41,7 @@
if (springBeanLocations.size() != 1) throw new RuntimeException("can
only load one Spring bean definition file");
Resource springBeanResource = getResourceByPath((String)
springBeanLocations.get(0));
Resource jamesAssemblyResource = (Resource)
jamesAssemblyResources.get(0);
-
AvalonApplicationContext.loadAvalonBasedBeanDefinitions(defaultListableBeanFactory,
springBeanResource, jamesAssemblyResource);
+
//AvalonApplicationContext.loadAvalonBasedBeanDefinitions(defaultListableBeanFactory,
springBeanResource, jamesAssemblyResource);
}
public void setConfigLocations(String[] locationStrings) {
Copied:
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/JSR250LoaderService.java
(from r895059,
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/SpringLoaderService.java)
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/JSR250LoaderService.java?p2=james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/JSR250LoaderService.java&p1=james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/SpringLoaderService.java&r1=895059&r2=895194&rev=895194&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/SpringLoaderService.java
(original)
+++
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/JSR250LoaderService.java
Sat Jan 2 13:59:29 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring;
+package org.apache.james.container.spring.lifecycle;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
@@ -30,6 +30,7 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
+import
org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
/**
* LoaderService which try to lookup instances of classes in the
ApplicationContext of Spring.
@@ -37,29 +38,15 @@
*
*
*/
-public class SpringLoaderService implements LoaderService,
ApplicationContextAware{
-
- private ConfigurableApplicationContext context;
-
- /*
- * (non-Javadoc)
- * @see
org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
- */
- public void setApplicationContext(ApplicationContext context)
- throws BeansException {
- if (context instanceof ConfigurableApplicationContext) {
- this.context = (ConfigurableApplicationContext)context;
- } else {
- throw new FatalBeanException("Application needs to be a
instance of ConfigurableApplicationContext");
- }
- }
+...@suppresswarnings("unused")
+public class JSR250LoaderService extends CommonAnnotationBeanPostProcessor
implements LoaderService {
/*
* (non-Javadoc)
* @see
org.apache.james.api.kernel.LoaderService#injectDependencies(java.lang.Object)
*/
public void injectDependencies(Object obj) {
- ((BeanPostProcessor)
context.getBean("jsr250")).postProcessAfterInitialization(obj,
obj.getClass().getName());
+ postProcessAfterInitialization(obj, obj.getClass().getName());
}
/*
Modified:
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java?rev=895194&r1=895193&r2=895194&view=diff
==============================================================================
---
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java
(original)
+++
james/server/sandbox/active/pure_spring_deployment/spring-deployment/src/main/java/org/apache/james/container/spring/lifecycle/SpringLogProvider.java
Sat Jan 2 13:59:29 2010
@@ -29,12 +29,13 @@
*/
public class SpringLogProvider implements LogProvider{
+ private final static String PREFIX = "james.";
/*
* (non-Javadoc)
* @see
org.apache.james.container.spring.LogProvider#getLogForComponent(java.lang.String)
*/
public Log getLogForComponent(String componentname) {
- return new Log4JLogger(componentname);
+ return new Log4JLogger(PREFIX + componentname);
}
}
Modified: james/server/sandbox/active/pure_spring_deployment/stage/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/pure_spring_deployment/stage/pom.xml?rev=895194&r1=895193&r2=895194&view=diff
==============================================================================
--- james/server/sandbox/active/pure_spring_deployment/stage/pom.xml (original)
+++ james/server/sandbox/active/pure_spring_deployment/stage/pom.xml Sat Jan 2
13:59:29 2010
@@ -324,16 +324,6 @@
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
- <dependency>
- <groupId>avalon-phoenix</groupId>
- <artifactId>avalon-phoenix-client</artifactId>
- </dependency>
-
- <!-- phoenix-runtime -->
- <dependency>
- <groupId>spice</groupId>
- <artifactId>spice-configkit</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
