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 no...@apache.org on 2010/07/19 21:57:54 UTC
svn commit: r965609 - in /james/server/trunk: imapserver/pom.xml
imapserver/src/main/java/org/apache/james/mailboxmanager/torque/ pom.xml
spring-deployment/src/main/config/james/spring-beans.xml
Author: norman
Date: Mon Jul 19 19:57:53 2010
New Revision: 965609
URL: http://svn.apache.org/viewvc?rev=965609&view=rev
Log:
Remove torque implementation for imapserver (JAMES-1029)
Removed:
james/server/trunk/imapserver/src/main/java/org/apache/james/mailboxmanager/torque/
Modified:
james/server/trunk/imapserver/pom.xml
james/server/trunk/pom.xml
james/server/trunk/spring-deployment/src/main/config/james/spring-beans.xml
Modified: james/server/trunk/imapserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=965609&r1=965608&r2=965609&view=diff
==============================================================================
--- james/server/trunk/imapserver/pom.xml (original)
+++ james/server/trunk/imapserver/pom.xml Mon Jul 19 19:57:53 2010
@@ -62,10 +62,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-torque</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-store</artifactId>
</dependency>
<dependency>
@@ -96,11 +92,7 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.db.torque</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
-
+
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=965609&r1=965608&r2=965609&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Jul 19 19:57:53 2010
@@ -475,11 +475,6 @@
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-torque</artifactId>
- <version>${imap.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-jpa</artifactId>
<version>${imap.version}</version>
</dependency>
@@ -685,7 +680,6 @@
<artifactId>servlet-api</artifactId>
<version>2.4</version>
</dependency>
- <!-- used by torque -->
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
@@ -720,13 +714,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>village</groupId>
- <artifactId>village</artifactId>
- <version>2.0</version>
- </dependency>
-
-
+
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
@@ -809,30 +797,6 @@
<artifactId>xstream</artifactId>
<version>1.2.2</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.db.torque</groupId>
- <artifactId>runtime</artifactId>
- <version>3.3-RC2</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>village</groupId>
- <artifactId>village</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<!-- Used by Mime4J -->
<dependency>
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=965609&r1=965608&r2=965609&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 Mon Jul 19 19:57:53 2010
@@ -308,23 +308,6 @@
<bean id="authenticator" class="org.apache.james.imapserver.UserRepositoryAuthenticator"/>
- <!-- Torque implementation of IMAP Storage-->
- <!--
- <bean id="subscriper" class="org.apache.james.imapserver.UserMetaDataRepositorySubscripter"/>
-
- <bean id="userMetaDataRepository" class="org.apache.james.user.impl.file.FileUserMetaDataRepository">
- <property name="baseDirectory" value="file://var/users"/>
- </bean>
-
-
- <bean id="mailboxmanager" class="org.apache.james.mailboxmanager.torque.DefaultMailboxManager">
- <constructor-arg index="0" ref="authenticator"/>
- <constructor-arg index="1" ref="subscriper"/>
- <property name="torqueConfig" value="file://conf/torque.properties" />
- <property name="sqlFile" value="file://conf/mailboxManagerSqlResources.xml"/>
- </bean>
- -->
-
<!-- JPA implementation of IMAP Storage-->
<bean id="sessionMapperFactory" class="org.apache.james.imap.jpa.JPAMailboxSessionMapperFactory">
<constructor-arg index="0" ref="entityManagerFactory"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org