Author: bago
Date: Sun Aug 27 10:36:38 2006
New Revision: 437419
URL: http://svn.apache.org/viewvc?rev=437419&view=rev
Log:
Removed jj/jjt files from java sources.
Updated Tests to retrieve resources from src/test/resources
Removed:
james/mime4j/branches/maven2-port/src/main/java/org/mime4j/field/address/AddressListParser.jjt
james/mime4j/branches/maven2-port/src/main/java/org/mime4j/field/address/parser/AddressListParser.jj
Modified:
james/mime4j/branches/maven2-port/src/main/javacc/org/mime4j/field/contenttype/ContentTypeParser.jj
james/mime4j/branches/maven2-port/src/main/javacc/org/mime4j/field/datetime/DateTimeParser.jj
james/mime4j/branches/maven2-port/src/main/jjtree/org/mime4j/field/address/AddressListParser.jjt
james/mime4j/branches/maven2-port/src/test/java/org/mime4j/MimeStreamParserTest.java
james/mime4j/branches/maven2-port/src/test/java/org/mime4j/message/MessageParserTest.java
Modified:
james/mime4j/branches/maven2-port/src/main/javacc/org/mime4j/field/contenttype/ContentTypeParser.jj
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/maven2-port/src/main/javacc/org/mime4j/field/contenttype/ContentTypeParser.jj?rev=437419&r1=437418&r2=437419&view=diff
==============================================================================
---
james/mime4j/branches/maven2-port/src/main/javacc/org/mime4j/field/contenttype/ContentTypeParser.jj
(original)
+++
james/mime4j/branches/maven2-port/src/main/javacc/org/mime4j/field/contenttype/ContentTypeParser.jj
Sun Aug 27 10:36:38 2006
@@ -160,18 +160,18 @@
<INCOMMENT>
MORE :
{
- <<QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+ < <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
| "(" { commentNest = 1; } : NESTED_COMMENT
-| <<ANY>>
+| < <ANY>>
}
<NESTED_COMMENT>
MORE :
{
- <<QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+ < <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
| "(" { ++commentNest; }
| ")" { --commentNest; if (commentNest == 0) SwitchTo(INCOMMENT); }
-| <<ANY>>
+| < <ANY>>
}
@@ -186,7 +186,7 @@
<INQUOTEDSTRING>
MORE :
{
- <<QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+ < <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
| < (~["\"", "\\"])+ >
}
Modified:
james/mime4j/branches/maven2-port/src/main/javacc/org/mime4j/field/datetime/DateTimeParser.jj
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/maven2-port/src/main/javacc/org/mime4j/field/datetime/DateTimeParser.jj?rev=437419&r1=437418&r2=437419&view=diff
==============================================================================
---
james/mime4j/branches/maven2-port/src/main/javacc/org/mime4j/field/datetime/DateTimeParser.jj
(original)
+++
james/mime4j/branches/maven2-port/src/main/javacc/org/mime4j/field/datetime/DateTimeParser.jj
Sun Aug 27 10:36:38 2006
@@ -24,6 +24,8 @@
options {
STATIC=false;
LOOKAHEAD=1;
+ NODE_PACKAGE="org.mime4j.field.datetime.parser";
+ PACKAGE_NAME="org.mime4j.field.datetime.parser";
//DEBUG_PARSER=true;
//DEBUG_TOKEN_MANAGER=true;
}
@@ -308,18 +310,18 @@
<INCOMMENT>
MORE :
{
- <<QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+ < <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
| "(" { commentNest = 1; } : NESTED_COMMENT
-| <<ANY>>
+| < <ANY>>
}
<NESTED_COMMENT>
MORE :
{
- <<QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+ < <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
| "(" { ++commentNest; }
| ")" { --commentNest; if (commentNest == 0) SwitchTo(INCOMMENT); }
-| <<ANY>>
+| < <ANY>>
}
TOKEN :
Modified:
james/mime4j/branches/maven2-port/src/main/jjtree/org/mime4j/field/address/AddressListParser.jjt
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/maven2-port/src/main/jjtree/org/mime4j/field/address/AddressListParser.jjt?rev=437419&r1=437418&r2=437419&view=diff
==============================================================================
---
james/mime4j/branches/maven2-port/src/main/jjtree/org/mime4j/field/address/AddressListParser.jjt
(original)
+++
james/mime4j/branches/maven2-port/src/main/jjtree/org/mime4j/field/address/AddressListParser.jjt
Sun Aug 27 10:36:38 2006
@@ -27,6 +27,7 @@
VISITOR=true;
MULTI=true;
NODE_SCOPE_HOOK=true;
+ NODE_EXTENDS="org.mime4j.field.address.parser.BaseNode";
//DEBUG_PARSER=true;
//DEBUG_TOKEN_MANAGER=true;
}
@@ -239,7 +240,7 @@
<INDOMAINLITERAL>
MORE :
{
- <<QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+ < <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
| < ~["[", "]", "\\"] >
}
@@ -268,18 +269,18 @@
<INCOMMENT>
MORE :
{
- <<QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+ < <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
| "(" { commentNest = 1; } : NESTED_COMMENT
-| <<ANY>>
+| < <ANY>>
}
<NESTED_COMMENT>
MORE :
{
- <<QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+ < <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
| "(" { ++commentNest; }
| ")" { --commentNest; if (commentNest == 0) SwitchTo(INCOMMENT); }
-| <<ANY>>
+| < <ANY>>
}
@@ -293,7 +294,7 @@
<INQUOTEDSTRING>
MORE :
{
- <<QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
+ < <QUOTEDPAIR>> { image.deleteCharAt(image.length() - 2); }
| < (~["\"", "\\"])+ >
}
Modified:
james/mime4j/branches/maven2-port/src/test/java/org/mime4j/MimeStreamParserTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/maven2-port/src/test/java/org/mime4j/MimeStreamParserTest.java?rev=437419&r1=437418&r2=437419&view=diff
==============================================================================
---
james/mime4j/branches/maven2-port/src/test/java/org/mime4j/MimeStreamParserTest.java
(original)
+++
james/mime4j/branches/maven2-port/src/test/java/org/mime4j/MimeStreamParserTest.java
Sun Aug 27 10:36:38 2006
@@ -410,7 +410,7 @@
}
public void testParse() throws IOException {
- File dir = new File("testmsgs");
+ File dir = new File("src/test/resources/testmsgs");
File[] files = dir.listFiles();
for (int i = 0; i < files.length; i++) {
Modified:
james/mime4j/branches/maven2-port/src/test/java/org/mime4j/message/MessageParserTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/branches/maven2-port/src/test/java/org/mime4j/message/MessageParserTest.java?rev=437419&r1=437418&r2=437419&view=diff
==============================================================================
---
james/mime4j/branches/maven2-port/src/test/java/org/mime4j/message/MessageParserTest.java
(original)
+++
james/mime4j/branches/maven2-port/src/test/java/org/mime4j/message/MessageParserTest.java
Sun Aug 27 10:36:38 2006
@@ -60,7 +60,7 @@
public static Test suite() {
TestSuite suite = new TestSuite();
- File dir = new File("testmsgs");
+ File dir = new File("src/test/resources/testmsgs");
File[] files = dir.listFiles();
for (int i = 0; i < files.length && i < 5000; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
