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 rd...@apache.org on 2008/12/28 13:05:54 UTC
svn commit: r729721 [1/2] - in /james/protocols/imap/trunk: ./ build-tools/
jpa/ jpa/src/main/java/org/apache/james/imap/
jpa/src/main/java/org/apache/james/imap/jpa/
jpa/src/main/java/org/apache/james/imap/jpa/om/
jpa/src/main/java/org/apache/james/im...
Author: rdonkin
Date: Sun Dec 28 04:05:51 2008
New Revision: 729721
URL: http://svn.apache.org/viewvc?rev=729721&view=rev
Log:
Starting work on a JPA port. I propose to leave the torque version as legacy code to allow an upgrade path. So, no common code will be factored out at this stage. The first stage will be a straight OM conversion from torque to JPA. Note that this will retain the unsatisfactory table structure (for the time being).
Added:
james/protocols/imap/trunk/jpa/
- copied from r729710, james/protocols/imap/trunk/torque/
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/ByteContent.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/CRLFOutputStream.java
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/CRLFOutputStream.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/FullContent.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/Header.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/Header.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearcher.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearcher.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageUtils.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageUtils.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/OrFetchGroup.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/PartContentBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueCriteriaBuilder.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueCriteriaBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailbox.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxManager.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxSession.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSession.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueResultIterator.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UnsupportedSearchException.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRow.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRow.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRowPeer.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRowPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBody.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBody.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBodyPeer.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBodyPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlags.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlagsPeer.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlagsPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeader.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeader.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeaderPeer.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeaderPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRow.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRow.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRowPeer.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRowPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRow.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRow.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRowPeer.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBody.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBody.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBodyPeer.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBodyPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlags.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlags.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlagsPeer.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlagsPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageHeader.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageHeaderPeer.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeaderPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageRow.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRow.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageRowPeer.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRowPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/map/
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/map/MailboxMapBuilder.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MailboxMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/map/MailboxRowMapBuilder.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MailboxRowMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/map/MailboxmanagerMapInit.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MailboxmanagerMapInit.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/map/MessageBodyMapBuilder.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageBodyMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/map/MessageFlagsMapBuilder.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageFlagsMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/map/MessageHeaderMapBuilder.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageHeaderMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/map/MessageMapBuilder.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/map/MessageRowMapBuilder.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageRowMapBuilder.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageRowUtilsTest.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/MessageRowUtilsTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageUtilsCountUnnormalLinesTest.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/MessageUtilsCountUnnormalLinesTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/MessageUtilsNormalisedWriteToTest.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/MessageUtilsNormalisedWriteToTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/PartContentBuilderComplexMultipartTest.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/PartContentBuilderMultipartAlternativeTest.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsMultipartMixedTest.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsRFC822Test.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/imap/jpa/SearchUtilsTest.java (contents, props changed)
- copied, changed from r729710, james/protocols/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java
Removed:
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/ByteContent.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/CRLFOutputStream.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/FullContent.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/Header.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearcher.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/MessageUtils.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/OrFetchGroup.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/PartContentBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/TorqueCriteriaBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSession.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/UnsupportedSearchException.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRow.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRowPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBody.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBodyPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlagsPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeader.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeaderPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRow.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRowPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRow.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBody.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBodyPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlags.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlagsPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeaderPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRow.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageRowPeer.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MailboxMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MailboxRowMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MailboxmanagerMapInit.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageBodyMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageFlagsMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageHeaderMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/mailboxmanager/torque/om/map/MessageRowMapBuilder.java
james/protocols/imap/trunk/jpa/src/main/java/org/apache/torque/linkage/
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/mailboxmanager/torque/MessageRowUtilsTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/mailboxmanager/torque/MessageUtilsCountUnnormalLinesTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/mailboxmanager/torque/MessageUtilsNormalisedWriteToTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java
james/protocols/imap/trunk/jpa/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java
Modified:
james/protocols/imap/trunk/build-tools/common-build.xml
james/protocols/imap/trunk/build.xml
james/protocols/imap/trunk/jpa/build.xml
james/protocols/imap/trunk/jpa/pom.xml
james/protocols/imap/trunk/pom.xml
Modified: james/protocols/imap/trunk/build-tools/common-build.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/build-tools/common-build.xml?rev=729721&r1=729720&r2=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/build-tools/common-build.xml (original)
+++ james/protocols/imap/trunk/build-tools/common-build.xml Sun Dec 28 04:05:51 2008
@@ -205,6 +205,19 @@
<include name="${commons-configuration.jar}"/>
<include name="${commons-digester.jar}"/>
</fileset>
+ </path>
+
+ <path id='classpath.jpa'>
+ <fileset dir="${lib.dir}">
+ <include name="${commons-io.jar}"/>
+ <include name="${commons-collections.jar}"/>
+ <include name="${commons-dbcp.jar}"/>
+ <include name="${commons-pool.jar}"/>
+ <include name="${torque.jar}"/>
+ <include name="${village.jar}"/>
+ <include name="${commons-configuration.jar}"/>
+ <include name="${commons-digester.jar}"/>
+ </fileset>
</path>
<path id='classpath.base.test'>
Modified: james/protocols/imap/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/build.xml?rev=729721&r1=729720&r2=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/build.xml (original)
+++ james/protocols/imap/trunk/build.xml Sun Dec 28 04:05:51 2008
@@ -37,6 +37,7 @@
<property name='module.processor' location='processor'/>
<property name='module.seda' location='seda'/>
<property name='module.torque' location='torque'/>
+ <property name='module.jpa' location='jpa'/>
<property name='module.deployment' location='deployment'/>
<!--
@@ -60,6 +61,7 @@
<file name='${module.processor}'/>
<file name='${module.seda}'/>
<file name='${module.torque}'/>
+ <file name='${module.jpa}'/>
<file name='${module.deployment}'/>
</filelist>
</subant>
Modified: james/protocols/imap/trunk/jpa/build.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/build.xml?rev=729721&r1=729710&r2=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/build.xml (original)
+++ james/protocols/imap/trunk/jpa/build.xml Sun Dec 28 04:05:51 2008
@@ -17,17 +17,17 @@
specific language governing permissions and limitations
under the License.
-->
-<project default="main" name="torque">
- <description>Builds torque module. This is an function module.</description>
- <property name="name.module" value="torque" />
+<project default="main" name="jpa">
+ <description>Builds JPA Storage Module</description>
+ <property name="name.module" value="jpa" />
<import file="../build-tools/function-build.xml" optional="no" />
-
+
<target
name='set-classpath'
depends='check-environment, master-module-template.set-classpath'>
<path id='classpath.main'>
<path refid='classpath.base'/>
- <path refid='classpath.torque'/>
+ <path refid='classpath.jpa'/>
<path refid='classpath.dependencies.libraries'/>
</path>
<path id='classpath.test'>
Modified: james/protocols/imap/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/pom.xml?rev=729721&r1=729710&r2=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/jpa/pom.xml (original)
+++ james/protocols/imap/trunk/jpa/pom.xml Sun Dec 28 04:05:51 2008
@@ -25,8 +25,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-torque</artifactId>
- <name>Apache JAMES Imap Torque Mailbox Manager</name>
+ <artifactId>apache-james-imap-jpa</artifactId>
+ <name>Apache James IMAP JPA Mailbox Manager</name>
<dependencies>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/ByteContent.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/ByteContent.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/ByteContent.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java Sun Dec 28 04:05:51 2008
@@ -20,7 +20,7 @@
/**
*
*/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.IOException;
import java.nio.ByteBuffer;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/ByteContent.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/CRLFOutputStream.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/CRLFOutputStream.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/CRLFOutputStream.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/CRLFOutputStream.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/CRLFOutputStream.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/CRLFOutputStream.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/CRLFOutputStream.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.FilterOutputStream;
import java.io.IOException;
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/FullContent.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/FullContent.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/FullContent.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java Sun Dec 28 04:05:51 2008
@@ -20,7 +20,7 @@
/**
*
*/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.IOException;
import java.nio.ByteBuffer;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/FullContent.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/Header.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/Header.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/Header.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/Header.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/Header.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/Header.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/Header.java Sun Dec 28 04:05:51 2008
@@ -20,7 +20,7 @@
/**
*
*/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -28,10 +28,10 @@
import javax.mail.MessagingException;
+import org.apache.james.imap.jpa.om.MessageHeader;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.MessageResult.Content;
-import org.apache.james.mailboxmanager.torque.om.MessageHeader;
final class Header implements MessageResult.Header, MessageResult.Content {
private final String name;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/Header.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageRowUtils.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.IOException;
import java.io.InputStream;
@@ -32,6 +32,9 @@
import javax.mail.Flags;
+import org.apache.james.imap.jpa.om.MessageBody;
+import org.apache.james.imap.jpa.om.MessageHeader;
+import org.apache.james.imap.jpa.om.MessageRow;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.MessageResult.Content;
@@ -39,9 +42,6 @@
import org.apache.james.mailboxmanager.MessageResult.MimePath;
import org.apache.james.mailboxmanager.impl.MessageFlags;
import org.apache.james.mailboxmanager.impl.MessageResultImpl;
-import org.apache.james.mailboxmanager.torque.om.MessageBody;
-import org.apache.james.mailboxmanager.torque.om.MessageHeader;
-import org.apache.james.mailboxmanager.torque.om.MessageRow;
import org.apache.james.mime4j.MimeException;
import org.apache.torque.TorqueException;
@@ -131,7 +131,7 @@
if (fetchGroup != null) {
int content = fetchGroup.content();
if ((content & FetchGroup.FLAGS) > 0) {
- org.apache.james.mailboxmanager.torque.om.MessageFlags messageFlags = messageRow
+ org.apache.james.imap.jpa.om.MessageFlags messageFlags = messageRow
.getMessageFlags();
if (messageFlags != null) {
messageResult.setFlags(messageFlags.getFlagsObject());
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageRowUtils.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearcher.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearcher.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearcher.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearcher.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearcher.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearcher.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearcher.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.IOException;
import java.io.InputStream;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearcher.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageSearches.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.IOException;
import java.io.InputStream;
@@ -34,11 +34,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.james.imap.jpa.om.MessageFlags;
+import org.apache.james.imap.jpa.om.MessageHeader;
+import org.apache.james.imap.jpa.om.MessageRow;
import org.apache.james.mailboxmanager.SearchQuery;
import org.apache.james.mailboxmanager.SearchQuery.NumericRange;
-import org.apache.james.mailboxmanager.torque.om.MessageFlags;
-import org.apache.james.mailboxmanager.torque.om.MessageHeader;
-import org.apache.james.mailboxmanager.torque.om.MessageRow;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.field.datetime.DateTime;
import org.apache.james.mime4j.field.datetime.parser.DateTimeParser;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageSearches.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageUtils.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageUtils.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageUtils.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageUtils.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageUtils.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MessageUtils.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageUtils.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MessageUtils.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/MimeDescriptorImpl.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.IOException;
import java.io.InputStream;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/MimeDescriptorImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/OrFetchGroup.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/OrFetchGroup.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/OrFetchGroup.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.util.Set;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/OrFetchGroup.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/PartContentBuilder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/PartContentBuilder.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/PartContentBuilder.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.IOException;
import java.io.InputStream;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/PartContentBuilder.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueCriteriaBuilder.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueCriteriaBuilder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueCriteriaBuilder.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueCriteriaBuilder.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueCriteriaBuilder.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueCriteriaBuilder.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueCriteriaBuilder.java Sun Dec 28 04:05:51 2008
@@ -17,13 +17,13 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import javax.mail.Flags.Flag;
-import org.apache.james.mailboxmanager.torque.om.MessageFlagsPeer;
-import org.apache.james.mailboxmanager.torque.om.MessageHeaderPeer;
-import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
+import org.apache.james.imap.jpa.om.MessageFlagsPeer;
+import org.apache.james.imap.jpa.om.MessageHeaderPeer;
+import org.apache.james.imap.jpa.om.MessageRowPeer;
import org.apache.torque.util.Criteria;
class TorqueCriteriaBuilder {
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueCriteriaBuilder.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailbox.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailbox.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailbox.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailbox.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailbox.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -38,6 +38,14 @@
import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.logging.Log;
import org.apache.james.api.imap.AbstractLogEnabled;
+import org.apache.james.imap.jpa.om.MailboxRow;
+import org.apache.james.imap.jpa.om.MailboxRowPeer;
+import org.apache.james.imap.jpa.om.MessageBody;
+import org.apache.james.imap.jpa.om.MessageFlags;
+import org.apache.james.imap.jpa.om.MessageFlagsPeer;
+import org.apache.james.imap.jpa.om.MessageHeader;
+import org.apache.james.imap.jpa.om.MessageRow;
+import org.apache.james.imap.jpa.om.MessageRowPeer;
import org.apache.james.mailboxmanager.MailboxListener;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MailboxSession;
@@ -50,14 +58,6 @@
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
import org.apache.james.mailboxmanager.impl.UidChangeTracker;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
-import org.apache.james.mailboxmanager.torque.om.MailboxRow;
-import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
-import org.apache.james.mailboxmanager.torque.om.MessageBody;
-import org.apache.james.mailboxmanager.torque.om.MessageFlags;
-import org.apache.james.mailboxmanager.torque.om.MessageFlagsPeer;
-import org.apache.james.mailboxmanager.torque.om.MessageHeader;
-import org.apache.james.mailboxmanager.torque.om.MessageRow;
-import org.apache.james.mailboxmanager.torque.om.MessageRowPeer;
import org.apache.james.mailboxmanager.util.UidRange;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailbox.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailbox.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxManager.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxManager.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxManager.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManager.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxManager.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.util.ArrayList;
import java.util.Arrays;
@@ -31,6 +31,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.impl.SimpleLog;
+import org.apache.james.imap.jpa.om.MailboxRow;
+import org.apache.james.imap.jpa.om.MailboxRowPeer;
import org.apache.james.mailboxmanager.ListResult;
import org.apache.james.mailboxmanager.MailboxExistsException;
import org.apache.james.mailboxmanager.MailboxManagerException;
@@ -42,8 +44,6 @@
import org.apache.james.mailboxmanager.manager.MailboxExpression;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.SubscriptionException;
-import org.apache.james.mailboxmanager.torque.om.MailboxRow;
-import org.apache.james.mailboxmanager.torque.om.MailboxRowPeer;
import org.apache.torque.TorqueException;
import org.apache.torque.util.CountHelper;
import org.apache.torque.util.Criteria;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxManager.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxSession.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSession.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxSession.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxSession.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSession.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueMailboxSession.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxSession.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import org.apache.james.mailboxmanager.MailboxSession;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueMailboxSession.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueResultIterator.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueResultIterator.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueResultIterator.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/TorqueResultIterator.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueResultIterator.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.util.Collection;
import java.util.Date;
@@ -30,12 +30,12 @@
import org.apache.commons.collections.Buffer;
import org.apache.commons.collections.BufferUtils;
import org.apache.commons.collections.buffer.BoundedFifoBuffer;
+import org.apache.james.imap.jpa.om.MessageRow;
import org.apache.james.mailboxmanager.MailboxManagerException;
import org.apache.james.mailboxmanager.MessageResult;
import org.apache.james.mailboxmanager.MessageResult.FetchGroup;
import org.apache.james.mailboxmanager.impl.FetchGroupImpl;
import org.apache.james.mailboxmanager.impl.MessageFlags;
-import org.apache.james.mailboxmanager.torque.om.MessageRow;
import org.apache.torque.TorqueException;
public class TorqueResultIterator implements Iterator {
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/TorqueResultIterator.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UnsupportedSearchException.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UnsupportedSearchException.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UnsupportedSearchException.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import org.apache.torque.TorqueException;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UnsupportedSearchException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/UserManager.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque;
+package org.apache.james.imap.jpa;
import java.util.Collection;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/UserManager.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRow.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRow.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRow.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRow.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRow.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRow.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRow.java Sun Dec 28 04:05:51 2008
@@ -1,4 +1,4 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import java.sql.Connection;
import java.util.ArrayList;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRow.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRow.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRowPeer.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRowPeer.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRowPeer.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRowPeer.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRowPeer.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMailboxRowPeer.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRowPeer.java Sun Dec 28 04:05:51 2008
@@ -1,6 +1,6 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
-import org.apache.james.mailboxmanager.torque.om.map.MailboxRowMapBuilder;
+import org.apache.james.imap.jpa.om.map.MailboxRowMapBuilder;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRowPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMailboxRowPeer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBody.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBody.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBody.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBody.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBody.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBody.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBody.java Sun Dec 28 04:05:51 2008
@@ -1,4 +1,4 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import org.apache.commons.lang.ObjectUtils;
import org.apache.torque.TorqueException;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBody.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBody.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBodyPeer.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBodyPeer.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBodyPeer.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBodyPeer.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBodyPeer.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageBodyPeer.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBodyPeer.java Sun Dec 28 04:05:51 2008
@@ -1,6 +1,6 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
-import org.apache.james.mailboxmanager.torque.om.map.MessageBodyMapBuilder;
+import org.apache.james.imap.jpa.om.map.MessageBodyMapBuilder;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBodyPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageBodyPeer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlags.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlags.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlags.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlags.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlags.java Sun Dec 28 04:05:51 2008
@@ -1,4 +1,4 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import org.apache.torque.TorqueException;
import org.apache.torque.map.TableMap;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlags.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlags.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlagsPeer.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlagsPeer.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlagsPeer.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlagsPeer.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlagsPeer.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageFlagsPeer.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlagsPeer.java Sun Dec 28 04:05:51 2008
@@ -1,6 +1,6 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
-import org.apache.james.mailboxmanager.torque.om.map.MessageFlagsMapBuilder;
+import org.apache.james.imap.jpa.om.map.MessageFlagsMapBuilder;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlagsPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageFlagsPeer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeader.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeader.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeader.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeader.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeader.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeader.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeader.java Sun Dec 28 04:05:51 2008
@@ -1,4 +1,4 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import org.apache.commons.lang.ObjectUtils;
import org.apache.torque.TorqueException;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeader.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeaderPeer.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeaderPeer.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeaderPeer.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeaderPeer.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeaderPeer.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageHeaderPeer.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeaderPeer.java Sun Dec 28 04:05:51 2008
@@ -1,6 +1,6 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
-import org.apache.james.mailboxmanager.torque.om.map.MessageHeaderMapBuilder;
+import org.apache.james.imap.jpa.om.map.MessageHeaderMapBuilder;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeaderPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageHeaderPeer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRow.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRow.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRow.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRow.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRow.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRow.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRow.java Sun Dec 28 04:05:51 2008
@@ -1,4 +1,4 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import org.apache.commons.lang.ObjectUtils;
import org.apache.torque.TorqueException;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRow.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRow.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRowPeer.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRowPeer.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRowPeer.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRowPeer.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRowPeer.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/BaseMessageRowPeer.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRowPeer.java Sun Dec 28 04:05:51 2008
@@ -1,6 +1,6 @@
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
-import org.apache.james.mailboxmanager.torque.om.map.MessageRowMapBuilder;
+import org.apache.james.imap.jpa.om.map.MessageRowMapBuilder;
import org.apache.torque.NoRowsException;
import org.apache.torque.TooManyRowsException;
import org.apache.torque.Torque;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRowPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/BaseMessageRowPeer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRow.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRow.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRow.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRow.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRow.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRow.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRow.java Sun Dec 28 04:05:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import java.sql.Connection;
import java.sql.SQLException;
@@ -42,7 +42,7 @@
* already exist in the output directory.
*/
public class MailboxRow extends
- org.apache.james.mailboxmanager.torque.om.BaseMailboxRow implements
+ org.apache.james.imap.jpa.om.BaseMailboxRow implements
Persistent {
private static final long serialVersionUID = -8207690877715465485L;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRow.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRow.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRowPeer.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeer.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRowPeer.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRowPeer.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeer.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MailboxRowPeer.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRowPeer.java Sun Dec 28 04:05:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import java.sql.Connection;
import java.util.List;
@@ -34,7 +34,7 @@
* already exist in the output directory.
*/
public class MailboxRowPeer extends
- org.apache.james.mailboxmanager.torque.om.BaseMailboxRowPeer {
+ org.apache.james.imap.jpa.om.BaseMailboxRowPeer {
private static final long serialVersionUID = -1906212927584890188L;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRowPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MailboxRowPeer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBody.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBody.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBody.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBody.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBody.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBody.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBody.java Sun Dec 28 04:05:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import org.apache.torque.om.Persistent;
@@ -30,7 +30,7 @@
* already exist in the output directory.
*/
public class MessageBody extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageBody implements
+ org.apache.james.imap.jpa.om.BaseMessageBody implements
Persistent {
private static final long serialVersionUID = -1304530949913525943L;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBody.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBody.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBodyPeer.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBodyPeer.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBodyPeer.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBodyPeer.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBodyPeer.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageBodyPeer.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBodyPeer.java Sun Dec 28 04:05:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
/**
* The skeleton for this class was autogenerated by Torque on:
@@ -28,7 +28,7 @@
* already exist in the output directory.
*/
public class MessageBodyPeer extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageBodyPeer {
+ org.apache.james.imap.jpa.om.BaseMessageBodyPeer {
/**
*
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBodyPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageBodyPeer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlags.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlags.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlags.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlags.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlags.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlags.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlags.java Sun Dec 28 04:05:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import javax.mail.Flags;
@@ -32,7 +32,7 @@
* already exist in the output directory.
*/
public class MessageFlags extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageFlags implements
+ org.apache.james.imap.jpa.om.BaseMessageFlags implements
Persistent {
private static final long serialVersionUID = -7426028860085278304L;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlags.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlags.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlagsPeer.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlagsPeer.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlagsPeer.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlagsPeer.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlagsPeer.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageFlagsPeer.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlagsPeer.java Sun Dec 28 04:05:51 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import org.apache.torque.util.Criteria;
@@ -32,7 +32,7 @@
* already exist in the output directory.
*/
public class MessageFlagsPeer extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageFlagsPeer {
+ org.apache.james.imap.jpa.om.BaseMessageFlagsPeer {
/**
*
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlagsPeer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageFlagsPeer.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageHeader.java (from r729710, james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageHeader.java?p2=james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageHeader.java&p1=james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java&r1=729710&r2=729721&rev=729721&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/src/main/java/org/apache/james/mailboxmanager/torque/om/MessageHeader.java (original)
+++ james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageHeader.java Sun Dec 28 04:05:51 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.mailboxmanager.torque.om;
+package org.apache.james.imap.jpa.om;
import org.apache.torque.om.Persistent;
@@ -31,7 +31,7 @@
* already exist in the output directory.
*/
public class MessageHeader extends
- org.apache.james.mailboxmanager.torque.om.BaseMessageHeader implements
+ org.apache.james.imap.jpa.om.BaseMessageHeader implements
Persistent {
private static final long serialVersionUID = -9191792349506771474L;
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageHeader.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/jpa/src/main/java/org/apache/james/imap/jpa/om/MessageHeader.java
------------------------------------------------------------------------------
svn:mergeinfo =
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org