You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rd...@apache.org on 2009/05/17 18:00:10 UTC
svn commit: r775684 - in /james/server/trunk/spring-deployment: build.xml
src/main/config/james/spring-beans.xml
Author: rdonkin
Date: Sun May 17 16:00:10 2009
New Revision: 775684
URL: http://svn.apache.org/viewvc?rev=775684&view=rev
Log:
Phoenix runtime not needed (smoke tests run fine) JAMES-834 https://issues.apache.org/jira/browse/JAMES-834
Modified:
james/server/trunk/spring-deployment/build.xml
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Modified: james/server/trunk/spring-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/build.xml?rev=775684&r1=775683&r2=775684&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/build.xml (original)
+++ james/server/trunk/spring-deployment/build.xml Sun May 17 16:00:10 2009
@@ -157,29 +157,6 @@
</fileset>
</path>
- <path id="classpath.phoenix.runtime">
- <fileset dir="${basedir}/lib/phoenix-runtime">
- <include name="avalon-logkit-2.1.jar"/>
- <include name="concurrent-1.3.4.jar"/>
- <!-- TODO shouldn't cornerstone-store-impl.jar be available from stage dir? -->
- <include name="cornerstone-store-impl-2.1.jar"/>
- <include name="excalibur-cli-1.0.jar"/>
- <include name="excalibur-extension-1.0a.jar"/>
- <include name="excalibur-instrument-api-2.1.jar"/>
- <include name="excalibur-instrument-manager-1.0.jar"/>
- <include name="excalibur-io-1.1.jar"/>
- <include name="excalibur-logger-2.1.jar"/>
- <include name="excalibur-monitor-2.1.jar"/>
- <include name="phoenix-client.jar"/>
- <include name="phoenix-engine.jar"/>
- <include name="spice-classman-1.0.jar"/>
- <include name="spice-configkit-1.1.2.jar"/>
- <include name="spice-loggerstore-0.5.jar"/>
- <include name="spice-salt-0.8.jar"/>
- <include name="spice-xmlpolicy-1.0.jar"/>
- </fileset>
- </path>
-
<path id="classpath.spring">
<fileset dir="${basedir}/lib/spring">
<!-- TODO: remove from commons lists non-spring required libs -->
@@ -207,7 +184,6 @@
</path>
<path id="classpath.all.libs">
- <path refid="classpath.phoenix.runtime" />
<path refid="classpath.phoenix.implementations" />
<path refid="classpath.james.target" />
<path refid="classpath.spring" />
Modified: james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml?rev=775684&r1=775683&r2=775684&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml (original)
+++ james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml Sun May 17 16:00:10 2009
@@ -26,7 +26,7 @@
<!--
beans which replace Avalon specific container logic
-->
- <bean id="fileSystemOverride" class="org.apache.james.container.spring.adaptor.FileSystemBridge" />
+ <bean id="fileSystemOverride" class="org.apache.james.container.spring.adaptor.FileSystemBridge" />
<bean id="serviceManager" class="org.apache.james.container.spring.adaptor.DefaultServiceManagerFactory" >
<property name="replacements">
@@ -82,13 +82,13 @@
<property name="configurationInterceptors">
<list>
<ref bean="stringRemapperConfigurationInterceptor" />
- <!--<ref bean="privilegedPortsConfigurationInterceptor" />-->
+ <ref bean="privilegedPortsConfigurationInterceptor" />
</list>
- </property>
- </bean>
-
+ </property>
+ </bean>
+
<bean id="avalonContext" class="org.apache.james.container.spring.adaptor.AvalonContext" >
- <property name="applicationHome" value="data" />
+ <property name="applicationHome" value="data" />
<property name="applicationName" value="Apache JAMES Server" />
</bean>
@@ -161,4 +161,4 @@
<bean id="initializationManager" class="org.apache.james.container.spring.lifecycle.InitializationPropagator" />
-</beans>
\ No newline at end of file
+</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org