Author: eric
Date: Wed Aug 17 13:13:58 2011
New Revision: 1158689
URL: http://svn.apache.org/viewvc?rev=1158689&view=rev
Log:
All spring files in META-INF/org/apache/james (MAILBOX-76)
Added:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/
- copied from r1158650,
james/mailbox/trunk/spring/src/main/resources/META-INF/james/
Removed:
james/mailbox/trunk/spring/src/main/resources/META-INF/james/
Modified:
james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jcr.xml
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
Modified:
james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java?rev=1158689&r1=1158688&r2=1158689&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
(original)
+++
james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
Wed Aug 17 13:13:58 2011
@@ -26,7 +26,7 @@ public class SpringMailbox {
private ApplicationContext applicationContext;
public SpringMailbox() {
- applicationContext = new
ClassPathXmlApplicationContext("META-INF/james/spring-mailbox.xml");
+ applicationContext = new
ClassPathXmlApplicationContext("META-INF/org/apache/james/spring-mailbox.xml");
}
public Object getBean(String beanName) {
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jcr.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jcr.xml?rev=1158689&r1=1158650&r2=1158689&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jcr.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jcr.xml
Wed Aug 17 13:13:58 2011
@@ -71,7 +71,7 @@
</bean>
<bean id="jcrUtils" class="org.apache.james.mailbox.jcr.JCRUtils"/>
<bean id="config"
class="org.apache.jackrabbit.core.config.RepositoryConfig"
factory-method="create">
- <constructor-arg index="0"
value="classpath:META-INF/james/jcr-repository.xml" type="java.io.InputStream"/>
+ <constructor-arg index="0"
value="classpath:META-INF/org/apache/james/jcr-repository.xml"
type="java.io.InputStream"/>
<constructor-arg index="1" value="var/store/jackrabbit" />
</bean>
<alias name="jvm-locker" alias="jcr-locker"/>
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml?rev=1158689&r1=1158650&r2=1158689&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
Wed Aug 17 13:13:58 2011
@@ -59,7 +59,7 @@
<bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders" value="true"/>
- <property name ="location"
value="classpath:META-INF/james/database.properties"/>
+ <property name ="location"
value="classpath:META-INF/org/apache/james/database.properties"/>
</bean>
<bean id="datasource" class="org.apache.commons.dbcp.BasicDataSource"
destroy-method="close">
<property name="driverClassName" value="${database.driverClassName}" />
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml?rev=1158689&r1=1158650&r2=1158689&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
Wed Aug 17 13:13:58 2011
@@ -31,15 +31,15 @@
Mailbox Managers
-->
- <import resource="classpath:META-INF/james/spring-mailbox-util.xml" />
- <import resource="classpath:META-INF/james/spring-mailbox-lucene.xml" />
- <import resource="classpath:META-INF/james/spring-mailbox-jpa.xml" />
+ <import
resource="classpath:META-INF/org/apache/james/spring-mailbox-util.xml" />
+ <import
resource="classpath:META-INF/org/apache/james/spring-mailbox-lucene.xml" />
+ <import
resource="classpath:META-INF/org/apache/james/spring-mailbox-jpa.xml" />
<!--
JCR temporary desactivated because jackrabbit still uses lucene 2
- <import resource="classpath:META-INF/james/spring-mailbox-jcr.xml" />
+ <import
resource="classpath:META-INF/org/apache/james/spring-mailbox-jcr.xml" />
-->
- <import resource="classpath:META-INF/james/spring-mailbox-maildir.xml" />
- <import resource="classpath:META-INF/james/spring-mailbox-memory.xml" />
+ <import
resource="classpath:META-INF/org/apache/james/spring-mailbox-maildir.xml" />
+ <import
resource="classpath:META-INF/org/apache/james/spring-mailbox-memory.xml" />
<!--
Mailbox Copier
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
