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 ie...@apache.org on 2013/03/05 14:32:37 UTC
svn commit: r1452790 - in /james/server/trunk: container/cli/
container/core/ container/filesystem-api/ container/lifecycle-api/
container/mailbox-adapter/ container/spring/
container/spring/src/main/resources/META-INF/org/apache/james/
container/util/...
Author: ieugen
Date: Tue Mar 5 13:32:37 2013
New Revision: 1452790
URL: http://svn.apache.org/r1452790
Log:
Fixed code break due to fixes for MAILBOX-188 and JAMES-1184
Modified:
james/server/trunk/container/cli/pom.xml
james/server/trunk/container/core/pom.xml
james/server/trunk/container/filesystem-api/pom.xml
james/server/trunk/container/lifecycle-api/pom.xml
james/server/trunk/container/mailbox-adapter/pom.xml
james/server/trunk/container/spring/pom.xml
james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
james/server/trunk/container/util/pom.xml
james/server/trunk/dns-service/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml
james/server/trunk/mailet/mailetcontainer-api/pom.xml
james/server/trunk/mailet/mailetcontainer-camel/pom.xml
james/server/trunk/mailet/mailets/pom.xml
james/server/trunk/protocols/fetchmail/pom.xml
Modified: james/server/trunk/container/cli/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container/cli/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/container/cli/pom.xml (original)
+++ james/server/trunk/container/cli/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/container/core/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container/core/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/container/core/pom.xml (original)
+++ james/server/trunk/container/core/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/container/filesystem-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container/filesystem-api/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/container/filesystem-api/pom.xml (original)
+++ james/server/trunk/container/filesystem-api/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>james-server-filesystem-api</artifactId>
Modified: james/server/trunk/container/lifecycle-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container/lifecycle-api/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/container/lifecycle-api/pom.xml (original)
+++ james/server/trunk/container/lifecycle-api/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/container/mailbox-adapter/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container/mailbox-adapter/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/container/mailbox-adapter/pom.xml (original)
+++ james/server/trunk/container/mailbox-adapter/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/container/spring/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container/spring/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/container/spring/pom.xml (original)
+++ james/server/trunk/container/spring/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml (original)
+++ james/server/trunk/container/spring/src/main/resources/META-INF/org/apache/james/spring-server.xml Tue Mar 5 13:32:37 2013
@@ -123,7 +123,7 @@
<bean id="locker" class="org.apache.james.mailbox.store.JVMMailboxPathLocker"/>
- <import resource="classpath:META-INF/org/apache/james/spring-mailbox.xml"/>
+ <import resource="classpath:META-INF/spring/spring-mailbox.xml"/>
<!-- Mailbox Copier -->
<bean id="mailboxcopier" class="org.apache.james.mailbox.copier.MailboxCopierImpl"/>
Modified: james/server/trunk/container/util/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container/util/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/container/util/pom.xml (original)
+++ james/server/trunk/container/util/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/dns-service/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dns-service/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/dns-service/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml (original)
+++ james/server/trunk/dns-service/dnsservice-dnsjava/src/main/resources/META-INF/spring/dns-osgi.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.2.xsd
http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
<!-- export the dnsserver as osgi service -->
<osgi:service ref="dnsservice">
Modified: james/server/trunk/mailet/mailetcontainer-api/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailet/mailetcontainer-api/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/mailet/mailetcontainer-api/pom.xml (original)
+++ james/server/trunk/mailet/mailetcontainer-api/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/mailet/mailetcontainer-camel/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailet/mailetcontainer-camel/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/mailet/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailet/mailetcontainer-camel/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/mailet/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailet/mailets/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/mailet/mailets/pom.xml (original)
+++ james/server/trunk/mailet/mailets/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/protocols/fetchmail/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols/fetchmail/pom.xml?rev=1452790&r1=1452789&r2=1452790&view=diff
==============================================================================
--- james/server/trunk/protocols/fetchmail/pom.xml (original)
+++ james/server/trunk/protocols/fetchmail/pom.xml Tue Mar 5 13:32:37 2013
@@ -25,7 +25,7 @@
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0.0-beta5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.apache.james</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org