Author: bago Date: Tue Jan 18 12:05:20 2011 New Revision: 1060343 URL: http://svn.apache.org/viewvc?rev=1060343&view=rev Log: modules consolidation (JAMES-1184)
Modified: james/server/trunk/container-spring/pom.xml james/server/trunk/file/ (props changed) james/server/trunk/file/pom.xml james/server/trunk/jcr/ (props changed) james/server/trunk/jcr/pom.xml james/server/trunk/jdbc/ (props changed) james/server/trunk/jdbc/pom.xml james/server/trunk/jpa/ (props changed) james/server/trunk/jpa/pom.xml james/server/trunk/pom.xml james/server/trunk/queue-jms/pom.xml Modified: james/server/trunk/container-spring/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1060343&r1=1060342&r2=1060343&view=diff ============================================================================== --- james/server/trunk/container-spring/pom.xml (original) +++ james/server/trunk/container-spring/pom.xml Tue Jan 18 12:05:20 2011 @@ -554,26 +554,6 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-user-file</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-user-jcr</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-user-jdbc</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-user-jpa</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> <artifactId>james-server-user-ldap</artifactId> <scope>runtime</scope> </dependency> @@ -584,16 +564,6 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-domainlist-xml</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-domainlist-jpa</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> <artifactId>james-server-smtpserver</artifactId> <scope>runtime</scope> </dependency> @@ -672,17 +642,17 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-mail-file</artifactId> + <artifactId>james-server-file</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-mail-jdbc</artifactId> + <artifactId>james-server-jdbc</artifactId> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-mail-jcr</artifactId> + <artifactId>james-server-jcr</artifactId> <scope>runtime</scope> </dependency> <dependency> Propchange: james/server/trunk/file/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jan 18 12:05:20 2011 @@ -1 +1,7 @@ target + +.project + +.classpath + +.settings Modified: james/server/trunk/file/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/file/pom.xml?rev=1060343&r1=1060342&r2=1060343&view=diff ============================================================================== --- james/server/trunk/file/pom.xml (original) +++ james/server/trunk/file/pom.xml Tue Jan 18 12:05:20 2011 @@ -25,8 +25,8 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.james</groupId> - <artifactId>james-server-user-file</artifactId> - <name>Apache James Server User File</name> + <artifactId>james-server-file</artifactId> + <name>Apache James Server File Data Persistence</name> <dependencies> <dependency> Propchange: james/server/trunk/jcr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jan 18 12:05:20 2011 @@ -1 +1,7 @@ target + +.settings + +.project + +.classpath Modified: james/server/trunk/jcr/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/jcr/pom.xml?rev=1060343&r1=1060342&r2=1060343&view=diff ============================================================================== --- james/server/trunk/jcr/pom.xml (original) +++ james/server/trunk/jcr/pom.xml Tue Jan 18 12:05:20 2011 @@ -25,8 +25,8 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.james</groupId> - <artifactId>james-server-user-jcr</artifactId> - <name>Apache James Server User JCR</name> + <artifactId>james-server-jcr</artifactId> + <name>Apache James Server JCR Data Persistence</name> <dependencies> <dependency> Propchange: james/server/trunk/jdbc/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jan 18 12:05:20 2011 @@ -1 +1,7 @@ target + +.classpath + +.settings + +.project Modified: james/server/trunk/jdbc/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/jdbc/pom.xml?rev=1060343&r1=1060342&r2=1060343&view=diff ============================================================================== --- james/server/trunk/jdbc/pom.xml (original) +++ james/server/trunk/jdbc/pom.xml Tue Jan 18 12:05:20 2011 @@ -25,8 +25,8 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.james</groupId> - <artifactId>james-server-user-jdbc</artifactId> - <name>Apache James Server User JDBC</name> + <artifactId>james-server-jdbc</artifactId> + <name>Apache James Server JDBC Data Persistence</name> <dependencies> <dependency> @@ -43,6 +43,30 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> + <artifactId>james-server-repository-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-repository-file</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-mail-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>apache-mailet</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> <artifactId>james-server-user-api</artifactId> </dependency> <dependency> Propchange: james/server/trunk/jpa/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Jan 18 12:05:20 2011 @@ -1 +1,7 @@ target + +.classpath + +.settings + +.project Modified: james/server/trunk/jpa/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/jpa/pom.xml?rev=1060343&r1=1060342&r2=1060343&view=diff ============================================================================== --- james/server/trunk/jpa/pom.xml (original) +++ james/server/trunk/jpa/pom.xml Tue Jan 18 12:05:20 2011 @@ -25,8 +25,8 @@ </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.james</groupId> - <artifactId>james-server-user-jpa</artifactId> - <name>Apache James Server User JPA</name> + <artifactId>james-server-jpa</artifactId> + <name>Apache James Server JPA Data Persistence</name> <build> <plugins> @@ -36,7 +36,7 @@ <artifactId>openjpa-maven-plugin</artifactId> <version>1.0</version> <configuration> - <includes>org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/vut/jpa/model/JPAVirtualUser.class</includes> + <includes>org/apache/james/user/jpa/model/JPAUser.class,org/apache/james/vut/jpa/model/JPAVirtualUser.class,org/apache/james/domainlist/jpa/model/JPADomain.class</includes> <addDefaultConstructor>true</addDefaultConstructor> <enforcePropertyRestrictions>true</enforcePropertyRestrictions> <toolProperties> @@ -46,7 +46,7 @@ </property> <property> <name>metaDataFactory</name> - <value>jpa(Types=org.apache.james.user.jpa.model.JPAUser;org.apache.james.vut.jpa.model.JPAVirtualUser)</value> + <value>jpa(Types=org.apache.james.user.jpa.model.JPAUser;org.apache.james.vut.jpa.model.JPAVirtualUser,org.apache.james.domainlist.jpa.model.JPADomain)</value> </property> </toolProperties> </configuration> @@ -70,6 +70,10 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> + <artifactId>james-server-dnsservice-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> <artifactId>james-server-user-api</artifactId> </dependency> <dependency> @@ -110,6 +114,17 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.james</groupId> + <artifactId>james-server-dnsservice-api</artifactId> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> <scope>runtime</scope> Modified: james/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1060343&r1=1060342&r2=1060343&view=diff ============================================================================== --- james/server/trunk/pom.xml (original) +++ james/server/trunk/pom.xml Tue Jan 18 12:05:20 2011 @@ -43,9 +43,11 @@ <module>imapserver</module> <module>lmtpserver</module> <module>data-library</module> + <module>jpa</module> + <module>jcr</module> + <module>jdbc</module> + <module>file</module> <module>domainlist-api</module> - <module>domainlist-jpa</module> - <module>domainlist-xml</module> <module>lifecycle-api</module> <module>mailbox-adapter</module> <module>mailetcontainer-api</module> @@ -53,9 +55,6 @@ <module>mailetcontainer-camel</module> <module>mailets</module> <module>mail-api</module> - <module>mail-file</module> - <module>mail-jcr</module> - <module>mail-jdbc</module> <module>protocols-library</module> <module>osgi</module> <module>pop3server</module> @@ -63,14 +62,9 @@ <module>repository-file</module> <module>smtpserver</module> <module>queue-api</module> - <module>queue-library</module> <module>queue-jms</module> <module>queue-activemq</module> <module>user-api</module> - <module>user-file</module> - <module>user-jcr</module> - <module>user-jdbc</module> - <module>user-jpa</module> <module>user-ldap</module> <module>util</module> <module>cli</module> @@ -303,11 +297,6 @@ <artifactId>james-server-repository-file</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-queue-library</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.james</groupId> @@ -555,12 +544,7 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-domainlist-xml</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-domainlist-jpa</artifactId> + <artifactId>james-server-jpa</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -570,17 +554,17 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-mail-file</artifactId> + <artifactId>james-server-file</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-mail-jdbc</artifactId> + <artifactId>james-server-jdbc</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-mail-jcr</artifactId> + <artifactId>james-server-jcr</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -638,26 +622,6 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-user-file</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-user-jcr</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-user-jdbc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>james-server-user-jpa</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.james</groupId> <artifactId>james-server-user-ldap</artifactId> <version>${project.version}</version> </dependency> Modified: james/server/trunk/queue-jms/pom.xml URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/pom.xml?rev=1060343&r1=1060342&r2=1060343&view=diff ============================================================================== --- james/server/trunk/queue-jms/pom.xml (original) +++ james/server/trunk/queue-jms/pom.xml Tue Jan 18 12:05:20 2011 @@ -33,9 +33,9 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-queue-api</artifactId> </dependency> - <dependency> + <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-queue-library</artifactId> + <artifactId>james-server-lifecycle-api</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> @@ -71,6 +71,7 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-core</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org