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 er...@apache.org on 2010/09/13 17:07:12 UTC
svn commit: r996569 - in /james/imap/trunk/jpa-migrator: ./
src/main/java/org/apache/james/imap/jpa/migrator/
src/main/java/org/apache/james/imap/jpa/migrator/command/
src/main/java/org/apache/james/imap/jpa/migrator/exception/
src/main/java/org/apache...
Author: eric
Date: Mon Sep 13 15:07:11 2010
New Revision: 996569
URL: http://svn.apache.org/viewvc?rev=996569&view=rev
Log:
Take new project and package naming into account for jpa migrator (IMAP-208)
Added:
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java
- copied, changed from r996507, james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/imap/jpa/migrator/JpaMigrator.java
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/
- copied from r996507, james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/imap/jpa/migrator/command/
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/exception/
- copied from r996507, james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/imap/jpa/migrator/exception/
james/imap/trunk/jpa-migrator/src/test/java/org/apache/james/mailbox/
james/imap/trunk/jpa-migrator/src/test/java/org/apache/james/mailbox/jpa/
james/imap/trunk/jpa-migrator/src/test/java/org/apache/james/mailbox/jpa/migrator/
- copied from r996507, james/imap/trunk/jpa-migrator/src/test/java/org/apache/james/imap/jpa/migrator/
Removed:
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/imap/jpa/migrator/JpaMigrator.java
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/imap/jpa/migrator/command/
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/imap/jpa/migrator/exception/
james/imap/trunk/jpa-migrator/src/test/java/org/apache/james/imap/jpa/migrator/
Modified:
james/imap/trunk/jpa-migrator/pom.xml
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP165JpaMigrateCommand.java
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP172JpaMigrateCommand.java
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP176JpaMigrateCommand.java
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP184JpaMigrateCommand.java
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/JpaMigrateCommand.java
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/JpaMigrateQuery.java
james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/exception/JpaMigrateException.java
james/imap/trunk/jpa-migrator/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java
Modified: james/imap/trunk/jpa-migrator/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/pom.xml?rev=996569&r1=996568&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/pom.xml (original)
+++ james/imap/trunk/jpa-migrator/pom.xml Mon Sep 13 15:07:11 2010
@@ -23,89 +23,31 @@
<parent>
<artifactId>apache-james-imap-parent</artifactId>
<groupId>org.apache.james</groupId>
- <version>0.1-M2-SNAPSHOT</version>
+ <version>0.2-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
-
<modelVersion>4.0.0</modelVersion>
-
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-jpa-migrator</artifactId>
- <name>Apache James IMAP JPA Mailbox Migrator</name>
-
+ <artifactId>apache-james-mailbox-jpa-migrator</artifactId>
+ <name>Apache James JPA Mailbox Migrator</name>
<dependencies>
-<!--
- <dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
- </dependency>
- <dependency>
- <groupId>${javax.activation.groupId}</groupId>
- <artifactId>${javax.activation.artifactId}</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-mailbox</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-store</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-jpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
--->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>runtime</scope>
</dependency>
-
-<!--
- <dependency> <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId> </dependency>
--->
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
-
<build>
-
<plugins>
-
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
@@ -114,7 +56,6 @@
<target>1.5</target>
</configuration>
</plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
@@ -160,9 +101,7 @@
</platforms>
</program>
</programs>
-
</configuration>
-
<executions>
<execution>
<id>make-appassemble</id>
@@ -172,11 +111,8 @@
</goals>
</execution>
</executions>
-
</plugin>
-
<plugin>
-
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.2</version>
@@ -184,7 +120,6 @@
<execution>
<phase>package</phase>
<configuration>
-
<tasks>
<!--
this is only needed because windows freak out on long cmd
@@ -195,9 +130,7 @@
token="%BASEDIR%\lib" value="..\lib" />
<replace file="${project.build.directory}/appassembler/bin/run.sh"
token="setenv" value="setenv.sh" />
-
</tasks>
-
</configuration>
<goals>
<goal>run</goal>
@@ -205,7 +138,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -222,15 +154,11 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.4</version>
</plugin>
-
</plugins>
-
</build>
-
</project>
Copied: james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java (from r996507, james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/imap/jpa/migrator/JpaMigrator.java)
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java?p2=james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java&p1=james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/imap/jpa/migrator/JpaMigrator.java&r1=996507&r2=996569&rev=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/imap/jpa/migrator/JpaMigrator.java (original)
+++ james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java Mon Sep 13 15:07:11 2010
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator;
+package org.apache.james.mailbox.jpa.migrator;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
-import org.apache.james.imap.jpa.migrator.command.JpaMigrateCommand;
-import org.apache.james.imap.jpa.migrator.exception.JpaMigrateException;
+import org.apache.james.mailbox.jpa.migrator.command.JpaMigrateCommand;
+import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
/**
* The class that will manage the migration commands for the James JPA database.
Modified: james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP165JpaMigrateCommand.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP165JpaMigrateCommand.java?rev=996569&r1=996507&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP165JpaMigrateCommand.java (original)
+++ james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP165JpaMigrateCommand.java Mon Sep 13 15:07:11 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator.command;
+package org.apache.james.mailbox.jpa.migrator.command;
import javax.persistence.EntityManager;
-import org.apache.james.imap.jpa.migrator.exception.JpaMigrateException;
+import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
/**
* JIRA IMAP-165 is "Add index annotation on frequently used columns".
Modified: james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java?rev=996569&r1=996507&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java (original)
+++ james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP168JpaMigrateCommand.java Mon Sep 13 15:07:11 2010
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator.command;
+package org.apache.james.mailbox.jpa.migrator.command;
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.Query;
-import org.apache.james.imap.jpa.migrator.exception.JpaMigrateException;
+import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
/**
* <p>
Modified: james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP172JpaMigrateCommand.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP172JpaMigrateCommand.java?rev=996569&r1=996507&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP172JpaMigrateCommand.java (original)
+++ james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP172JpaMigrateCommand.java Mon Sep 13 15:07:11 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator.command;
+package org.apache.james.mailbox.jpa.migrator.command;
import javax.persistence.EntityManager;
-import org.apache.james.imap.jpa.migrator.exception.JpaMigrateException;
+import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
/**
* JIRA IMAP-172 is "Cleanup JPAMailbox".
Modified: james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP176JpaMigrateCommand.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP176JpaMigrateCommand.java?rev=996569&r1=996507&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP176JpaMigrateCommand.java (original)
+++ james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP176JpaMigrateCommand.java Mon Sep 13 15:07:11 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator.command;
+package org.apache.james.mailbox.jpa.migrator.command;
import javax.persistence.EntityManager;
-import org.apache.james.imap.jpa.migrator.exception.JpaMigrateException;
+import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
/**
* JIRA 176 is "Change users' namespace to #private".
Modified: james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java?rev=996569&r1=996507&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java (original)
+++ james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP180JpaMigrateCommand.java Mon Sep 13 15:07:11 2010
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator.command;
+package org.apache.james.mailbox.jpa.migrator.command;
import javax.persistence.EntityManager;
import javax.persistence.Query;
-import org.apache.james.imap.jpa.migrator.exception.JpaMigrateException;
+import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
import org.apache.openjpa.kernel.DelegatingResultList;
import org.apache.openjpa.lib.rop.ResultList;
Modified: james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP184JpaMigrateCommand.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP184JpaMigrateCommand.java?rev=996569&r1=996507&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP184JpaMigrateCommand.java (original)
+++ james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/IMAP184JpaMigrateCommand.java Mon Sep 13 15:07:11 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator.command;
+package org.apache.james.mailbox.jpa.migrator.command;
import javax.persistence.EntityManager;
-import org.apache.james.imap.jpa.migrator.exception.JpaMigrateException;
+import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
/**
* JIRA IMAP-184 is "Remove size of MailboxMembership".
Modified: james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/JpaMigrateCommand.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/JpaMigrateCommand.java?rev=996569&r1=996507&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/JpaMigrateCommand.java (original)
+++ james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/JpaMigrateCommand.java Mon Sep 13 15:07:11 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator.command;
+package org.apache.james.mailbox.jpa.migrator.command;
import javax.persistence.EntityManager;
-import org.apache.james.imap.jpa.migrator.exception.JpaMigrateException;
+import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
/**
* A command that apply to James database the needed updates.
Modified: james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/JpaMigrateQuery.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/JpaMigrateQuery.java?rev=996569&r1=996507&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/JpaMigrateQuery.java (original)
+++ james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/command/JpaMigrateQuery.java Mon Sep 13 15:07:11 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator.command;
+package org.apache.james.mailbox.jpa.migrator.command;
import javax.persistence.EntityManager;
import javax.persistence.Query;
Modified: james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/exception/JpaMigrateException.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/exception/JpaMigrateException.java?rev=996569&r1=996507&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/exception/JpaMigrateException.java (original)
+++ james/imap/trunk/jpa-migrator/src/main/java/org/apache/james/mailbox/jpa/migrator/exception/JpaMigrateException.java Mon Sep 13 15:07:11 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator.exception;
+package org.apache.james.mailbox.jpa.migrator.exception;
/**
* Exception to be thrown when a problem occurs in the migration process.
Modified: james/imap/trunk/jpa-migrator/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/jpa-migrator/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java?rev=996569&r1=996507&r2=996569&view=diff
==============================================================================
--- james/imap/trunk/jpa-migrator/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java (original)
+++ james/imap/trunk/jpa-migrator/src/test/java/org/apache/james/mailbox/jpa/migrator/JpaMigratorTest.java Mon Sep 13 15:07:11 2010
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.imap.jpa.migrator;
+package org.apache.james.mailbox.jpa.migrator;
-import org.apache.james.imap.jpa.migrator.JpaMigrator;
-import org.apache.james.imap.jpa.migrator.exception.JpaMigrateException;
+import org.apache.james.mailbox.jpa.migrator.JpaMigrator;
+import org.apache.james.mailbox.jpa.migrator.exception.JpaMigrateException;
import org.junit.Test;
public class JpaMigratorTest {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org