You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mime4j-dev@james.apache.org by ol...@apache.org on 2013/04/30 10:46:17 UTC
svn commit: r1477509 - in /james/mime4j/trunk: ./ core/
dom/src/main/java/org/apache/james/mime4j/message/
mbox/src/main/java/org/apache/james/mime4j/mboxiterator/
Author: olegk
Date: Tue Apr 30 08:46:16 2013
New Revision: 1477509
URL: http://svn.apache.org/r1477509
Log:
Restored full Java 1.5 compatibility
Modified:
james/mime4j/trunk/core/pom.xml
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/DefaultMessageImplFactory.java
james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/EntityBuilder.java
james/mime4j/trunk/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/MboxIterator.java
james/mime4j/trunk/pom.xml
Modified: james/mime4j/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/core/pom.xml?rev=1477509&r1=1477508&r2=1477509&view=diff
==============================================================================
--- james/mime4j/trunk/core/pom.xml (original)
+++ james/mime4j/trunk/core/pom.xml Tue Apr 30 08:46:16 2013
@@ -48,15 +48,6 @@
<build>
<plugins>
<plugin>
- <!-- Mime4j is used in projects that still use java-1.5 so please be careful when changing this -->
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
Modified: james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/DefaultMessageImplFactory.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/DefaultMessageImplFactory.java?rev=1477509&r1=1477508&r2=1477509&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/DefaultMessageImplFactory.java (original)
+++ james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/DefaultMessageImplFactory.java Tue Apr 30 08:46:16 2013
@@ -24,7 +24,6 @@ package org.apache.james.mime4j.message;
*/
public class DefaultMessageImplFactory implements MessageImplFactory {
- @Override
public MessageImpl messageImpl() {
return new MessageImpl();
}
Modified: james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/EntityBuilder.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/EntityBuilder.java?rev=1477509&r1=1477508&r2=1477509&view=diff
==============================================================================
--- james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/EntityBuilder.java (original)
+++ james/mime4j/trunk/dom/src/main/java/org/apache/james/mime4j/message/EntityBuilder.java Tue Apr 30 08:46:16 2013
@@ -73,7 +73,6 @@ class EntityBuilder implements ContentHa
}
}
- @Override
public void startMessage() throws MimeException {
if (stack.isEmpty()) {
stack.push(this.entity);
@@ -85,24 +84,20 @@ class EntityBuilder implements ContentHa
}
}
- @Override
public void endMessage() throws MimeException {
expect(Message.class);
stack.pop();
}
- @Override
public void startHeader() throws MimeException {
stack.push(new HeaderImpl());
}
- @Override
public void field(Field field) throws MimeException {
expect(Header.class);
((Header) stack.peek()).addField(field);
}
- @Override
public void endHeader() throws MimeException {
expect(Header.class);
Header h = (Header) stack.pop();
@@ -110,7 +105,6 @@ class EntityBuilder implements ContentHa
((Entity) stack.peek()).setHeader(h);
}
- @Override
public void startMultipart(final BodyDescriptor bd) throws MimeException {
expect(Entity.class);
@@ -121,7 +115,6 @@ class EntityBuilder implements ContentHa
stack.push(multiPart);
}
- @Override
public void body(BodyDescriptor bd, final InputStream is) throws MimeException, IOException {
expect(Entity.class);
@@ -154,12 +147,10 @@ class EntityBuilder implements ContentHa
entity.setBody(body);
}
- @Override
public void endMultipart() throws MimeException {
stack.pop();
}
- @Override
public void startBodyPart() throws MimeException {
expect(Multipart.class);
@@ -168,20 +159,17 @@ class EntityBuilder implements ContentHa
stack.push(bodyPart);
}
- @Override
public void endBodyPart() throws MimeException {
expect(BodyPart.class);
stack.pop();
}
- @Override
public void epilogue(InputStream is) throws MimeException, IOException {
expect(MultipartImpl.class);
ByteSequence bytes = loadStream(is);
((MultipartImpl) stack.peek()).setEpilogueRaw(bytes);
}
- @Override
public void preamble(InputStream is) throws MimeException, IOException {
expect(MultipartImpl.class);
ByteSequence bytes = loadStream(is);
@@ -194,7 +182,6 @@ class EntityBuilder implements ContentHa
* @param is the raw contents of the entity.
* @throws UnsupportedOperationException
*/
- @Override
public void raw(InputStream is) throws MimeException, IOException {
throw new UnsupportedOperationException("Not supported");
}
Modified: james/mime4j/trunk/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/MboxIterator.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/MboxIterator.java?rev=1477509&r1=1477508&r2=1477509&view=diff
==============================================================================
--- james/mime4j/trunk/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/MboxIterator.java (original)
+++ james/mime4j/trunk/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/MboxIterator.java Tue Apr 30 08:46:16 2013
@@ -253,8 +253,6 @@ public class MboxIterator implements Ite
.append("\nlimit:\t").append(buffer.limit())
.append("\nremaining:\t").append(buffer.remaining())
.append("\nposition:\t").append(buffer.position())
- .append("\nis direct:\t").append(buffer.isDirect())
- .append("\nhas array:\t").append(buffer.hasArray())
.append("\nbuffer:\t").append(buffer.isReadOnly())
.append("\nclass:\t").append(buffer.getClass());
return sb.toString();
Modified: james/mime4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/pom.xml?rev=1477509&r1=1477508&r2=1477509&view=diff
==============================================================================
--- james/mime4j/trunk/pom.xml (original)
+++ james/mime4j/trunk/pom.xml Tue Apr 30 08:46:16 2013
@@ -64,11 +64,12 @@
</distributionManagement>
<properties>
- <target.jdk>1.6</target.jdk>
+ <target.jdk>1.5</target.jdk>
<commons-logging.version>1.1.1</commons-logging.version>
<log4j.version>1.2.14</log4j.version>
<junit.version>4.10</junit.version>
- <commons-io.version>2.4</commons-io.version>
+ <!-- Version 2.2 is required for Java 1.5 compatibility -->
+ <commons-io.version>2.2</commons-io.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>