svn commit: r1292219 - /james/jsieve/trunk/manager/target/

[bago]

Author: bago
Date: Wed Feb 22 10:00:37 2012
New Revision: 1292219

URL: http://svn.apache.org/viewvc?rev=1292219view=rev
Log:
Remove generated folders

Removed:
james/jsieve/trunk/manager/target/


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1292244 - /james/jsieve/trunk/core/src/test/java/org/apache/jsieve/MultipleToTest.java

[bago]

Author: bago
Date: Wed Feb 22 11:41:23 2012
New Revision: 1292244

URL: http://svn.apache.org/viewvc?rev=1292244view=rev
Log:
Fix EOL chars in test file. I believe \r\f is not a valid EOL and is strange 
that javamail did support this. 

Modified:
james/jsieve/trunk/core/src/test/java/org/apache/jsieve/MultipleToTest.java

Modified: 
james/jsieve/trunk/core/src/test/java/org/apache/jsieve/MultipleToTest.java
URL: 
http://svn.apache.org/viewvc/james/jsieve/trunk/core/src/test/java/org/apache/jsieve/MultipleToTest.java?rev=1292244r1=1292243r2=1292244view=diff
==
--- james/jsieve/trunk/core/src/test/java/org/apache/jsieve/MultipleToTest.java 
(original)
+++ james/jsieve/trunk/core/src/test/java/org/apache/jsieve/MultipleToTest.java 
Wed Feb 22 11:41:23 2012
@@ -29,26 +29,26 @@ import org.apache.jsieve.util.check.Scri
 
 public class MultipleToTest extends TestCase {
 
-private static final String SOLO_TO_EMAIL = Date: Sun, 1 Apr 2007 
1100:00:00 +0100 (BST)\r\f
-+ From: roadrun...@acme.example.com\r\f
-+ To: coy...@desert.example.org\r\f
-+ Subject: Who's The Fool?\r\f + \r\f + Beep-Beep\r\f;
+private static final String SOLO_TO_EMAIL = Date: Sun, 1 Apr 2007 
1100:00:00 +0100 (BST)\r\n
++ From: roadrun...@acme.example.com\r\n
++ To: coy...@desert.example.org\r\n
++ Subject: Who's The Fool?\r\n + \r\n + Beep-Beep\r\n;
 
-private static final String MULTIPLE_TO_EMAIL = Date: Sun, 1 Apr 2007 
1100:00:00 +0100 (BST)\r\f
-+ From: roadrun...@acme.example.com\r\f
+private static final String MULTIPLE_TO_EMAIL = Date: Sun, 1 Apr 2007 
1100:00:00 +0100 (BST)\r\n
++ From: roadrun...@acme.example.com\r\n
 + To: coy...@desert.example.org, b...@example.org, 
-+ el...@hunters.example.org,\r\f
-+ Subject: Who's The Fool?\r\f + \r\f + Beep-Beep\r\f;
++ el...@hunters.example.org,\r\n
++ Subject: Who's The Fool?\r\n + \r\n + Beep-Beep\r\n;
 
-private static final String FILTER_SCRIPT = require \fileinto\;\r\f
-+ if address :is :all \to\ \coy...@desert.example.org\ {\r\f
-+   fileinto \coyote\;\r\f}\r\f
-+ if address :is :all \to\ \b...@example.org\ {\r\f
-+   fileinto \bugs\;\r\f}\r\f
-+ if address :is :all \to\ \roadrunnerac...@example.org\ 
{\r\f
-+   fileinto \rr\;\r\f}\r\f
-+ if address :is :all \to\ \el...@hunters.example.org\ {\r\f
-+   fileinto \elmer\;\r\f}\r\f;
+private static final String FILTER_SCRIPT = require \fileinto\;\r\n
++ if address :is :all \to\ \coy...@desert.example.org\ {\r\n
++   fileinto \coyote\;\r\n}\r\n
++ if address :is :all \to\ \b...@example.org\ {\r\n
++   fileinto \bugs\;\r\n}\r\n
++ if address :is :all \to\ \roadrunnerac...@example.org\ 
{\r\n
++   fileinto \rr\;\r\n}\r\n
++ if address :is :all \to\ \el...@hunters.example.org\ {\r\n
++   fileinto \elmer\;\r\n}\r\n;
 
 public void testSingleTo() throws Exception {
 ScriptChecker checker = new ScriptChecker();



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1292256 - /james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java

[bago]

Author: bago
Date: Wed Feb 22 12:37:35 2012
New Revision: 1292256

URL: http://svn.apache.org/viewvc?rev=1292256view=rev
Log:
Make sure to set the right content type when creating test messages 
(application/sieve is not declared/added to the mailcap so oracle javamail 
allow an undocumented behaviour, while geronimo is more strict and remove the 
unknown content type).

Modified:

james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java

Modified: 
james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java
URL: 
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java?rev=1292256r1=1292255r2=1292256view=diff
==
--- 
james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java
 (original)
+++ 
james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java
 Wed Feb 22 12:37:35 2012
@@ -197,6 +197,11 @@ public class ManageSieveMailetTestCase {
 application/sieve; charset=UTF-8)
   ));
 scriptPart.setDisposition(MimeBodyPart.ATTACHMENT);
+// setting a DataHandler with no mailcap definition is not
+// supported by the specs. Javamail activation still work,
+// but Geronimo activation translate it to text/plain. 
+// Let's manually force the header.
+scriptPart.setHeader(Content-Type, application/sieve; 
charset=UTF-8);
 scriptPart.setFileName(scriptName);
 multipart.addBodyPart(scriptPart);
 message.setContent(multipart);
@@ -264,6 +269,7 @@ public class ManageSieveMailetTestCase {
 SyntaxException, 
 application/sieve; charset=UTF-8)
   ));
+scriptPart.setHeader(Content-Type, application/sieve; 
charset=UTF-8);
 scriptPart.setDisposition(MimeBodyPart.ATTACHMENT);
 scriptPart.setFileName(scriptName);
 multipart.addBodyPart(scriptPart);
@@ -469,6 +475,7 @@ public class ManageSieveMailetTestCase {
 scriptContent, 
 application/sieve; charset=UTF-8)
   ));
+scriptPart.setHeader(Content-Type, application/sieve; 
charset=UTF-8);
 scriptPart.setDisposition(MimeBodyPart.ATTACHMENT);
 scriptPart.setFileName(scriptName);
 multipart.addBodyPart(scriptPart);
@@ -536,6 +543,7 @@ public class ManageSieveMailetTestCase {
 SyntaxException, 
 application/sieve; charset=UTF-8)
   ));
+scriptPart.setHeader(Content-Type, application/sieve; 
charset=UTF-8);
 scriptPart.setDisposition(MimeBodyPart.ATTACHMENT);
 scriptPart.setFileName(scriptName);
 multipart.addBodyPart(scriptPart);
@@ -1164,7 +1172,8 @@ public class ManageSieveMailetTestCase {
 MimeMessage result = ((MockMailetContext) 
_mailet.getMailetContext()).getMessage();
 assertNotNull(result);
 // Check the subject header
-assertEquals(Re: , result.getSubject());
+// Javamail returns Re:  instead Geronimo returns Re: (no 
trailing space)
+assertEquals(Re:, result.getSubject().trim());
 // Check the response
 MimeMultipart multipart = (MimeMultipart) result.getContent();
 assertEquals(1, multipart.getCount());



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1292257 - in /james/jsieve/trunk: NOTICE.txt RELEASE_NOTES.txt all/src/assemble/bin.xml core/pom.xml mailet/pom.xml manager/mailet/pom.xml pom.xml util/pom.xml

[bago]

Author: bago
Date: Wed Feb 22 12:38:56 2012
New Revision: 1292257

URL: http://svn.apache.org/viewvc?rev=1292257view=rev
Log:
move to geronimo / remove oracle dependencies and licensing stuff (JSIEVE-89)
Clean up build configuration, assembly, notice/license attachment, ant build 
(JSIEVE-90)

Modified:
james/jsieve/trunk/NOTICE.txt
james/jsieve/trunk/RELEASE_NOTES.txt
james/jsieve/trunk/all/src/assemble/bin.xml
james/jsieve/trunk/core/pom.xml
james/jsieve/trunk/mailet/pom.xml
james/jsieve/trunk/manager/mailet/pom.xml
james/jsieve/trunk/pom.xml
james/jsieve/trunk/util/pom.xml

Modified: james/jsieve/trunk/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/james/jsieve/trunk/NOTICE.txt?rev=1292257r1=1292256r2=1292257view=diff
==
--- james/jsieve/trunk/NOTICE.txt (original)
+++ james/jsieve/trunk/NOTICE.txt Wed Feb 22 12:38:56 2012
@@ -1,5 +1,5 @@
 Apache James JSieve Library
-Copyright 2009 The Apache Software Foundation
+Copyright 2012 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: james/jsieve/trunk/RELEASE_NOTES.txt
URL: 
http://svn.apache.org/viewvc/james/jsieve/trunk/RELEASE_NOTES.txt?rev=1292257r1=1292256r2=1292257view=diff
==
--- james/jsieve/trunk/RELEASE_NOTES.txt (original)
+++ james/jsieve/trunk/RELEASE_NOTES.txt Wed Feb 22 12:38:56 2012
@@ -45,6 +45,8 @@ Task
 [JSIEVE-61] - Split Parent And Aggregation Poms
 [JSIEVE-62] - Review TODOs
 [JSIEVE-64] - Improve and Standardise Build
+[JSIEVE-89] - move to geronimo / remove oracle dependencies and licensing 
stuff
+[JSIEVE-90] - Clean up build configuration, assembly, notice/license 
attachment, ant build
 
 Version 0.4
 --- 

Modified: james/jsieve/trunk/all/src/assemble/bin.xml
URL: 
http://svn.apache.org/viewvc/james/jsieve/trunk/all/src/assemble/bin.xml?rev=1292257r1=1292256r2=1292257view=diff
==
--- james/jsieve/trunk/all/src/assemble/bin.xml (original)
+++ james/jsieve/trunk/all/src/assemble/bin.xml Wed Feb 22 12:38:56 2012
@@ -18,10 +18,6 @@
   limitations under the License.
   --
   idbin/id
-  !-- 
-  Generates a jar file including the binary jar and the runtime dependencies.
-  including NOTICE and LICENSE in the root.
-  --
   formats
 formatzip/format
 formattar.gz/format
@@ -36,107 +32,25 @@
 includeRELEASE_NOTES.txt/include
   /includes
 /fileSet
-fileSet
-  directory${project.basedir}/../core/target/directory
-  outputDirectory//outputDirectory
-  includes
-includeapache-jsieve*.jar/include
-  /includes
-/fileSet
-fileSet
-  directory${project.basedir}/../mailet/target/directory
-  outputDirectory//outputDirectory
-  includes
-includeapache-jsieve*.jar/include
-  /includes
-/fileSet
-fileSet
-  directory${project.basedir}/../util/target/directory
-  outputDirectory//outputDirectory
-  includes
-includeapache-jsieve*.jar/include
-  /includes
-/fileSet
-fileSet
-  directory${project.basedir}/../manager/api/target/directory
-  outputDirectory//outputDirectory
-  includes
-includeapache-jsieve*.jar/include
-  /includes
-/fileSet
-fileSet
-  directory${project.basedir}/../manager/core/target/directory
-  outputDirectory//outputDirectory
-  includes
-includeapache-jsieve*.jar/include
-  /includes
-/fileSet
-fileSet
-  directory${project.basedir}/../manager/jsieve/target/directory
-  outputDirectory//outputDirectory
-  includes
-includeapache-jsieve*.jar/include
-  /includes
-/fileSet
-fileSet
-  directory${project.basedir}/../manager/mailet/target/directory
-  outputDirectory//outputDirectory
-  includes
-includeapache-jsieve*.jar/include
-  /includes
-/fileSet
-fileSet
-  directory${project.basedir}/../manager/mock/target/directory
-  outputDirectory//outputDirectory
-  includes
-includeapache-jsieve*.jar/include
-  /includes
-/fileSet
-fileSet
-  directory${project.basedir}/../target/site/apidocs/directory
-  outputDirectory/apidocs/outputDirectory
-/fileSet
+fileSet
+  directory${project.basedir}/../target/site/apidocs/directory
+  outputDirectory/apidocs/outputDirectory
+/fileSet
   /fileSets
-  files
-file
-  source${project.basedir}/../LICENSE.mail/source
-  outputDirectorylib/outputDirectory
-  destNamemail.LICENSE/destName
-/file
-file
-  source${project.basedir}/../LICENSE.activation/source
-  outputDirectorylib/outputDirectory
-  destNameactivation.LICENSE/destName
-/file
-file
-  source

svn commit: r1292258 - in /james/jsieve/trunk: ./ core/ mailet/ util/

[bago]

Author: bago
Date: Wed Feb 22 12:39:16 2012
New Revision: 1292258

URL: http://svn.apache.org/viewvc?rev=1292258view=rev
Log:
move to geronimo / remove oracle dependencies and licensing stuff (JSIEVE-89)
Clean up build configuration, assembly, notice/license attachment, ant build 
(JSIEVE-90)

Removed:
james/jsieve/trunk/LICENSE.activation
james/jsieve/trunk/LICENSE.mail
james/jsieve/trunk/core/BUILDING.txt
james/jsieve/trunk/core/LICENSE.apache
james/jsieve/trunk/core/NOTICE.base
james/jsieve/trunk/core/build.xml
james/jsieve/trunk/mailet/LICENSE.apache
james/jsieve/trunk/mailet/NOTICE.base
james/jsieve/trunk/mailet/build.xml
james/jsieve/trunk/util/LICENSE.apache
james/jsieve/trunk/util/NOTICE.base
james/jsieve/trunk/util/build.xml


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1221742 - /james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java

[bago]

Author: bago
Date: Wed Dec 21 14:38:34 2011
New Revision: 1221742

URL: http://svn.apache.org/viewvc?rev=1221742view=rev
Log:
java 5 doesn't like @override on interface implementations.

Modified:

james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java

Modified: 
james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java?rev=1221742r1=1221741r2=1221742view=diff
==
--- 
james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
 (original)
+++ 
james/protocols/trunk/api/src/test/java/org/apache/james/protocols/api/AbstractProtocolTransportTest.java
 Wed Dec 21 14:38:34 2011
@@ -100,7 +100,6 @@ public class AbstractProtocolTransportTe
 private void notifyFutureResponses(final ListResponse messages, final 
boolean reverse) {
 new Thread(new Runnable() {
 
-@Override
 public void run() {
 try {
 Thread.sleep(200);
@@ -212,17 +211,14 @@ public class AbstractProtocolTransportTe
 this.msg =  UUID.randomUUID().toString();
 }
 
-@Override
 public String getRetCode() {
 throw new UnsupportedOperationException();
 }
 
-@Override
 public ListCharSequence getLines() {
 return Arrays.asList((CharSequence)msg);
 }
 
-@Override
 public boolean isEndSession() {
 return false;
 }



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1221743 - /james/protocols/trunk/api/pom.xml

[bago]

Author: bago
Date: Wed Dec 21 14:38:57 2011
New Revision: 1221743

URL: http://svn.apache.org/viewvc?rev=1221743view=rev
Log:
Add junit dependency for api module

Modified:
james/protocols/trunk/api/pom.xml

Modified: james/protocols/trunk/api/pom.xml
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1221743r1=1221742r2=1221743view=diff
==
--- james/protocols/trunk/api/pom.xml (original)
+++ james/protocols/trunk/api/pom.xml Wed Dec 21 14:38:57 2011
@@ -37,6 +37,12 @@
 groupIdorg.slf4j/groupId
 artifactIdslf4j-api/artifactId
 /dependency
+dependency
+groupIdjunit/groupId
+artifactIdjunit/artifactId
+version3.8.1/version
+scopetest/scope
+/dependency
 /dependencies
 
 build



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1221744 - in /james/protocols/trunk/pop3: .classpath .project .settings/

[bago]

Author: bago
Date: Wed Dec 21 14:39:56 2011
New Revision: 1221744

URL: http://svn.apache.org/viewvc?rev=1221744view=rev
Log:
Remove eclipse artifacts

Removed:
james/protocols/trunk/pop3/.classpath
james/protocols/trunk/pop3/.project
james/protocols/trunk/pop3/.settings/


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1221748 - /james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java

[bago]

Author: bago
Date: Wed Dec 21 14:47:25 2011
New Revision: 1221748

URL: http://svn.apache.org/viewvc?rev=1221748view=rev
Log:
An attempt to refactor AbstractProtocolTransport to be thread safe. I moved 
back to standard synchronization as we only have max 2 threads competing for 
the queue so it doesn't make sense to use a non blocking queue. Norman, please 
overview, and feel free to revert if you don't like the solution (i thought it 
was better to simply commit instead of opening a JIRA to show you this).

Modified:

james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java

Modified: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java?rev=1221748r1=1221747r2=1221748view=diff
==
--- 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
 (original)
+++ 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractProtocolTransport.java
 Wed Dec 21 14:47:25 2011
@@ -22,9 +22,8 @@ package org.apache.james.protocols.api;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-
+import java.util.Queue;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import org.apache.james.protocols.api.FutureResponse.ResponseListener;
 
@@ -42,18 +41,34 @@ public abstract class AbstractProtocolTr
 
 
 // TODO: Should we limit the size ?
-private final ConcurrentLinkedQueueResponse responses = new 
ConcurrentLinkedQueueResponse();
-private final AtomicBoolean write = new AtomicBoolean(false);
+private final QueueResponse responses = new 
LinkedBlockingQueueResponse();
+private volatile boolean isAsync = false;
 
 /**
  * @see 
org.apache.james.protocols.api.ProtocolTransport#writeResponse(org.apache.james.protocols.api.Response,
 org.apache.james.protocols.api.ProtocolSession)
  */
 public final void writeResponse(Response response, final ProtocolSession 
session) {
-// just add the response to the queue. We will trigger the write 
operation later
-responses.add(response);
- 
-// trigger the write
-writeQueuedResponses(session);
+// if we already in asynchrnous mode we simply enqueue the response
+// we do this synchronously because we may have a dequeuer thread 
working on
+// isAsync and responses.
+boolean enqueued = false;
+synchronized(this) {
+if (isAsync == true) {
+responses.offer(response);
+enqueued = true;
+}
+}
+
+// if we didn't enqueue then we check if the response is writable or 
we have to 
+// set us asynchrnous and wait for response to be ready.
+if (!enqueued) {
+if (isResponseWritable(response)) {
+writeResponseToClient(response, session);
+} else {
+addDequeuerListener(response, session);
+isAsync = true;
+}
+}
 }
 
 /**
@@ -65,50 +80,46 @@ public abstract class AbstractProtocolTr
  * @param session
  */
 private  void writeQueuedResponses(final ProtocolSession session) {
-Response queuedResponse = null;
 
-if (write.compareAndSet(false, true)){
-boolean listenerAdded = false;
-// dequeue Responses until non is left
-while ((queuedResponse = responses.poll()) != null) {
-
-// check if we need to take special care of FutureResponses
-if (queuedResponse instanceof FutureResponse) {
-FutureResponse futureResponse =(FutureResponse) 
queuedResponse;
-if (futureResponse.isReady()) {
-// future is ready so we can write it without blocking 
the IO-Thread
-writeResponseToClient(queuedResponse, session);
-} else {
-
-// future is not ready so we need to write it via a 
ResponseListener otherwise we MAY block the IO-Thread
-futureResponse.addListener(new ResponseListener() {
-
-public void onResponse(FutureResponse response) {
-writeResponseToClient(response, session);
-if (write.compareAndSet(true, false)) {
-writeQueuedResponses(session

svn commit: r1221749 - /james/protocols/trunk/pop3/

[bago]

Author: bago
Date: Wed Dec 21 14:47:43 2011
New Revision: 1221749

URL: http://svn.apache.org/viewvc?rev=1221749view=rev
Log:
Remove eclipse artifacts

Modified:
james/protocols/trunk/pop3/   (props changed)

Propchange: james/protocols/trunk/pop3/
--
--- svn:ignore (original)
+++ svn:ignore Wed Dec 21 14:47:43 2011
@@ -1 +1,7 @@
 target
+
+.project
+
+.classpath
+
+.settings



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171989 - in /james/server/trunk: lmtpserver/pom.xml pom.xml smtpserver/pom.xml

[bago]

Author: bago
Date: Sat Sep 17 14:29:02 2011
New Revision: 1171989

URL: http://svn.apache.org/viewvc?rev=1171989view=rev
Log:
remove dependency from smtp-netty

Modified:
james/server/trunk/lmtpserver/pom.xml
james/server/trunk/pom.xml
james/server/trunk/smtpserver/pom.xml

Modified: james/server/trunk/lmtpserver/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/pom.xml?rev=1171989r1=1171988r2=1171989view=diff
==
--- james/server/trunk/lmtpserver/pom.xml (original)
+++ james/server/trunk/lmtpserver/pom.xml Sat Sep 17 14:29:02 2011
@@ -90,10 +90,6 @@
   artifactIdprotocols-impl/artifactId
 /dependency   
 dependency
-  groupIdorg.apache.james.protocols/groupId
-  artifactIdprotocols-smtp-netty/artifactId
-/dependency 
-dependency
   groupIdorg.apache.james/groupId
   artifactIdapache-james-mailbox-api/artifactId
 /dependency

Modified: james/server/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1171989r1=1171988r2=1171989view=diff
==
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sat Sep 17 14:29:02 2011
@@ -632,11 +632,6 @@
   artifactIdprotocols-smtp/artifactId
   version${protocols.version}/version
 /dependency
-dependency
-  groupIdorg.apache.james.protocols/groupId
-  artifactIdprotocols-smtp-netty/artifactId
-  version${protocols.version}/version
-/dependency
 
 dependency
   groupIdorg.apache.james/groupId

Modified: james/server/trunk/smtpserver/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1171989r1=1171988r2=1171989view=diff
==
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Sat Sep 17 14:29:02 2011
@@ -91,11 +91,6 @@
   artifactIdprotocols-impl/artifactId
 /dependency
 dependency
-  groupIdorg.apache.james.protocols/groupId
-  artifactIdprotocols-smtp-netty/artifactId
-  version${protocols.version}/version
-/dependency
-dependency
   groupIdorg.apache.james.jspf/groupId
   artifactIdapache-jspf-resolver/artifactId
 /dependency



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171990 - in /james/protocols/trunk: pom.xml smtp-netty/

[bago]

Author: bago
Date: Sat Sep 17 14:30:56 2011
New Revision: 1171990

URL: http://svn.apache.org/viewvc?rev=1171990view=rev
Log:
remove smtp-netty module as it isn't needed anymore.

Removed:
james/protocols/trunk/smtp-netty/
Modified:
james/protocols/trunk/pom.xml

Modified: james/protocols/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1171990r1=1171989r2=1171990view=diff
==
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Sat Sep 17 14:30:56 2011
@@ -37,7 +37,6 @@
 moduleapi/module
 modulesmtp/module
 moduleimpl/module
-modulesmtp-netty/module
   /modules
   ciManagement
 systemhudson/system



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1172056 - /james/imap/trunk/target/

[bago]

Author: bago
Date: Sat Sep 17 19:45:09 2011
New Revision: 1172056

URL: http://svn.apache.org/viewvc?rev=1172056view=rev
Log:
target doesn't belong to the source tree

Removed:
james/imap/trunk/target/


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171587 - /james/protocols/trunk/pom.xml

[bago]

Author: bago
Date: Fri Sep 16 14:29:45 2011
New Revision: 1171587

URL: http://svn.apache.org/viewvc?rev=1171587view=rev
Log:
add smtp-netty module to the parent pom.

Modified:
james/protocols/trunk/pom.xml

Modified: james/protocols/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1171587r1=1171586r2=1171587view=diff
==
--- james/protocols/trunk/pom.xml (original)
+++ james/protocols/trunk/pom.xml Fri Sep 16 14:29:45 2011
@@ -37,6 +37,7 @@
 moduleapi/module
 modulesmtp/module
 moduleimpl/module
+modulesmtp-netty/module
   /modules
   ciManagement
 systemhudson/system



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171588 - in /james/protocols/trunk: impl/src/main/java/org/apache/james/protocols/impl/ smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/ smtp/src/main/java/org/apache/jame

[bago]

Author: bago
Date: Fri Sep 16 14:31:17 2011
New Revision: 1171588

URL: http://svn.apache.org/viewvc?rev=1171588view=rev
Log:
Remote SMTPResponseEncoder by moving RetCodeResponse encoding logic into the 
RetCodeResponse implementation (SMTPResponse) so that we can directly use 
AbstractResponseEncoder (that is not anymore abstract). Refactored fields to 
use generic interfaces when available.

Modified:

james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractResponseEncoder.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPResponseEncoder.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java

james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPResponse.java

Modified: 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractResponseEncoder.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractResponseEncoder.java?rev=1171588r1=1171587r2=1171588view=diff
==
--- 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractResponseEncoder.java
 (original)
+++ 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractResponseEncoder.java
 Fri Sep 16 14:31:17 2011
@@ -18,12 +18,11 @@
  /
 package org.apache.james.protocols.impl;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static org.jboss.netty.buffer.ChannelBuffers.copiedBuffer;
 
 import java.nio.charset.Charset;
 import java.util.List;
 
-
 import org.apache.james.protocols.api.Response;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
@@ -35,7 +34,7 @@ import org.jboss.netty.handler.codec.one
  *
  * @param R
  */
-public abstract class AbstractResponseEncoderR extends Response extends 
OneToOneEncoder{
+public class AbstractResponseEncoder extends OneToOneEncoder{
 
 private Class? extends Response classType;
 private Charset charset;
@@ -45,13 +44,12 @@ public abstract class AbstractResponseEn
 this.charset = charset;
 }
 
-@SuppressWarnings(unchecked)
 @Override
 protected Object encode(ChannelHandlerContext arg0, Channel arg1, Object 
obj) throws Exception {
 if (classType.isInstance(obj)) {
 StringBuilder builder = new StringBuilder();
-R response = (R) obj;
-ListString lines = getResponse(response);
+Response response = (Response) obj;
+ListCharSequence lines = response.getLines();
 for (int i = 0; i  lines.size(); i++) {
 builder.append(lines.get(i));
 if (i  lines.size()) {
@@ -62,9 +60,4 @@ public abstract class AbstractResponseEn
 }
 return obj;
 }
-
-/**
- * Return a list which contains the response
- */
-protected abstract ListString getResponse(R response);
 }

Modified: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java?rev=1171588r1=1171587r2=1171588view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 Fri Sep 16 14:31:17 2011
@@ -27,13 +27,12 @@ import org.apache.james.protocols.impl.A
 import org.apache.james.protocols.smtp.SMTPConfiguration;
 import org.apache.james.protocols.smtp.SMTPResponse;
 import org.apache.james.protocols.smtp.SMTPRetCode;
-import org.apache.james.protocols.smtp.SMTPSession;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.channel.ChannelHandler.Sharable;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ChannelUpstreamHandler;
 import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
 import org.jboss.netty.handler.codec.frame.TooLongFrameException;
 import org.slf4j.Logger;
 
@@ -61,15 +60,14 @@ public class SMTPChannelUpstreamHandler 
 
 @Override
 protected ProtocolSession createSession(ChannelHandlerContext ctx) throws 
Exception

svn commit: r1171589 - in /james/protocols/trunk/smtp-netty: .classpath .project

[bago]

Author: bago
Date: Fri Sep 16 14:32:31 2011
New Revision: 1171589

URL: http://svn.apache.org/viewvc?rev=1171589view=rev
Log:
Remove eclipse artifacts

Modified:
james/protocols/trunk/smtp-netty/.classpath
james/protocols/trunk/smtp-netty/.project


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171594 - /james/protocols/trunk/smtp-netty/

[bago]

Author: bago
Date: Fri Sep 16 14:36:09 2011
New Revision: 1171594

URL: http://svn.apache.org/viewvc?rev=1171594view=rev
Log:
Add svn-ignores for smtp-netty

Modified:
james/protocols/trunk/smtp-netty/   (props changed)

Propchange: james/protocols/trunk/smtp-netty/
--
--- svn:ignore (original)
+++ svn:ignore Fri Sep 16 14:36:09 2011
@@ -1 +1,7 @@
 target
+
+.settings
+
+.project
+
+.classpath



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171625 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ impl/src/main/java/org/apache/james/protocols/impl/ smtp-netty/src/main/java/org/apache/james/protoc

[bago]

Author: bago
Date: Fri Sep 16 15:32:17 2011
New Revision: 1171625

URL: http://svn.apache.org/viewvc?rev=1171625view=rev
Log:
Introduce ProtocolTransport a service implemented by the transport 
implementation (e.g: netty) and used by generic Protocol sessions (e.g: 
SmtpSession).
This way the session does need to depend on the transport implementation but 
depends on it at runtime.

Added:

james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
   (with props)

james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyProtocolTransport.java
   (with props)
Modified:

james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSession.java

james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/LineHandlerUpstreamHandler.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java

Added: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java?rev=1171625view=auto
==
--- 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
 (added)
+++ 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
 Fri Sep 16 15:32:17 2011
@@ -0,0 +1,46 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * License); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+
+package org.apache.james.protocols.api;
+
+import java.net.InetSocketAddress;
+
+/**
+ * ProtocolTransport is used by each ProtocolSession to communicate with the 
underlying transport.
+ * Transport implementations will provide their own implementation of the 
transport.
+ */
+public interface ProtocolTransport {
+
+InetSocketAddress getRemoteAddress();
+
+String getId();
+
+boolean isTLSStarted();
+
+boolean isStartTLSSupported();
+
+void writeResponse(Response response, ProtocolSession session);
+
+void popLineHandler();
+
+T extends ProtocolSession void pushLineHandler(LineHandlerT 
overrideCommandHandler, T smtpNettySession);
+
+int getPushedLineHandlerCount();
+
+}

Propchange: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolTransport.java
--
svn:mime-type = text/plain

Modified: 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSession.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSession.java?rev=1171625r1=1171624r2=1171625view=diff
==
--- 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSession.java
 (original)
+++ 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSession.java
 Fri Sep 16 15:32:17 2011
@@ -21,15 +21,9 @@ package org.apache.james.protocols.impl;
 
 import java.net.InetSocketAddress;
 
-import javax.net.ssl.SSLEngine;
-
+import org.apache.james.protocols.api.ProtocolTransport;
 import org.apache.james.protocols.api.Response;
-import org.apache.james.protocols.api.StartTlsResponse;
 import org.apache.james.protocols.api.TLSSupportedSession;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.handler.ssl.SslHandler;
 import org.slf4j.Logger;
 
 /**
@@ -38,27 +32,21

svn commit: r1171630 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ impl/src/main/java/org/apache/james/protocols/impl/ smtp-netty/src/main/java/org/apache/james/protoc

[bago]

Author: bago
Date: Fri Sep 16 15:42:54 2011
New Revision: 1171630

URL: http://svn.apache.org/viewvc?rev=1171630view=rev
Log:
Move SessionLog and AbstractSession to api so SMTPNettySession does not depend 
on netty anymore.

Added:

james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
  - copied, changed from r1171625, 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSession.java

james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java
  - copied, changed from r1171593, 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/SessionLog.java
Modified:

james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSession.java

james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/SessionLog.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java

Copied: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
 (from r1171625, 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSession.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.javap1=james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSession.javar1=1171625r2=1171630rev=1171630view=diff
==
--- 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/AbstractSession.java
 (original)
+++ 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/AbstractSession.java
 Fri Sep 16 15:42:54 2011
@@ -17,7 +17,7 @@
  * under the License.   *
  /
 
-package org.apache.james.protocols.impl;
+package org.apache.james.protocols.api;
 
 import java.net.InetSocketAddress;
 

Copied: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java
 (from r1171593, 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/SessionLog.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.javap1=james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/SessionLog.javar1=1171593r2=1171630rev=1171630view=diff
==
--- 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/SessionLog.java
 (original)
+++ 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java
 Fri Sep 16 15:42:54 2011
@@ -17,7 +17,7 @@
  * under the License.   *
  /
 
-package org.apache.james.protocols.impl;
+package org.apache.james.protocols.api;
 
 import org.slf4j.Logger;
 import org.slf4j.Marker;

Modified: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java?rev=1171630r1=1171629r2=1171630view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java
 Fri Sep 16 15:42:54 2011
@@ -24,7 +24,7 @@ import java.util.Map;
 
 import org.apache.james.protocols.api.LineHandler;
 import org.apache.james.protocols.api.ProtocolTransport;
-import org.apache.james.protocols.impl.AbstractSession;
+import org.apache.james.protocols.api.AbstractSession;
 import org.apache.james.protocols.smtp.SMTPConfiguration;
 import org.apache.james.protocols.smtp.SMTPSession;
 import org.slf4j.Logger;



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171632 - in /james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty: SMTPChannelUpstreamHandler.java SMTPNettySession.java SMTPSessionImpl.java

[bago]

Author: bago
Date: Fri Sep 16 15:44:36 2011
New Revision: 1171632

URL: http://svn.apache.org/viewvc?rev=1171632view=rev
Log:
Rename SMTPNettySession to SMTPSessionImpl now that it doesn't depend on Netty 
anymore

Added:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.java
   (contents, props changed)
  - copied, changed from r1171630, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java
Modified:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java

Modified: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java?rev=1171632r1=1171631r2=1171632view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 Fri Sep 16 15:44:36 2011
@@ -69,7 +69,7 @@ public class SMTPChannelUpstreamHandler 
 }
 }
 
-return new SMTPNettySession(conf, logger, new 
NettyProtocolTransport(ctx.getChannel(), engine));
+return new SMTPSessionImpl(conf, logger, new 
NettyProtocolTransport(ctx.getChannel(), engine));
 }
 
 @Override

Copied: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.java
 (from r1171630, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.java?p2=james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.javap1=james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.javar1=1171630r2=1171632rev=1171632view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPNettySession.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.java
 Fri Sep 16 15:44:36 2011
@@ -30,9 +30,9 @@ import org.apache.james.protocols.smtp.S
 import org.slf4j.Logger;
 
 /**
- * {@link SMTPSession} implementation for use with Netty
+ * {@link SMTPSession} implementation
  */
-public class SMTPNettySession extends AbstractSession implements SMTPSession {
+public class SMTPSessionImpl extends AbstractSession implements SMTPSession {
 public final static String SMTP_SESSION = SMTP_SESSION;
 
 private boolean relayingAllowed;
@@ -41,7 +41,7 @@ public class SMTPNettySession extends Ab
 
 private SMTPConfiguration theConfigData;
 
-public SMTPNettySession(SMTPConfiguration theConfigData, Logger logger, 
ProtocolTransport transport) {
+public SMTPSessionImpl(SMTPConfiguration theConfigData, Logger logger, 
ProtocolTransport transport) {
 super(logger, transport);
 this.theConfigData = theConfigData;
 connectionState = new HashMapString, Object();
@@ -177,9 +177,7 @@ public class SMTPNettySession extends Ab
 return theConfigData.useHeloEhloEnforcement();
 }
 
-/*
- * (non-Javadoc)
- * 
+/**
  * @see
  * org.apache.james.protocols.smtp.SMTPSession#getPushedLineHandlerCount()
  */

Propchange: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.java
--
svn:mime-type = text/plain



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171635 - in /james/protocols/trunk: smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/ smtp/src/main/java/org/apache/james/protocols/smtp/

[bago]

Author: bago
Date: Fri Sep 16 15:46:11 2011
New Revision: 1171635

URL: http://svn.apache.org/viewvc?rev=1171635view=rev
Log:
Move SMTPSessionImpl from smtp-netty to smtp module.

Added:

james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
   (contents, props changed)
  - copied, changed from r1171632, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.java
Modified:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.java

Modified: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java?rev=1171635r1=1171634r2=1171635view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 Fri Sep 16 15:46:11 2011
@@ -28,6 +28,7 @@ import org.apache.james.protocols.impl.N
 import org.apache.james.protocols.smtp.SMTPConfiguration;
 import org.apache.james.protocols.smtp.SMTPResponse;
 import org.apache.james.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSessionImpl;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFutureListener;
 import org.jboss.netty.channel.ChannelHandler.Sharable;

Copied: 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
 (from r1171632, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java?p2=james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.javap1=james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.javar1=1171632r2=1171635rev=1171635view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPSessionImpl.java
 (original)
+++ 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
 Fri Sep 16 15:46:11 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations  *
  * under the License.   *
  /
-package org.apache.james.protocols.smtp.netty;
+package org.apache.james.protocols.smtp;
 
 import java.util.Collection;
 import java.util.HashMap;

Propchange: 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
--
svn:mime-type = text/plain



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171835 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/

[bago]

Author: bago
Date: Fri Sep 16 22:33:58 2011
New Revision: 1171835

URL: http://svn.apache.org/viewvc?rev=1171835view=rev
Log:
Added a ProtocolSessionFactory interface to create ProtocolSession objects 
given a ProtocolTransport implementation.

Added:

james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionFactory.java
   (with props)
Modified:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java

Added: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionFactory.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionFactory.java?rev=1171835view=auto
==
--- 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionFactory.java
 (added)
+++ 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionFactory.java
 Fri Sep 16 22:33:58 2011
@@ -0,0 +1,26 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * License); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+
+package org.apache.james.protocols.api;
+
+public interface ProtocolSessionFactory {
+
+ProtocolSession newSession(ProtocolTransport transport);
+
+}

Propchange: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionFactory.java
--
svn:mime-type = text/plain

Modified: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java?rev=1171835r1=1171834r2=1171835view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 Fri Sep 16 22:33:58 2011
@@ -23,12 +23,11 @@ import javax.net.ssl.SSLEngine;
 
 import org.apache.james.protocols.api.ProtocolHandlerChain;
 import org.apache.james.protocols.api.ProtocolSession;
+import org.apache.james.protocols.api.ProtocolSessionFactory;
 import org.apache.james.protocols.impl.AbstractChannelUpstreamHandler;
 import org.apache.james.protocols.impl.NettyProtocolTransport;
-import org.apache.james.protocols.smtp.SMTPConfiguration;
 import org.apache.james.protocols.smtp.SMTPResponse;
 import org.apache.james.protocols.smtp.SMTPRetCode;
-import org.apache.james.protocols.smtp.SMTPSessionImpl;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFutureListener;
 import org.jboss.netty.channel.ChannelHandler.Sharable;
@@ -44,17 +43,17 @@ import org.slf4j.Logger;
 @Sharable
 public class SMTPChannelUpstreamHandler extends AbstractChannelUpstreamHandler 
{
 protected final Logger logger;
-protected final SMTPConfiguration conf;
 protected final SSLContext context;
 protected String[] enabledCipherSuites;
+protected ProtocolSessionFactory sessionFactory;
 
-public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain, 
SMTPConfiguration conf, Logger logger) {
-this(chain, conf, logger, null, null);
+public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain, 
ProtocolSessionFactory sessionFactory, Logger logger) {
+this(chain, sessionFactory, logger, null, null);
 }
 
-public SMTPChannelUpstreamHandler(ProtocolHandlerChain

svn commit: r1171854 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/ smtp/src/main/java/org/apache/james/

[bago]

Author: bago
Date: Fri Sep 16 23:33:39 2011
New Revision: 1171854

URL: http://svn.apache.org/viewvc?rev=1171854view=rev
Log:
Added generic ways to declare how a protocol replies to too long lines and to 
fatal errors. Not sure this is generic enough to correctly support 
pop3/lmtp/imap, but this may be a first attempt at making it generic.

Modified:

james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java

james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java

Modified: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java?rev=1171854r1=1171853r2=1171854view=diff
==
--- 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
 (original)
+++ 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java
 Fri Sep 16 23:33:39 2011
@@ -77,4 +77,17 @@ public interface ProtocolSession {
  * @return id
  */
 String getSessionID();
+
+/**
+ * Define a response object to be used as reply for a too long input line
+ * @return Response
+ */
+Response newLineTooLongResponse();
+
+/**
+ * Define a response object to be used as reply during a fatal error.
+ * Connection will be closed after this response.
+ * @return Response
+ */
+Response newFatalErrorResponse();
 }

Modified: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java?rev=1171854r1=1171853r2=1171854view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 Fri Sep 16 23:33:39 2011
@@ -24,10 +24,9 @@ import javax.net.ssl.SSLEngine;
 import org.apache.james.protocols.api.ProtocolHandlerChain;
 import org.apache.james.protocols.api.ProtocolSession;
 import org.apache.james.protocols.api.ProtocolSessionFactory;
+import org.apache.james.protocols.api.Response;
 import org.apache.james.protocols.impl.AbstractChannelUpstreamHandler;
 import org.apache.james.protocols.impl.NettyProtocolTransport;
-import org.apache.james.protocols.smtp.SMTPResponse;
-import org.apache.james.protocols.smtp.SMTPRetCode;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFutureListener;
 import org.jboss.netty.channel.ChannelHandler.Sharable;
@@ -75,13 +74,19 @@ public class SMTPChannelUpstreamHandler 
 @Override
 public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) 
throws Exception {
 Channel channel = ctx.getChannel();
+ProtocolSession session = (ProtocolSession) ctx.getAttachment();
 if (e.getCause() instanceof TooLongFrameException) {
-ctx.getChannel().write(new 
SMTPResponse(SMTPRetCode.SYNTAX_ERROR_COMMAND_UNRECOGNIZED, Line length 
exceeded. See RFC 2821 #4.5.3.1.));
+Response r = session.newLineTooLongResponse();
+if (r != null) ctx.getChannel().write(r);
 } else {
 if (channel.isConnected()) {
-ctx.getChannel().write(new 
SMTPResponse(SMTPRetCode.LOCAL_ERROR, Unable to process 
request)).addListener(ChannelFutureListener.CLOSE);
+Response r = session.newFatalErrorResponse();
+if (r != null) {
+
ctx.getChannel().write(r).addListener(ChannelFutureListener.CLOSE);
+} else {
+ctx.getChannel().close();
+}
 }
-ProtocolSession session = (ProtocolSession) ctx.getAttachment();
 if (session != null) {
 session.getLogger().debug(Unable to process request, 
e.getCause());
 } else {

Modified: 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java?rev=1171854r1=1171853r2=1171854view=diff
==
--- 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java
 (original)
+++ 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp

svn commit: r1171855 - in /james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty: BasicChannelUpstreamHandler.java SMTPChannelUpstreamHandler.java SMTPServer.java

[bago]

Author: bago
Date: Fri Sep 16 23:35:16 2011
New Revision: 1171855

URL: http://svn.apache.org/viewvc?rev=1171855view=rev
Log:
Rename SMTPChannelUpstreamHandler to BasicChannelUpstreamHandler.

Added:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.java
   (contents, props changed)
  - copied, changed from r1171854, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
Removed:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
Modified:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java

Copied: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.java
 (from r1171854, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.java?p2=james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.javap1=james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.javar1=1171854r2=1171855rev=1171855view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPChannelUpstreamHandler.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.java
 Fri Sep 16 23:35:16 2011
@@ -37,20 +37,20 @@ import org.jboss.netty.handler.codec.fra
 import org.slf4j.Logger;
 
 /**
- * {@link ChannelUpstreamHandler} which is used by the SMTPServer
+ * {@link ChannelUpstreamHandler} which is used by the SMTPServer and other 
line based protocols
  */
 @Sharable
-public class SMTPChannelUpstreamHandler extends AbstractChannelUpstreamHandler 
{
+public class BasicChannelUpstreamHandler extends 
AbstractChannelUpstreamHandler {
 protected final Logger logger;
 protected final SSLContext context;
 protected String[] enabledCipherSuites;
 protected ProtocolSessionFactory sessionFactory;
 
-public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain, 
ProtocolSessionFactory sessionFactory, Logger logger) {
+public BasicChannelUpstreamHandler(ProtocolHandlerChain chain, 
ProtocolSessionFactory sessionFactory, Logger logger) {
 this(chain, sessionFactory, logger, null, null);
 }
 
-public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain, 
ProtocolSessionFactory sessionFactory, Logger logger, SSLContext context, 
String[] enabledCipherSuites) {
+public BasicChannelUpstreamHandler(ProtocolHandlerChain chain, 
ProtocolSessionFactory sessionFactory, Logger logger, SSLContext context, 
String[] enabledCipherSuites) {
 super(chain);
 this.sessionFactory = sessionFactory;
 this.logger = logger;

Propchange: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.java
--
svn:mime-type = text/plain

Modified: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java?rev=1171855r1=1171854r2=1171855view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java
 Fri Sep 16 23:35:16 2011
@@ -134,7 +134,7 @@ public class SMTPServer extends Abstract
 
 @Override
 public synchronized void bind() throws Exception {
-coreHandler = new SMTPChannelUpstreamHandler(chain, new 
ProtocolSessionFactory() {
+coreHandler = new BasicChannelUpstreamHandler(chain, new 
ProtocolSessionFactory() {
 
 public ProtocolSession newSession(ProtocolTransport transport) {
 return new SMTPSessionImpl(theConfigData, logger, transport);



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171856 - in /james/protocols/trunk: impl/src/main/java/org/apache/james/protocols/impl/ smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/ smtp/src/test/java/org/apache/jame

[bago]

Author: bago
Date: Fri Sep 16 23:37:11 2011
New Revision: 1171856

URL: http://svn.apache.org/viewvc?rev=1171856view=rev
Log:
Move BasicChannelUpstreamHandler to the netty module (impl). Another step at 
removing the smtp-netty module.

Added:

james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java
   (contents, props changed)
  - copied, changed from r1171855, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.java
Removed:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.java
Modified:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java

james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java

Copied: 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java
 (from r1171855, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java?p2=james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.javap1=james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.javar1=1171855r2=1171856rev=1171856view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/BasicChannelUpstreamHandler.java
 (original)
+++ 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java
 Fri Sep 16 23:37:11 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations  *
  * under the License.   *
  /
-package org.apache.james.protocols.smtp.netty;
+package org.apache.james.protocols.impl;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;

Propchange: 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/BasicChannelUpstreamHandler.java
--
svn:mime-type = text/plain

Modified: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java?rev=1171856r1=1171855r2=1171856view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java
 Fri Sep 16 23:37:11 2011
@@ -30,6 +30,7 @@ import org.apache.james.protocols.api.Pr
 import org.apache.james.protocols.impl.AbstractAsyncServer;
 import org.apache.james.protocols.impl.AbstractResponseEncoder;
 import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
+import org.apache.james.protocols.impl.BasicChannelUpstreamHandler;
 import org.apache.james.protocols.smtp.SMTPConfiguration;
 import org.apache.james.protocols.smtp.SMTPProtocolHandlerChain;
 import org.apache.james.protocols.smtp.SMTPResponse;

Modified: 
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java?rev=1171856r1=1171855r2=1171856view=diff
==
--- 
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
 (original)
+++ 
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java
 Fri Sep 16 23:37:11 2011
@@ -208,4 +208,12 @@ public class BaseFakeSMTPSession impleme
 throw new UnsupportedOperationException(Unimplemented Stub Method);
 }
 
+public Response newLineTooLongResponse() {
+throw new UnsupportedOperationException(Unimplemented Stub Method);
+}
+
+public Response newFatalErrorResponse() {
+throw new UnsupportedOperationException(Unimplemented Stub Method);
+}
+
 }



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1171871 - in /james/protocols/trunk: smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/ smtp/src/main/java/org/apache/james/protocols/smtp/

[bago]

Author: bago
Date: Sat Sep 17 00:16:40 2011
New Revision: 1171871

URL: http://svn.apache.org/viewvc?rev=1171871view=rev
Log:
Use SMTPConfiguration to decide wether to enable starttls or not.

Added:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java
   (with props)
Modified:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java

james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java

Added: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java?rev=1171871view=auto
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java
 (added)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java
 Sat Sep 17 00:16:40 2011
@@ -0,0 +1,141 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * License); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+package org.apache.james.protocols.smtp.netty;
+
+
+import java.nio.charset.Charset;
+
+import javax.net.ssl.SSLContext;
+
+import org.apache.james.protocols.api.ProtocolHandlerChain;
+import org.apache.james.protocols.api.ProtocolSession;
+import org.apache.james.protocols.api.ProtocolSessionFactory;
+import org.apache.james.protocols.api.ProtocolTransport;
+import org.apache.james.protocols.impl.AbstractAsyncServer;
+import org.apache.james.protocols.impl.AbstractResponseEncoder;
+import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
+import org.apache.james.protocols.impl.BasicChannelUpstreamHandler;
+import org.apache.james.protocols.smtp.SMTPConfiguration;
+import org.apache.james.protocols.smtp.SMTPResponse;
+import org.apache.james.protocols.smtp.SMTPSessionImpl;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.ChannelUpstreamHandler;
+import org.jboss.netty.channel.group.ChannelGroup;
+import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import org.jboss.netty.handler.execution.ExecutionHandler;
+import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Generic NettyServer
+ */
+public class NettyServer extends AbstractAsyncServer {
+
+private ProtocolHandlerChain chain;
+
+private Logger logger = LoggerFactory.getLogger(NettyServer.class);
+
+protected SSLContext context;
+
+private ExecutionHandler eHandler;
+
+   
+/**
+ * The configuration data to be passed to the handler
+ */
+private final SMTPConfiguration theConfigData;
+
+private final static OneToOneEncoder SMTP_RESPONSE_ENCODER = new 
AbstractResponseEncoder(SMTPResponse.class, Charset.forName(US-ASCII));
+private ChannelUpstreamHandler coreHandler;
+
+public NettyServer(SMTPConfiguration theConfigData, ProtocolHandlerChain 
chain) {
+this(theConfigData, chain, null);
+}
+
+
+public NettyServer(SMTPConfiguration theConfigData, ProtocolHandlerChain 
chain, SSLContext context) {
+super();
+this.chain  = chain;
+this.context = context;
+this.theConfigData = theConfigData;
+}
+
+protected ExecutionHandler createExecutionHandler(int size) {
+return new ExecutionHandler(new 
OrderedMemoryAwareThreadPoolExecutor(size, 0, 0));
+}
+
+
+public void setUseExecutionHandler(boolean useHandler, int size) {
+if (isBound()) throw new IllegalStateException(Server running 
already);
+if (useHandler) {
+eHandler

svn commit: r1171877 - in /james/protocols/trunk: api/src/main/java/org/apache/james/protocols/api/ smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/

[bago]

Author: bago
Date: Sat Sep 17 00:31:36 2011
New Revision: 1171877

URL: http://svn.apache.org/viewvc?rev=1171877view=rev
Log:
Created a Protocol interface (maybe temporarily) and an SMTPProtocol definition.
NettyServer now does not anymore depend on SMTP and simply takes SMTPProtocol 
as an argument to start a server implementing that protocol.

Added:

james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
   (with props)

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPProtocol.java
   (with props)
Modified:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java

Added: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java?rev=1171877view=auto
==
--- 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
 (added)
+++ 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
 Sat Sep 17 00:31:36 2011
@@ -0,0 +1,35 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * License); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+
+package org.apache.james.protocols.api;
+
+/**
+ * Define a protocol
+ */
+public interface Protocol {
+
+ProtocolHandlerChain getProtocolChain();
+
+ProtocolSessionFactory getProtocolSessionFactory();
+
+boolean isStartTLSSupported();
+
+Class? extends Response getResponseClass();
+
+}

Propchange: 
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Protocol.java
--
svn:mime-type = text/plain

Modified: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java?rev=1171877r1=1171876r2=1171877view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java
 Sat Sep 17 00:31:36 2011
@@ -23,17 +23,11 @@ import java.nio.charset.Charset;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.james.protocols.api.ProtocolHandlerChain;
-import org.apache.james.protocols.api.ProtocolSession;
-import org.apache.james.protocols.api.ProtocolSessionFactory;
-import org.apache.james.protocols.api.ProtocolTransport;
+import org.apache.james.protocols.api.Protocol;
 import org.apache.james.protocols.impl.AbstractAsyncServer;
 import org.apache.james.protocols.impl.AbstractResponseEncoder;
 import org.apache.james.protocols.impl.AbstractSSLAwareChannelPipelineFactory;
 import org.apache.james.protocols.impl.BasicChannelUpstreamHandler;
-import org.apache.james.protocols.smtp.SMTPConfiguration;
-import org.apache.james.protocols.smtp.SMTPResponse;
-import org.apache.james.protocols.smtp.SMTPSessionImpl;
 import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.ChannelUpstreamHandler;
 import org.jboss.netty.channel.group.ChannelGroup;
@@ -48,7 +42,7 @@ import org.slf4j.LoggerFactory;
  */
 public class NettyServer extends AbstractAsyncServer {
 
-private ProtocolHandlerChain chain;
+private Protocol protocol;
 
 private Logger logger = LoggerFactory.getLogger(NettyServer.class);
 
@@ -56,25 +50,20 @@ public class NettyServer

svn commit: r1171878 - in /james/protocols/trunk: impl/src/main/java/org/apache/james/protocols/impl/ smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/ smtp/src/main/java/org/apache/jame

[bago]

Author: bago
Date: Sat Sep 17 00:34:00 2011
New Revision: 1171878

URL: http://svn.apache.org/viewvc?rev=1171878view=rev
Log:
Moved generic NettyServer to netty impl module.
Moved SMTPProtocol to smtp module.

Added:

james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
   (contents, props changed)
  - copied, changed from r1171877, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java

james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
   (contents, props changed)
  - copied, changed from r1171877, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPProtocol.java
Removed:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPProtocol.java
Modified:

james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java

Copied: 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
 (from r1171877, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java?p2=james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.javap1=james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.javar1=1171877r2=1171878rev=1171878view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/NettyServer.java
 (original)
+++ 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
 Sat Sep 17 00:34:00 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations  *
  * under the License.   *
  /
-package org.apache.james.protocols.smtp.netty;
+package org.apache.james.protocols.impl;
 
 
 import java.nio.charset.Charset;

Propchange: 
james/protocols/trunk/impl/src/main/java/org/apache/james/protocols/impl/NettyServer.java
--
svn:mime-type = text/plain

Modified: 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java?rev=1171878r1=1171877r2=1171878view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java
 (original)
+++ 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPServer.java
 Sat Sep 17 00:34:00 2011
@@ -21,7 +21,9 @@ package org.apache.james.protocols.smtp.
 
 import javax.net.ssl.SSLContext;
 
+import org.apache.james.protocols.impl.NettyServer;
 import org.apache.james.protocols.smtp.SMTPConfiguration;
+import org.apache.james.protocols.smtp.SMTPProtocol;
 import org.apache.james.protocols.smtp.SMTPProtocolHandlerChain;
 import org.apache.james.protocols.smtp.SMTPServerMBean;
 

Copied: 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
 (from r1171877, 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPProtocol.java)
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java?p2=james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.javap1=james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPProtocol.javar1=1171877r2=1171878rev=1171878view=diff
==
--- 
james/protocols/trunk/smtp-netty/src/main/java/org/apache/james/protocols/smtp/netty/SMTPProtocol.java
 (original)
+++ 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java
 Sat Sep 17 00:34:00 2011
@@ -17,7 +17,7 @@
  * under the License.   *
  /
 
-package org.apache.james.protocols.smtp.netty;
+package org.apache.james.protocols.smtp;
 
 import org.apache.james.protocols.api.Protocol;
 import org.apache.james.protocols.api.ProtocolHandlerChain;

Propchange: 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java

svn commit: r1152453 - in /james/jdkim/trunk: mailets/pom.xml main/pom.xml pom.xml

[bago]

Author: bago
Date: Sat Jul 30 11:07:04 2011
New Revision: 1152453

URL: http://svn.apache.org/viewvc?rev=1152453view=rev
Log:
- fix site deploy url paths for submodules. 
- readd reports for the site generation
- remove doap and add emma plugin

Modified:
james/jdkim/trunk/mailets/pom.xml
james/jdkim/trunk/main/pom.xml
james/jdkim/trunk/pom.xml

Modified: james/jdkim/trunk/mailets/pom.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/pom.xml?rev=1152453r1=1152452r2=1152453view=diff
==
--- james/jdkim/trunk/mailets/pom.xml (original)
+++ james/jdkim/trunk/mailets/pom.xml Sat Jul 30 11:07:04 2011
@@ -30,6 +30,13 @@
 urlhttp://james.apache.org/jdkim/mailets//url
 descriptionMailets integrating DKIM functions/description
 
+distributionManagement
+site
+idjdkim-website-mailets/id
+
urlscp://people.apache.org/www/james.apache.org/jdkim/mailets//url
+/site
+/distributionManagement
+
 dependencies
 dependency
 groupIdorg.apache.james/groupId

Modified: james/jdkim/trunk/main/pom.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/pom.xml?rev=1152453r1=1152452r2=1152453view=diff
==
--- james/jdkim/trunk/main/pom.xml (original)
+++ james/jdkim/trunk/main/pom.xml Sat Jul 30 11:07:04 2011
@@ -34,8 +34,8 @@
 
 distributionManagement
 site
-idjdkim-website/id
-urlscp://people.apache.org/www/james.apache.org/jdkim//url
+idjdkim-website-main/id
+urlscp://people.apache.org/www/james.apache.org/jdkim/main//url
 /site
 /distributionManagement
 
@@ -208,6 +208,7 @@
 /execution
 /executions
 /plugin
+!-- 
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-doap-plugin/artifactId
@@ -239,7 +240,7 @@
   /standard
   standard
 idDKIM/id
-titleDomainKeys Identified Mail (DKIM) Signatures -- 
Update/title
+titleDomainKeys Identified Mail (DKIM) Signatures - - 
Update/title
 bodyIEFT/body
 urlhttp://www.ietf.org/rfc/rfc5672.txt/url
   /standard
@@ -247,6 +248,7 @@
/asfExtOptions
   /configuration
 /plugin
+ --
 !-- Shading commons-codec Base64 class so that we don't have one 
more dependency --
 plugin
 groupIdorg.apache.maven.plugins/groupId

Modified: james/jdkim/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/pom.xml?rev=1152453r1=1152452r2=1152453view=diff
==
--- james/jdkim/trunk/pom.xml (original)
+++ james/jdkim/trunk/pom.xml Sat Jul 30 11:07:04 2011
@@ -290,11 +290,13 @@
 artifactIdmaven-javadoc-plugin/artifactId
 version2.7/version
 /plugin
+!--
 plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-doap-plugin/artifactId
 version1.1/version
 /plugin
+--
 plugin
 groupIdorg.codehaus.mojo/groupId
 artifactIdfindbugs-maven-plugin/artifactId
@@ -399,13 +401,13 @@
 /goals
 configuration
 siteDirectory${basedir}/src/site/siteDirectory
-generateReportsfalse/generateReports
+generateReportstrue/generateReports
 /configuration
 /execution
 /executions
 configuration
 
siteDirectory${maven-site-plugin.siteDirectory}/siteDirectory
-
generateReports${maven-site-plugin.generateReports}/generateReports
+generateReportstrue/generateReports
 reportPlugins
 !-- Order matters. First project-info-reports, second 
jxr. --
 plugin
@@ -522,6 +524,10 @@
 
findbugsXmlWithMessagestrue/findbugsXmlWithMessages
 /configuration
 /plugin
+plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdemma-maven-plugin/artifactId
+/plugin
 !--
 plugin
   groupIdorg.apache.maven.plugins/groupId

svn commit: r1152460 - /james/project/trunk/project/src/site/xdoc/download.xml

[bago]

Author: bago
Date: Sat Jul 30 13:24:45 2011
New Revision: 1152460

URL: http://svn.apache.org/viewvc?rev=1152460view=rev
Log:
fix jdkim download urls.

Modified:
james/project/trunk/project/src/site/xdoc/download.xml

Modified: james/project/trunk/project/src/site/xdoc/download.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/project/src/site/xdoc/download.xml?rev=1152460r1=1152459r2=1152460view=diff
==
--- james/project/trunk/project/src/site/xdoc/download.xml (original)
+++ james/project/trunk/project/src/site/xdoc/download.xml Sat Jul 30 13:24:45 
2011
@@ -331,31 +331,17 @@ is found a href='http://www.apache.org/
 pApache James jDKIM 0.2 is the latest jDKIM stable version:/p
 ul
 
-liBinary Main Library (JAR): a
-
href=[preferred]/james/jdkim/binaries/apache-jdkim-main-0.2.jarapache-jdkim-main-0.2.jar/a
 [a
-
href=http://www.apache.org/dist/james/jdkim/binaries/apache-jdkim-main-0.2.jar.asc;PGP/a]/li
-
-liBinary Mailet (JAR): a
-
href=[preferred]/james/jdkim/binaries/apache-jdkim-mailets-0.1.jarapache-jdkim-mailets-0.2.jar/a
 [a
-
href=http://www.apache.org/dist/james/jdkim/binaries/apache-jdkim-mailets-0.2.jar.asc;PGP/a]/li
-
 liBinary (ZIP Format): a
-
href=[preferred]/james/jdkim/binaries/apache-jdkim-0.2-bin.zipapache-jdkim-0.2-bin.zip/a
 [a
-
href=http://www.apache.org/dist/james/jdkim/binaries/apache-jdkim-0.2-bin.zip.asc;PGP/a]/li
+
href=[preferred]/james/jdkim/apache-jdkim-0.2-bin.zipapache-jdkim-0.2-bin.zip/a
 [a
+
href=http://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip.asc;PGP/a]/li
 
 liBinary (Unix TAR.GZ): a
-
href=[preferred]/james/jdkim/binaries/apache-jdkim-0.2-bin.tar.gzapache-jdkim-0.2-bin.tar.gz/a
 [a
-
href=http://www.apache.org/dist/james/jdkim/binaries/apache-jdkim-0.2-bin.tar.gz.asc;PGP/a]/li
-
-liSource (Unix TAR.GZ): a
-
href=[preferred]/james/jdkim/source/apache-jdkim-project-0.2-source-release.tar.gzapache-jdkim-project-0.2-source-release.tar.gz/a
 [a
-
href=http://www.apache.org/dist/james/jdkim/source/apache-jdkim-project-0.2-source-release.tar.gz.asc;PGP/a]/li
+
href=[preferred]/james/jdkim/apache-jdkim-0.2-bin.tar.gzapache-jdkim-0.2-bin.tar.gz/a
 [a
+
href=http://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.tar.gz.asc;PGP/a]/li
 
 liSource (ZIP Format): a
-
href=[preferred]/james/jdkim/source/apache-jdkim-project-0.2-source-release.zipapache-jdkim-project-0.2-source-release.zip/a
 [a
-
href=http://www.apache.org/dist/james/jdkim/source/apache-jdkim-project-0.2-source-release.zip.asc;PGP/a]/li
-
-lia href=[preferred]/james/jdkim/binaries/Other Binaries/a/li
+
href=[preferred]/james/jdkim/apache-jdkim-project-0.2-source-release.zipapache-jdkim-project-0.2-source-release.zip/a
 [a
+
href=http://www.apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip.asc;PGP/a]/li
 
 /ul
   



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1152386 - in /james/project/trunk/project/src/site/xdoc: download.xml index.xml newsarchive.xml

[bago]

Author: bago
Date: Fri Jul 29 22:08:47 2011
New Revision: 1152386

URL: http://svn.apache.org/viewvc?rev=1152386view=rev
Log:
Update main James site to reflect jDKIM 0.2 release

Modified:
james/project/trunk/project/src/site/xdoc/download.xml
james/project/trunk/project/src/site/xdoc/index.xml
james/project/trunk/project/src/site/xdoc/newsarchive.xml

Modified: james/project/trunk/project/src/site/xdoc/download.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/project/src/site/xdoc/download.xml?rev=1152386r1=1152385r2=1152386view=diff
==
--- james/project/trunk/project/src/site/xdoc/download.xml (original)
+++ james/project/trunk/project/src/site/xdoc/download.xml Fri Jul 29 22:08:47 
2011
@@ -63,6 +63,7 @@ is found a href='http://www.apache.org/
   lia href='#Apache_James_Server'Apache James Server/a/li
   lia href='#Apache_Mime4J'Apache James Mime4j/a/li
   lia href='#Apache_jSPF'Apache James jSPF/a/li
+  lia href='#Apache_jDKIM'Apache James jDKIM/a/li
   lia href='#Apache_JSieve'Apache James JSieve/a/li
   lia href='#Apache_Mailet'Apache James Mailet/a/li
   lia href='#Apache_Mailet_Base'Apache James Mailet Base/a/li
@@ -325,6 +326,41 @@ is found a href='http://www.apache.org/
   
   /section
   
+  section name=Apache jDKIM
+  
+pApache James jDKIM 0.2 is the latest jDKIM stable version:/p
+ul
+
+liBinary Main Library (JAR): a
+
href=[preferred]/james/jdkim/binaries/apache-jdkim-main-0.2.jarapache-jdkim-main-0.2.jar/a
 [a
+
href=http://www.apache.org/dist/james/jdkim/binaries/apache-jdkim-main-0.2.jar.asc;PGP/a]/li
+
+liBinary Mailet (JAR): a
+
href=[preferred]/james/jdkim/binaries/apache-jdkim-mailets-0.1.jarapache-jdkim-mailets-0.2.jar/a
 [a
+
href=http://www.apache.org/dist/james/jdkim/binaries/apache-jdkim-mailets-0.2.jar.asc;PGP/a]/li
+
+liBinary (ZIP Format): a
+
href=[preferred]/james/jdkim/binaries/apache-jdkim-0.2-bin.zipapache-jdkim-0.2-bin.zip/a
 [a
+
href=http://www.apache.org/dist/james/jdkim/binaries/apache-jdkim-0.2-bin.zip.asc;PGP/a]/li
+
+liBinary (Unix TAR.GZ): a
+
href=[preferred]/james/jdkim/binaries/apache-jdkim-0.2-bin.tar.gzapache-jdkim-0.2-bin.tar.gz/a
 [a
+
href=http://www.apache.org/dist/james/jdkim/binaries/apache-jdkim-0.2-bin.tar.gz.asc;PGP/a]/li
+
+liSource (Unix TAR.GZ): a
+
href=[preferred]/james/jdkim/source/apache-jdkim-project-0.2-source-release.tar.gzapache-jdkim-project-0.2-source-release.tar.gz/a
 [a
+
href=http://www.apache.org/dist/james/jdkim/source/apache-jdkim-project-0.2-source-release.tar.gz.asc;PGP/a]/li
+
+liSource (ZIP Format): a
+
href=[preferred]/james/jdkim/source/apache-jdkim-project-0.2-source-release.zipapache-jdkim-project-0.2-source-release.zip/a
 [a
+
href=http://www.apache.org/dist/james/jdkim/source/apache-jdkim-project-0.2-source-release.zip.asc;PGP/a]/li
+
+lia href=[preferred]/james/jdkim/binaries/Other Binaries/a/li
+
+/ul
+  
+  /section
+  
   section name=Apache JSieve
   
 pApache JSieve 0.4 is the latest stable version:/p

Modified: james/project/trunk/project/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/project/src/site/xdoc/index.xml?rev=1152386r1=1152385r2=1152386view=diff
==
--- james/project/trunk/project/src/site/xdoc/index.xml (original)
+++ james/project/trunk/project/src/site/xdoc/index.xml Fri Jul 29 22:08:47 2011
@@ -379,6 +379,10 @@
   /li
 --
   liJuly/2011 - ul
+  lia href=newsarchive.html#30072011strongApache James jDKIM 
0.2/strong released/a/li
+  /ul
+  /li
+  liJuly/2011 - ul
   lia href=newsarchive.html#25072011strongApache James Mime4J 
0.7/strong released/a/li
   /ul
   /li

Modified: james/project/trunk/project/src/site/xdoc/newsarchive.xml
URL: 
http://svn.apache.org/viewvc/james/project/trunk/project/src/site/xdoc/newsarchive.xml?rev=1152386r1=1152385r2=1152386view=diff
==
--- james/project/trunk/project/src/site/xdoc/newsarchive.xml (original)
+++ james/project/trunk/project/src/site/xdoc/newsarchive.xml Fri Jul 29 
22:08:47 2011
@@ -17,6 +17,15 @@
   /div
 
 subsection name='2011'
+a name=30072011h4Apache James jDKIM 0.2/h4/a
+pThe Apache James Project is happy to announce
+   the release of version 0.2 of the Apache James jDKIM library./p
+pjDKIM is a DKIM implementation library written in Java. It provides
+   both verification and signing and also provides Mailets for the
+   Apache JAMES project./p
+pThis is the first official release of the library, but the code has
+   been in production almost unchanged since two years./p

svn commit: r1152390 - in /james/jdkim/trunk: pom.xml src/site/xdoc/index.xml

[bago]

Author: bago
Date: Fri Jul 29 22:14:57 2011
New Revision: 1152390

URL: http://svn.apache.org/viewvc?rev=1152390view=rev
Log:
Update James jDKIM site to reflect jDKIM 0.2 release and update scm url for 
site deploy

Modified:
james/jdkim/trunk/pom.xml
james/jdkim/trunk/src/site/xdoc/index.xml

Modified: james/jdkim/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/pom.xml?rev=1152390r1=1152389r2=1152390view=diff
==
--- james/jdkim/trunk/pom.xml (original)
+++ james/jdkim/trunk/pom.xml Fri Jul 29 22:14:57 2011
@@ -46,7 +46,7 @@
 distributionManagement
 site
 idjdkim-current-website/id
-
urlscp://people.apache.org/www/james.apache.org/jdkim/current//url
+urlscp://people.apache.org/www/james.apache.org/jdkim//url
 /site
 /distributionManagement
 

Modified: james/jdkim/trunk/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/src/site/xdoc/index.xml?rev=1152390r1=1152389r2=1152390view=diff
==
--- james/jdkim/trunk/src/site/xdoc/index.xml (original)
+++ james/jdkim/trunk/src/site/xdoc/index.xml Fri Jul 29 22:14:57 2011
@@ -31,16 +31,28 @@
It provides both verification and signing and 
also
provides Mailets for the Apache JAMES project.
/p
-
+   
+   p
+   The 0.2 release is the first release. It 
requires Java 1.5 at
+   runtime and it requires the JVM running the 
library to support
+   SHA256withRSA cypher suite. The default Sun 
Java 1.5 does support this
+   suite. If your JVM doesn't support it you can 
install a third party
+   cryptography provider like BouncyCastle and 
configure it appropriately
+   in your JVM.
+   /p
+   
+   p
+   The architecture is thought to handle multiple 
signatures with
+   performance in mind: body hashing for multiple 
signatures is computed
+   concurrently in a single stream run.
+   /p
+   
p
-   The 0.2 release is the first release. It 
requires Java
-   1.4 at runtime but for full compliance with the 
DKIM
-   specification the JVM running the library must 
support
-   SHA256withRSA cypher suite. The default Sun 
Java 1.4
-   does not support this suite, so either you move 
to Java
-   1.5+ or you install a third party cryptography 
provider
-   like BouncyCastle and configure it 
appropriately in your
-   JVM.
+   The whole internal verification/signing is done 
via OutputStream
+   leaving much more flexibility than the use of 
InputStream. As the
+   InputStream approach is easier from the user 
side the default
+   implementation simply prepare the OutputStream 
and copy the supplied
+   InputStream to the OutputStream.
/p

p



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1150625 - in /james/jdkim/trunk: ./ assemble/src/assemble/ mailets/ mailets/src/main/java/org/apache/james/jdkim/mailets/ main/

[bago]

Author: bago
Date: Mon Jul 25 10:42:48 2011
New Revision: 1150625

URL: http://svn.apache.org/viewvc?rev=1150625view=rev
Log:
upgrade to mime4j 0.7 final
remove of src assembly (it is already generated by our apache parent pom 
during release)
renamed LICENSE/NOTICE to remove the .txt extension (so the source package from 
the parent pom is ok)
removed sun's javamail dependency in favor of geronimo deps, so we can build 
without external repositories.
created a CRLFOutputStream (copied from the one in james-mailbox, previously in 
server/util/stream) so to not use the one from javamail com.sun package anymore.

Added:
james/jdkim/trunk/LICENSE
  - copied unchanged from r1147805, james/jdkim/trunk/LICENSE.txt
james/jdkim/trunk/NOTICE
  - copied unchanged from r1147805, james/jdkim/trunk/NOTICE.txt

james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/CRLFOutputStream.java
   (with props)
Removed:
james/jdkim/trunk/LICENSE.txt
james/jdkim/trunk/NOTICE.txt
Modified:
james/jdkim/trunk/assemble/src/assemble/bin.xml
james/jdkim/trunk/mailets/pom.xml

james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMSign.java

james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java
james/jdkim/trunk/main/pom.xml
james/jdkim/trunk/pom.xml

Modified: james/jdkim/trunk/assemble/src/assemble/bin.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/assemble/src/assemble/bin.xml?rev=1150625r1=1150624r2=1150625view=diff
==
--- james/jdkim/trunk/assemble/src/assemble/bin.xml (original)
+++ james/jdkim/trunk/assemble/src/assemble/bin.xml Mon Jul 25 10:42:48 2011
@@ -29,8 +29,8 @@
   directory../directory
   outputDirectory//outputDirectory
   includes
-includeLICENSE.*/include
-includeNOTICE.*/include
+includeLICENSE/include
+includeNOTICE/include
 includeRELEASE_NOTES.txt/include
   /includes
 /fileSet

Modified: james/jdkim/trunk/mailets/pom.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/pom.xml?rev=1150625r1=1150624r2=1150625view=diff
==
--- james/jdkim/trunk/mailets/pom.xml (original)
+++ james/jdkim/trunk/mailets/pom.xml Mon Jul 25 10:42:48 2011
@@ -90,12 +90,12 @@
 scopetest/scope
 /dependency
 dependency
-groupIdjavax.mail/groupId
-artifactIdmail/artifactId
+groupIdorg.apache.geronimo.specs/groupId
+artifactIdgeronimo-activation_1.1_spec/artifactId
 /dependency
 dependency
-groupIdjavax.activation/groupId
-artifactIdactivation/artifactId
+groupIdorg.apache.geronimo.javamail/groupId
+artifactIdgeronimo-javamail_1.4_mail/artifactId
 /dependency
 dependency
 groupIdca.juliusdavies/groupId

Added: 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/CRLFOutputStream.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/CRLFOutputStream.java?rev=1150625view=auto
==
--- 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/CRLFOutputStream.java
 (added)
+++ 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/CRLFOutputStream.java
 Mon Jul 25 10:42:48 2011
@@ -0,0 +1,161 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the*
+ * License); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *  *
+ *   http://www.apache.org/licenses/LICENSE-2.0 *
+ *  *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY   *
+ * KIND, either express or implied.  See the License for the*
+ * specific language governing permissions and limitations  *
+ * under the License.   *
+ /
+
+package org.apache.james.jdkim.mailets;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * A Filter for use with SMTP

svn commit: r1150626 - /james/jdkim/trunk/assemble/src/assemble/src.xml

[bago]

Author: bago
Date: Mon Jul 25 10:43:29 2011
New Revision: 1150626

URL: http://svn.apache.org/viewvc?rev=1150626view=rev
Log:
upgrade to mime4j 0.7 final
remove of src assembly (it is already generated by our apache parent pom 
during release)
renamed LICENSE/NOTICE to remove the .txt extension (so the source package from 
the parent pom is ok)
removed sun's javamail dependency in favor of geronimo deps, so we can build 
without external repositories.
created a CRLFOutputStream (copied from the one in james-mailbox, previously in 
server/util/stream) so to not use the one from javamail com.sun package anymore.

Removed:
james/jdkim/trunk/assemble/src/assemble/src.xml


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1150639 - /james/jdkim/trunk/RELEASE_NOTES.txt

[bago]

Author: bago
Date: Mon Jul 25 11:39:22 2011
New Revision: 1150639

URL: http://svn.apache.org/viewvc?rev=1150639view=rev
Log:
Updated release notes to reflect latest changes (expecially mime4j 0.7 and java 
1.5)

Modified:
james/jdkim/trunk/RELEASE_NOTES.txt

Modified: james/jdkim/trunk/RELEASE_NOTES.txt
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/RELEASE_NOTES.txt?rev=1150639r1=1150638r2=1150639view=diff
==
--- james/jdkim/trunk/RELEASE_NOTES.txt (original)
+++ james/jdkim/trunk/RELEASE_NOTES.txt Mon Jul 25 11:39:22 2011
@@ -4,16 +4,15 @@ Release 0.2
 jDKIM is a DKIM implementation library written in Java. It provides both 
verification and signing
 and also provides Mailets for the Apache JAMES project.
 
-The 0.2 release is the first release. It requires Java 1.4 at runtime but for 
full compliance with
-the DKIM specification the JVM running the library must support SHA256withRSA 
cypher suite.
-The default Sun Java 1.4 does not support this suite, so either you move to 
Java 1.5+ or you 
-install a third party cryptography provider like BouncyCastle and configure it 
appropriately in 
-your JVM.
+The 0.2 release is the first release. It requires Java 1.5 at runtime and it 
requires the JVM 
+running the library to support SHA256withRSA cypher suite. The default Sun 
Java 1.5 does support 
+this suite. If your JVM doesn't support it you can install a third party 
cryptography provider 
+like BouncyCastle and configure it appropriately in your JVM.
 
 The architecture is thought to handle multiple signatures with performance in 
mind: body hashing
 for multiple signatures is computed concurrently in a single stream run.
 
-The whole internal verification/signing is dove via OutputStream leaving much 
more flexibility than
+The whole internal verification/signing is done via OutputStream leaving much 
more flexibility than
 the use of InputStream. As the InputStream approach is easier from the user 
side the default
 implementation simply prepare the OutputStream and copy the supplied 
InputStream to the OutputStream.
 
@@ -24,9 +23,7 @@ Notes
 -
 
  * jDKIM API is still considered unstable and is likely to change in future 
releases
- * Code is likely to be updated to Java 1.5 before a final release.
- * Default parsing is done using mime4j 0.5 parser (0.6 is Java 5 only, so we 
stuck to 0.5).
+ * Default parsing is done using mime4j 0.7 parser.
  * The mailet does rely on javamail parsing instead of mime4j.
  * Make sure to use dnsjava 2.0.7 or greater as 2.0.6 has a bug in TXT record 
escaping. 
- 
 



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1150640 - in /james/jdkim/trunk: LICENSE NOTICE assemble/src/assemble/bin.xml assemble/src/licensing/ assemble/src/licensing/licenseForApp.txt assemble/src/licensing/noticeForApp.txt main

[bago]

Author: bago
Date: Mon Jul 25 11:40:21 2011
New Revision: 1150640

URL: http://svn.apache.org/viewvc?rev=1150640view=rev
Log:
Updated main LICENSE/NOTICE and created licenseForApp/noticeForApp for the 
binary package (JDKIM-29).
Also updated the rat configuration for main library.

Added:
james/jdkim/trunk/assemble/src/licensing/
james/jdkim/trunk/assemble/src/licensing/licenseForApp.txt   (with props)
james/jdkim/trunk/assemble/src/licensing/noticeForApp.txt   (with props)
Modified:
james/jdkim/trunk/LICENSE
james/jdkim/trunk/NOTICE
james/jdkim/trunk/assemble/src/assemble/bin.xml
james/jdkim/trunk/main/pom.xml

Modified: james/jdkim/trunk/LICENSE
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/LICENSE?rev=1150640r1=1150639r2=1150640view=diff
==
--- james/jdkim/trunk/LICENSE (original)
+++ james/jdkim/trunk/LICENSE Mon Jul 25 11:40:21 2011
@@ -176,431 +176,9 @@
END OF TERMS AND CONDITIONS


-   
-
 THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
 FOLLOWING LICENSES:
 
-Javax Activation (activation-1.1.1.jar) and Javax Mail (mail-1.4.1.jar) under
-
-   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-   
-   1. Definitions.
-   
-   1.1. Contributor means each individual or entity that
-   creates or contributes to the creation of Modifications.
-   
-   1.2. Contributor Version means the combination of the
-   Original Software, prior Modifications used by a
-   Contributor (if any), and the Modifications made by that
-   particular Contributor.
-   
-   1.3. Covered Software means (a) the Original Software, or
-   (b) Modifications, or (c) the combination of files
-   containing Original Software with files containing
-   Modifications, in each case including portions thereof.
-   
-   1.4. Executable means the Covered Software in any form
-   other than Source Code.
-   
-   1.5. Initial Developer means the individual or entity
-   that first makes Original Software available under this
-   License.
-   
-   1.6. Larger Work means a work which combines Covered
-   Software or portions thereof with code not governed by the
-   terms of this License.
-   
-   1.7. License means this document.
-   
-   1.8. Licensable means having the right to grant, to the
-   maximum extent possible, whether at the time of the initial
-   grant or subsequently acquired, any and all of the rights
-   conveyed herein.
-   
-   1.9. Modifications means the Source Code and Executable
-   form of any of the following:
-   
-   A. Any file that results from an addition to,
-   deletion from or modification of the contents of a
-   file containing Original Software or previous
-   Modifications;
-   
-   B. Any new file that contains any part of the
-   Original Software or previous Modification; or
-   
-   C. Any new file that is contributed or otherwise made
-   available under the terms of this License.
-   
-   1.10. Original Software means the Source Code and
-   Executable form of computer software code that is
-   originally released under this License.
-   
-   1.11. Patent Claims means any patent claim(s), now owned
-   or hereafter acquired, including without limitation,
-   method, process, and apparatus claims, in any patent
-   Licensable by grantor.
-   
-   1.12. Source Code means (a) the common form of computer
-   software code in which modifications are made and (b)
-   associated documentation included in or with such code.
-   
-   1.13. You (or Your) means an individual or a legal
-   entity exercising rights under, and complying with all of
-   the terms of, this License. For legal entities, You
-   includes any entity which controls, is controlled by, or is
-   under common control with You. For purposes of this
-   definition, control means (a) the power, direct or
-   indirect, to cause the direction or management of such
-   entity, whether by contract or otherwise, or (b) ownership
-   of more than fifty percent (50%) of the outstanding shares
-   or beneficial ownership of such entity.
-   
-   2. License Grants.
-   
-   2.1. The Initial Developer Grant.
-   
-   Conditioned upon Your compliance with Section 3.1 below and
-   subject to third party intellectual property claims, the
-   Initial Developer hereby grants You a world-wide,
-   royalty-free, non-exclusive license:
-   
-   (a) under intellectual property rights (other than
-   patent or trademark) Licensable by Initial Developer,
-   to use, reproduce, modify, display, perform,
-   sublicense and distribute the Original Software

svn commit: r1147805 - /james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

[bago]

Author: bago
Date: Mon Jul 18 10:36:30 2011
New Revision: 1147805

URL: http://svn.apache.org/viewvc?rev=1147805view=rev
Log:
update codebase against latest mime4j trunk.

Modified:

james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

Modified: 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java?rev=1147805r1=1147804r2=1147805view=diff
==
--- 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
(original)
+++ 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
Mon Jul 18 10:36:30 2011
@@ -34,7 +34,7 @@ import org.apache.james.mime4j.dom.Messa
 import org.apache.james.mime4j.dom.SingleBody;
 import org.apache.james.mime4j.stream.Field;
 import org.apache.james.mime4j.io.EOLConvertingInputStream;
-import org.apache.james.mime4j.stream.MimeEntityConfig;
+import org.apache.james.mime4j.stream.MimeConfig;
 
 /**
  * The header of an entity (see RFC 2045).
@@ -62,7 +62,7 @@ public class Message implements Headers 
 }
 
 private MessageServiceFactory newMessageBuilder() throws MimeException {
-MimeEntityConfig mec = new MimeEntityConfig();
+MimeConfig mec = new MimeConfig();
 mec.setMaxLineLen(1);
 mec.setMaxHeaderLen(3);
 



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1137807 - /james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

[bago]

Author: bago
Date: Mon Jun 20 22:34:28 2011
New Revision: 1137807

URL: http://svn.apache.org/viewvc?rev=1137807view=rev
Log:
Update jDKIM to latest mime4j trunk (MessageFormatter = MessageWriter)

Modified:

james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

Modified: 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java?rev=1137807r1=1137806r2=1137807view=diff
==
--- 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
(original)
+++ 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
Mon Jun 20 22:34:28 2011
@@ -29,7 +29,7 @@ import org.apache.james.jdkim.api.Header
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.MimeIOException;
 import org.apache.james.mime4j.dom.MessageBuilder;
-import org.apache.james.mime4j.dom.MessageFormatter;
+import org.apache.james.mime4j.dom.MessageWriter;
 import org.apache.james.mime4j.dom.MessageServiceFactory;
 import org.apache.james.mime4j.dom.SingleBody;
 import org.apache.james.mime4j.stream.Field;
@@ -56,7 +56,7 @@ public class Message implements Headers 
  */
 public Message(InputStream is) throws IOException, MimeException {
 MessageBuilder mb = newMessageBuilder().newMessageBuilder();
-org.apache.james.mime4j.dom.Message mImpl = mb.parse(new 
EOLConvertingInputStream(is));
+org.apache.james.mime4j.dom.Message mImpl = mb.parseMessage(new 
EOLConvertingInputStream(is));
 
 this.message = mImpl;
 }
@@ -92,9 +92,9 @@ public class Message implements Headers 
 
 private ListString convertFields(ListField res) {
 ListString res2 = new LinkedListString();
-MessageFormatter mf;
+MessageWriter mw;
 try {
-mf = newMessageBuilder().newMessageFormatter();
+mw = newMessageBuilder().newMessageWriter();
 } catch (MimeException e1) {
 return res2;
 }
@@ -102,7 +102,7 @@ public class Message implements Headers 
 ByteArrayOutputStream bos = new ByteArrayOutputStream();
 String field = null;
 try {
-mf.writeField(f, bos);
+mw.writeField(f, bos);
 // writeField always ends with CRLF and we don't want it.
 byte[] fieldbytes = bos.toByteArray();
 field = new String(fieldbytes, 0, fieldbytes.length - 2);



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1136807 - /james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

[bago]

Author: bago
Date: Fri Jun 17 08:36:11 2011
New Revision: 1136807

URL: http://svn.apache.org/viewvc?rev=1136807view=rev
Log:
Update jDKIM to the latest mime4j trunk (near to 0.7 release?), also using 
MessageFormatter instead of MimeWriter (see MIME4J-193)

Modified:

james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

Modified: 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java?rev=1136807r1=1136806r2=1136807view=diff
==
--- 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
(original)
+++ 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
Fri Jun 17 08:36:11 2011
@@ -29,11 +29,11 @@ import org.apache.james.jdkim.api.Header
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.MimeIOException;
 import org.apache.james.mime4j.dom.MessageBuilder;
+import org.apache.james.mime4j.dom.MessageFormatter;
 import org.apache.james.mime4j.dom.MessageServiceFactory;
 import org.apache.james.mime4j.dom.SingleBody;
-import org.apache.james.mime4j.dom.field.Field;
+import org.apache.james.mime4j.stream.Field;
 import org.apache.james.mime4j.io.EOLConvertingInputStream;
-import org.apache.james.mime4j.message.MimeWriter;
 import org.apache.james.mime4j.stream.MimeEntityConfig;
 
 /**
@@ -55,14 +55,13 @@ public class Message implements Headers 
  * on MIME protocol violations.
  */
 public Message(InputStream is) throws IOException, MimeException {
-MessageBuilder mb = newMessageBuilder();
-
+MessageBuilder mb = newMessageBuilder().newMessageBuilder();
 org.apache.james.mime4j.dom.Message mImpl = mb.parse(new 
EOLConvertingInputStream(is));
 
 this.message = mImpl;
 }
 
-private MessageBuilder newMessageBuilder() throws MimeException {
+private MessageServiceFactory newMessageBuilder() throws MimeException {
 MimeEntityConfig mec = new MimeEntityConfig();
 mec.setMaxLineLen(1);
 mec.setMaxHeaderLen(3);
@@ -72,10 +71,7 @@ public class Message implements Headers 
 mbf.setAttribute(FlatMode, true);
 mbf.setAttribute(ContentDecoding, false);
 
-// mbf.setProperty(MaxLineLength, 1);
-MessageBuilder mb = mbf.newMessageBuilder();
-
-return mb;
+return mbf;
 }
 
 public InputStream getBodyInputStream() {
@@ -96,11 +92,17 @@ public class Message implements Headers 
 
 private ListString convertFields(ListField res) {
 ListString res2 = new LinkedListString();
+   MessageFormatter mf;
+   try {
+   mf = newMessageBuilder().newMessageFormatter();
+   } catch (MimeException e1) {
+   return res2;
+   }
 for (Field f : res) {
 ByteArrayOutputStream bos = new ByteArrayOutputStream();
 String field = null;
 try {
-   MimeWriter.DEFAULT.writeField(f, bos);
+   mf.writeField(f, bos);
// writeField always ends with CRLF and we don't want it.
byte[] fieldbytes = bos.toByteArray();
 field = new String(fieldbytes, 0, fieldbytes.length - 2);



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1136814 - /james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

[bago]

Author: bago
Date: Fri Jun 17 09:05:22 2011
New Revision: 1136814

URL: http://svn.apache.org/viewvc?rev=1136814view=rev
Log:
Fix formatting

Modified:

james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

Modified: 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java?rev=1136814r1=1136813r2=1136814view=diff
==
--- 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
(original)
+++ 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
Fri Jun 17 09:05:22 2011
@@ -92,19 +92,19 @@ public class Message implements Headers 
 
 private ListString convertFields(ListField res) {
 ListString res2 = new LinkedListString();
-   MessageFormatter mf;
-   try {
-   mf = newMessageBuilder().newMessageFormatter();
-   } catch (MimeException e1) {
-   return res2;
-   }
+MessageFormatter mf;
+try {
+mf = newMessageBuilder().newMessageFormatter();
+} catch (MimeException e1) {
+return res2;
+}
 for (Field f : res) {
 ByteArrayOutputStream bos = new ByteArrayOutputStream();
 String field = null;
 try {
-   mf.writeField(f, bos);
-   // writeField always ends with CRLF and we don't want it.
-   byte[] fieldbytes = bos.toByteArray();
+mf.writeField(f, bos);
+// writeField always ends with CRLF and we don't want it.
+byte[] fieldbytes = bos.toByteArray();
 field = new String(fieldbytes, 0, fieldbytes.length - 2);
 } catch (IOException e) {
 }



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1094139 - in /james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim: impl/Message.java tagvalue/TagValue.java

[bago]

Author: bago
Date: Sun Apr 17 12:53:34 2011
New Revision: 1094139

URL: http://svn.apache.org/viewvc?rev=1094139view=rev
Log:
updated code to reflect current mime4j trunk (MIME4J-191, MIME4J-192). Code 
still depends on MimeWriter (MIME4J-193)

Modified:

james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java

Modified: 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java?rev=1094139r1=1094138r2=1094139view=diff
==
--- 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
(original)
+++ 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
Sun Apr 17 12:53:34 2011
@@ -33,7 +33,7 @@ import org.apache.james.mime4j.dom.Messa
 import org.apache.james.mime4j.dom.SingleBody;
 import org.apache.james.mime4j.dom.field.Field;
 import org.apache.james.mime4j.io.EOLConvertingInputStream;
-import org.apache.james.mime4j.message.MessageBuilderImpl;
+import org.apache.james.mime4j.message.MimeWriter;
 import org.apache.james.mime4j.stream.MimeEntityConfig;
 
 /**
@@ -57,10 +57,6 @@ public class Message implements Headers 
 public Message(InputStream is) throws IOException, MimeException {
 MessageBuilder mb = newMessageBuilder();
 
-if (mb instanceof MessageBuilderImpl) {
-   ((MessageBuilderImpl) mb).setFlatMode(true);
-   ((MessageBuilderImpl) mb).setContentDecoding(false);
-}
 org.apache.james.mime4j.dom.Message mImpl = mb.parse(new 
EOLConvertingInputStream(is));
 
 this.message = mImpl;
@@ -73,8 +69,12 @@ public class Message implements Headers 
 
 MessageServiceFactory mbf = MessageServiceFactory.newInstance();
 mbf.setAttribute(MimeEntityConfig, mec);
+mbf.setAttribute(FlatMode, true);
+mbf.setAttribute(ContentDecoding, false);
+
 // mbf.setProperty(MaxLineLength, 1);
 MessageBuilder mb = mbf.newMessageBuilder();
+
 return mb;
 }
 
@@ -100,8 +100,10 @@ public class Message implements Headers 
 ByteArrayOutputStream bos = new ByteArrayOutputStream();
 String field = null;
 try {
-f.writeTo(bos);
-field = new String(bos.toByteArray());
+   MimeWriter.DEFAULT.writeField(f, bos);
+   // writeField always ends with CRLF and we don't want it.
+   byte[] fieldbytes = bos.toByteArray();
+field = new String(fieldbytes, 0, fieldbytes.length - 2);
 } catch (IOException e) {
 }
 res2.add(field);

Modified: 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java?rev=1094139r1=1094138r2=1094139view=diff
==
--- 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
 (original)
+++ 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
 Sun Apr 17 12:53:34 2011
@@ -149,7 +149,7 @@ public class TagValue {
  trimFWS(rest, 0, rest.length() - 1, true).length() 
 0) {
 throw new IllegalStateException(
 Unexpected termination at position  + i + : 
-+ data);
++ data +  | [ + rest + ]);
 }
 i = data.length();
 continue;



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1087218 - /james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

[bago]

Author: bago
Date: Thu Mar 31 08:50:37 2011
New Revision: 1087218

URL: http://svn.apache.org/viewvc?rev=1087218view=rev
Log:
Fix behaviour with latest mime4j trunk. Felix change did fix build error 
(against latest mime4j trunk) but introduced behaviour issues.

With current mime4j trunk we are forced to check private implementation 
details: MessageBuilderImpl. Maybe the 2 methods (setFlatMode and 
setContentDecoding) should be moved to the MessageBuilder interface?

Modified:

james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java

Modified: 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java?rev=1087218r1=1087217r2=1087218view=diff
==
--- 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
(original)
+++ 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/impl/Message.java 
Thu Mar 31 08:50:37 2011
@@ -33,6 +33,7 @@ import org.apache.james.mime4j.dom.Messa
 import org.apache.james.mime4j.dom.SingleBody;
 import org.apache.james.mime4j.dom.field.Field;
 import org.apache.james.mime4j.io.EOLConvertingInputStream;
+import org.apache.james.mime4j.message.MessageBuilderImpl;
 import org.apache.james.mime4j.stream.MimeEntityConfig;
 
 /**
@@ -55,6 +56,11 @@ public class Message implements Headers 
  */
 public Message(InputStream is) throws IOException, MimeException {
 MessageBuilder mb = newMessageBuilder();
+
+if (mb instanceof MessageBuilderImpl) {
+   ((MessageBuilderImpl) mb).setFlatMode(true);
+   ((MessageBuilderImpl) mb).setContentDecoding(false);
+}
 org.apache.james.mime4j.dom.Message mImpl = mb.parse(new 
EOLConvertingInputStream(is));
 
 this.message = mImpl;
@@ -63,13 +69,12 @@ public class Message implements Headers 
 private MessageBuilder newMessageBuilder() throws MimeException {
 MimeEntityConfig mec = new MimeEntityConfig();
 mec.setMaxLineLen(1);
-
+mec.setMaxHeaderLen(3);
+
 MessageServiceFactory mbf = MessageServiceFactory.newInstance();
 mbf.setAttribute(MimeEntityConfig, mec);
 // mbf.setProperty(MaxLineLength, 1);
 MessageBuilder mb = mbf.newMessageBuilder();
-// mb.setContentDecoding(false);
-// mb.setFlatMode();
 return mb;
 }
 



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1087231 - in /james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim: DKIMSigner.java DKIMVerifier.java

[bago]

Author: bago
Date: Thu Mar 31 09:55:40 2011
New Revision: 1087231

URL: http://svn.apache.org/viewvc?rev=1087231view=rev
Log:
Remove mime4j imports from DKIMSigner/DKIMVerifier so users of the DKIM mailets 
do not need mime4j in their classpath (mainly to reduce issues with mismatching 
mime4j versions inside james).

Modified:
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMSigner.java

james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java

Modified: 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMSigner.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMSigner.java?rev=1087231r1=1087230r2=1087231view=diff
==
--- james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMSigner.java 
(original)
+++ james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMSigner.java 
Thu Mar 31 09:55:40 2011
@@ -40,7 +40,6 @@ import org.apache.james.jdkim.exceptions
 import org.apache.james.jdkim.impl.BodyHasherImpl;
 import org.apache.james.jdkim.impl.Message;
 import org.apache.james.jdkim.tagvalue.SignatureRecordImpl;
-import org.apache.james.mime4j.MimeException;
 
 public class DKIMSigner extends DKIMCommon {
 
@@ -66,23 +65,29 @@ public class DKIMSigner extends DKIMComm
 try {
 try {
 message = new Message(is);
+} catch (RuntimeException e) {
+   throw e;
+} catch (IOException e) {
+   throw e;
+} catch (Exception e1) {
+   // This can only be a MimeException but we don't declare to 
allow usage of
+   // DKIMSigner without Mime4J dependency.
+throw new PermFailException(MIME parsing exception: 
++ e1.getMessage(), e1);
+}
 
-try {
-SignatureRecord srt = 
newSignatureRecordTemplate(signatureRecordTemplate);
+try {
+SignatureRecord srt = 
newSignatureRecordTemplate(signatureRecordTemplate);
 
-BodyHasher bhj = newBodyHasher(srt);
+BodyHasher bhj = newBodyHasher(srt);
 
-// computation of the body hash.
-DKIMCommon.streamCopy(message.getBodyInputStream(), bhj
-.getOutputStream());
-
-return sign(message, bhj);
-} finally {
-message.dispose();
-}
-} catch (MimeException e1) {
-throw new PermFailException(MIME parsing exception: 
-+ e1.getMessage(), e1);
+// computation of the body hash.
+DKIMCommon.streamCopy(message.getBodyInputStream(), bhj
+.getOutputStream());
+
+return sign(message, bhj);
+} finally {
+message.dispose();
 }
 
 } finally {

Modified: 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java?rev=1087231r1=1087230r2=1087231view=diff
==
--- 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java 
(original)
+++ 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/DKIMVerifier.java 
Thu Mar 31 09:55:40 2011
@@ -49,7 +49,6 @@ import org.apache.james.jdkim.impl.Messa
 import org.apache.james.jdkim.impl.MultiplexingPublicKeyRecordRetriever;
 import org.apache.james.jdkim.tagvalue.PublicKeyRecordImpl;
 import org.apache.james.jdkim.tagvalue.SignatureRecordImpl;
-import org.apache.james.mime4j.MimeException;
 
 public class DKIMVerifier extends DKIMCommon {
 
@@ -212,15 +211,23 @@ public class DKIMVerifier extends DKIMCo
 FailException {
 Message message;
 try {
-message = new Message(is);
-try {
-return verify(message, message.getBodyInputStream());
-} finally {
-message.dispose();
-}
-} catch (MimeException e1) {
-throw new PermFailException(Mime parsing exception: 
-+ e1.getMessage(), e1);
+   try {
+   message = new Message(is);
+} catch (RuntimeException e) {
+   throw e;
+} catch (IOException e) {
+   throw e;
+} catch (Exception e1) {
+   // This can only be a MimeException but we don't declare to 
allow usage of
+   // DKIMSigner without Mime4J dependency.
+   throw new PermFailException(Mime parsing exception: 
+   + e1.getMessage(), e1);
+   }
+   try

svn commit: r1087233 - in /james/jdkim/trunk/mailets: pom.xml src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java

[bago]

Author: bago
Date: Thu Mar 31 09:58:03 2011
New Revision: 1087233

URL: http://svn.apache.org/viewvc?rev=1087233view=rev
Log:
Refactored DKIM mailets and their tests to not depend on mime4j. Excluded 
inheritance of mime4j dependency from pom.xml

Modified:
james/jdkim/trunk/mailets/pom.xml

james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java

james/jdkim/trunk/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java

Modified: james/jdkim/trunk/mailets/pom.xml
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/pom.xml?rev=1087233r1=1087232r2=1087233view=diff
==
--- james/jdkim/trunk/mailets/pom.xml (original)
+++ james/jdkim/trunk/mailets/pom.xml Thu Mar 31 09:58:03 2011
@@ -38,12 +38,32 @@
 dependency
 groupIdorg.apache.james.jdkim/groupId
 artifactIdapache-jdkim-library/artifactId
+exclusions
+exclusion
+groupIdorg.apache.james/groupId
+artifactIdapache-mime4j-core/artifactId
+/exclusion
+exclusion
+groupIdorg.apache.james/groupId
+artifactIdapache-mime4j-dom/artifactId
+/exclusion
+/exclusions
 /dependency
 dependency
 groupIdorg.apache.james.jdkim/groupId
 artifactIdapache-jdkim-library/artifactId
 typetest-jar/type
 scopetest/scope
+exclusions
+exclusion
+groupIdorg.apache.james/groupId
+artifactIdapache-mime4j-core/artifactId
+/exclusion
+exclusion
+groupIdorg.apache.james/groupId
+artifactIdapache-mime4j-dom/artifactId
+/exclusion
+/exclusions
 /dependency
 dependency
 groupIdorg.apache.james/groupId

Modified: 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java?rev=1087233r1=1087232r2=1087233view=diff
==
--- 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java
 (original)
+++ 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java
 Thu Mar 31 09:58:03 2011
@@ -56,20 +56,7 @@ public class DKIMVerify extends GenericM
 public void service(Mail mail) throws MessagingException {
 try {
 MimeMessage message = mail.getMessage();
-Headers headers = new MimeMessageHeaders(message);
-BodyHasher bh = verifier.newBodyHasher(headers);
-try {
-if (bh != null) {
-message.writeTo(new HeaderSkippingOutputStream(bh
-.getOutputStream()));
-bh.getOutputStream().close();
-}
-
-} catch (IOException e) {
-throw new MessagingException(Exception calculating bodyhash: 
-+ e.getMessage(), e);
-}
-ListSignatureRecord res = verifier.verify(bh);
+ListSignatureRecord res = verify(verifier, message);
 if (res == null || res.isEmpty()) {
 // neutral
 mail.setAttribute(DKIM_AUTH_RESULT_ATTRIBUTE, neutral (no 
signatures));
@@ -91,4 +78,22 @@ public class DKIMVerify extends GenericM
 }
 
 }
+
+   protected static ListSignatureRecord verify(DKIMVerifier verifier, 
MimeMessage message)
+   throws MessagingException, FailException {
+   Headers headers = new MimeMessageHeaders(message);
+   BodyHasher bh = verifier.newBodyHasher(headers);
+   try {
+   if (bh != null) {
+   message.writeTo(new HeaderSkippingOutputStream(bh
+   .getOutputStream()));
+   bh.getOutputStream().close();
+   }
+   
+   } catch (IOException e) {
+   throw new MessagingException(Exception calculating 
bodyhash: 
+   + e.getMessage(), e);
+   }
+   return verifier.verify(bh);
+   }
 }

Modified: 
james/jdkim/trunk/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java?rev=1087233r1=1087232r2=1087233view=diff
==
--- 
james/jdkim/trunk/mailets/src/test/java/org/apache/james/jdkim

svn commit: r1087248 - in /james/jsieve/trunk/main/src: main/jjtree/sieve/sieve.jjt test/java/org/apache/jsieve/MultilineTextTest.java

[bago]

Author: bago
Date: Thu Mar 31 10:52:09 2011
New Revision: 1087248

URL: http://svn.apache.org/viewvc?rev=1087248view=rev
Log:
RFC 3028 says newline is CRLF, so changed parser and tests to follow the rule 
(JSIEVE-75).
Patch contributed by Vishal Mahajan: thank you.

Modified:
james/jsieve/trunk/main/src/main/jjtree/sieve/sieve.jjt

james/jsieve/trunk/main/src/test/java/org/apache/jsieve/MultilineTextTest.java

Modified: james/jsieve/trunk/main/src/main/jjtree/sieve/sieve.jjt
URL: 
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/jjtree/sieve/sieve.jjt?rev=1087248r1=1087247r2=1087248view=diff
==
--- james/jsieve/trunk/main/src/main/jjtree/sieve/sieve.jjt (original)
+++ james/jsieve/trunk/main/src/main/jjtree/sieve/sieve.jjt Thu Mar 31 10:52:09 
2011
@@ -138,29 +138,33 @@ TOKEN : /* LITERALS */
   #MULTI_LINE_START: 
   (text:)
   ([ , \t])*
-  (HASH_COMMENT|NEWLINE)
+  (HASH_COMMENT|CRLF)
   
 |
   #MULTI_LINE_END:
-  (. NEWLINE)
+  (. CRLF)
 
 |
+  #CRLF:
+  (\r\n)
+  
+|
   #NEWLINE:
   (\n|\r|\r\n)
   
-|   
+|
 // multi-line-literal  = [CHAR-NOT-DOT *CHAR_NOT_NEWLINE] NEWLINE 
#MULTI_LINE_LITERAL:
   (CHAR_NOT_DOT (CHAR_NOT_NEWLINE)*)?
   NEWLINE
 
 |
-   #CHAR_NOT_DOT: 
-  (~[.])
+   #CHAR_NOT_DOT:
+  (~[.,\n,\r])
   
 |
#CHAR_NOT_NEWLINE: 
-  (~[\n] | (\r ~[\n]))
+  (~[\n,\r])
  
 |
 // multi-line-dotstuff = . 1*CHAR-NOT-CRLF CRLF
@@ -267,7 +271,9 @@ void string() :
   while (builder.length()0  builder.charAt(0) != '\n') {
 builder.deleteCharAt(0);
   }
-  // remove suffixing newline-dot-newline
+  // remove suffixing CRLF-dot-CRLF
+  builder.deleteCharAt(builder.length() - 1);
+  builder.deleteCharAt(builder.length() - 1);
   builder.deleteCharAt(builder.length() - 1);
   builder.deleteCharAt(builder.length() - 1);
   builder.deleteCharAt(builder.length() - 1);

Modified: 
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/MultilineTextTest.java
URL: 
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/MultilineTextTest.java?rev=1087248r1=1087247r2=1087248view=diff
==
--- 
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/MultilineTextTest.java 
(original)
+++ 
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/MultilineTextTest.java 
Thu Mar 31 10:52:09 2011
@@ -37,7 +37,7 @@ public class MultilineTextTest extends T
  */
 public void testRejectMultilineMessage() throws Exception {
 String message = This is not a love song;
-String script = reject text:\n + message + \n.\n;;
+String script = reject text:\r\n + message + \r\n.\r\n;;
 ActionReject rejection = runRejectScript(script);
 assertEquals(message, rejection.getMessage());
 }
@@ -48,7 +48,7 @@ public class MultilineTextTest extends T
  */
 public void testRejectMultilineMessageWithWhitespace() throws Exception {
 String message = This is not a love song;
-String script = reject text: \t \t \n + message + \n.\n;;
+String script = reject text: \t \t \r\n + message + \r\n.\r\n;;
 ActionReject rejection = runRejectScript(script);
 assertEquals(message, rejection.getMessage());
 }
@@ -59,7 +59,7 @@ public class MultilineTextTest extends T
  */
 public void testRejectMultilineMessageWithDotsMidline() throws Exception {
 String message = This is not.a love song;
-String script = reject text:\n + message + \n.\n;;
+String script = reject text:\r\n + message + \r\n.\r\n;;
 ActionReject rejection = runRejectScript(script);
 assertEquals(message, rejection.getMessage());
 }
@@ -70,7 +70,7 @@ public class MultilineTextTest extends T
 public void testRejectMultilineMessageWithDotStuffing() throws Exception {
 String lineOne = This is not\n;
 String lineTwo = .A Love Story;
-String script = reject text:\n + lineOne + '.' + lineTwo + \n.\n;;
+String script = reject text:\r\n + lineOne + '.' + lineTwo + 
\r\n.\r\n;;
 ActionReject rejection = runRejectScript(script);
 assertEquals(lineOne + lineTwo, rejection.getMessage());
 }
@@ -81,7 +81,7 @@ public class MultilineTextTest extends T
 public void testRejectMultilineMessageWithMissedDotStuffing() throws 
Exception {
 String lineOne = This is not\n;
 String lineTwo = .A Love Story;
-String script = reject text:\n + lineOne + lineTwo + \n.\n;;
+String script = reject text:\r\n + lineOne + lineTwo + \r\n.\r\n;;
 ActionReject rejection = runRejectScript(script);
 assertEquals(lineOne + lineTwo, rejection.getMessage

svn commit: r1087252 - in /james/jsieve/trunk/main/src: main/jjtree/sieve/sieve.jjt test/java/org/apache/jsieve/HeaderTest.java test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java

[bago]

Author: bago
Date: Thu Mar 31 11:07:54 2011
New Revision: 1087252

URL: http://svn.apache.org/viewvc?rev=1087252view=rev
Log:
Fix backslash parsing inside quoted text (JSIEVE-74).
Patch contributed by Vishal Mahajan: thank you.

Modified:
james/jsieve/trunk/main/src/main/jjtree/sieve/sieve.jjt
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/HeaderTest.java

james/jsieve/trunk/main/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java

Modified: james/jsieve/trunk/main/src/main/jjtree/sieve/sieve.jjt
URL: 
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/main/jjtree/sieve/sieve.jjt?rev=1087252r1=1087251r2=1087252view=diff
==
--- james/jsieve/trunk/main/src/main/jjtree/sieve/sieve.jjt (original)
+++ james/jsieve/trunk/main/src/main/jjtree/sieve/sieve.jjt Thu Mar 31 11:07:54 
2011
@@ -121,10 +121,14 @@ TOKEN : /* LITERALS */
 // note that newlines and other characters are all allowed strings
QUOTED_STRING:
   \
-  (~[\]|\\\)*
+  (~[\,\\]|ESCAPED_CHAR)*
   \
   
 |
+  #ESCAPED_CHAR:
+  (\\ (\\|\))
+  
+|
 // multi-line = text: *(SP / HTAB) (hash-comment / CRLF)
 //   *(multi-line-literal / multi-line-dotstuff)
 //   . CRLF

Modified: 
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/HeaderTest.java
URL: 
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/HeaderTest.java?rev=1087252r1=1087251r2=1087252view=diff
==
--- james/jsieve/trunk/main/src/test/java/org/apache/jsieve/HeaderTest.java 
(original)
+++ james/jsieve/trunk/main/src/test/java/org/apache/jsieve/HeaderTest.java Thu 
Mar 31 11:07:54 2011
@@ -329,11 +329,11 @@ public class HeaderTest extends TestCase
  */
 public void testSpecialCharsEscapingInMatch() {
 boolean isTestPassed = false;
-String script = if header :matches \X-Caffeine\ 
\my,,?,\\?,?,*,\\*,*,pattern\ {throwTestException;};
+String script = if header :matches \X-Caffeine\ 
\my,,?,?,*,*,pattern\ {throwTestException;};
 try {
 SieveMailAdapter mail = (SieveMailAdapter) JUnitUtils.createMail();
 mail.getMessage().addHeader(X-Caffeine,
-my,\\,x,x,?,foo,bar,*,pattern);
+my,\\,x,?,foo,*,pattern);
 JUnitUtils.interpret(mail, script);
 } catch (MessagingException e) {
 } catch (ThrowTestException.TestException e) {
@@ -349,11 +349,11 @@ public class HeaderTest extends TestCase
  */
 public void testSpecialCharsEscapingInMatchFalse() {
 boolean isTestPassed = false;
-String script = if header :matches \X-Caffeine\ 
\my,?,\\?,?,*,\\*,*,pattern\ {throwTestException;};
+String script = if header :matches \X-Caffeine\ 
\my,?,?,*,*,pattern\ {throwTestException;};
 try {
 SieveMailAdapter mail = (SieveMailAdapter) JUnitUtils.createMail();
 mail.getMessage().addHeader(X-Caffeine,
-my,x,x,q,foo,bar,*,pattern);
+my,x,q,foo,*,pattern);
 JUnitUtils.interpret(mail, script);
 isTestPassed = true;
 } catch (MessagingException e) {

Modified: 
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
URL: 
http://svn.apache.org/viewvc/james/jsieve/trunk/main/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java?rev=1087252r1=1087251r2=1087252view=diff
==
--- 
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
 (original)
+++ 
james/jsieve/trunk/main/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
 Thu Mar 31 11:07:54 2011
@@ -100,7 +100,7 @@ public class SieveParserVisitorImplQuote
 
 public void testVisitASTstringObjectMultiSlashQuoted() throws Exception {
 
-node = stringNode(\valu\\e\);
+node = stringNode(\value\);
 visitor.visit(node, data);
 assertEquals(Data value added after quotes stripped, 1, data.size());
 assertEquals(Data value added after quotes stripped, v\\al\\ue\\,



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1087332 - in /james/jdkim/trunk/mailets/src: main/java/org/apache/james/jdkim/mailets/DKIMSign.java main/java/org/apache/james/jdkim/mailets/DKIMVerify.java test/java/org/apache/james/jdk

[bago]

Author: bago
Date: Thu Mar 31 15:12:10 2011
New Revision: 1087332

URL: http://svn.apache.org/viewvc?rev=1087332view=rev
Log:
Added forceCRLF parameter (default to true) to DKIMSign and DKIMVerify mailets 
(JDKIM-28)

Modified:

james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMSign.java

james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java

james/jdkim/trunk/mailets/src/test/java/org/apache/james/jdkim/mailets/DKIMSignTest.java

Modified: 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMSign.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMSign.java?rev=1087332r1=1087331r2=1087332view=diff
==
--- 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMSign.java
 (original)
+++ 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMSign.java
 Thu Mar 31 15:12:10 2011
@@ -21,6 +21,7 @@ package org.apache.james.jdkim.mailets;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.security.GeneralSecurityException;
 import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
@@ -43,6 +44,8 @@ import org.apache.james.jdkim.exceptions
 import org.apache.mailet.Mail;
 import org.apache.mailet.base.GenericMailet;
 
+import com.sun.mail.util.CRLFOutputStream;
+
 /**
  * This mailet sign a message using the DKIM protocol
  * If the privateKey is encoded using a password then you can pass
@@ -73,14 +76,15 @@ import org.apache.mailet.base.GenericMai
  * lt;/mailetgt;
  * /code/pre
  * 
- * @version CVS $Revision: 713949 $ $Date: 2008-11-14 08:40:21 +0100 (ven, 14
- *  nov 2008) $
- * @since 2.2.0
+ * By default the mailet assume that Javamail will convert LF to CRLF when 
sending 
+ * so will compute the hash using converted newlines. If you don't want this 
+ * behaviout then set forceCRLF attribute to false. 
  */
 public class DKIMSign extends GenericMailet {
 
 private String signatureTemplate;
 private PrivateKey privateKey;
+private boolean forceCRLF;
 
/**
 * @return the signatureTemplate
@@ -100,6 +104,7 @@ public class DKIMSign extends GenericMai
 signatureTemplate = getInitParameter(signatureTemplate);
 String privateKeyString = getInitParameter(privateKey);
 String privateKeyPassword = getInitParameter(privateKeyPassword, 
null);
+forceCRLF = getInitParameter(forceCRLF, true);
 try {
 PKCS8Key pkcs8 = new PKCS8Key(new ByteArrayInputStream(
 privateKeyString.getBytes()),
@@ -129,8 +134,9 @@ public class DKIMSign extends GenericMai
 MimeMessage message = mail.getMessage();
 Headers headers = new MimeMessageHeaders(message);
 try {
-message.writeTo(new HeaderSkippingOutputStream(bhj
-.getOutputStream()));
+   OutputStream os = new 
HeaderSkippingOutputStream(bhj.getOutputStream());
+   if (forceCRLF) os = new CRLFOutputStream(os);
+message.writeTo(os);
 bhj.getOutputStream().close();
 } catch (IOException e) {
 throw new MessagingException(Exception calculating bodyhash: 

Modified: 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java?rev=1087332r1=1087331r2=1087332view=diff
==
--- 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java
 (original)
+++ 
james/jdkim/trunk/mailets/src/main/java/org/apache/james/jdkim/mailets/DKIMVerify.java
 Thu Mar 31 15:12:10 2011
@@ -20,6 +20,7 @@
 package org.apache.james.jdkim.mailets;
 
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.List;
 
 import javax.mail.MessagingException;
@@ -33,6 +34,8 @@ import org.apache.james.jdkim.exceptions
 import org.apache.mailet.Mail;
 import org.apache.mailet.base.GenericMailet;
 
+import com.sun.mail.util.CRLFOutputStream;
+
 /**
  * This mailet verify a message using the DKIM protocol
  * 
@@ -41,22 +44,28 @@ import org.apache.mailet.base.GenericMai
  * lt;mailet match=quot;Allquot; class=quot;DKIMVerifyquot;gt;
  * lt;/mailetgt;
  * /code/pre
+ * 
+ * By default the mailet assume that Javamail will use LF instead of CRLF 
+ * so it will verify the hash using converted newlines. If you don't want this 
+ * behaviout then set forceCRLF attribute to false. 
  */
 public class DKIMVerify extends GenericMailet {
 
 public static final String DKIM_AUTH_RESULT_ATTRIBUTE = jDKIM.AUTHRESULT;
 
 protected DKIMVerifier verifier

svn commit: r1066409 - /james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java

[bago]

Author: bago
Date: Wed Feb  2 10:52:17 2011
New Revision: 1066409

URL: http://svn.apache.org/viewvc?rev=1066409view=rev
Log:
Optimized valuetag validation regex so to limit stack abuse (JDKIM-26)

Modified:

james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java

Modified: 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
URL: 
http://svn.apache.org/viewvc/james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java?rev=1066409r1=1066408r2=1066409view=diff
==
--- 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
 (original)
+++ 
james/jdkim/trunk/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
 Wed Feb  2 10:52:17 2011
@@ -39,10 +39,12 @@ public class TagValue {
 
 private static Pattern tagPattern = Pattern
 .compile(^[A-Za-z][A-Za-z0-9_]*$);
-private static final String tval = [^; \t\r\n]+;
+// Use possessive matching to avoid heavy stack usage
+private static final String tval = [^; \t\r\n]++;
 // validate value chars
-private static Pattern valuePattern = Pattern.compile(^( + tval
-+ ((\r\n[\t ]|[\t ])+ + tval + )*)?$);
+// Use possessive matching to avoid heavy stack usage
+private static Pattern valuePattern = Pattern.compile(^(?: + tval
++ (?:(?:(?:\r\n)?[\t ])++ + tval + )*+)?$);
 
 // we may use a TreeMap because we may need to know original order.
 private MapString, CharSequence tagValues;



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1061209 - in /james/server/trunk: data-library/src/main/java/org/apache/james/mailrepository/lib/ data-library/src/main/java/org/apache/james/vut/lib/ util/src/main/java/org/apache/james/

[bago]

Author: bago
Date: Thu Jan 20 10:56:26 2011
New Revision: 1061209

URL: http://svn.apache.org/viewvc?rev=1061209view=rev
Log:
Move Lock from util to data-library.
Remove XMLResources by simply moving 2 static methods to VirtualUserTableUtil 
(they was not XML specific anyway).

Added:

james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
   (contents, props changed)
  - copied, changed from r1060981, 
james/server/trunk/util/src/main/java/org/apache/james/util/Lock.java
Removed:
james/server/trunk/util/src/main/java/org/apache/james/util/Lock.java
Modified:

james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java

james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java

Modified: 
james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java?rev=1061209r1=1061208r2=1061209view=diff
==
--- 
james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
 (original)
+++ 
james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java
 Thu Jan 20 10:56:26 2011
@@ -27,7 +27,6 @@ import org.apache.commons.logging.Log;
 import org.apache.james.lifecycle.api.Configurable;
 import org.apache.james.lifecycle.api.LogEnabled;
 import org.apache.james.mailrepository.api.MailRepository;
-import org.apache.james.util.Lock;
 import org.apache.mailet.Mail;
 
 import javax.mail.MessagingException;

Copied: 
james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
 (from r1060981, 
james/server/trunk/util/src/main/java/org/apache/james/util/Lock.java)
URL: 
http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java?p2=james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.javap1=james/server/trunk/util/src/main/java/org/apache/james/util/Lock.javar1=1060981r2=1061209rev=1061209view=diff
==
--- james/server/trunk/util/src/main/java/org/apache/james/util/Lock.java 
(original)
+++ 
james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
 Thu Jan 20 10:56:26 2011
@@ -19,7 +19,7 @@
 
 
 
-package org.apache.james.util;
+package org.apache.james.mailrepository.lib;
 
 import java.util.Hashtable;
 

Propchange: 
james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
--
cvs2svn:cvs-rev = 1.3.4.3

Propchange: 
james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
--
svn:eol-style = native

Propchange: 
james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/lib/Lock.java
--
svn:keywords = Author Date Id Revision

Modified: 
james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java?rev=1061209r1=1061208r2=1061209view=diff
==
--- 
james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java
 (original)
+++ 
james/server/trunk/data-library/src/main/java/org/apache/james/vut/lib/VirtualUserTableUtil.java
 Thu Jan 20 10:56:26 2011
@@ -28,7 +28,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.apache.james.util.XMLResources;
 import org.apache.james.vut.api.VirtualUserTable;
 import org.apache.mailet.MailAddress;
 
@@ -76,11 +75,64 @@ public class VirtualUserTableUtil {
 for (int i = 1; i  match.groupCount(); i++) {
 parameters.put(Integer.toString(i), match.group(i));
 }
-result = 
XMLResources.replaceParameters(targetString.substring(msgPos + 1), parameters);
+result = replaceParameters(targetString.substring(msgPos + 1), 
parameters);
 }
 return result;
  }
- 
+
+/**
+ * Returns a named string, replacing parameters with the values set.
+ * 
+ * @param str  the name of the String resource required.
+ * @param parametersa map of parameters (name-value string pairs) 
which

svn commit: r1061211 - /james/server/trunk/util/src/main/java/org/apache/james/util/XMLResources.java

[bago]

Author: bago
Date: Thu Jan 20 10:57:37 2011
New Revision: 1061211

URL: http://svn.apache.org/viewvc?rev=1061211view=rev
Log:
Move Lock from util to data-library.
Remove XMLResources by simply moving 2 static methods to VirtualUserTableUtil 
(they was not XML specific anyway).

Removed:

james/server/trunk/util/src/main/java/org/apache/james/util/XMLResources.java


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1061213 - in /james/server/trunk: core/pom.xml data-library/pom.xml

[bago]

Author: bago
Date: Thu Jan 20 10:59:32 2011
New Revision: 1061213

URL: http://svn.apache.org/viewvc?rev=1061213view=rev
Log:
core and data-library no longer depends on util.

Modified:
james/server/trunk/core/pom.xml
james/server/trunk/data-library/pom.xml

Modified: james/server/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/core/pom.xml?rev=1061213r1=1061212r2=1061213view=diff
==
--- james/server/trunk/core/pom.xml (original)
+++ james/server/trunk/core/pom.xml Thu Jan 20 10:59:32 2011
@@ -41,10 +41,6 @@
   dependencies
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-util/artifactId
-/dependency   
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdjames-server-lifecycle-api/artifactId
 /dependency   
 

Modified: james/server/trunk/data-library/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/data-library/pom.xml?rev=1061213r1=1061212r2=1061213view=diff
==
--- james/server/trunk/data-library/pom.xml (original)
+++ james/server/trunk/data-library/pom.xml Thu Jan 20 10:59:32 2011
@@ -34,10 +34,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-util/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdjames-server-data-api/artifactId
 /dependency
 dependency



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1061553 - /james/mailet/current/

[bago]

Author: bago
Date: Thu Jan 20 22:36:32 2011
New Revision: 1061553

URL: http://svn.apache.org/viewvc?rev=1061553view=rev
Log:
remove site and project external links from current

Modified:
james/mailet/current/   (props changed)

Propchange: james/mailet/current/
--
--- svn:externals (original)
+++ svn:externals Thu Jan 20 22:36:32 2011
@@ -3,5 +3,3 @@ basehttps://svn.apache.org/repos/asf/ja
 crypto https://svn.apache.org/repos/asf/james/mailet/crypto/trunk
 standard https://svn.apache.org/repos/asf/james/mailet/standard/trunk
 maven-mailetdocs-plugin 
https://svn.apache.org/repos/asf/james/mailet/maven-mailetdocs-plugin/trunk
-james-project 
http://svn.apache.org/repos/asf/james/project/tags/james-parent-1.2
-site https://svn.apache.org/repos/asf/james/site/trunk/www/mailet



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060940 - /james/server/trunk/data-library/src/main/java/org/apache/james/repository/api/

[bago]

Author: bago
Date: Wed Jan 19 19:57:43 2011
New Revision: 1060940

URL: http://svn.apache.org/viewvc?rev=1060940view=rev
Log:
second step of modules consolidation (JAMES-1184)

Added:

james/server/trunk/data-library/src/main/java/org/apache/james/repository/api/  
 (props changed)
  - copied from r1060939, 
james/server/trunk/repository-api/src/main/java/org/apache/james/repository/api/

Propchange: 
james/server/trunk/data-library/src/main/java/org/apache/james/repository/api/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 19:57:43 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/repository-api/src/main/java/org/apache/james/repository/api:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/repository-api/src/main/java/org/apache/james/repository/api:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060942 - /james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/api/

[bago]

Author: bago
Date: Wed Jan 19 19:58:52 2011
New Revision: 1060942

URL: http://svn.apache.org/viewvc?rev=1060942view=rev
Log:
second step of modules consolidation (JAMES-1184)

Added:

james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/api/
   (props changed)
  - copied from r1060941, 
james/server/trunk/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api/

Propchange: 
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/api/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 19:58:52 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mailetcontainer-api/src/main/java/org/apache/james/mailetcontainer/api:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060943 - /james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/

[bago]

Author: bago
Date: Wed Jan 19 19:59:02 2011
New Revision: 1060943

URL: http://svn.apache.org/viewvc?rev=1060943view=rev
Log:
second step of modules consolidation (JAMES-1184)

Added:

james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/
   (props changed)
  - copied from r1060942, 
james/server/trunk/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/

Propchange: 
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/api/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 19:59:02 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060944 - /james/server/trunk/data-api/

[bago]

Author: bago
Date: Wed Jan 19 19:59:24 2011
New Revision: 1060944

URL: http://svn.apache.org/viewvc?rev=1060944view=rev
Log:
second step of modules consolidation (JAMES-1184)

Added:
james/server/trunk/data-api/


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060946 - in /james/server/trunk/data-api: LICENSE.txt NOTICE.txt pom.xml src/

[bago]

Author: bago
Date: Wed Jan 19 20:00:25 2011
New Revision: 1060946

URL: http://svn.apache.org/viewvc?rev=1060946view=rev
Log:
second step of modules consolidation (JAMES-1184)

Added:
james/server/trunk/data-api/LICENSE.txt   (props changed)
  - copied unchanged from r1060945, james/server/trunk/user-api/LICENSE.txt
james/server/trunk/data-api/NOTICE.txt   (props changed)
  - copied unchanged from r1060945, james/server/trunk/user-api/NOTICE.txt
james/server/trunk/data-api/pom.xml   (props changed)
  - copied unchanged from r1060945, james/server/trunk/user-api/pom.xml
james/server/trunk/data-api/src/   (props changed)
  - copied from r1060945, james/server/trunk/user-api/src/

Propchange: james/server/trunk/data-api/LICENSE.txt
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:00:25 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-api/LICENSE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-api/LICENSE.txt:893986-896410

Propchange: james/server/trunk/data-api/NOTICE.txt
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:00:25 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-api/NOTICE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-api/NOTICE.txt:893986-896410

Propchange: james/server/trunk/data-api/pom.xml
--
svn:eol-style = native

Propchange: james/server/trunk/data-api/pom.xml
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:00:25 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-api/pom.xml:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-api/pom.xml:893986-896410

Propchange: james/server/trunk/data-api/pom.xml
--
svn:mime-type = text/plain

Propchange: james/server/trunk/data-api/src/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:00:25 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-api/src:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-api/src:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060950 - /james/server/trunk/data-api/src/main/java/org/apache/james/domainlist/

[bago]

Author: bago
Date: Wed Jan 19 20:02:06 2011
New Revision: 1060950

URL: http://svn.apache.org/viewvc?rev=1060950view=rev
Log:
second step of modules consolidation (JAMES-1184)

Added:
james/server/trunk/data-api/src/main/java/org/apache/james/domainlist/   
(props changed)
  - copied from r1060949, 
james/server/trunk/domainlist-api/src/main/java/org/apache/james/domainlist/

Propchange: 
james/server/trunk/data-api/src/main/java/org/apache/james/domainlist/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:02:06 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/domainlist-api/src/main/java/org/apache/james/domainlist:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/domainlist-api/src/main/java/org/apache/james/domainlist:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060951 - /james/server/trunk/data-api/src/test/

[bago]

Author: bago
Date: Wed Jan 19 20:02:19 2011
New Revision: 1060951

URL: http://svn.apache.org/viewvc?rev=1060951view=rev
Log:
second step of modules consolidation (JAMES-1184)

Added:
james/server/trunk/data-api/src/test/   (props changed)
  - copied from r1060950, james/server/trunk/domainlist-api/src/test/

Propchange: james/server/trunk/data-api/src/test/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:02:19 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/domainlist-api/src/test:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/domainlist-api/src/test:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060952 - /james/server/trunk/data-api/src/main/java/org/apache/james/mailrepository/

[bago]

Author: bago
Date: Wed Jan 19 20:03:18 2011
New Revision: 1060952

URL: http://svn.apache.org/viewvc?rev=1060952view=rev
Log:
second step of modules consolidation (JAMES-1184)

Added:
james/server/trunk/data-api/src/main/java/org/apache/james/mailrepository/  
 (props changed)
  - copied from r1060951, 
james/server/trunk/mail-api/src/main/java/org/apache/james/mailrepository/

Propchange: 
james/server/trunk/data-api/src/main/java/org/apache/james/mailrepository/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:03:18 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-api/src/main/java/org/apache/james/mailrepository:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-api/src/main/java/org/apache/james/mailrepository:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060953 - /james/server/trunk/ldap/

[bago]

Author: bago
Date: Wed Jan 19 20:04:04 2011
New Revision: 1060953

URL: http://svn.apache.org/viewvc?rev=1060953view=rev
Log:
second step of modules consolidation (JAMES-1184)

Added:
james/server/trunk/ldap/


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060954 - in /james/server/trunk/ldap: LICENSE.txt NOTICE.txt pom.xml src/

[bago]

Author: bago
Date: Wed Jan 19 20:05:30 2011
New Revision: 1060954

URL: http://svn.apache.org/viewvc?rev=1060954view=rev
Log:
second step of modules consolidation (JAMES-1184)

Added:
james/server/trunk/ldap/LICENSE.txt   (props changed)
  - copied unchanged from r1060953, james/server/trunk/user-ldap/LICENSE.txt
james/server/trunk/ldap/NOTICE.txt   (props changed)
  - copied unchanged from r1060953, james/server/trunk/user-ldap/NOTICE.txt
james/server/trunk/ldap/pom.xml   (props changed)
  - copied unchanged from r1060953, james/server/trunk/user-ldap/pom.xml
james/server/trunk/ldap/src/   (props changed)
  - copied from r1060953, james/server/trunk/user-ldap/src/

Propchange: james/server/trunk/ldap/LICENSE.txt
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:05:30 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-ldap/LICENSE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-ldap/LICENSE.txt:893986-896410

Propchange: james/server/trunk/ldap/NOTICE.txt
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:05:30 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-ldap/NOTICE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-ldap/NOTICE.txt:893986-896410

Propchange: james/server/trunk/ldap/pom.xml
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:05:30 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-ldap/pom.xml:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-ldap/pom.xml:893986-896410

Propchange: james/server/trunk/ldap/src/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 19 20:05:30 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-ldap/src:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-ldap/src:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060970 - in /james/server/trunk: ./ cli/ container-spring/ data-api/ data-library/ fetchmail/ file/ jcr/ jdbc/ jpa/ ldap/ lmtpserver/ mailbox-adapter/ mailetcontainer-camel/ mailetcontai

[bago]

Author: bago
Date: Wed Jan 19 20:27:47 2011
New Revision: 1060970

URL: http://svn.apache.org/viewvc?rev=1060970view=rev
Log:
second step of modules consolidation (JAMES-1184)

Modified:
james/server/trunk/cli/pom.xml
james/server/trunk/container-spring/pom.xml
james/server/trunk/data-api/pom.xml
james/server/trunk/data-library/pom.xml
james/server/trunk/fetchmail/pom.xml
james/server/trunk/file/pom.xml
james/server/trunk/jcr/pom.xml
james/server/trunk/jdbc/pom.xml
james/server/trunk/jpa/pom.xml
james/server/trunk/ldap/pom.xml
james/server/trunk/lmtpserver/pom.xml
james/server/trunk/mailbox-adapter/pom.xml
james/server/trunk/mailetcontainer-camel/pom.xml
james/server/trunk/mailetcontainer-library/pom.xml
james/server/trunk/mailets/pom.xml
james/server/trunk/pom.xml
james/server/trunk/smtpserver/pom.xml

Modified: james/server/trunk/cli/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/cli/pom.xml?rev=1060970r1=1060969r2=1060970view=diff
==
--- james/server/trunk/cli/pom.xml (original)
+++ james/server/trunk/cli/pom.xml Wed Jan 19 20:27:47 2011
@@ -64,11 +64,7 @@
   dependencies
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-domainlist-api/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-api/artifactId
+  artifactIdjames-server-data-api/artifactId
 /dependency
 dependency
   groupIdcommons-cli/groupId

Modified: james/server/trunk/container-spring/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1060970r1=1060969r2=1060970view=diff
==
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Wed Jan 19 20:27:47 2011
@@ -439,10 +439,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-mailetcontainer-api/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdapache-mailet/artifactId
 /dependency
 dependency
@@ -545,21 +541,17 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-api/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdjames-server-data-library/artifactId
   scoperuntime/scope
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-ldap/artifactId
+  artifactIdjames-server-ldap/artifactId
   scoperuntime/scope
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-domainlist-api/artifactId
+  artifactIdjames-server-data-api/artifactId
   scopecompile/scope
 /dependency
 dependency
@@ -634,10 +626,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-mail-api/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdapache-james-mailbox-tool/artifactId
 /dependency
 dependency

Modified: james/server/trunk/data-api/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/data-api/pom.xml?rev=1060970r1=1060969r2=1060970view=diff
==
--- james/server/trunk/data-api/pom.xml (original)
+++ james/server/trunk/data-api/pom.xml Wed Jan 19 20:27:47 2011
@@ -25,8 +25,8 @@
   /parent
   modelVersion4.0.0/modelVersion
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-api/artifactId
-  nameApache James Server User API/name
+  artifactIdjames-server-data-api/artifactId
+  nameApache James Server Data API/name
   properties
 !-- OSGI stuff --
 james.osgi.export
@@ -68,5 +68,9 @@
   groupIdorg.apache.james/groupId
   artifactIdapache-mailet/artifactId
 /dependency
+dependency
+  groupId${javax.mail.groupId}/groupId
+  artifactId${javax.mail.artifactId}/artifactId
+/dependency 
   /dependencies
 /project
\ No newline at end of file

Modified: james/server/trunk/data-library/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/data-library/pom.xml?rev=1060970r1=1060969r2=1060970view=diff
==
--- james/server/trunk/data-library/pom.xml (original)
+++ james/server/trunk/data-library/pom.xml Wed Jan 19 20:27:47 2011
@@ -38,15 +38,7 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-api/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-repository-api/artifactId
-/dependency
-dependency

svn commit: r1060981 - in /james/server/trunk: domainlist-api/ mail-api/ mailetcontainer-api/ repository-api/ user-api/ user-ldap/

[bago]

Author: bago
Date: Wed Jan 19 20:44:08 2011
New Revision: 1060981

URL: http://svn.apache.org/viewvc?rev=1060981view=rev
Log:
second step of modules consolidation (JAMES-1184)

Removed:
james/server/trunk/domainlist-api/
james/server/trunk/mail-api/
james/server/trunk/mailetcontainer-api/
james/server/trunk/repository-api/
james/server/trunk/user-api/
james/server/trunk/user-ldap/


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060982 - in /james/server/trunk: data-api/ ldap/

[bago]

Author: bago
Date: Wed Jan 19 20:46:37 2011
New Revision: 1060982

URL: http://svn.apache.org/viewvc?rev=1060982view=rev
Log:
second step of modules consolidation (JAMES-1184)

Modified:
james/server/trunk/data-api/   (props changed)
james/server/trunk/ldap/   (props changed)

Propchange: james/server/trunk/data-api/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jan 19 20:46:37 2011
@@ -0,0 +1,7 @@
+.classpath
+
+.settings
+
+.project
+
+target

Propchange: james/server/trunk/ldap/
--
--- svn:ignore (added)
+++ svn:ignore Wed Jan 19 20:46:37 2011
@@ -0,0 +1,5 @@
+.settings
+
+.project
+
+target



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060984 - /james/server/trunk/ldap/

[bago]

Author: bago
Date: Wed Jan 19 20:52:27 2011
New Revision: 1060984

URL: http://svn.apache.org/viewvc?rev=1060984view=rev
Log:
second step of modules consolidation (JAMES-1184)

Modified:
james/server/trunk/ldap/   (props changed)

Propchange: james/server/trunk/ldap/
--
--- svn:ignore (original)
+++ svn:ignore Wed Jan 19 20:52:27 2011
@@ -3,3 +3,5 @@
 .project
 
 target
+
+.classpath



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060991 - /james/server/trunk/container-spring/pom.xml

[bago]

Author: bago
Date: Wed Jan 19 21:13:35 2011
New Revision: 1060991

URL: http://svn.apache.org/viewvc?rev=1060991view=rev
Log:
second step of modules consolidation (JAMES-1184)

Modified:
james/server/trunk/container-spring/pom.xml

Modified: james/server/trunk/container-spring/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1060991r1=1060990r2=1060991view=diff
==
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Wed Jan 19 21:13:35 2011
@@ -506,7 +506,6 @@
 dependency
   groupIdorg.apache.james/groupId
   artifactIdjames-server-mailetcontainer-library/artifactId
-  scoperuntime/scope
 /dependency
 dependency
   groupIdorg.apache.james/groupId



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060295 - in /james/server/trunk: data-library/ file/ jcr/ jdbc/ jpa/

[bago]

Author: bago
Date: Tue Jan 18 10:46:52 2011
New Revision: 1060295

URL: http://svn.apache.org/viewvc?rev=1060295view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/data-library/
james/server/trunk/file/
james/server/trunk/jcr/
james/server/trunk/jdbc/
james/server/trunk/jpa/


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060296 - in /james/server/trunk/data-library: LICENSE.txt NOTICE.txt pom.xml src/

[bago]

Author: bago
Date: Tue Jan 18 10:48:34 2011
New Revision: 1060296

URL: http://svn.apache.org/viewvc?rev=1060296view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/data-library/LICENSE.txt   (props changed)
  - copied unchanged from r1060295, 
james/server/trunk/user-library/LICENSE.txt
james/server/trunk/data-library/NOTICE.txt   (props changed)
  - copied unchanged from r1060295, 
james/server/trunk/user-library/NOTICE.txt
james/server/trunk/data-library/pom.xml   (props changed)
  - copied unchanged from r1060295, james/server/trunk/user-library/pom.xml
james/server/trunk/data-library/src/   (props changed)
  - copied from r1060295, james/server/trunk/user-library/src/

Propchange: james/server/trunk/data-library/LICENSE.txt
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 10:48:34 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-library/LICENSE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-library/LICENSE.txt:893986-896410

Propchange: james/server/trunk/data-library/NOTICE.txt
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 10:48:34 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-library/NOTICE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-library/NOTICE.txt:893986-896410

Propchange: james/server/trunk/data-library/pom.xml
--
svn:eol-style = native

Propchange: james/server/trunk/data-library/pom.xml
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 10:48:34 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-library/pom.xml:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-library/pom.xml:893986-896410

Propchange: james/server/trunk/data-library/pom.xml
--
svn:mime-type = text/plain

Propchange: james/server/trunk/data-library/src/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 10:48:34 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-library/src:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-library/src:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060298 - /james/server/trunk/data-library/src/main/java/org/apache/james/domainlist/

[bago]

Author: bago
Date: Tue Jan 18 10:51:06 2011
New Revision: 1060298

URL: http://svn.apache.org/viewvc?rev=1060298view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/data-library/src/main/java/org/apache/james/domainlist/  
 (props changed)
  - copied from r1060297, 
james/server/trunk/domainlist-library/src/main/java/org/apache/james/domainlist/

Propchange: 
james/server/trunk/data-library/src/main/java/org/apache/james/domainlist/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 10:51:06 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/domainlist-library/src/main/java/org/apache/james/domainlist:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/domainlist-library/src/main/java/org/apache/james/domainlist:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060300 - /james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/

[bago]

Author: bago
Date: Tue Jan 18 10:52:07 2011
New Revision: 1060300

URL: http://svn.apache.org/viewvc?rev=1060300view=rev
Log:
modules consolidation (JAMES-1184)

Added:

james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/  
 (props changed)
  - copied from r1060299, 
james/server/trunk/mail-library/src/main/java/org/apache/james/mailrepository/

Propchange: 
james/server/trunk/data-library/src/main/java/org/apache/james/mailrepository/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 10:52:07 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-library/src/main/java/org/apache/james/mailrepository:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-library/src/main/java/org/apache/james/mailrepository:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060301 - /james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/

[bago]

Author: bago
Date: Tue Jan 18 10:52:55 2011
New Revision: 1060301

URL: http://svn.apache.org/viewvc?rev=1060301view=rev
Log:
modules consolidation (JAMES-1184)

Added:

james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/  
 (props changed)
  - copied from r1060300, 
james/server/trunk/mail-library/src/test/java/org/apache/james/mailrepository/

Propchange: 
james/server/trunk/data-library/src/test/java/org/apache/james/mailrepository/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 10:52:55 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-library/src/test/java/org/apache/james/mailrepository:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-library/src/test/java/org/apache/james/mailrepository:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060306 - in /james/server/trunk: ./ container-spring/ data-library/ domainlist-jpa/ domainlist-xml/ mail-file/ mail-jcr/ mail-jdbc/ mailets/ pop3server/ smtpserver/ user-file/ user-jcr/

[bago]

Author: bago
Date: Tue Jan 18 11:10:36 2011
New Revision: 1060306

URL: http://svn.apache.org/viewvc?rev=1060306view=rev
Log:
modules consolidation (JAMES-1184)

Modified:
james/server/trunk/container-spring/pom.xml
james/server/trunk/data-library/   (props changed)
james/server/trunk/data-library/pom.xml
james/server/trunk/domainlist-jpa/pom.xml
james/server/trunk/domainlist-xml/pom.xml
james/server/trunk/mail-file/pom.xml
james/server/trunk/mail-jcr/pom.xml
james/server/trunk/mail-jdbc/pom.xml
james/server/trunk/mailets/pom.xml
james/server/trunk/pom.xml
james/server/trunk/pop3server/pom.xml
james/server/trunk/smtpserver/pom.xml
james/server/trunk/user-file/pom.xml
james/server/trunk/user-jcr/pom.xml
james/server/trunk/user-jdbc/pom.xml
james/server/trunk/user-jpa/pom.xml

Modified: james/server/trunk/container-spring/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1060306r1=1060305r2=1060306view=diff
==
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Tue Jan 18 11:10:36 2011
@@ -549,7 +549,7 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-library/artifactId
+  artifactIdjames-server-data-library/artifactId
   scoperuntime/scope
 /dependency
 dependency
@@ -584,11 +584,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-domainlist-library/artifactId
-  scoperuntime/scope
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdjames-server-domainlist-xml/artifactId
   scoperuntime/scope
 /dependency
@@ -677,11 +672,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-mail-library/artifactId
-  scoperuntime/scope
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdjames-server-mail-file/artifactId
   scoperuntime/scope
 /dependency

Propchange: james/server/trunk/data-library/
--
--- svn:ignore (added)
+++ svn:ignore Tue Jan 18 11:10:36 2011
@@ -0,0 +1,5 @@
+.settings
+
+.classpath
+
+.project

Modified: james/server/trunk/data-library/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/data-library/pom.xml?rev=1060306r1=1060305r2=1060306view=diff
==
--- james/server/trunk/data-library/pom.xml (original)
+++ james/server/trunk/data-library/pom.xml Tue Jan 18 11:10:36 2011
@@ -25,8 +25,8 @@
   /parent
   modelVersion4.0.0/modelVersion
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-library/artifactId
-  nameApache James Server User Library/name
+  artifactIdjames-server-data-library/artifactId
+  nameApache James Server Data Library/name
   dependencies
 dependency
   groupIdorg.apache.james/groupId
@@ -46,6 +46,18 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
+  artifactIdjames-server-dnsservice-api/artifactId
+/dependency
+dependency
+  groupIdorg.apache.james/groupId
+  artifactIdjames-server-mail-api/artifactId
+/dependency
+dependency
+  groupIdorg.apache.james/groupId
+  artifactIdjames-server-filesystem-api/artifactId
+/dependency
+dependency
+  groupIdorg.apache.james/groupId
   artifactIdapache-mailet/artifactId
 /dependency
 
@@ -72,6 +84,11 @@
   artifactIdjunit/artifactId
   scopetest/scope
 /dependency
-
+dependency
+  groupIdorg.apache.james/groupId
+  artifactIdjames-server-core/artifactId
+  scopetest/scope
+/dependency
+
   /dependencies
 /project

Modified: james/server/trunk/domainlist-jpa/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/domainlist-jpa/pom.xml?rev=1060306r1=1060305r2=1060306view=diff
==
--- james/server/trunk/domainlist-jpa/pom.xml (original)
+++ james/server/trunk/domainlist-jpa/pom.xml Tue Jan 18 11:10:36 2011
@@ -39,7 +39,7 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-domainlist-library/artifactId
+  artifactIdjames-server-data-library/artifactId
 /dependency
 dependency
   groupIdcommons-configuration/groupId

Modified: james/server/trunk/domainlist-xml/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/domainlist-xml/pom.xml?rev=1060306r1=1060305r2=1060306view=diff
==
--- james/server/trunk/domainlist-xml/pom.xml (original)
+++ james/server/trunk/domainlist-xml/pom.xml Tue Jan 18 11:10:36 2011

svn commit: r1060307 - /james/server/trunk/data-library/

[bago]

Author: bago
Date: Tue Jan 18 11:10:53 2011
New Revision: 1060307

URL: http://svn.apache.org/viewvc?rev=1060307view=rev
Log:
modules consolidation (JAMES-1184)

Modified:
james/server/trunk/data-library/   (props changed)

Propchange: james/server/trunk/data-library/
--
--- svn:ignore (original)
+++ svn:ignore Tue Jan 18 11:10:53 2011
@@ -3,3 +3,5 @@
 .classpath
 
 .project
+
+target



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060308 - in /james/server/trunk/jpa: LICENSE.txt NOTICE.txt pom.xml src/

[bago]

Author: bago
Date: Tue Jan 18 11:12:57 2011
New Revision: 1060308

URL: http://svn.apache.org/viewvc?rev=1060308view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/jpa/LICENSE.txt   (props changed)
  - copied unchanged from r1060307, james/server/trunk/user-jpa/LICENSE.txt
james/server/trunk/jpa/NOTICE.txt   (props changed)
  - copied unchanged from r1060307, james/server/trunk/user-jpa/NOTICE.txt
james/server/trunk/jpa/pom.xml   (props changed)
  - copied unchanged from r1060307, james/server/trunk/user-jpa/pom.xml
james/server/trunk/jpa/src/   (props changed)
  - copied from r1060307, james/server/trunk/user-jpa/src/

Propchange: james/server/trunk/jpa/LICENSE.txt
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:12:57 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-jpa/LICENSE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-jpa/LICENSE.txt:893986-896410

Propchange: james/server/trunk/jpa/NOTICE.txt
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:12:57 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-jpa/NOTICE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-jpa/NOTICE.txt:893986-896410

Propchange: james/server/trunk/jpa/pom.xml
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:12:57 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-jpa/pom.xml:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-jpa/pom.xml:893986-896410

Propchange: james/server/trunk/jpa/src/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:12:57 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-jpa/src:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-jpa/src:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060309 - /james/server/trunk/jpa/src/main/java/org/apache/james/domainlist/

[bago]

Author: bago
Date: Tue Jan 18 11:13:50 2011
New Revision: 1060309

URL: http://svn.apache.org/viewvc?rev=1060309view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/jpa/src/main/java/org/apache/james/domainlist/   (props 
changed)
  - copied from r1060308, 
james/server/trunk/domainlist-jpa/src/main/java/org/apache/james/domainlist/

Propchange: james/server/trunk/jpa/src/main/java/org/apache/james/domainlist/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:13:50 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/domainlist-jpa/src/main/java/org/apache/james/domainlist:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/domainlist-jpa/src/main/java/org/apache/james/domainlist:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060310 - /james/server/trunk/jpa/src/test/java/org/apache/james/domainlist/

[bago]

Author: bago
Date: Tue Jan 18 11:13:58 2011
New Revision: 1060310

URL: http://svn.apache.org/viewvc?rev=1060310view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/jpa/src/test/java/org/apache/james/domainlist/   (props 
changed)
  - copied from r1060309, 
james/server/trunk/domainlist-jpa/src/test/java/org/apache/james/domainlist/

Propchange: james/server/trunk/jpa/src/test/java/org/apache/james/domainlist/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:13:58 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/domainlist-jpa/src/test/java/org/apache/james/domainlist:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/domainlist-jpa/src/test/java/org/apache/james/domainlist:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060311 - in /james/server/trunk: file/ jcr/ jdbc/ jpa/

[bago]

Author: bago
Date: Tue Jan 18 11:16:27 2011
New Revision: 1060311

URL: http://svn.apache.org/viewvc?rev=1060311view=rev
Log:
modules consolidation (JAMES-1184)

Modified:
james/server/trunk/file/   (props changed)
james/server/trunk/jcr/   (props changed)
james/server/trunk/jdbc/   (props changed)
james/server/trunk/jpa/   (props changed)

Propchange: james/server/trunk/file/
--
--- svn:ignore (added)
+++ svn:ignore Tue Jan 18 11:16:27 2011
@@ -0,0 +1 @@
+target

Propchange: james/server/trunk/jcr/
--
--- svn:ignore (added)
+++ svn:ignore Tue Jan 18 11:16:27 2011
@@ -0,0 +1 @@
+target

Propchange: james/server/trunk/jdbc/
--
--- svn:ignore (added)
+++ svn:ignore Tue Jan 18 11:16:27 2011
@@ -0,0 +1 @@
+target

Propchange: james/server/trunk/jpa/
--
--- svn:ignore (added)
+++ svn:ignore Tue Jan 18 11:16:27 2011
@@ -0,0 +1 @@
+target



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060314 - /james/server/trunk/jcr/src/main/resources/

[bago]

Author: bago
Date: Tue Jan 18 11:23:27 2011
New Revision: 1060314

URL: http://svn.apache.org/viewvc?rev=1060314view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/jcr/src/main/resources/   (props changed)
  - copied from r1060313, james/server/trunk/mail-jcr/src/main/resources/

Propchange: james/server/trunk/jcr/src/main/resources/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:23:27 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-jcr/src/main/resources:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-jcr/src/main/resources:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060315 - /james/server/trunk/jcr/src/main/java/org/apache/james/mailrepository/

[bago]

Author: bago
Date: Tue Jan 18 11:24:03 2011
New Revision: 1060315

URL: http://svn.apache.org/viewvc?rev=1060315view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/jcr/src/main/java/org/apache/james/mailrepository/   
(props changed)
  - copied from r1060314, 
james/server/trunk/mail-jcr/src/main/java/org/apache/james/mailrepository/

Propchange: 
james/server/trunk/jcr/src/main/java/org/apache/james/mailrepository/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:24:03 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-jcr/src/main/java/org/apache/james/mailrepository:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-jcr/src/main/java/org/apache/james/mailrepository:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060319 - /james/server/trunk/jdbc/src/test/resources/sqlResources-mail.xml

[bago]

Author: bago
Date: Tue Jan 18 11:29:29 2011
New Revision: 1060319

URL: http://svn.apache.org/viewvc?rev=1060319view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/jdbc/src/test/resources/sqlResources-mail.xml   (props 
changed)
  - copied unchanged from r1060318, 
james/server/trunk/mail-jdbc/src/test/resources/sqlResources.xml

Propchange: james/server/trunk/jdbc/src/test/resources/sqlResources-mail.xml
--
svn:eol-style = native

Propchange: james/server/trunk/jdbc/src/test/resources/sqlResources-mail.xml
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:29:29 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-jdbc/src/test/resources/sqlResources.xml:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-jdbc/src/test/resources/sqlResources.xml:893986-896410

Propchange: james/server/trunk/jdbc/src/test/resources/sqlResources-mail.xml
--
svn:mime-type = text/plain



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060320 - /james/server/trunk/jdbc/src/main/java/org/apache/james/mailrepository/

[bago]

Author: bago
Date: Tue Jan 18 11:29:54 2011
New Revision: 1060320

URL: http://svn.apache.org/viewvc?rev=1060320view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/jdbc/src/main/java/org/apache/james/mailrepository/   
(props changed)
  - copied from r1060319, 
james/server/trunk/mail-jdbc/src/main/java/org/apache/james/mailrepository/

Propchange: 
james/server/trunk/jdbc/src/main/java/org/apache/james/mailrepository/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:29:54 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-jdbc/src/main/java/org/apache/james/mailrepository:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-jdbc/src/main/java/org/apache/james/mailrepository:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060321 - /james/server/trunk/jdbc/src/test/java/org/apache/james/mailrepository/

[bago]

Author: bago
Date: Tue Jan 18 11:30:03 2011
New Revision: 1060321

URL: http://svn.apache.org/viewvc?rev=1060321view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/jdbc/src/test/java/org/apache/james/mailrepository/   
(props changed)
  - copied from r1060320, 
james/server/trunk/mail-jdbc/src/test/java/org/apache/james/mailrepository/

Propchange: 
james/server/trunk/jdbc/src/test/java/org/apache/james/mailrepository/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:30:03 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-jdbc/src/test/java/org/apache/james/mailrepository:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-jdbc/src/test/java/org/apache/james/mailrepository:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060322 - in /james/server/trunk/file: LICENSE.txt NOTICE.txt pom.xml src/

[bago]

Author: bago
Date: Tue Jan 18 11:31:19 2011
New Revision: 1060322

URL: http://svn.apache.org/viewvc?rev=1060322view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/file/LICENSE.txt   (props changed)
  - copied unchanged from r1060321, james/server/trunk/user-file/LICENSE.txt
james/server/trunk/file/NOTICE.txt   (props changed)
  - copied unchanged from r1060321, james/server/trunk/user-file/NOTICE.txt
james/server/trunk/file/pom.xml   (props changed)
  - copied unchanged from r1060321, james/server/trunk/user-file/pom.xml
james/server/trunk/file/src/   (props changed)
  - copied from r1060321, james/server/trunk/user-file/src/

Propchange: james/server/trunk/file/LICENSE.txt
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:31:19 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-file/LICENSE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-file/LICENSE.txt:893986-896410

Propchange: james/server/trunk/file/NOTICE.txt
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:31:19 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-file/NOTICE.txt:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-file/NOTICE.txt:893986-896410

Propchange: james/server/trunk/file/pom.xml
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:31:19 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-file/pom.xml:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-file/pom.xml:893986-896410

Propchange: james/server/trunk/file/src/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:31:19 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/user-file/src:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/user-file/src:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060326 - /james/server/trunk/file/src/test/resources/

[bago]

Author: bago
Date: Tue Jan 18 11:31:59 2011
New Revision: 1060326

URL: http://svn.apache.org/viewvc?rev=1060326view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/file/src/test/resources/   (props changed)
  - copied from r1060324, james/server/trunk/mail-file/src/test/resources/

Propchange: james/server/trunk/file/src/test/resources/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:31:59 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-file/src/test/resources:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-file/src/test/resources:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060327 - /james/server/trunk/file/src/main/resources/

[bago]

Author: bago
Date: Tue Jan 18 11:32:14 2011
New Revision: 1060327

URL: http://svn.apache.org/viewvc?rev=1060327view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/file/src/main/resources/   (props changed)
  - copied from r1060326, 
james/server/trunk/domainlist-xml/src/main/resources/

Propchange: james/server/trunk/file/src/main/resources/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:32:14 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/domainlist-xml/src/main/resources:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/domainlist-xml/src/main/resources:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060329 - /james/server/trunk/file/src/main/java/org/apache/james/domainlist/

[bago]

Author: bago
Date: Tue Jan 18 11:34:54 2011
New Revision: 1060329

URL: http://svn.apache.org/viewvc?rev=1060329view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/file/src/main/java/org/apache/james/domainlist/   (props 
changed)
  - copied from r1060328, 
james/server/trunk/domainlist-xml/src/main/java/org/apache/james/domainlist/

Propchange: james/server/trunk/file/src/main/java/org/apache/james/domainlist/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:34:54 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/domainlist-xml/src/main/java/org/apache/james/domainlist:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/domainlist-xml/src/main/java/org/apache/james/domainlist:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060330 - /james/server/trunk/file/src/test/java/org/apache/james/domainlist/

[bago]

Author: bago
Date: Tue Jan 18 11:35:03 2011
New Revision: 1060330

URL: http://svn.apache.org/viewvc?rev=1060330view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/file/src/test/java/org/apache/james/domainlist/   (props 
changed)
  - copied from r1060329, 
james/server/trunk/domainlist-xml/src/test/java/org/apache/james/domainlist/

Propchange: james/server/trunk/file/src/test/java/org/apache/james/domainlist/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:35:03 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/domainlist-xml/src/test/java/org/apache/james/domainlist:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/domainlist-xml/src/test/java/org/apache/james/domainlist:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060331 - /james/server/trunk/file/src/main/java/org/apache/james/mailrepository/

[bago]

Author: bago
Date: Tue Jan 18 11:35:12 2011
New Revision: 1060331

URL: http://svn.apache.org/viewvc?rev=1060331view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/file/src/main/java/org/apache/james/mailrepository/   
(props changed)
  - copied from r1060330, 
james/server/trunk/mail-file/src/main/java/org/apache/james/mailrepository/

Propchange: 
james/server/trunk/file/src/main/java/org/apache/james/mailrepository/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:35:12 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-file/src/main/java/org/apache/james/mailrepository:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-file/src/main/java/org/apache/james/mailrepository:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060332 - /james/server/trunk/file/src/test/java/org/apache/james/mailrepository/

[bago]

Author: bago
Date: Tue Jan 18 11:35:19 2011
New Revision: 1060332

URL: http://svn.apache.org/viewvc?rev=1060332view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/file/src/test/java/org/apache/james/mailrepository/   
(props changed)
  - copied from r1060330, 
james/server/trunk/mail-file/src/test/java/org/apache/james/mailrepository/

Propchange: 
james/server/trunk/file/src/test/java/org/apache/james/mailrepository/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:35:19 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/mail-file/src/test/java/org/apache/james/mailrepository:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/mail-file/src/test/java/org/apache/james/mailrepository:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060334 - /james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/

[bago]

Author: bago
Date: Tue Jan 18 11:39:47 2011
New Revision: 1060334

URL: http://svn.apache.org/viewvc?rev=1060334view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/  
 (props changed)
  - copied from r1060333, 
james/server/trunk/queue-library/src/main/java/org/apache/james/queue/library/

Propchange: 
james/server/trunk/queue-jms/src/main/java/org/apache/james/queue/library/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 11:39:47 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/queue-library/src/main/java/org/apache/james/queue/library:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/queue-library/src/main/java/org/apache/james/queue/library:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060343 - in /james/server/trunk: container-spring/pom.xml file/ file/pom.xml jcr/ jcr/pom.xml jdbc/ jdbc/pom.xml jpa/ jpa/pom.xml pom.xml queue-jms/pom.xml

[bago]

Author: bago
Date: Tue Jan 18 12:05:20 2011
New Revision: 1060343

URL: http://svn.apache.org/viewvc?rev=1060343view=rev
Log:
modules consolidation (JAMES-1184)

Modified:
james/server/trunk/container-spring/pom.xml
james/server/trunk/file/   (props changed)
james/server/trunk/file/pom.xml
james/server/trunk/jcr/   (props changed)
james/server/trunk/jcr/pom.xml
james/server/trunk/jdbc/   (props changed)
james/server/trunk/jdbc/pom.xml
james/server/trunk/jpa/   (props changed)
james/server/trunk/jpa/pom.xml
james/server/trunk/pom.xml
james/server/trunk/queue-jms/pom.xml

Modified: james/server/trunk/container-spring/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1060343r1=1060342r2=1060343view=diff
==
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Tue Jan 18 12:05:20 2011
@@ -554,26 +554,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-file/artifactId
-  scoperuntime/scope
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-jcr/artifactId
-  scoperuntime/scope
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-jdbc/artifactId
-  scoperuntime/scope
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-jpa/artifactId
-  scoperuntime/scope
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdjames-server-user-ldap/artifactId
   scoperuntime/scope
 /dependency
@@ -584,16 +564,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-domainlist-xml/artifactId
-  scoperuntime/scope
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-domainlist-jpa/artifactId
-  scoperuntime/scope
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdjames-server-smtpserver/artifactId
   scoperuntime/scope
 /dependency
@@ -672,17 +642,17 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-mail-file/artifactId
+  artifactIdjames-server-file/artifactId
   scoperuntime/scope
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-mail-jdbc/artifactId
+  artifactIdjames-server-jdbc/artifactId
   scoperuntime/scope
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-mail-jcr/artifactId
+  artifactIdjames-server-jcr/artifactId
   scoperuntime/scope
 /dependency
 dependency

Propchange: james/server/trunk/file/
--
--- svn:ignore (original)
+++ svn:ignore Tue Jan 18 12:05:20 2011
@@ -1 +1,7 @@
 target
+
+.project
+
+.classpath
+
+.settings

Modified: james/server/trunk/file/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/file/pom.xml?rev=1060343r1=1060342r2=1060343view=diff
==
--- james/server/trunk/file/pom.xml (original)
+++ james/server/trunk/file/pom.xml Tue Jan 18 12:05:20 2011
@@ -25,8 +25,8 @@
   /parent
   modelVersion4.0.0/modelVersion
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-file/artifactId
-  nameApache James Server User File/name
+  artifactIdjames-server-file/artifactId
+  nameApache James Server File Data Persistence/name
   
   dependencies
 dependency

Propchange: james/server/trunk/jcr/
--
--- svn:ignore (original)
+++ svn:ignore Tue Jan 18 12:05:20 2011
@@ -1 +1,7 @@
 target
+
+.settings
+
+.project
+
+.classpath

Modified: james/server/trunk/jcr/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/jcr/pom.xml?rev=1060343r1=1060342r2=1060343view=diff
==
--- james/server/trunk/jcr/pom.xml (original)
+++ james/server/trunk/jcr/pom.xml Tue Jan 18 12:05:20 2011
@@ -25,8 +25,8 @@
   /parent
   modelVersion4.0.0/modelVersion
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-jcr/artifactId
-  nameApache James Server User JCR/name
+  artifactIdjames-server-jcr/artifactId
+  nameApache James Server JCR Data Persistence/name
   
   dependencies
 dependency

Propchange: james/server/trunk/jdbc/
--
--- svn:ignore (original)
+++ svn:ignore Tue Jan 18 12:05:20 2011
@@ -1 +1,7 @@
 target
+
+.classpath
+
+.settings
+
+.project

Modified: james/server/trunk/jdbc

svn commit: r1060352 - /james/server/trunk/data-library/src/main/java/org/apache/james/repository/

[bago]

Author: bago
Date: Tue Jan 18 12:44:12 2011
New Revision: 1060352

URL: http://svn.apache.org/viewvc?rev=1060352view=rev
Log:
modules consolidation (JAMES-1184)

Added:
james/server/trunk/data-library/src/main/java/org/apache/james/repository/  
 (props changed)
  - copied from r1060351, 
james/server/trunk/repository-file/src/main/java/org/apache/james/repository/

Propchange: 
james/server/trunk/data-library/src/main/java/org/apache/james/repository/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Jan 18 12:44:12 2011
@@ -0,0 +1,2 @@
+/james/server/sandbox/active/mina_experiments/repository-file/src/main/java/org/apache/james/repository:824613-825114
+/james/server/sandbox/active/pure_spring_deployment/repository-file/src/main/java/org/apache/james/repository:893986-896410



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060354 - in /james/server/trunk: data-library/pom.xml file/pom.xml jdbc/pom.xml pom.xml

[bago]

Author: bago
Date: Tue Jan 18 12:51:07 2011
New Revision: 1060354

URL: http://svn.apache.org/viewvc?rev=1060354view=rev
Log:
modules consolidation (JAMES-1184)

Modified:
james/server/trunk/data-library/pom.xml
james/server/trunk/file/pom.xml
james/server/trunk/jdbc/pom.xml
james/server/trunk/pom.xml

Modified: james/server/trunk/data-library/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/data-library/pom.xml?rev=1060354r1=1060353r2=1060354view=diff
==
--- james/server/trunk/data-library/pom.xml (original)
+++ james/server/trunk/data-library/pom.xml Tue Jan 18 12:51:07 2011
@@ -42,6 +42,10 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
+  artifactIdjames-server-repository-api/artifactId
+/dependency
+dependency
+  groupIdorg.apache.james/groupId
   artifactIdjames-server-domainlist-api/artifactId
 /dependency
 dependency

Modified: james/server/trunk/file/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/file/pom.xml?rev=1060354r1=1060353r2=1060354view=diff
==
--- james/server/trunk/file/pom.xml (original)
+++ james/server/trunk/file/pom.xml Tue Jan 18 12:51:07 2011
@@ -43,10 +43,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-repository-file/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdjames-server-user-api/artifactId
 /dependency
 dependency

Modified: james/server/trunk/jdbc/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/jdbc/pom.xml?rev=1060354r1=1060353r2=1060354view=diff
==
--- james/server/trunk/jdbc/pom.xml (original)
+++ james/server/trunk/jdbc/pom.xml Tue Jan 18 12:51:07 2011
@@ -47,10 +47,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-repository-file/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdjames-server-mail-api/artifactId
 /dependency
 dependency

Modified: james/server/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1060354r1=1060353r2=1060354view=diff
==
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Jan 18 12:51:07 2011
@@ -59,7 +59,6 @@
 moduleosgi/module
 modulepop3server/module
 modulerepository-api/module
-modulerepository-file/module
 modulesmtpserver/module
 modulequeue-api/module
 modulequeue-jms/module
@@ -292,11 +291,6 @@
   artifactIdjames-server-repository-api/artifactId
   version${project.version}/version
 /dependency
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-repository-file/artifactId
-  version${project.version}/version
-/dependency
 
 dependency
   groupIdorg.apache.james/groupId



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060374 - /james/server/trunk/file/pom.xml

[bago]

Author: bago
Date: Tue Jan 18 13:48:49 2011
New Revision: 1060374

URL: http://svn.apache.org/viewvc?rev=1060374view=rev
Log:
modules consolidation (JAMES-1184)

Modified:
james/server/trunk/file/pom.xml

Modified: james/server/trunk/file/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/file/pom.xml?rev=1060374r1=1060373r2=1060374view=diff
==
--- james/server/trunk/file/pom.xml (original)
+++ james/server/trunk/file/pom.xml Tue Jan 18 13:48:49 2011
@@ -52,7 +52,6 @@
 dependency
   groupIdorg.apache.james/groupId
   artifactIdjames-server-core/artifactId
-  scoperuntime/scope
 /dependency
 dependency
   groupIdorg.apache.james/groupId
@@ -89,5 +88,11 @@
   typetest-jar/type
   scopetest/scope
 /dependency
+dependency
+  groupIdorg.apache.james/groupId
+  artifactIdjames-server-filesystem-api/artifactId
+  typetest-jar/type
+  scopetest/scope
+/dependency
   /dependencies
 /project



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060376 - /james/server/trunk/file/pom.xml

[bago]

Author: bago
Date: Tue Jan 18 13:49:56 2011
New Revision: 1060376

URL: http://svn.apache.org/viewvc?rev=1060376view=rev
Log:
modules consolidation (JAMES-1184)

Modified:
james/server/trunk/file/pom.xml

Modified: james/server/trunk/file/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/file/pom.xml?rev=1060376r1=1060375r2=1060376view=diff
==
--- james/server/trunk/file/pom.xml (original)
+++ james/server/trunk/file/pom.xml Tue Jan 18 13:49:56 2011
@@ -94,5 +94,11 @@
   typetest-jar/type
   scopetest/scope
 /dependency
+dependency
+  groupIdorg.apache.james/groupId
+  artifactIdjames-server-dnsservice-api/artifactId
+  typetest-jar/type
+  scopetest/scope
+/dependency
   /dependencies
 /project



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060410 - in /james/server/trunk: mailets/src/main/java/org/apache/james/transport/util/ mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java util/src/main/java/org

[bago]

Author: bago
Date: Tue Jan 18 15:20:15 2011
New Revision: 1060410

URL: http://svn.apache.org/viewvc?rev=1060410view=rev
Log:
Moved MailetContextLog to mailets package so to remove commons-logging 
dependency from util.

Added:
james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/

james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java
  - copied, changed from r1060352, 
james/server/trunk/util/src/main/java/org/apache/james/util/MailetContextLog.java
Removed:

james/server/trunk/util/src/main/java/org/apache/james/util/MailetContextLog.java

Copied: 
james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java
 (from r1060352, 
james/server/trunk/util/src/main/java/org/apache/james/util/MailetContextLog.java)
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java?p2=james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.javap1=james/server/trunk/util/src/main/java/org/apache/james/util/MailetContextLog.javar1=1060352r2=1060410rev=1060410view=diff
==
--- 
james/server/trunk/util/src/main/java/org/apache/james/util/MailetContextLog.java
 (original)
+++ 
james/server/trunk/mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java
 Tue Jan 18 15:20:15 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations  *
  * under the License.   *
  /
-package org.apache.james.util;
+package org.apache.james.transport.util;
 
 import org.apache.commons.logging.Log;
 import org.apache.mailet.MailetContext;



-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060411 - in /james/server/trunk: core/ filesystem-api/ mailets/src/main/java/org/apache/james/transport/mailets/ mailets/src/main/java/org/apache/james/transport/matchers/ util/

[bago]

Author: bago
Date: Tue Jan 18 15:20:48 2011
New Revision: 1060411

URL: http://svn.apache.org/viewvc?rev=1060411view=rev
Log:
Moved MailetContextLog to mailets package so to remove commons-logging 
dependency from util.

Modified:
james/server/trunk/core/pom.xml
james/server/trunk/filesystem-api/pom.xml

james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java

james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java

james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
james/server/trunk/util/pom.xml

Modified: james/server/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/core/pom.xml?rev=1060411r1=1060410r2=1060411view=diff
==
--- james/server/trunk/core/pom.xml (original)
+++ james/server/trunk/core/pom.xml Tue Jan 18 15:20:48 2011
@@ -43,12 +43,17 @@
   groupIdorg.apache.james/groupId
   artifactIdjames-server-util/artifactId
 /dependency   
+dependency
+  groupIdorg.apache.james/groupId
+  artifactIdjames-server-lifecycle-api/artifactId
+/dependency   
 
 dependency
   groupIdorg.apache.james/groupId
   artifactIdapache-mailet/artifactId
 /dependency
 
+!-- RFC2822Headers constants imported from mailet-base (undetected by 
bytecode analyzers because constants are inlined) --
 dependency
   groupIdorg.apache.james/groupId
   artifactIdapache-mailet-base/artifactId

Modified: james/server/trunk/filesystem-api/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/filesystem-api/pom.xml?rev=1060411r1=1060410r2=1060411view=diff
==
--- james/server/trunk/filesystem-api/pom.xml (original)
+++ james/server/trunk/filesystem-api/pom.xml Tue Jan 18 15:20:48 2011
@@ -60,15 +60,4 @@
   /plugin
 /plugins
   /build
-
-  dependencies
-dependency
-  groupIdcommons-configuration/groupId
-  artifactIdcommons-configuration/artifactId
-/dependency
-dependency
-  groupIdcommons-logging/groupId
-  artifactIdcommons-logging/artifactId
-/dependency
-  /dependencies
 /project
\ No newline at end of file

Modified: 
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java?rev=1060411r1=1060410r2=1060411view=diff
==
--- 
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
 (original)
+++ 
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/RemoteDelivery.java
 Tue Jan 18 15:20:48 2011
@@ -31,7 +31,7 @@ import org.apache.james.queue.api.MailQu
 import org.apache.james.queue.api.MailQueueFactory;
 import org.apache.james.queue.api.MailQueue.MailQueueException;
 import org.apache.james.queue.api.MailQueue.MailQueueItem;
-import org.apache.james.util.MailetContextLog;
+import org.apache.james.transport.util.MailetContextLog;
 import org.apache.james.util.TimeConverter;
 import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.HostAddress;

Modified: 
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java?rev=1060411r1=1060410r2=1060411view=diff
==
--- 
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
 (original)
+++ 
james/server/trunk/mailets/src/main/java/org/apache/james/transport/mailets/SieveMailet.java
 Tue Jan 18 15:20:48 2011
@@ -35,7 +35,7 @@ import org.apache.james.mailbox.MailboxS
 import org.apache.james.mailbox.MessageManager;
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.api.UsersRepositoryException;
-import org.apache.james.util.MailetContextLog;
+import org.apache.james.transport.util.MailetContextLog;
 import org.apache.jsieve.mailet.Poster;
 import org.apache.jsieve.mailet.SieveMailboxMailet;
 import org.apache.mailet.Mail;

Modified: 
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java?rev=1060411r1=1060410r2=1060411view=diff
==
--- 
james/server/trunk/mailets/src/main/java/org/apache/james/transport/matchers/AbstractStorageQuota.java
 (original)
+++ 
james/server/trunk/mailets/src/main/java

svn commit: r1060425 - in /james/server/trunk: domainlist-jpa/ domainlist-library/ domainlist-xml/ mail-file/ mail-jcr/ mail-jdbc/ mail-library/ queue-library/ repository-file/ user-file/ user-jcr/ us

[bago]

Author: bago
Date: Tue Jan 18 15:50:36 2011
New Revision: 1060425

URL: http://svn.apache.org/viewvc?rev=1060425view=rev
Log:
modules consolidation (JAMES-1184)
removing merged modules.

Removed:
james/server/trunk/domainlist-jpa/
james/server/trunk/domainlist-library/
james/server/trunk/domainlist-xml/
james/server/trunk/mail-file/
james/server/trunk/mail-jcr/
james/server/trunk/mail-jdbc/
james/server/trunk/mail-library/
james/server/trunk/queue-library/
james/server/trunk/repository-file/
james/server/trunk/user-file/
james/server/trunk/user-jcr/
james/server/trunk/user-jdbc/
james/server/trunk/user-jpa/
james/server/trunk/user-library/


-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

svn commit: r1060478 - in /james/server/trunk: mail-api/pom.xml mailetcontainer-camel/pom.xml mailetcontainer-library/pom.xml smtpserver/pom.xml util/pom.xml

[bago]

Author: bago
Date: Tue Jan 18 17:10:39 2011
New Revision: 1060478

URL: http://svn.apache.org/viewvc?rev=1060478view=rev
Log:
removed some unused dependency and added some implicitly used dependency to the 
poms (dependency:analyze plugin).

Modified:
james/server/trunk/mail-api/pom.xml
james/server/trunk/mailetcontainer-camel/pom.xml
james/server/trunk/mailetcontainer-library/pom.xml
james/server/trunk/smtpserver/pom.xml
james/server/trunk/util/pom.xml

Modified: james/server/trunk/mail-api/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mail-api/pom.xml?rev=1060478r1=1060477r2=1060478view=diff
==
--- james/server/trunk/mail-api/pom.xml (original)
+++ james/server/trunk/mail-api/pom.xml Tue Jan 18 17:10:39 2011
@@ -66,10 +66,6 @@
   artifactIdapache-mailet/artifactId
 /dependency
 dependency
-  groupIdcommons-configuration/groupId
-  artifactIdcommons-configuration/artifactId
-/dependency
-dependency
   groupId${javax.mail.groupId}/groupId
   artifactId${javax.mail.artifactId}/artifactId
 /dependency

Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1060478r1=1060477r2=1060478view=diff
==
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Tue Jan 18 17:10:39 2011
@@ -38,6 +38,10 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
+  artifactIdjames-server-dnsservice-api/artifactId
+/dependency
+dependency
+  groupIdorg.apache.james/groupId
   artifactIdjames-server-dnsservice-library/artifactId
 /dependency
 dependency
@@ -46,16 +50,26 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
+  artifactIdjames-server-domainlist-api/artifactId
+/dependency
+dependency
+  groupIdorg.apache.james/groupId
+  artifactIdjames-server-user-api/artifactId
+/dependency
+dependency
+  groupIdorg.apache.james/groupId
   artifactIdjames-server-core/artifactId
 /dependency
  dependency
   groupIdorg.apache.james/groupId
   artifactIdapache-mailet/artifactId
 /dependency
+!-- 
 dependency
   groupIdorg.apache.james/groupId
   artifactIdapache-mailet-base/artifactId
-/dependency  
+/dependency
+ --  
 dependency
   groupIdcommons-logging/groupId
   artifactIdcommons-logging/artifactId

Modified: james/server/trunk/mailetcontainer-library/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/pom.xml?rev=1060478r1=1060477r2=1060478view=diff
==
--- james/server/trunk/mailetcontainer-library/pom.xml (original)
+++ james/server/trunk/mailetcontainer-library/pom.xml Tue Jan 18 17:10:39 2011
@@ -34,14 +34,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-filesystem-api/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-domainlist-api/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdjames-server-queue-api/artifactId
 /dependency
 dependency
@@ -77,18 +69,6 @@
   groupIdorg.apache.james/groupId
   artifactIdjames-server-core/artifactId
 /dependency  
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-user-api/artifactId
-/dependency   
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-dnsservice-api/artifactId
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
-  artifactIdjames-server-util/artifactId
-/dependency
 
 dependency
   groupIdjunit/groupId
@@ -97,12 +77,6 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
-  artifactIdjames-server-filesystem-api/artifactId
-  typetest-jar/type
-  scopetest/scope
-/dependency
-dependency
-  groupIdorg.apache.james/groupId
   artifactIdapache-mailet-base/artifactId
   classifiertests/classifier
   scopetest/scope

Modified: james/server/trunk/smtpserver/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1060478r1=1060477r2=1060478view=diff
==
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Tue Jan 18 17:10:39 2011
@@ -42,6 +42,10 @@
 /dependency
 dependency
   groupIdorg.apache.james/groupId
+  artifactIdjames-server-filesystem-api/artifactId
+/dependency
+dependency