From e65dfc8a04b77f299b73acc6c7a58fefb3629b41 Mon Sep 17 00:00:00 2001
From: Tom Copeland <tomcopeland@users.sourceforge.net>
Date: Mon, 24 Jun 2002 15:50:34 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@16 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd/docs/ant.html                             |  2 +-
 .../sourceforge}/pmd/FunctionalTest.java      |  6 +-
 .../sourceforge}/pmd/NamespaceTest.java       |  6 +-
 .../sourceforge}/pmd/ReportTest.java          |  8 +-
 .../sourceforge}/pmd/RuleFactoryTest.java     | 10 +--
 .../sourceforge}/pmd/RuleViolationTest.java   |  6 +-
 .../sourceforge}/pmd/SymbolTableTest.java     |  6 +-
 .../sourceforge}/pmd/SymbolTest.java          |  4 +-
 pmd/src/net/sourceforge/pmd/AbstractRule.java | 21 +++++
 .../pmd/DontCreateThreadsRule.java            | 20 +++++
 .../sourceforge/pmd/DontCreateTimersRule.java | 20 +++++
 .../sourceforge/pmd/EmptyCatchBlockRule.java  | 22 +++++
 .../net/sourceforge/pmd/EmptyIfStmtRule.java  | 23 +++++
 pmd/src/net/sourceforge/pmd/Namespace.java    | 63 +++++++++++++
 pmd/src/net/sourceforge/pmd/PMD.java          | 65 ++++++++++++++
 pmd/src/net/sourceforge/pmd/PMDTask.java      | 68 ++++++++++++++
 pmd/src/net/sourceforge/pmd/Report.java       | 40 +++++++++
 pmd/src/net/sourceforge/pmd/Rule.java         |  8 ++
 pmd/src/net/sourceforge/pmd/RuleFactory.java  | 55 ++++++++++++
 .../net/sourceforge/pmd/RuleViolation.java    | 27 ++++++
 pmd/src/net/sourceforge/pmd/Symbol.java       | 38 ++++++++
 pmd/src/net/sourceforge/pmd/SymbolTable.java  | 83 +++++++++++++++++
 .../net/sourceforge/pmd/SystemOutRule.java    | 18 ++++
 .../net/sourceforge/pmd/SystemPropsRule.java  | 19 ++++
 .../UnnecessaryConversionTemporaryRule.java   | 58 ++++++++++++
 .../pmd/UnusedLocalVariableRule.java          | 80 +++++++++++++++++
 .../UnusedPrivateInstanceVariableRule.java    | 90 +++++++++++++++++++
 .../pmd/ast/ASTAdditiveExpression.java        |  3 +-
 .../pmd/ast/ASTAllocationExpression.java      |  3 +-
 .../pmd/ast/ASTAndExpression.java             |  3 +-
 .../sourceforge}/pmd/ast/ASTArgumentList.java |  3 +-
 .../sourceforge}/pmd/ast/ASTArguments.java    |  3 +-
 .../pmd/ast/ASTArrayDimsAndInits.java         |  3 +-
 .../pmd/ast/ASTArrayInitializer.java          |  3 +-
 .../pmd/ast/ASTAssertStatement.java           |  3 +-
 .../pmd/ast/ASTAssignmentOperator.java        |  3 +-
 .../sourceforge}/pmd/ast/ASTBlock.java        |  3 +-
 .../pmd/ast/ASTBlockStatement.java            |  3 +-
 .../pmd/ast/ASTBooleanLiteral.java            |  3 +-
 .../pmd/ast/ASTBreakStatement.java            |  3 +-
 .../pmd/ast/ASTCastExpression.java            |  3 +-
 .../pmd/ast/ASTCastLookahead.java             |  3 +-
 .../sourceforge}/pmd/ast/ASTClassBody.java    |  3 +-
 .../pmd/ast/ASTClassBodyDeclaration.java      |  3 +-
 .../pmd/ast/ASTClassDeclaration.java          |  3 +-
 .../pmd/ast/ASTCompilationUnit.java           |  3 +-
 .../pmd/ast/ASTConditionalAndExpression.java  |  3 +-
 .../pmd/ast/ASTConditionalExpression.java     |  3 +-
 .../pmd/ast/ASTConditionalOrExpression.java   |  3 +-
 .../pmd/ast/ASTConstructorDeclaration.java    |  3 +-
 .../pmd/ast/ASTContinueStatement.java         |  3 +-
 .../sourceforge}/pmd/ast/ASTDoStatement.java  |  3 +-
 .../pmd/ast/ASTEmptyStatement.java            |  3 +-
 .../pmd/ast/ASTEqualityExpression.java        |  3 +-
 .../pmd/ast/ASTExclusiveOrExpression.java     |  3 +-
 .../ast/ASTExplicitConstructorInvocation.java |  3 +-
 .../sourceforge}/pmd/ast/ASTExpression.java   |  3 +-
 .../pmd/ast/ASTFieldDeclaration.java          |  3 +-
 .../sourceforge}/pmd/ast/ASTForInit.java      |  3 +-
 .../sourceforge}/pmd/ast/ASTForStatement.java |  3 +-
 .../sourceforge}/pmd/ast/ASTForUpdate.java    |  3 +-
 .../pmd/ast/ASTFormalParameter.java           |  3 +-
 .../pmd/ast/ASTFormalParameters.java          |  3 +-
 .../sourceforge}/pmd/ast/ASTIfStatement.java  |  3 +-
 .../pmd/ast/ASTImportDeclaration.java         |  3 +-
 .../pmd/ast/ASTInclusiveOrExpression.java     |  3 +-
 .../sourceforge}/pmd/ast/ASTInitializer.java  |  3 +-
 .../pmd/ast/ASTInstanceOfExpression.java      |  3 +-
 .../pmd/ast/ASTInterfaceDeclaration.java      |  3 +-
 .../ast/ASTInterfaceMemberDeclaration.java    |  3 +-
 .../pmd/ast/ASTLabeledStatement.java          |  3 +-
 .../sourceforge}/pmd/ast/ASTLiteral.java      |  3 +-
 .../pmd/ast/ASTLocalVariableDeclaration.java  |  3 +-
 .../pmd/ast/ASTMethodDeclaration.java         |  3 +-
 .../ast/ASTMethodDeclarationLookahead.java    |  3 +-
 .../pmd/ast/ASTMethodDeclarator.java          |  3 +-
 .../pmd/ast/ASTMultiplicativeExpression.java  |  3 +-
 .../sourceforge}/pmd/ast/ASTName.java         |  3 +-
 .../sourceforge}/pmd/ast/ASTNameList.java     |  3 +-
 .../pmd/ast/ASTNestedClassDeclaration.java    |  3 +-
 .../ast/ASTNestedInterfaceDeclaration.java    |  3 +-
 .../sourceforge}/pmd/ast/ASTNullLiteral.java  |  3 +-
 .../pmd/ast/ASTPackageDeclaration.java        |  3 +-
 .../pmd/ast/ASTPostfixExpression.java         |  3 +-
 .../pmd/ast/ASTPreDecrementExpression.java    |  3 +-
 .../pmd/ast/ASTPreIncrementExpression.java    |  3 +-
 .../pmd/ast/ASTPrimaryExpression.java         |  3 +-
 .../pmd/ast/ASTPrimaryPrefix.java             |  3 +-
 .../pmd/ast/ASTPrimarySuffix.java             |  3 +-
 .../pmd/ast/ASTPrimitiveType.java             |  3 +-
 .../pmd/ast/ASTRelationalExpression.java      |  3 +-
 .../sourceforge}/pmd/ast/ASTResultType.java   |  3 +-
 .../pmd/ast/ASTReturnStatement.java           |  3 +-
 .../pmd/ast/ASTShiftExpression.java           |  3 +-
 .../sourceforge}/pmd/ast/ASTStatement.java    |  3 +-
 .../pmd/ast/ASTStatementExpression.java       |  3 +-
 .../pmd/ast/ASTStatementExpressionList.java   |  3 +-
 .../sourceforge}/pmd/ast/ASTSwitchLabel.java  |  3 +-
 .../pmd/ast/ASTSwitchStatement.java           |  3 +-
 .../pmd/ast/ASTSynchronizedStatement.java     |  3 +-
 .../pmd/ast/ASTThrowStatement.java            |  3 +-
 .../sourceforge}/pmd/ast/ASTTryStatement.java |  3 +-
 .../sourceforge}/pmd/ast/ASTType.java         |  3 +-
 .../pmd/ast/ASTTypeDeclaration.java           |  3 +-
 .../pmd/ast/ASTUnaryExpression.java           |  3 +-
 .../ast/ASTUnaryExpressionNotPlusMinus.java   |  3 +-
 .../ast/ASTUnmodifiedClassDeclaration.java    |  3 +-
 .../ASTUnmodifiedInterfaceDeclaration.java    |  3 +-
 .../pmd/ast/ASTVariableDeclarator.java        |  3 +-
 .../pmd/ast/ASTVariableDeclaratorId.java      |  3 +-
 .../pmd/ast/ASTVariableInitializer.java       |  3 +-
 .../pmd/ast/ASTWhileStatement.java            |  3 +-
 .../pmd/ast/JJTJavaParserState.java           |  3 +-
 .../sourceforge}/pmd/ast/JavaCharStream.java  |  2 +-
 .../sourceforge}/pmd/ast/JavaParser.java      |  3 +-
 .../pmd/ast/JavaParserConstants.java          |  2 +-
 .../pmd/ast/JavaParserTokenManager.java       |  5 +-
 .../pmd/ast/JavaParserTreeConstants.java      |  2 +-
 .../pmd/ast/JavaParserVisitor.java            |  3 +-
 .../pmd/ast/JavaParserVisitorAdapter.java     |  3 +-
 .../sourceforge}/pmd/ast/Node.java            |  3 +-
 .../sourceforge}/pmd/ast/ParseException.java  |  3 +-
 .../sourceforge}/pmd/ast/SimpleNode.java      |  3 +-
 .../sourceforge}/pmd/ast/Test.java            |  2 +-
 .../sourceforge}/pmd/ast/Token.java           |  2 +-
 .../sourceforge}/pmd/ast/TokenMgrError.java   |  2 +-
 126 files changed, 1036 insertions(+), 123 deletions(-)
 rename pmd/regress/test/{com/infoether => net/sourceforge}/pmd/FunctionalTest.java (99%)
 rename pmd/regress/test/{com/infoether => net/sourceforge}/pmd/NamespaceTest.java (86%)
 rename pmd/regress/test/{com/infoether => net/sourceforge}/pmd/ReportTest.java (89%)
 rename pmd/regress/test/{com/infoether => net/sourceforge}/pmd/RuleFactoryTest.java (83%)
 rename pmd/regress/test/{com/infoether => net/sourceforge}/pmd/RuleViolationTest.java (87%)
 rename pmd/regress/test/{com/infoether => net/sourceforge}/pmd/SymbolTableTest.java (96%)
 rename pmd/regress/test/{com/infoether => net/sourceforge}/pmd/SymbolTest.java (87%)
 create mode 100644 pmd/src/net/sourceforge/pmd/AbstractRule.java
 create mode 100644 pmd/src/net/sourceforge/pmd/DontCreateThreadsRule.java
 create mode 100644 pmd/src/net/sourceforge/pmd/DontCreateTimersRule.java
 create mode 100644 pmd/src/net/sourceforge/pmd/EmptyCatchBlockRule.java
 create mode 100644 pmd/src/net/sourceforge/pmd/EmptyIfStmtRule.java
 create mode 100644 pmd/src/net/sourceforge/pmd/Namespace.java
 create mode 100644 pmd/src/net/sourceforge/pmd/PMD.java
 create mode 100644 pmd/src/net/sourceforge/pmd/PMDTask.java
 create mode 100644 pmd/src/net/sourceforge/pmd/Report.java
 create mode 100644 pmd/src/net/sourceforge/pmd/Rule.java
 create mode 100644 pmd/src/net/sourceforge/pmd/RuleFactory.java
 create mode 100644 pmd/src/net/sourceforge/pmd/RuleViolation.java
 create mode 100644 pmd/src/net/sourceforge/pmd/Symbol.java
 create mode 100644 pmd/src/net/sourceforge/pmd/SymbolTable.java
 create mode 100644 pmd/src/net/sourceforge/pmd/SystemOutRule.java
 create mode 100644 pmd/src/net/sourceforge/pmd/SystemPropsRule.java
 create mode 100644 pmd/src/net/sourceforge/pmd/UnnecessaryConversionTemporaryRule.java
 create mode 100644 pmd/src/net/sourceforge/pmd/UnusedLocalVariableRule.java
 create mode 100644 pmd/src/net/sourceforge/pmd/UnusedPrivateInstanceVariableRule.java
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTAdditiveExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTAllocationExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTAndExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTArgumentList.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTArguments.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTArrayDimsAndInits.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTArrayInitializer.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTAssertStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTAssignmentOperator.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTBlock.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTBlockStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTBooleanLiteral.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTBreakStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTCastExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTCastLookahead.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTClassBody.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTClassBodyDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTClassDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTCompilationUnit.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTConditionalAndExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTConditionalExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTConditionalOrExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTConstructorDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTContinueStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTDoStatement.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTEmptyStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTEqualityExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTExclusiveOrExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTExplicitConstructorInvocation.java (93%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTExpression.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTFieldDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTForInit.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTForStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTForUpdate.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTFormalParameter.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTFormalParameters.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTIfStatement.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTImportDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTInclusiveOrExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTInitializer.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTInstanceOfExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTInterfaceDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTInterfaceMemberDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTLabeledStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTLiteral.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTLocalVariableDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTMethodDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTMethodDeclarationLookahead.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTMethodDeclarator.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTMultiplicativeExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTName.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTNameList.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTNestedClassDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTNestedInterfaceDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTNullLiteral.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTPackageDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTPostfixExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTPreDecrementExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTPreIncrementExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTPrimaryExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTPrimaryPrefix.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTPrimarySuffix.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTPrimitiveType.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTRelationalExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTResultType.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTReturnStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTShiftExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTStatement.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTStatementExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTStatementExpressionList.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTSwitchLabel.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTSwitchStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTSynchronizedStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTThrowStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTTryStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTType.java (91%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTTypeDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTUnaryExpression.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTUnaryExpressionNotPlusMinus.java (93%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTUnmodifiedClassDeclaration.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTUnmodifiedInterfaceDeclaration.java (93%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTVariableDeclarator.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTVariableDeclaratorId.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTVariableInitializer.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ASTWhileStatement.java (92%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/JJTJavaParserState.java (98%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/JavaCharStream.java (99%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/JavaParser.java (99%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/JavaParserConstants.java (99%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/JavaParserTokenManager.java (99%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/JavaParserTreeConstants.java (99%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/JavaParserVisitor.java (99%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/JavaParserVisitorAdapter.java (99%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/Node.java (97%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/ParseException.java (99%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/SimpleNode.java (98%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/Test.java (99%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/Token.java (98%)
 rename pmd/src/{com/infoether => net/sourceforge}/pmd/ast/TokenMgrError.java (99%)

diff --git a/pmd/docs/ant.html b/pmd/docs/ant.html
index f6fce666c5..4054cfb67c 100644
--- a/pmd/docs/ant.html
+++ b/pmd/docs/ant.html
@@ -33,7 +33,7 @@ Runs a set of PMD rules on a set of files and generates a report.
 <h3>Examples</h3>
 <pre>
     &lt;target name="pmd"&gt;
-        &lt;taskdef name="pmd" classname="com.infoether.pmd.PMDTask"/&gt;
+        &lt;taskdef name="pmd" classname="net.sourceforge.pmd.PMDTask"/&gt;
         &lt;pmd reportFile="c:\foo.txt" verbose="false" rulesettype="general"&gt;
             &lt;fileset dir="c:\j2sdk1.4.0\src\"&gt;
                 &lt;include name="**/*.java"/&gt;
diff --git a/pmd/regress/test/com/infoether/pmd/FunctionalTest.java b/pmd/regress/test/net/sourceforge/pmd/FunctionalTest.java
similarity index 99%
rename from pmd/regress/test/com/infoether/pmd/FunctionalTest.java
rename to pmd/regress/test/net/sourceforge/pmd/FunctionalTest.java
index 50637a3137..970f9ffd0f 100644
--- a/pmd/regress/test/com/infoether/pmd/FunctionalTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/FunctionalTest.java
@@ -3,16 +3,16 @@
  * Date: Jun 17, 2002
  * Time: 3:19:33 PM
  */
-package test.com.infoether.pmd;
+package test.net.sourceforge.pmd;
 
 import junit.framework.TestCase;
 
-import com.infoether.pmd.*;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Iterator;
 
+import net.sourceforge.pmd.*;
+
 public class FunctionalTest extends TestCase{
 
     public FunctionalTest(String name) {
diff --git a/pmd/regress/test/com/infoether/pmd/NamespaceTest.java b/pmd/regress/test/net/sourceforge/pmd/NamespaceTest.java
similarity index 86%
rename from pmd/regress/test/com/infoether/pmd/NamespaceTest.java
rename to pmd/regress/test/net/sourceforge/pmd/NamespaceTest.java
index ff671e29fb..6afe07e1a8 100644
--- a/pmd/regress/test/com/infoether/pmd/NamespaceTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/NamespaceTest.java
@@ -3,11 +3,11 @@
  * Date: Jun 21, 2002
  * Time: 2:21:44 PM
  */
-package test.com.infoether.pmd;
+package test.net.sourceforge.pmd;
 
 import junit.framework.TestCase;
-import com.infoether.pmd.Namespace;
-import com.infoether.pmd.SymbolTable;
+import net.sourceforge.pmd.Namespace;
+import net.sourceforge.pmd.SymbolTable;
 
 public class NamespaceTest extends TestCase{
     public NamespaceTest(String name) {
diff --git a/pmd/regress/test/com/infoether/pmd/ReportTest.java b/pmd/regress/test/net/sourceforge/pmd/ReportTest.java
similarity index 89%
rename from pmd/regress/test/com/infoether/pmd/ReportTest.java
rename to pmd/regress/test/net/sourceforge/pmd/ReportTest.java
index cb78695726..e4aae47d98 100644
--- a/pmd/regress/test/com/infoether/pmd/ReportTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/ReportTest.java
@@ -3,12 +3,12 @@
  * Date: Jun 14, 2002
  * Time: 1:18:30 PM
  */
-package test.com.infoether.pmd;
+package test.net.sourceforge.pmd;
 
 import junit.framework.TestCase;
-import com.infoether.pmd.Report;
-import com.infoether.pmd.RuleViolation;
-import com.infoether.pmd.Rule;
+import net.sourceforge.pmd.Report;
+import net.sourceforge.pmd.RuleViolation;
+import net.sourceforge.pmd.Rule;
 
 import java.lang.reflect.Proxy;
 import java.lang.reflect.InvocationHandler;
diff --git a/pmd/regress/test/com/infoether/pmd/RuleFactoryTest.java b/pmd/regress/test/net/sourceforge/pmd/RuleFactoryTest.java
similarity index 83%
rename from pmd/regress/test/com/infoether/pmd/RuleFactoryTest.java
rename to pmd/regress/test/net/sourceforge/pmd/RuleFactoryTest.java
index 1a93740970..495a5d2596 100644
--- a/pmd/regress/test/com/infoether/pmd/RuleFactoryTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/RuleFactoryTest.java
@@ -3,16 +3,16 @@
  * Date: Jun 20, 2002
  * Time: 8:43:20 AM
  */
-package test.com.infoether.pmd;
+package test.net.sourceforge.pmd;
 
 import junit.framework.TestCase;
 
 import java.util.List;
 
-import com.infoether.pmd.RuleFactory;
-import com.infoether.pmd.Rule;
-import com.infoether.pmd.DontCreateTimersRule;
-import com.infoether.pmd.EmptyIfStmtRule;
+import net.sourceforge.pmd.RuleFactory;
+import net.sourceforge.pmd.Rule;
+import net.sourceforge.pmd.DontCreateTimersRule;
+import net.sourceforge.pmd.EmptyIfStmtRule;
 
 public class RuleFactoryTest extends TestCase {
     public RuleFactoryTest(String name) {
diff --git a/pmd/regress/test/com/infoether/pmd/RuleViolationTest.java b/pmd/regress/test/net/sourceforge/pmd/RuleViolationTest.java
similarity index 87%
rename from pmd/regress/test/com/infoether/pmd/RuleViolationTest.java
rename to pmd/regress/test/net/sourceforge/pmd/RuleViolationTest.java
index f539491f89..70e45bcddd 100644
--- a/pmd/regress/test/com/infoether/pmd/RuleViolationTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/RuleViolationTest.java
@@ -1,9 +1,11 @@
-package test.com.infoether.pmd;
+package test.net.sourceforge.pmd;
 
 import junit.framework.*;
-import com.infoether.pmd.*;
 import java.util.*;
 
+import net.sourceforge.pmd.Rule;
+import net.sourceforge.pmd.RuleViolation;
+
 public class RuleViolationTest extends TestCase {
     public RuleViolationTest(String name) {
         super(name);
diff --git a/pmd/regress/test/com/infoether/pmd/SymbolTableTest.java b/pmd/regress/test/net/sourceforge/pmd/SymbolTableTest.java
similarity index 96%
rename from pmd/regress/test/com/infoether/pmd/SymbolTableTest.java
rename to pmd/regress/test/net/sourceforge/pmd/SymbolTableTest.java
index d03c0a2138..308b82cd9a 100644
--- a/pmd/regress/test/com/infoether/pmd/SymbolTableTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/SymbolTableTest.java
@@ -3,11 +3,11 @@
  * Date: Jun 19, 2002
  * Time: 11:09:06 AM
  */
-package test.com.infoether.pmd;
+package test.net.sourceforge.pmd;
 
 import junit.framework.TestCase;
-import com.infoether.pmd.SymbolTable;
-import com.infoether.pmd.Symbol;
+import net.sourceforge.pmd.SymbolTable;
+import net.sourceforge.pmd.Symbol;
 
 import java.util.HashMap;
 
diff --git a/pmd/regress/test/com/infoether/pmd/SymbolTest.java b/pmd/regress/test/net/sourceforge/pmd/SymbolTest.java
similarity index 87%
rename from pmd/regress/test/com/infoether/pmd/SymbolTest.java
rename to pmd/regress/test/net/sourceforge/pmd/SymbolTest.java
index 55fbfd97f3..1ab311c559 100644
--- a/pmd/regress/test/com/infoether/pmd/SymbolTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/SymbolTest.java
@@ -3,10 +3,10 @@
  * Date: Jun 19, 2002
  * Time: 11:59:24 AM
  */
-package test.com.infoether.pmd;
+package test.net.sourceforge.pmd;
 
 import junit.framework.TestCase;
-import com.infoether.pmd.Symbol;
+import net.sourceforge.pmd.Symbol;
 
 public class SymbolTest extends TestCase {
 
diff --git a/pmd/src/net/sourceforge/pmd/AbstractRule.java b/pmd/src/net/sourceforge/pmd/AbstractRule.java
new file mode 100644
index 0000000000..7b1d1f5b97
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/AbstractRule.java
@@ -0,0 +1,21 @@
+/*
+ * User: tom
+ * Date: Jun 17, 2002
+ * Time: 5:44:22 PM
+ */
+package net.sourceforge.pmd;
+
+import net.sourceforge.pmd.ast.JavaParserVisitorAdapter;
+
+public abstract class AbstractRule extends JavaParserVisitorAdapter {
+    public String getName() {return getClass().getName();}
+
+    public boolean equals(Object o) {
+        Rule r = (Rule)o;
+        return r.getName().equals(getName());
+    }
+
+    public int hashCode() {
+        return getName().hashCode();
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/DontCreateThreadsRule.java b/pmd/src/net/sourceforge/pmd/DontCreateThreadsRule.java
new file mode 100644
index 0000000000..9d7e8df3d7
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/DontCreateThreadsRule.java
@@ -0,0 +1,20 @@
+package net.sourceforge.pmd;
+
+import net.sourceforge.pmd.ast.JavaParserVisitorAdapter;
+import net.sourceforge.pmd.ast.ASTAllocationExpression;
+import net.sourceforge.pmd.ast.ASTName;
+
+import java.util.*;
+
+public class DontCreateThreadsRule extends AbstractRule implements Rule {
+
+    public String getDescription() {return "Don't create threads, use the ThreadService instead";}
+
+    public Object visit(ASTAllocationExpression node, Object data){
+        if ((node.jjtGetChild(0) instanceof ASTName)  // this avoids "new <primitive-type>", i.e., "new int[]"
+                && ((ASTName)node.jjtGetChild(0)).getImage().equals("Thread")) {
+            ((Report)data).addRuleViolation(new RuleViolation(this, node.getBeginLine()));
+        }
+        return super.visit(node, data);
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/DontCreateTimersRule.java b/pmd/src/net/sourceforge/pmd/DontCreateTimersRule.java
new file mode 100644
index 0000000000..f055fc055b
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/DontCreateTimersRule.java
@@ -0,0 +1,20 @@
+package net.sourceforge.pmd;
+
+import net.sourceforge.pmd.ast.JavaParserVisitorAdapter;
+import net.sourceforge.pmd.ast.ASTAllocationExpression;
+import net.sourceforge.pmd.ast.ASTName;
+
+import java.util.*;
+
+public class DontCreateTimersRule extends AbstractRule implements Rule {
+
+    public String getDescription() {return "Don't create java.util.Timers, use the Cougaar alarm service instead";}
+
+    public Object visit(ASTAllocationExpression node, Object data){
+        if ((node.jjtGetChild(0) instanceof ASTName)  // this avoids "new <primitive-type>", i.e., "new int[]"
+                && ((ASTName)node.jjtGetChild(0)).getImage().equals("Timer")) {
+            ((Report)data).addRuleViolation(new RuleViolation(this, node.getBeginLine()));
+        }
+        return super.visit(node, data);
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/EmptyCatchBlockRule.java b/pmd/src/net/sourceforge/pmd/EmptyCatchBlockRule.java
new file mode 100644
index 0000000000..2ceac7c0e8
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/EmptyCatchBlockRule.java
@@ -0,0 +1,22 @@
+/*
+ * User: tom
+ * Date: Jun 14, 2002
+ * Time: 12:13:55 PM
+ */
+package net.sourceforge.pmd;
+
+import net.sourceforge.pmd.ast.ASTBlock;
+import net.sourceforge.pmd.ast.ASTTryStatement;
+
+public class EmptyCatchBlockRule extends AbstractRule implements Rule {
+
+    public String getDescription() {return "Avoid empty catch blocks";}
+
+   public Object visit(ASTBlock node, Object data){
+       if ((node.jjtGetParent() instanceof ASTTryStatement) && node.jjtGetNumChildren()==0) {
+           ((Report)data).addRuleViolation(new RuleViolation(this, node.getBeginLine()));
+       }
+
+        return super.visit(node, data);
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/EmptyIfStmtRule.java b/pmd/src/net/sourceforge/pmd/EmptyIfStmtRule.java
new file mode 100644
index 0000000000..872b6fd85d
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/EmptyIfStmtRule.java
@@ -0,0 +1,23 @@
+/*
+ * User: tom
+ * Date: Jun 17, 2002
+ * Time: 4:23:30 PM
+ */
+package net.sourceforge.pmd;
+
+import net.sourceforge.pmd.ast.JavaParserVisitorAdapter;
+import net.sourceforge.pmd.ast.ASTBlock;
+import net.sourceforge.pmd.ast.ASTTryStatement;
+import net.sourceforge.pmd.ast.ASTIfStatement;
+
+public class EmptyIfStmtRule extends AbstractRule implements Rule {
+    public String getDescription() {return "Avoid empty IF statements";}
+
+   public Object visit(ASTBlock node, Object data){
+       if ((node.jjtGetParent().jjtGetParent() instanceof ASTIfStatement) && node.jjtGetNumChildren()==0) {
+           ((Report)data).addRuleViolation(new RuleViolation(this, node.getBeginLine()));
+       }
+
+        return super.visit(node, data);
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/Namespace.java b/pmd/src/net/sourceforge/pmd/Namespace.java
new file mode 100644
index 0000000000..e13a9d7eae
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/Namespace.java
@@ -0,0 +1,63 @@
+/*
+ * User: tom
+ * Date: Jun 21, 2002
+ * Time: 2:11:15 PM
+ */
+package net.sourceforge.pmd;
+
+import java.util.Stack;
+
+
+/**
+ *
+ * Here's the problem:
+ *
+ * public class Outer
+ * {
+ *  private String foo;
+ *  public void foo() {
+ *      bar(new Runnable() {public void run() {String foo;}});
+ *  }
+ *  private void bar(Runnable r) {}
+ * }
+ *
+ * In this example, Outer.foo and the Runnable.foo are two different variables - even though
+ * Runnable.foo looks like its inside Outer, they don't conflict.
+ *
+ * So, a couple of SymbolTables are grouped into a Namespace.  SymbolTables are grouped so that inner classes have their own
+ * "group" of symbol tables.  So a class with an inner class would look like this:
+ *
+ *        ST
+ *        ST
+ *        NS2
+ * ST     ST    ST
+ * ST     ST    ST
+ * NS1    NS1   NS1
+ *
+ * That way the scopes work out nicely and inner classes can be arbitrarily nested.
+ */
+public class Namespace {
+
+    private Stack tables = new Stack();
+
+    public void addTable() {
+        if (tables.empty()) {
+            tables.push(new SymbolTable());
+        } else {
+            tables.push(new SymbolTable((SymbolTable)tables.peek()));
+        }
+    }
+
+    public void removeTable() {
+        tables.pop();
+    }
+
+    public SymbolTable peek() {
+        return (SymbolTable)tables.peek();
+    }
+
+    public int size() {
+        return tables.size();
+    }
+
+}
diff --git a/pmd/src/net/sourceforge/pmd/PMD.java b/pmd/src/net/sourceforge/pmd/PMD.java
new file mode 100644
index 0000000000..1f2b3ffc36
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/PMD.java
@@ -0,0 +1,65 @@
+/*
+ * User: tom
+ * Date: Jun 17, 2002
+ * Time: 3:23:17 PM
+ */
+package net.sourceforge.pmd;
+
+import net.sourceforge.pmd.ast.JavaParser;
+import net.sourceforge.pmd.ast.ASTCompilationUnit;
+import net.sourceforge.pmd.ast.JavaParserVisitor;
+import net.sourceforge.pmd.ast.ParseException;
+
+import java.io.*;
+import java.util.List;
+import java.util.Iterator;
+
+public class PMD {
+		
+		public Report processFile(InputStream is) {
+			return null;
+		}
+
+		public Report processFile(FileReader fr) {
+		return null; }
+	
+    public Report processFile(File file, String ruleSetType) {
+        Report report = new Report(file.getAbsolutePath());
+        List rules = RuleFactory.createRules(ruleSetType);
+
+        try {
+            Reader reader = new BufferedReader(new FileReader(file));
+            JavaParser parser = new JavaParser(reader);
+            ASTCompilationUnit c = parser.CompilationUnit();
+            //c.dump("");
+            for (Iterator iterator = rules.iterator(); iterator.hasNext();) {
+                JavaParserVisitor rule = (JavaParserVisitor)iterator.next();
+                c.childrenAccept(rule, report);
+            }
+            reader.close();
+        } catch (FileNotFoundException fnfe) {
+            fnfe.printStackTrace();
+        } catch (ParseException pe) {
+            System.out.println("Error while parsing " + file.getAbsolutePath() + " at line " + pe.currentToken.beginLine + "; continuing...");
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        } catch (Throwable t) {
+            System.out.println("Error while parsing " + file.getAbsolutePath() + "; "+ t.getMessage() + "; continuing...");
+            //t.printStackTrace();
+        }
+        return report;
+    }
+
+    public static void main(String[] args) {
+        if (args.length == 0) {
+            throw new RuntimeException("Pass a filename in");
+        }
+        File input = new File(args[0]);
+        if (!input.exists()) {
+            throw new RuntimeException("File " + args[0] + " doesn't exist");
+        }
+        PMD pmd = new PMD();
+        Report report = pmd.processFile(input, RuleFactory.ALL);
+        System.out.println(report.renderToText());
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/PMDTask.java b/pmd/src/net/sourceforge/pmd/PMDTask.java
new file mode 100644
index 0000000000..8da5426ed0
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/PMDTask.java
@@ -0,0 +1,68 @@
+package net.sourceforge.pmd;
+
+import org.apache.tools.ant.*;
+import org.apache.tools.ant.types.*;
+import java.util.*;
+import java.io.*;
+
+import net.sourceforge.pmd.ast.JavaParser;
+import net.sourceforge.pmd.ast.JavaParserVisitor;
+import net.sourceforge.pmd.ast.ParseException;
+import net.sourceforge.pmd.ast.ASTCompilationUnit;
+
+public class PMDTask extends Task {
+
+    private List filesets  = new ArrayList();
+    private String reportFile;
+    private boolean verbose;
+    private String ruleSetType;
+
+    public void setVerbose(boolean verbose) {
+        this.verbose = verbose;
+    }
+
+    public void setRuleSetType(String ruleSetType) {
+        this.ruleSetType = ruleSetType;
+    }
+
+    public void addFileset(FileSet set) {
+        filesets.add(set);
+    }
+    
+    public void setReportFile(String reportFile) {
+        this.reportFile = reportFile;
+    }
+    
+    public void execute() throws BuildException {
+        if (reportFile == null) {
+            throw new BuildException("No report file specified");
+        }
+        if (ruleSetType == null) {
+            throw new BuildException("No rule set type specified");
+        }
+        StringBuffer buf = new StringBuffer();
+        for (Iterator i = filesets.iterator(); i.hasNext();) {
+            FileSet fs = (FileSet) i.next();
+            DirectoryScanner ds = fs.getDirectoryScanner(project);
+            String[] srcFiles = ds.getIncludedFiles();
+            for (int j=0; j<srcFiles.length; j++) {
+                File file = new File(ds.getBasedir() + System.getProperty("file.separator") + srcFiles[j]);
+                if (verbose) System.out.println(file.getAbsoluteFile());
+                PMD pmd = new PMD();
+                Report report = pmd.processFile(file, ruleSetType);
+                if (!report.empty()) {
+                    buf.append(report.renderToText());
+                    buf.append(System.getProperty("line.separator"));
+                }
+            }
+        }
+
+        try {
+            BufferedWriter writer = new BufferedWriter(new FileWriter(new File(reportFile)));
+            writer.write(buf.toString(), 0, buf.length());
+            writer.close();
+        } catch (IOException ioe) {
+            throw new BuildException(ioe.getMessage());
+        }
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/Report.java b/pmd/src/net/sourceforge/pmd/Report.java
new file mode 100644
index 0000000000..2aa660b0c0
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/Report.java
@@ -0,0 +1,40 @@
+package net.sourceforge.pmd;
+
+import java.util.*;
+
+public class Report {
+    
+    private List violations = new ArrayList();
+    private String filename;
+    
+    public Report(String filename) {
+        this.filename = filename;
+    }
+    
+    public void addRuleViolation(RuleViolation violation) {
+       violations.add(violation); 
+    }
+    
+    public String renderToText() {
+        StringBuffer buf = new StringBuffer();
+        for (Iterator i = violations.iterator(); i.hasNext();) {
+            if (buf.length() != 0) {
+                buf.append(System.getProperty("line.separator"));
+            }
+            buf.append(filename + ":" + ((RuleViolation)i.next()).getText());
+        }
+        return buf.toString();
+    }
+    
+    public boolean empty() {
+        return violations.size() == 0;
+    }
+
+    public Iterator iterator() {
+        return violations.iterator();
+    }
+
+    public int getSize() {
+        return violations.size();
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/Rule.java b/pmd/src/net/sourceforge/pmd/Rule.java
new file mode 100644
index 0000000000..130d1916a2
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/Rule.java
@@ -0,0 +1,8 @@
+package net.sourceforge.pmd;
+
+import java.util.*;
+
+public interface Rule {
+    public String getName();
+    public String getDescription();
+}
diff --git a/pmd/src/net/sourceforge/pmd/RuleFactory.java b/pmd/src/net/sourceforge/pmd/RuleFactory.java
new file mode 100644
index 0000000000..736b86e0f4
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/RuleFactory.java
@@ -0,0 +1,55 @@
+/*
+ * User: tom
+ * Date: Jun 10, 2002
+ * Time: 11:27:51 AM
+ */
+package net.sourceforge.pmd;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class RuleFactory {
+
+    public static final String ALL = "all";
+    public static final String GENERAL = "general";
+    public static final String COUGAAR = "cougaar";
+
+    public static List createRules(String ruleSetType) {
+        if (ruleSetType.equals(ALL)) {
+            return createAllRules();
+        } else if (ruleSetType.equals(GENERAL)) {
+            return createGeneralRules();
+        } else if (ruleSetType.equals(COUGAAR)) {
+            return createCougaarRules();
+        }
+        throw new RuntimeException("Unknown rule set type " + ruleSetType);
+    }
+
+    private static List createAllRules() {
+        List list = new ArrayList();
+        list.addAll(createCougaarRules());
+        list.addAll(createGeneralRules());
+        return list;
+    }
+
+    private static List createCougaarRules() {
+        List list = new ArrayList();
+        list.add(new DontCreateThreadsRule());
+        list.add(new DontCreateTimersRule());
+        list.add(new SystemOutRule());
+        list.add(new SystemPropsRule());
+        return list;
+    }
+
+    private static List createGeneralRules() {
+        List list = new ArrayList();
+        list.add(new EmptyCatchBlockRule());
+        list.add(new EmptyIfStmtRule());
+        list.add(new UnnecessaryConversionTemporaryRule());
+        list.add(new UnusedLocalVariableRule());
+        //list.add(new UnusedPrivateInstanceVariableRule());
+        return list;
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/RuleViolation.java b/pmd/src/net/sourceforge/pmd/RuleViolation.java
new file mode 100644
index 0000000000..ac38613863
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/RuleViolation.java
@@ -0,0 +1,27 @@
+package net.sourceforge.pmd;
+
+
+public class RuleViolation {
+
+    private int line;
+    private Rule rule;
+    private String specificDescription;
+
+    public RuleViolation(Rule rule, int line) {
+        this(rule, line, rule.getDescription());
+    }
+
+    public RuleViolation(Rule rule, int line, String specificDescription) {
+        this.line = line;
+        this.rule = rule;
+        this.specificDescription = specificDescription;
+    }
+
+    public String getText() {
+        return rule.getName() +":" + specificDescription + ":" + line;
+    }
+
+    public Rule getRule() {
+        return rule;
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/Symbol.java b/pmd/src/net/sourceforge/pmd/Symbol.java
new file mode 100644
index 0000000000..1d2004b6a8
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/Symbol.java
@@ -0,0 +1,38 @@
+/*
+ * User: tom
+ * Date: Jun 19, 2002
+ * Time: 11:48:50 AM
+ */
+package net.sourceforge.pmd;
+
+public class Symbol {
+
+    private String image;
+    private int line;
+
+    public Symbol(String image, int line) {
+        this.image = image;
+        this.line = line;
+    }
+
+    public int getLine() {
+        return line;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public boolean equals(Object o) {
+        Symbol s = (Symbol)o;
+        return s.image.equals(this.image);
+    }
+
+    public int hashCode() {
+        return image.hashCode();
+    }
+
+    public String toString() {
+        return image + ":" + line;
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/SymbolTable.java b/pmd/src/net/sourceforge/pmd/SymbolTable.java
new file mode 100644
index 0000000000..c2c88bab23
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/SymbolTable.java
@@ -0,0 +1,83 @@
+/*
+ * User: tom
+ * Date: Jun 19, 2002
+ * Time: 9:31:16 AM
+ */
+package net.sourceforge.pmd;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+public class SymbolTable {
+
+    private SymbolTable parent;
+    private HashMap usageCounts = new HashMap();
+
+    public SymbolTable() {}
+
+    public SymbolTable(SymbolTable parent) {
+        this.parent = parent;
+    }
+
+    public SymbolTable getParent() {
+        return parent;
+    }
+
+    public void add(Symbol symbol) {
+        if (usageCounts.containsKey(symbol)) {
+            throw new RuntimeException(symbol + " is already in the symbol table");
+        }
+        if (parent != null && parent.contains(symbol)) {
+            throw new RuntimeException(symbol + " is already in the parent symbol table");
+        }
+        usageCounts.put(symbol, new Integer(0));
+    }
+
+    public void recordPossibleUsageOf(Symbol symbol) {
+        if (!usageCounts.containsKey(symbol) && parent != null) {
+            parent.recordPossibleUsageOf(symbol);
+            return;
+        }
+        if (!usageCounts.containsKey(symbol) ) {
+            return;
+        }
+        Integer usageCount = (Integer)usageCounts.get(symbol);
+        usageCount = new Integer(usageCount.intValue() + 1);
+        usageCounts.put(symbol, usageCount);
+    }
+
+    public Iterator getUnusedSymbols() {
+        List list = new ArrayList();
+        for (Iterator i = usageCounts.keySet().iterator(); i.hasNext();) {
+            Symbol symbol = (Symbol)i.next();
+            int usageCount = ((Integer)(usageCounts.get(symbol))).intValue();
+            if (usageCount == 0) {
+                list.add(symbol);
+            }
+        }
+        return list.iterator();
+    }
+
+    public String toString() {
+        StringBuffer buf = new StringBuffer();
+        for (Iterator i = usageCounts.keySet().iterator(); i.hasNext();) {
+            Symbol symbol = (Symbol)i.next();
+            int usageCount = ((Integer)(usageCounts.get(symbol))).intValue();
+            buf.append(symbol + "," + usageCount +":");
+        }
+        return buf.toString();
+    }
+
+    protected boolean contains(Symbol symbol) {
+        if (usageCounts.containsKey(symbol)) {
+            return true;
+        }
+        if (parent == null) {
+            return false;
+        }
+        return parent.contains(symbol);
+    }
+
+}
diff --git a/pmd/src/net/sourceforge/pmd/SystemOutRule.java b/pmd/src/net/sourceforge/pmd/SystemOutRule.java
new file mode 100644
index 0000000000..022ceca948
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/SystemOutRule.java
@@ -0,0 +1,18 @@
+package net.sourceforge.pmd;
+
+import net.sourceforge.pmd.ast.JavaParserVisitorAdapter;
+import net.sourceforge.pmd.ast.ASTName;
+
+import java.util.*;
+
+public class SystemOutRule extends AbstractRule implements Rule {
+
+    public String getDescription() {return "Don't use System.out/in/err, use the Cougaar logging service instead";}
+
+    public Object visit(ASTName node, Object data){
+        if (node.getImage() != null && (node.getImage().startsWith("System.out") || node.getImage().startsWith("System.err") || node.getImage().startsWith("System.in"))) {
+            ((Report)data).addRuleViolation(new RuleViolation(this, node.getBeginLine()));
+        }
+        return super.visit(node,data);
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/SystemPropsRule.java b/pmd/src/net/sourceforge/pmd/SystemPropsRule.java
new file mode 100644
index 0000000000..9377a4eb77
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/SystemPropsRule.java
@@ -0,0 +1,19 @@
+package net.sourceforge.pmd;
+
+import net.sourceforge.pmd.ast.ASTName;
+import net.sourceforge.pmd.ast.JavaParserVisitorAdapter;
+import net.sourceforge.pmd.ast.SimpleNode;
+
+import java.util.*;
+
+public class SystemPropsRule extends AbstractRule implements Rule {
+
+    public String getDescription() {return "Don't use System.getProperty()/getProperties()/setProperty";}
+
+    public Object visit(ASTName node, Object data){
+        if (node.getImage() != null && (node.getImage().startsWith("System.getProperty") || node.getImage().startsWith("System.setProperty") || node.getImage().startsWith("System.getProperties"))) {
+            ((Report)data).addRuleViolation(new RuleViolation(this, node.getBeginLine()));
+        }
+        return super.visit(node,data);
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/UnnecessaryConversionTemporaryRule.java b/pmd/src/net/sourceforge/pmd/UnnecessaryConversionTemporaryRule.java
new file mode 100644
index 0000000000..b849fe3bfe
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/UnnecessaryConversionTemporaryRule.java
@@ -0,0 +1,58 @@
+/*
+ * User: tom
+ * Date: Jun 20, 2002
+ * Time: 1:35:27 PM
+ */
+package net.sourceforge.pmd;
+
+import net.sourceforge.pmd.ast.*;
+
+public class UnnecessaryConversionTemporaryRule extends AbstractRule implements Rule{
+
+    private boolean inPrimaryExpressionContext;
+    private boolean usingPrimitiveWrapperAllocation;
+
+    public String getDescription() {
+        return "Avoid unnecessay temporaries when converting primitives to Strings";
+    }
+
+    public Object visit(ASTPrimaryExpression node, Object data) {
+        if (node.jjtGetNumChildren() == 0 || ((SimpleNode)node.jjtGetChild(0)).jjtGetNumChildren() == 0 || !(node.jjtGetChild(0).jjtGetChild(0) instanceof ASTAllocationExpression)) {
+            return super.visit(node, data);
+        }
+        inPrimaryExpressionContext = true;
+        Object report = super.visit(node, data);
+        inPrimaryExpressionContext = false;
+        usingPrimitiveWrapperAllocation = false;
+        return report;
+    }
+
+    public Object visit(ASTAllocationExpression node, Object data) {
+        if (!inPrimaryExpressionContext) {
+            return super.visit(node, data);
+        }
+        if (!(node.jjtGetChild(0) instanceof ASTName)) {
+            return super.visit(node, data);
+        }
+        SimpleNode child = (SimpleNode)node.jjtGetChild(0);
+        if (!isPrimitiveWrapperType(child.getImage())) {
+            return super.visit(node, data);
+        }
+        usingPrimitiveWrapperAllocation = true;
+        return super.visit(node, data);
+    }
+
+    public Object visit(ASTPrimarySuffix node, Object data) {
+        if (!inPrimaryExpressionContext || !usingPrimitiveWrapperAllocation) {
+            return super.visit(node, data);
+        }
+        if (node.getImage() != null && node.getImage().equals("toString")) {
+            ((Report)data).addRuleViolation(new RuleViolation(this, node.getBeginLine()));
+        }
+        return super.visit(node, data);
+    }
+
+    private boolean isPrimitiveWrapperType(String name) {
+        return name.equals("Integer") || name.equals("Boolean") || name.equals("Double") || name.equals("Long") || name.equals("Short") || name.equals("Byte") || name.equals("Float");
+    }
+}
diff --git a/pmd/src/net/sourceforge/pmd/UnusedLocalVariableRule.java b/pmd/src/net/sourceforge/pmd/UnusedLocalVariableRule.java
new file mode 100644
index 0000000000..beb8282155
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/UnusedLocalVariableRule.java
@@ -0,0 +1,80 @@
+/*
+ * User: tom
+ * Date: Jun 18, 2002
+ * Time: 11:02:09 AM
+ */
+package net.sourceforge.pmd;
+
+import java.util.Iterator;
+import java.util.Stack;
+
+import net.sourceforge.pmd.ast.*;
+
+public class UnusedLocalVariableRule extends AbstractRule implements Rule{
+
+    private Stack tableGroups = new Stack();
+
+    public String getDescription() {
+        return "Avoid unused local variables";
+    }
+
+    public Object createGroup(SimpleNode node, Object data) {
+        tableGroups.push(new Namespace());
+        Object report = super.visit(node, data);
+        tableGroups.pop();
+        return report;
+    }
+
+    // these AST types trigger creation of a new symbol table group
+    public Object visit(ASTClassBody node, Object data) {return createGroup(node, data);}
+    public Object visit(ASTInterfaceDeclaration node, Object data) {return createGroup(node, data);}
+    // these AST types trigger creation of a new symbol table group
+
+    // these AST types trigger creation of a new symbol table
+    public Object visit(ASTBlock node, Object data){return addTable(node, data);}
+    public Object visit(ASTConstructorDeclaration node, Object data){return addTable(node, data);}
+    public Object visit(ASTMethodDeclaration node, Object data){return addTable(node, data);}
+    public Object visit(ASTFieldDeclaration node, Object data){return addTable(node, data);}
+    public Object visit(ASTTryStatement node, Object data){return addTable(node, data);}
+    public Object visit(ASTForStatement node, Object data){return addTable(node, data);}
+    // these AST types trigger creation of a new symbol table
+
+    // these AST types are variable/name usages
+    public Object visit(ASTVariableDeclaratorId node, Object data) {
+        //System.out.println("ASTVariableDeclaratorId.getImage() = " + node.getImage());
+        if (!(node.jjtGetParent().jjtGetParent() instanceof ASTLocalVariableDeclaration)) {
+            return super.visit(node, data);
+        }
+        Namespace group = (Namespace)tableGroups.peek();
+        group.peek().add(new Symbol(node.getImage(), node.getBeginLine()));
+        return super.visit(node, data);
+    }
+
+    public Object visit(ASTName node, Object data) {
+        //System.out.println("ASTName.getImage() = " + node.getImage() + "; " + node.getBeginLine());
+        if (node.jjtGetParent() instanceof ASTPrimaryPrefix) {
+            String img = (node.getImage().indexOf('.') == -1) ? node.getImage() : node.getImage().substring(0, node.getImage().indexOf('.'));
+            Namespace group = (Namespace)tableGroups.peek();
+            group.peek().recordPossibleUsageOf(new Symbol(img, node.getBeginLine()));
+        }
+        return super.visit(node, data);
+    }
+    // these AST types are variable/name usages
+
+    private void reportUnusedLocals(Report report, SymbolTable table) {
+        for (Iterator i = table.getUnusedSymbols(); i.hasNext();) {
+            Symbol symbol = (Symbol)i.next();
+            report.addRuleViolation(new RuleViolation(this, symbol.getLine(), "Found unused local variable '" + symbol.getImage() + "'"));
+        }
+    }
+
+    private Object addTable(SimpleNode node, Object data) {
+        Namespace group = (Namespace)tableGroups.peek();
+        group.addTable();
+        Object RC = super.visit(node, data);
+        reportUnusedLocals((Report)data, group.peek());
+        group.removeTable();
+        return RC;
+    }
+
+}
diff --git a/pmd/src/net/sourceforge/pmd/UnusedPrivateInstanceVariableRule.java b/pmd/src/net/sourceforge/pmd/UnusedPrivateInstanceVariableRule.java
new file mode 100644
index 0000000000..018aea4eca
--- /dev/null
+++ b/pmd/src/net/sourceforge/pmd/UnusedPrivateInstanceVariableRule.java
@@ -0,0 +1,90 @@
+/*
+ * User: tom
+ * Date: Jun 21, 2002
+ * Time: 11:26:34 AM
+ */
+package net.sourceforge.pmd;
+
+import java.util.Iterator;
+import java.util.Stack;
+
+import net.sourceforge.pmd.ast.*;
+
+public class UnusedPrivateInstanceVariableRule extends AbstractRule implements Rule {
+
+    private Stack nameSpaces = new Stack();
+    // TODO
+    // this being an instance variable totally hoses up the recursion
+    // need to attach it to the report or the stack or something
+    // TODO
+    private boolean doingIDTraversal;
+
+    public String getDescription() {
+        return "Avoid unused private instance variables";
+    }
+
+    /**
+     * Skip interfaces because they don't have instance variables.
+     */
+    public Object visit(ASTInterfaceDeclaration node, Object data) {
+        return data;
+    }
+
+    public Object visit(ASTClassBody node, Object data) {
+        doingIDTraversal = true;
+        Namespace nameSpace = new Namespace();
+        nameSpaces.push(nameSpace);
+        nameSpace.addTable();
+        Object report = super.visit(node, data);
+
+        doingIDTraversal = false;
+        //System.out.println("data = " + data);
+        report = super.visit(node, data);
+        reportUnusedInstanceVars((Report)report, nameSpace.peek());
+
+        nameSpace.removeTable();
+        nameSpaces.pop();
+        return report;
+    }
+
+    public Object visit(ASTVariableDeclaratorId node, Object data) {
+        if (!doingIDTraversal) {
+            return super.visit(node, data);
+        }
+        //System.out.println("ASTVariableDeclaratorId.getImage() = " + node.getImage() + "; " + node.getBeginLine());
+        SimpleNode grandparent = (SimpleNode)node.jjtGetParent().jjtGetParent();
+        if (!(grandparent instanceof ASTFieldDeclaration) || grandparent.getImage().indexOf("private") == -1 || grandparent.getImage().indexOf("static") != -1) {
+            return super.visit(node, data);
+        }
+        Namespace group = (Namespace)nameSpaces.peek();
+        group.peek().add(new Symbol(node.getImage(), node.getBeginLine()));
+        return super.visit(node, data);
+    }
+
+    public Object visit(ASTPrimarySuffix node, Object data) {
+        if (!doingIDTraversal && (node.jjtGetParent() instanceof ASTPrimaryExpression) && (node.getImage() != null)) {
+            recordPossibleUsage(node, data);
+        }
+        return super.visit(node, data);
+    }
+
+    public Object visit(ASTName node, Object data) {
+        if (!doingIDTraversal && (node.jjtGetParent() instanceof ASTPrimaryPrefix)) {
+            recordPossibleUsage(node, data);
+        }
+        return super.visit(node, data);
+    }
+
+    private void recordPossibleUsage(SimpleNode node, Object data) {
+        String img = (node.getImage().indexOf('.') == -1) ? node.getImage() : node.getImage().substring(0, node.getImage().indexOf('.'));
+        Namespace group = (Namespace)nameSpaces.peek();
+        group.peek().recordPossibleUsageOf(new Symbol(img, node.getBeginLine()));
+    }
+
+    private void reportUnusedInstanceVars(Report report, SymbolTable table) {
+        for (Iterator i = table.getUnusedSymbols(); i.hasNext();) {
+            Symbol symbol = (Symbol)i.next();
+            report.addRuleViolation(new RuleViolation(this, symbol.getLine(), "Found unused private instance variable '" + symbol.getImage() + "'"));
+        }
+    }
+}
diff --git a/pmd/src/com/infoether/pmd/ast/ASTAdditiveExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTAdditiveExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTAdditiveExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTAdditiveExpression.java
index 972c8db57b..38a85d4e05 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTAdditiveExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTAdditiveExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTAdditiveExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTAdditiveExpression extends SimpleNode {
   public ASTAdditiveExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTAllocationExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTAllocationExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTAllocationExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTAllocationExpression.java
index 24e0d0d7d3..1d896e6533 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTAllocationExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTAllocationExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTAllocationExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTAllocationExpression extends SimpleNode {
   public ASTAllocationExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTAndExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTAndExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTAndExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTAndExpression.java
index bbbc164913..f9977a5504 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTAndExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTAndExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTAndExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTAndExpression extends SimpleNode {
   public ASTAndExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTArgumentList.java b/pmd/src/net/sourceforge/pmd/ast/ASTArgumentList.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTArgumentList.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTArgumentList.java
index b182a8f6ba..4ecfefb7b5 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTArgumentList.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTArgumentList.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTArgumentList.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTArgumentList extends SimpleNode {
   public ASTArgumentList(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTArguments.java b/pmd/src/net/sourceforge/pmd/ast/ASTArguments.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTArguments.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTArguments.java
index 5e964d45d1..41caaa7322 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTArguments.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTArguments.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTArguments.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTArguments extends SimpleNode {
   public ASTArguments(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTArrayDimsAndInits.java b/pmd/src/net/sourceforge/pmd/ast/ASTArrayDimsAndInits.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTArrayDimsAndInits.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTArrayDimsAndInits.java
index d1700e46b1..44707645d2 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTArrayDimsAndInits.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTArrayDimsAndInits.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTArrayDimsAndInits.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTArrayDimsAndInits extends SimpleNode {
   public ASTArrayDimsAndInits(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTArrayInitializer.java b/pmd/src/net/sourceforge/pmd/ast/ASTArrayInitializer.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTArrayInitializer.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTArrayInitializer.java
index 94b2b2591e..8080aba641 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTArrayInitializer.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTArrayInitializer.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTArrayInitializer.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTArrayInitializer extends SimpleNode {
   public ASTArrayInitializer(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTAssertStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTAssertStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTAssertStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTAssertStatement.java
index ca997c68aa..88838f3494 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTAssertStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTAssertStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTAssertStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTAssertStatement extends SimpleNode {
   public ASTAssertStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTAssignmentOperator.java b/pmd/src/net/sourceforge/pmd/ast/ASTAssignmentOperator.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTAssignmentOperator.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTAssignmentOperator.java
index fcf1bd94b5..53d49be5ec 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTAssignmentOperator.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTAssignmentOperator.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTAssignmentOperator.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTAssignmentOperator extends SimpleNode {
   public ASTAssignmentOperator(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTBlock.java b/pmd/src/net/sourceforge/pmd/ast/ASTBlock.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTBlock.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTBlock.java
index d5b7ad6796..104b2aadac 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTBlock.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTBlock.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTBlock.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTBlock extends SimpleNode {
   public ASTBlock(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTBlockStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTBlockStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTBlockStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTBlockStatement.java
index 430e747eaa..96171dd07b 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTBlockStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTBlockStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTBlockStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTBlockStatement extends SimpleNode {
   public ASTBlockStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTBooleanLiteral.java b/pmd/src/net/sourceforge/pmd/ast/ASTBooleanLiteral.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTBooleanLiteral.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTBooleanLiteral.java
index 8efc49883f..9609d4e0b6 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTBooleanLiteral.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTBooleanLiteral.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTBooleanLiteral.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTBooleanLiteral extends SimpleNode {
   public ASTBooleanLiteral(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTBreakStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTBreakStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTBreakStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTBreakStatement.java
index 263795e0dc..eebac97151 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTBreakStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTBreakStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTBreakStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTBreakStatement extends SimpleNode {
   public ASTBreakStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTCastExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTCastExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTCastExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTCastExpression.java
index 57f32110c7..c22616bf20 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTCastExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTCastExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTCastExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTCastExpression extends SimpleNode {
   public ASTCastExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTCastLookahead.java b/pmd/src/net/sourceforge/pmd/ast/ASTCastLookahead.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTCastLookahead.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTCastLookahead.java
index bf7cf88d94..71f07b1dda 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTCastLookahead.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTCastLookahead.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTCastLookahead.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTCastLookahead extends SimpleNode {
   public ASTCastLookahead(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTClassBody.java b/pmd/src/net/sourceforge/pmd/ast/ASTClassBody.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTClassBody.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTClassBody.java
index d636e1dcc2..70d096d024 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTClassBody.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTClassBody.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTClassBody.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTClassBody extends SimpleNode {
   public ASTClassBody(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTClassBodyDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTClassBodyDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTClassBodyDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTClassBodyDeclaration.java
index cca54aabbf..b9a9973ed1 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTClassBodyDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTClassBodyDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTClassBodyDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTClassBodyDeclaration extends SimpleNode {
   public ASTClassBodyDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTClassDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTClassDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTClassDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTClassDeclaration.java
index 5c5e6b3ce1..7a843986e6 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTClassDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTClassDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTClassDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTClassDeclaration extends SimpleNode {
   public ASTClassDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTCompilationUnit.java b/pmd/src/net/sourceforge/pmd/ast/ASTCompilationUnit.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTCompilationUnit.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTCompilationUnit.java
index 1a20155ac7..b43d65e728 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTCompilationUnit.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTCompilationUnit.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTCompilationUnit.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTCompilationUnit extends SimpleNode {
   public ASTCompilationUnit(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTConditionalAndExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTConditionalAndExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTConditionalAndExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTConditionalAndExpression.java
index 99c83cd5ba..8a4cfb12fa 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTConditionalAndExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTConditionalAndExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTConditionalAndExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTConditionalAndExpression extends SimpleNode {
   public ASTConditionalAndExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTConditionalExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTConditionalExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTConditionalExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTConditionalExpression.java
index fdc6fbfb2e..98e617af9c 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTConditionalExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTConditionalExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTConditionalExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTConditionalExpression extends SimpleNode {
   public ASTConditionalExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTConditionalOrExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTConditionalOrExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTConditionalOrExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTConditionalOrExpression.java
index 3b95bfcb13..327a138d6d 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTConditionalOrExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTConditionalOrExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTConditionalOrExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTConditionalOrExpression extends SimpleNode {
   public ASTConditionalOrExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTConstructorDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTConstructorDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTConstructorDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTConstructorDeclaration.java
index d97235516b..0b99941f6e 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTConstructorDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTConstructorDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTConstructorDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTConstructorDeclaration extends SimpleNode {
   public ASTConstructorDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTContinueStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTContinueStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTContinueStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTContinueStatement.java
index 4bcf915955..f4dfc76c87 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTContinueStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTContinueStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTContinueStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTContinueStatement extends SimpleNode {
   public ASTContinueStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTDoStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTDoStatement.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTDoStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTDoStatement.java
index c81106dbbb..efe876c37b 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTDoStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTDoStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTDoStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTDoStatement extends SimpleNode {
   public ASTDoStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTEmptyStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTEmptyStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTEmptyStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTEmptyStatement.java
index 2c57a9f93f..578a89999f 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTEmptyStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTEmptyStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTEmptyStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTEmptyStatement extends SimpleNode {
   public ASTEmptyStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTEqualityExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTEqualityExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTEqualityExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTEqualityExpression.java
index cfcf222892..862c3b6bdc 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTEqualityExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTEqualityExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTEqualityExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTEqualityExpression extends SimpleNode {
   public ASTEqualityExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTExclusiveOrExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTExclusiveOrExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTExclusiveOrExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTExclusiveOrExpression.java
index 7326a9818d..78c87e36ff 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTExclusiveOrExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTExclusiveOrExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTExclusiveOrExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTExclusiveOrExpression extends SimpleNode {
   public ASTExclusiveOrExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTExplicitConstructorInvocation.java b/pmd/src/net/sourceforge/pmd/ast/ASTExplicitConstructorInvocation.java
similarity index 93%
rename from pmd/src/com/infoether/pmd/ast/ASTExplicitConstructorInvocation.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTExplicitConstructorInvocation.java
index fef8e8eb80..a7d22a585f 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTExplicitConstructorInvocation.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTExplicitConstructorInvocation.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTExplicitConstructorInvocation.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTExplicitConstructorInvocation extends SimpleNode {
   public ASTExplicitConstructorInvocation(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTExpression.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTExpression.java
index 13dd97e216..ac9b427383 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTExpression extends SimpleNode {
   public ASTExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTFieldDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTFieldDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTFieldDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTFieldDeclaration.java
index e2cbe113e0..87aec3e421 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTFieldDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTFieldDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTFieldDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTFieldDeclaration extends SimpleNode {
   public ASTFieldDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTForInit.java b/pmd/src/net/sourceforge/pmd/ast/ASTForInit.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTForInit.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTForInit.java
index 9e43d269d7..af068b622c 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTForInit.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTForInit.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTForInit.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTForInit extends SimpleNode {
   public ASTForInit(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTForStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTForStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTForStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTForStatement.java
index a79521f2b6..67aec5d40d 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTForStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTForStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTForStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTForStatement extends SimpleNode {
   public ASTForStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTForUpdate.java b/pmd/src/net/sourceforge/pmd/ast/ASTForUpdate.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTForUpdate.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTForUpdate.java
index 81014f3de0..15f852b182 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTForUpdate.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTForUpdate.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTForUpdate.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTForUpdate extends SimpleNode {
   public ASTForUpdate(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTFormalParameter.java b/pmd/src/net/sourceforge/pmd/ast/ASTFormalParameter.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTFormalParameter.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTFormalParameter.java
index 7a927daf81..6d0ccb107f 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTFormalParameter.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTFormalParameter.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTFormalParameter.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTFormalParameter extends SimpleNode {
   public ASTFormalParameter(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTFormalParameters.java b/pmd/src/net/sourceforge/pmd/ast/ASTFormalParameters.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTFormalParameters.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTFormalParameters.java
index a231bbfa9e..533aca4d7e 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTFormalParameters.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTFormalParameters.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTFormalParameters.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTFormalParameters extends SimpleNode {
   public ASTFormalParameters(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTIfStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTIfStatement.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTIfStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTIfStatement.java
index 9c708cbcfb..20f4a95f83 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTIfStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTIfStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTIfStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTIfStatement extends SimpleNode {
   public ASTIfStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTImportDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTImportDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTImportDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTImportDeclaration.java
index e9ec5b2fc3..b96d8593bf 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTImportDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTImportDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTImportDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTImportDeclaration extends SimpleNode {
   public ASTImportDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTInclusiveOrExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTInclusiveOrExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTInclusiveOrExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTInclusiveOrExpression.java
index 8e37f42e7a..a3c2eb20a6 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTInclusiveOrExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTInclusiveOrExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTInclusiveOrExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTInclusiveOrExpression extends SimpleNode {
   public ASTInclusiveOrExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTInitializer.java b/pmd/src/net/sourceforge/pmd/ast/ASTInitializer.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTInitializer.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTInitializer.java
index 0267401913..cb655c8b03 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTInitializer.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTInitializer.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTInitializer.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTInitializer extends SimpleNode {
   public ASTInitializer(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTInstanceOfExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTInstanceOfExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTInstanceOfExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTInstanceOfExpression.java
index a5853e97ef..1fb4a1268b 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTInstanceOfExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTInstanceOfExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTInstanceOfExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTInstanceOfExpression extends SimpleNode {
   public ASTInstanceOfExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTInterfaceDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTInterfaceDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTInterfaceDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTInterfaceDeclaration.java
index 77612df73d..afcb2e917a 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTInterfaceDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTInterfaceDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTInterfaceDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTInterfaceDeclaration extends SimpleNode {
   public ASTInterfaceDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTInterfaceMemberDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTInterfaceMemberDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTInterfaceMemberDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTInterfaceMemberDeclaration.java
index 2b4dd720bf..be953e43e4 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTInterfaceMemberDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTInterfaceMemberDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTInterfaceMemberDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTInterfaceMemberDeclaration extends SimpleNode {
   public ASTInterfaceMemberDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTLabeledStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTLabeledStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTLabeledStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTLabeledStatement.java
index af35520c13..3ea494144f 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTLabeledStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTLabeledStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTLabeledStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTLabeledStatement extends SimpleNode {
   public ASTLabeledStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTLiteral.java b/pmd/src/net/sourceforge/pmd/ast/ASTLiteral.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTLiteral.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTLiteral.java
index 90d4d10638..fb3b888f3b 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTLiteral.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTLiteral.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTLiteral.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTLiteral extends SimpleNode {
   public ASTLiteral(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTLocalVariableDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTLocalVariableDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTLocalVariableDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTLocalVariableDeclaration.java
index 29ba07a8ee..b3365bb547 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTLocalVariableDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTLocalVariableDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTLocalVariableDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTLocalVariableDeclaration extends SimpleNode {
   public ASTLocalVariableDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTMethodDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTMethodDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTMethodDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTMethodDeclaration.java
index 734874c8f4..333104f9c3 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTMethodDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTMethodDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTMethodDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTMethodDeclaration extends SimpleNode {
   public ASTMethodDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTMethodDeclarationLookahead.java b/pmd/src/net/sourceforge/pmd/ast/ASTMethodDeclarationLookahead.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTMethodDeclarationLookahead.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTMethodDeclarationLookahead.java
index d440098358..30f4062bea 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTMethodDeclarationLookahead.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTMethodDeclarationLookahead.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTMethodDeclarationLookahead.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTMethodDeclarationLookahead extends SimpleNode {
   public ASTMethodDeclarationLookahead(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTMethodDeclarator.java b/pmd/src/net/sourceforge/pmd/ast/ASTMethodDeclarator.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTMethodDeclarator.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTMethodDeclarator.java
index 69d8061079..4fdcca39c7 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTMethodDeclarator.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTMethodDeclarator.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTMethodDeclarator.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTMethodDeclarator extends SimpleNode {
   public ASTMethodDeclarator(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTMultiplicativeExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTMultiplicativeExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTMultiplicativeExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTMultiplicativeExpression.java
index 648ccdb40d..caded3bba9 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTMultiplicativeExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTMultiplicativeExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTMultiplicativeExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTMultiplicativeExpression extends SimpleNode {
   public ASTMultiplicativeExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTName.java b/pmd/src/net/sourceforge/pmd/ast/ASTName.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTName.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTName.java
index 98a3fc80d0..c555c1642a 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTName.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTName.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTName.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTName extends SimpleNode {
   public ASTName(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTNameList.java b/pmd/src/net/sourceforge/pmd/ast/ASTNameList.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTNameList.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTNameList.java
index d4dc4205fb..ffcd216306 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTNameList.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTNameList.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTNameList.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTNameList extends SimpleNode {
   public ASTNameList(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTNestedClassDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTNestedClassDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTNestedClassDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTNestedClassDeclaration.java
index 55c10e5008..2159b9f630 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTNestedClassDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTNestedClassDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTNestedClassDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTNestedClassDeclaration extends SimpleNode {
   public ASTNestedClassDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTNestedInterfaceDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTNestedInterfaceDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTNestedInterfaceDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTNestedInterfaceDeclaration.java
index 99cfa0a2aa..b394e12e6e 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTNestedInterfaceDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTNestedInterfaceDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTNestedInterfaceDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTNestedInterfaceDeclaration extends SimpleNode {
   public ASTNestedInterfaceDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTNullLiteral.java b/pmd/src/net/sourceforge/pmd/ast/ASTNullLiteral.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTNullLiteral.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTNullLiteral.java
index 2e44cfa1e6..33b50801dd 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTNullLiteral.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTNullLiteral.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTNullLiteral.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTNullLiteral extends SimpleNode {
   public ASTNullLiteral(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTPackageDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTPackageDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTPackageDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTPackageDeclaration.java
index 7ebfb2f4c9..7d11ab8b36 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTPackageDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTPackageDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTPackageDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTPackageDeclaration extends SimpleNode {
   public ASTPackageDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTPostfixExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTPostfixExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTPostfixExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTPostfixExpression.java
index b0ca7e833e..d3987c58ab 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTPostfixExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTPostfixExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTPostfixExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTPostfixExpression extends SimpleNode {
   public ASTPostfixExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTPreDecrementExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTPreDecrementExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTPreDecrementExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTPreDecrementExpression.java
index 2affcde554..c916bfcd03 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTPreDecrementExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTPreDecrementExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTPreDecrementExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTPreDecrementExpression extends SimpleNode {
   public ASTPreDecrementExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTPreIncrementExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTPreIncrementExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTPreIncrementExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTPreIncrementExpression.java
index 04b253383c..51761ce609 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTPreIncrementExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTPreIncrementExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTPreIncrementExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTPreIncrementExpression extends SimpleNode {
   public ASTPreIncrementExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTPrimaryExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTPrimaryExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTPrimaryExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTPrimaryExpression.java
index 34a76a5a00..f3224cb337 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTPrimaryExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTPrimaryExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTPrimaryExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTPrimaryExpression extends SimpleNode {
   public ASTPrimaryExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTPrimaryPrefix.java b/pmd/src/net/sourceforge/pmd/ast/ASTPrimaryPrefix.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTPrimaryPrefix.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTPrimaryPrefix.java
index caf1d77ab2..9528466705 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTPrimaryPrefix.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTPrimaryPrefix.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTPrimaryPrefix.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTPrimaryPrefix extends SimpleNode {
   public ASTPrimaryPrefix(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTPrimarySuffix.java b/pmd/src/net/sourceforge/pmd/ast/ASTPrimarySuffix.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTPrimarySuffix.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTPrimarySuffix.java
index a4b639cd82..08f80eafc7 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTPrimarySuffix.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTPrimarySuffix.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTPrimarySuffix.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTPrimarySuffix extends SimpleNode {
   public ASTPrimarySuffix(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTPrimitiveType.java b/pmd/src/net/sourceforge/pmd/ast/ASTPrimitiveType.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTPrimitiveType.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTPrimitiveType.java
index 6c59e0be55..9a6d5d963f 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTPrimitiveType.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTPrimitiveType.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTPrimitiveType.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTPrimitiveType extends SimpleNode {
   public ASTPrimitiveType(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTRelationalExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTRelationalExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTRelationalExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTRelationalExpression.java
index 33a5ced728..932e651080 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTRelationalExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTRelationalExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTRelationalExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTRelationalExpression extends SimpleNode {
   public ASTRelationalExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTResultType.java b/pmd/src/net/sourceforge/pmd/ast/ASTResultType.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTResultType.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTResultType.java
index 9aeffcd002..f5f782e7e9 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTResultType.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTResultType.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTResultType.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTResultType extends SimpleNode {
   public ASTResultType(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTReturnStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTReturnStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTReturnStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTReturnStatement.java
index 70d21a5264..43327df601 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTReturnStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTReturnStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTReturnStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTReturnStatement extends SimpleNode {
   public ASTReturnStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTShiftExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTShiftExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTShiftExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTShiftExpression.java
index 3d1edcaf68..02cc6d8505 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTShiftExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTShiftExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTShiftExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTShiftExpression extends SimpleNode {
   public ASTShiftExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTStatement.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTStatement.java
index 9251362b44..9ef805f822 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTStatement extends SimpleNode {
   public ASTStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTStatementExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTStatementExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTStatementExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTStatementExpression.java
index a8c31a5186..4b7672afcf 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTStatementExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTStatementExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTStatementExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTStatementExpression extends SimpleNode {
   public ASTStatementExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTStatementExpressionList.java b/pmd/src/net/sourceforge/pmd/ast/ASTStatementExpressionList.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTStatementExpressionList.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTStatementExpressionList.java
index e18ed441b3..f168768c92 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTStatementExpressionList.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTStatementExpressionList.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTStatementExpressionList.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTStatementExpressionList extends SimpleNode {
   public ASTStatementExpressionList(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTSwitchLabel.java b/pmd/src/net/sourceforge/pmd/ast/ASTSwitchLabel.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTSwitchLabel.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTSwitchLabel.java
index 52cc588437..bb51d67dce 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTSwitchLabel.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTSwitchLabel.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTSwitchLabel.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTSwitchLabel extends SimpleNode {
   public ASTSwitchLabel(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTSwitchStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTSwitchStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTSwitchStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTSwitchStatement.java
index 0909a5729a..b9e0c414e6 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTSwitchStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTSwitchStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTSwitchStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTSwitchStatement extends SimpleNode {
   public ASTSwitchStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTSynchronizedStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTSynchronizedStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTSynchronizedStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTSynchronizedStatement.java
index 2333156ea2..dc5583b677 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTSynchronizedStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTSynchronizedStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTSynchronizedStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTSynchronizedStatement extends SimpleNode {
   public ASTSynchronizedStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTThrowStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTThrowStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTThrowStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTThrowStatement.java
index d5a7c0c533..d645202e18 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTThrowStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTThrowStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTThrowStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTThrowStatement extends SimpleNode {
   public ASTThrowStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTTryStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTTryStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTTryStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTTryStatement.java
index b1ed2df1d6..c7345fc00f 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTTryStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTTryStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTTryStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTTryStatement extends SimpleNode {
   public ASTTryStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTType.java b/pmd/src/net/sourceforge/pmd/ast/ASTType.java
similarity index 91%
rename from pmd/src/com/infoether/pmd/ast/ASTType.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTType.java
index b6cf7e0d94..b8ef8755db 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTType.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTType.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTType.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTType extends SimpleNode {
   public ASTType(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTTypeDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTTypeDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTTypeDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTTypeDeclaration.java
index 2bdccef628..3c5b321c07 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTTypeDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTTypeDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTTypeDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTTypeDeclaration extends SimpleNode {
   public ASTTypeDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTUnaryExpression.java b/pmd/src/net/sourceforge/pmd/ast/ASTUnaryExpression.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTUnaryExpression.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTUnaryExpression.java
index 27864d7c45..34a5edde73 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTUnaryExpression.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTUnaryExpression.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTUnaryExpression.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTUnaryExpression extends SimpleNode {
   public ASTUnaryExpression(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTUnaryExpressionNotPlusMinus.java b/pmd/src/net/sourceforge/pmd/ast/ASTUnaryExpressionNotPlusMinus.java
similarity index 93%
rename from pmd/src/com/infoether/pmd/ast/ASTUnaryExpressionNotPlusMinus.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTUnaryExpressionNotPlusMinus.java
index 158663eed1..69eb1e63df 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTUnaryExpressionNotPlusMinus.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTUnaryExpressionNotPlusMinus.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTUnaryExpressionNotPlusMinus.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTUnaryExpressionNotPlusMinus extends SimpleNode {
   public ASTUnaryExpressionNotPlusMinus(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTUnmodifiedClassDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTUnmodifiedClassDeclaration.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTUnmodifiedClassDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTUnmodifiedClassDeclaration.java
index caa148f7a3..1a0603b657 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTUnmodifiedClassDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTUnmodifiedClassDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTUnmodifiedClassDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTUnmodifiedClassDeclaration extends SimpleNode {
   public ASTUnmodifiedClassDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTUnmodifiedInterfaceDeclaration.java b/pmd/src/net/sourceforge/pmd/ast/ASTUnmodifiedInterfaceDeclaration.java
similarity index 93%
rename from pmd/src/com/infoether/pmd/ast/ASTUnmodifiedInterfaceDeclaration.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTUnmodifiedInterfaceDeclaration.java
index eadcd9daff..db11396922 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTUnmodifiedInterfaceDeclaration.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTUnmodifiedInterfaceDeclaration.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTUnmodifiedInterfaceDeclaration.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTUnmodifiedInterfaceDeclaration extends SimpleNode {
   public ASTUnmodifiedInterfaceDeclaration(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTVariableDeclarator.java b/pmd/src/net/sourceforge/pmd/ast/ASTVariableDeclarator.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTVariableDeclarator.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTVariableDeclarator.java
index 033bdebd1f..7208da504d 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTVariableDeclarator.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTVariableDeclarator.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTVariableDeclarator.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTVariableDeclarator extends SimpleNode {
   public ASTVariableDeclarator(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTVariableDeclaratorId.java b/pmd/src/net/sourceforge/pmd/ast/ASTVariableDeclaratorId.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTVariableDeclaratorId.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTVariableDeclaratorId.java
index dcda2c0c76..2592353e55 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTVariableDeclaratorId.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTVariableDeclaratorId.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTVariableDeclaratorId.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTVariableDeclaratorId extends SimpleNode {
   public ASTVariableDeclaratorId(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTVariableInitializer.java b/pmd/src/net/sourceforge/pmd/ast/ASTVariableInitializer.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTVariableInitializer.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTVariableInitializer.java
index 6458f7a79e..a3608c615d 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTVariableInitializer.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTVariableInitializer.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTVariableInitializer.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTVariableInitializer extends SimpleNode {
   public ASTVariableInitializer(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/ASTWhileStatement.java b/pmd/src/net/sourceforge/pmd/ast/ASTWhileStatement.java
similarity index 92%
rename from pmd/src/com/infoether/pmd/ast/ASTWhileStatement.java
rename to pmd/src/net/sourceforge/pmd/ast/ASTWhileStatement.java
index 1ee8cdb391..bc76fe8654 100644
--- a/pmd/src/com/infoether/pmd/ast/ASTWhileStatement.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ASTWhileStatement.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. ASTWhileStatement.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class ASTWhileStatement extends SimpleNode {
   public ASTWhileStatement(int id) {
diff --git a/pmd/src/com/infoether/pmd/ast/JJTJavaParserState.java b/pmd/src/net/sourceforge/pmd/ast/JJTJavaParserState.java
similarity index 98%
rename from pmd/src/com/infoether/pmd/ast/JJTJavaParserState.java
rename to pmd/src/net/sourceforge/pmd/ast/JJTJavaParserState.java
index e0fc648140..aed54832aa 100644
--- a/pmd/src/com/infoether/pmd/ast/JJTJavaParserState.java
+++ b/pmd/src/net/sourceforge/pmd/ast/JJTJavaParserState.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. C:/data/pmd/pmd/src/com/infoether/pmd/ast\JJTJavaParserState.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 class JJTJavaParserState {
   private java.util.Stack nodes;
diff --git a/pmd/src/com/infoether/pmd/ast/JavaCharStream.java b/pmd/src/net/sourceforge/pmd/ast/JavaCharStream.java
similarity index 99%
rename from pmd/src/com/infoether/pmd/ast/JavaCharStream.java
rename to pmd/src/net/sourceforge/pmd/ast/JavaCharStream.java
index ab464fdd15..a6f5bdb419 100644
--- a/pmd/src/com/infoether/pmd/ast/JavaCharStream.java
+++ b/pmd/src/net/sourceforge/pmd/ast/JavaCharStream.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. JavaCharStream.java Version 2.1 */
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to
diff --git a/pmd/src/com/infoether/pmd/ast/JavaParser.java b/pmd/src/net/sourceforge/pmd/ast/JavaParser.java
similarity index 99%
rename from pmd/src/com/infoether/pmd/ast/JavaParser.java
rename to pmd/src/net/sourceforge/pmd/ast/JavaParser.java
index f08dde7094..db414c64eb 100644
--- a/pmd/src/com/infoether/pmd/ast/JavaParser.java
+++ b/pmd/src/net/sourceforge/pmd/ast/JavaParser.java
@@ -1,5 +1,6 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. JavaParser.java */
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 public class JavaParser/*@bgen(jjtree)*/implements JavaParserTreeConstants, JavaParserConstants {/*@bgen(jjtree)*/
   protected JJTJavaParserState jjtree = new JJTJavaParserState();
 
diff --git a/pmd/src/com/infoether/pmd/ast/JavaParserConstants.java b/pmd/src/net/sourceforge/pmd/ast/JavaParserConstants.java
similarity index 99%
rename from pmd/src/com/infoether/pmd/ast/JavaParserConstants.java
rename to pmd/src/net/sourceforge/pmd/ast/JavaParserConstants.java
index 40f0c256ed..b5515cbab7 100644
--- a/pmd/src/com/infoether/pmd/ast/JavaParserConstants.java
+++ b/pmd/src/net/sourceforge/pmd/ast/JavaParserConstants.java
@@ -1,5 +1,5 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. JavaParserConstants.java */
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
 
 public interface JavaParserConstants {
 
diff --git a/pmd/src/com/infoether/pmd/ast/JavaParserTokenManager.java b/pmd/src/net/sourceforge/pmd/ast/JavaParserTokenManager.java
similarity index 99%
rename from pmd/src/com/infoether/pmd/ast/JavaParserTokenManager.java
rename to pmd/src/net/sourceforge/pmd/ast/JavaParserTokenManager.java
index 0ffae2fcf6..b23a5201ac 100644
--- a/pmd/src/com/infoether/pmd/ast/JavaParserTokenManager.java
+++ b/pmd/src/net/sourceforge/pmd/ast/JavaParserTokenManager.java
@@ -1,5 +1,6 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. JavaParserTokenManager.java */
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class JavaParserTokenManager implements JavaParserConstants
 {
@@ -1519,7 +1520,7 @@ int jjround;
 int jjmatchedPos;
 int jjmatchedKind;
 
-public final Token getNextToken() 
+public final Token getNextToken()
 {
   int kind;
   Token specialToken = null;
diff --git a/pmd/src/com/infoether/pmd/ast/JavaParserTreeConstants.java b/pmd/src/net/sourceforge/pmd/ast/JavaParserTreeConstants.java
similarity index 99%
rename from pmd/src/com/infoether/pmd/ast/JavaParserTreeConstants.java
rename to pmd/src/net/sourceforge/pmd/ast/JavaParserTreeConstants.java
index cd06c0aedb..915d93a316 100644
--- a/pmd/src/com/infoether/pmd/ast/JavaParserTreeConstants.java
+++ b/pmd/src/net/sourceforge/pmd/ast/JavaParserTreeConstants.java
@@ -1,6 +1,6 @@
 /* Generated By:JJTree: Do not edit this line. C:/data/pmd/pmd/src/com/infoether/pmd/ast\JavaParserTreeConstants.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
 
 public interface JavaParserTreeConstants
 {
diff --git a/pmd/src/com/infoether/pmd/ast/JavaParserVisitor.java b/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitor.java
similarity index 99%
rename from pmd/src/com/infoether/pmd/ast/JavaParserVisitor.java
rename to pmd/src/net/sourceforge/pmd/ast/JavaParserVisitor.java
index f9b1037f13..c1a5a1eeb6 100644
--- a/pmd/src/com/infoether/pmd/ast/JavaParserVisitor.java
+++ b/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitor.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. C:/data/pmd/pmd/src/com/infoether/pmd/ast\JavaParserVisitor.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public interface JavaParserVisitor
 {
diff --git a/pmd/src/com/infoether/pmd/ast/JavaParserVisitorAdapter.java b/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitorAdapter.java
similarity index 99%
rename from pmd/src/com/infoether/pmd/ast/JavaParserVisitorAdapter.java
rename to pmd/src/net/sourceforge/pmd/ast/JavaParserVisitorAdapter.java
index 8df7c5d239..c01b26e4d0 100644
--- a/pmd/src/com/infoether/pmd/ast/JavaParserVisitorAdapter.java
+++ b/pmd/src/net/sourceforge/pmd/ast/JavaParserVisitorAdapter.java
@@ -3,7 +3,8 @@
  * Date: Jun 13, 2002
  * Time: 4:57:15 PM
  */
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class JavaParserVisitorAdapter implements JavaParserVisitor {
     public Object visit(SimpleNode node, Object data) {
diff --git a/pmd/src/com/infoether/pmd/ast/Node.java b/pmd/src/net/sourceforge/pmd/ast/Node.java
similarity index 97%
rename from pmd/src/com/infoether/pmd/ast/Node.java
rename to pmd/src/net/sourceforge/pmd/ast/Node.java
index b51986caaa..921afcc9c8 100644
--- a/pmd/src/com/infoether/pmd/ast/Node.java
+++ b/pmd/src/net/sourceforge/pmd/ast/Node.java
@@ -1,6 +1,7 @@
 /* Generated By:JJTree: Do not edit this line. Node.java */
 
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 /* All AST nodes must implement this interface.  It provides basic
    machinery for constructing the parent and child relationships
diff --git a/pmd/src/com/infoether/pmd/ast/ParseException.java b/pmd/src/net/sourceforge/pmd/ast/ParseException.java
similarity index 99%
rename from pmd/src/com/infoether/pmd/ast/ParseException.java
rename to pmd/src/net/sourceforge/pmd/ast/ParseException.java
index 6e3e8c3eb4..0fee0f253b 100644
--- a/pmd/src/com/infoether/pmd/ast/ParseException.java
+++ b/pmd/src/net/sourceforge/pmd/ast/ParseException.java
@@ -1,5 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 2.1 */
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 /**
  * This exception is thrown when parse errors are encountered.
diff --git a/pmd/src/com/infoether/pmd/ast/SimpleNode.java b/pmd/src/net/sourceforge/pmd/ast/SimpleNode.java
similarity index 98%
rename from pmd/src/com/infoether/pmd/ast/SimpleNode.java
rename to pmd/src/net/sourceforge/pmd/ast/SimpleNode.java
index a342783da9..a632912c77 100644
--- a/pmd/src/com/infoether/pmd/ast/SimpleNode.java
+++ b/pmd/src/net/sourceforge/pmd/ast/SimpleNode.java
@@ -1,5 +1,6 @@
 /* Generated By:JJTree: Do not edit this line. SimpleNode.java */
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
+
 
 public class SimpleNode implements Node {
   protected Node parent;
diff --git a/pmd/src/com/infoether/pmd/ast/Test.java b/pmd/src/net/sourceforge/pmd/ast/Test.java
similarity index 99%
rename from pmd/src/com/infoether/pmd/ast/Test.java
rename to pmd/src/net/sourceforge/pmd/ast/Test.java
index 448f48f428..450935e08f 100644
--- a/pmd/src/com/infoether/pmd/ast/Test.java
+++ b/pmd/src/net/sourceforge/pmd/ast/Test.java
@@ -1,4 +1,4 @@
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
 import java.io.*;
 
 public class Test implements JavaParserVisitor
diff --git a/pmd/src/com/infoether/pmd/ast/Token.java b/pmd/src/net/sourceforge/pmd/ast/Token.java
similarity index 98%
rename from pmd/src/com/infoether/pmd/ast/Token.java
rename to pmd/src/net/sourceforge/pmd/ast/Token.java
index 866b843ebb..3cefe615c2 100644
--- a/pmd/src/com/infoether/pmd/ast/Token.java
+++ b/pmd/src/net/sourceforge/pmd/ast/Token.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 2.1 */
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
 
 /**
  * Describes the input token stream.
diff --git a/pmd/src/com/infoether/pmd/ast/TokenMgrError.java b/pmd/src/net/sourceforge/pmd/ast/TokenMgrError.java
similarity index 99%
rename from pmd/src/com/infoether/pmd/ast/TokenMgrError.java
rename to pmd/src/net/sourceforge/pmd/ast/TokenMgrError.java
index 46c965f433..e08316a670 100644
--- a/pmd/src/com/infoether/pmd/ast/TokenMgrError.java
+++ b/pmd/src/net/sourceforge/pmd/ast/TokenMgrError.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 2.1 */
-package com.infoether.pmd.ast;
+package net.sourceforge.pmd.ast;
 
 public class TokenMgrError extends Error
 {