Author: rdonkin
Date: Thu Jun 4 13:11:04 2009
New Revision: 781728
URL: http://svn.apache.org/viewvc?rev=781728&view=rev
Log:
IMAP-97 Add enhancement https://issues.apache.org/jira/browse/IMAP-97
Modified:
james/imap/trunk/jpa/build.xml
james/imap/trunk/jpa/pom.xml
james/imap/trunk/parent/pom.xml
Modified: james/imap/trunk/jpa/build.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jpa/build.xml?rev=781728&r1=781727&r2=781728&view=diff
==============================================================================
--- james/imap/trunk/jpa/build.xml (original)
+++ james/imap/trunk/jpa/build.xml Thu Jun 4 13:11:04 2009
@@ -55,7 +55,7 @@
<openjpac>
<fileset dir="${dir.src.java}">
- <include name="org/apache/james/imap/jpa/om/*.java" />
+ <include name="org/apache/james/imap/jpa/*/model/*.java" />
</fileset>
<classpath>
<path refid='classpath.main'/>
Modified: james/imap/trunk/jpa/pom.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jpa/pom.xml?rev=781728&r1=781727&r2=781728&view=diff
==============================================================================
--- james/imap/trunk/jpa/pom.xml (original)
+++ james/imap/trunk/jpa/pom.xml Thu Jun 4 13:11:04 2009
@@ -32,6 +32,10 @@
<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>
@@ -73,12 +77,110 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>1.0</version>
+ <configuration>
+ <includes>org/apache/james/imap/jpa/*/model/*.class</includes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ <toolProperties>
+ <property>
+ <name>log</name>
+ <value>TOOL=TRACE</value>
+ </property>
+ <property>
+ <name>metaDataFactory</name>
+
<value>jpa(Types=org.apache.james.imap.jpa.mail.model.JPAHeader;org.apache.james.imap.jpa.mail.model.JPAMailbox;org.apache.james.imap.jpa.mail.model.JPAMailboxMembership;org.apache.james.imap.jpa.mail.model.JPAMessage;org.apache.james.imap.jpa.mail.model.JPAProperty;org.apache.james.imap.jpa.user.model.JPASubscription)</value>
+ </property>
+ </toolProperties>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ <dependencies>
+ <!--
+ WORKAROUND
+ -->
+ <dependency>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
+ <version>${version.javax.mail}</version>
+ </dependency>
+ <dependency>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
+ <version>${version.activation}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-mailbox</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-store</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j</artifactId>
+ <version>${version.apache-mime4j}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${version.commons-logging}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${version.commons-lang}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${version.commons-collections}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>${version.javax.persistence}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${version.openjpa}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: james/imap/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/james/imap/trunk/parent/pom.xml?rev=781728&r1=781727&r2=781728&view=diff
==============================================================================
--- james/imap/trunk/parent/pom.xml (original)
+++ james/imap/trunk/parent/pom.xml Thu Jun 4 13:11:04 2009
@@ -350,19 +350,19 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
- <version>0.6</version>
+ <version>${version.apache-mime4j}</version>
</dependency>
<!-- Declare javamail as provided to be able to easily switch -->
<!-- to different implementations (Geronimo) -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.1</version>
+ <version>${version.javax.mail}</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1.1</version>
+ <version>${version.activation}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -377,12 +377,12 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.1</version>
+ <version>${version.commons-collections}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
+ <version>${version.commons-logging}</version>
<exclusions>
<exclusion>
<artifactId>logkit</artifactId>
@@ -405,7 +405,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.1</version>
+ <version>${version.commons-lang}</version>
</dependency>
<!-- used by torque -->
<dependency>
@@ -561,12 +561,12 @@
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
- <version>1.0.2</version>
+ <version>${version.javax.persistence}</version>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>1.2.0</version>
+ <version>${version.openjpa}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -587,7 +587,15 @@
<javax.activation.artifactId>activation</javax.activation.artifactId>
<javax.mail.groupId>javax.mail</javax.mail.groupId>
<javax.mail.artifactId>mail</javax.mail.artifactId>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <version.openjpa>1.2.0</version.openjpa>
+ <version.javax.persistence>1.0.2</version.javax.persistence>
+ <version.commons-lang>2.1</version.commons-lang>
+ <version.commons-collections>3.1</version.commons-collections>
+ <version.commons-logging>1.1</version.commons-logging>
+ <version.apache-mime4j>0.6</version.apache-mime4j>
+ <version.javax.mail>1.4.1</version.javax.mail>
+ <version.activation>1.1.1</version.activation>
</properties>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
