diff --git a/pmd-eclipse-feature/feature.properties b/pmd-eclipse-feature/feature.properties
index ca58ade7ea..e08b8c5e85 100644
--- a/pmd-eclipse-feature/feature.properties
+++ b/pmd-eclipse-feature/feature.properties
@@ -11,16 +11,35 @@ Copyright 1997-2003 PMD for Eclipse Development Team \n\
 under sponsorship of the Defense Advanced Research Projects Agency (DARPA).
 
 license.text =\
-This program is free software; you can redistribute it and/or \
-modify it under the terms of the Cougaar Open Source License as published \
-by DARPA on the Cougaar Open Source Website (www.cougaar.org).\
-\n\
-THE COUGAAR SOFTWARE AND ANY DERIVATIVE SUPPLIED BY LICENSOR \
-IS PROVIDED "AS IS" WITHOUT WARRANTIES OF ANY KIND, WHETHER EXPRESS \
-OR IMPLIED, INCLUDING (BUT NOT LIMITED TO) ALL IMPLIED WARRANTIES \
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, AND WITHOUT \
-ANY WARRANTIES AS TO NON-INFRINGEMENT. IN NO EVENT SHALL COPYRIGHT \
-HOLDER BE LIABLE FOR ANY DIRECT, SPECIAL, INDIRECT OR CONSEQUENTIAL \
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE OF DATA OR PROFITS, \
-TORTIOUS CONDUCT, ARISING OUT OF OR IN CONNECTION WITH THE USE OR \
-PERFORMANCE OF THE COUGAAR SOFTWARE.
+Copyright (c) 2003, PMD for Eclipse Development Team \
+All rights reserved. \
+ \
+Redistribution and use in source and binary forms, with or without \
+modification, are permitted provided that the following conditions are \
+met: \
+ \
+    * Redistributions of source code must retain the above copyright \
+      notice, this list of conditions and the following disclaimer. \
+    * Redistributions in binary form must reproduce the above copyright \
+      notice, this list of conditions and the following disclaimer in the \
+      documentation and/or other materials provided with the distribution. \
+    * The end-user documentation included with the redistribution, if \
+      any, must include the following acknowledgement: \
+      "This product includes software developed in part by support from \
+      the Defense Advanced Research Project Agency (DARPA)" \
+    * Neither the name of "PMD for Eclipse Development Team" nor the names of its \
+      contributors may be used to endorse or promote products derived from \
+      this software without specific prior written permission. \
+ \
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS \
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED \
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A \
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER \
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, \
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, \
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF \
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING \
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS \
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \
+ 
diff --git a/pmd-eclipse-feature/feature.xml b/pmd-eclipse-feature/feature.xml
index 2b719d34b3..1273a7d030 100644
--- a/pmd-eclipse-feature/feature.xml
+++ b/pmd-eclipse-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="net.sourceforge.pmd.eclipse"
       label="%feature.label"
-      version="3.1.0"
+      version="3.1.1"
       provider-name="%feature.provider_name"
       image="pmd_logo_small.jpg">
 
@@ -19,28 +19,28 @@
    </license>
 
    <requires>
+      <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.views"/>
       <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
       <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
    </requires>
 
    <plugin
          id="net.sourceforge.pmd.core"
-         download-size="5 193 557"
-         install-size="5 193 728 "
-         version="3.2.0"/>
+         download-size="0"
+         install-size="0"
+         version="3.3.0"/>
 
    <plugin
          id="net.sourceforge.pmd.eclipse"
-         download-size="596 038"
-         install-size="598 016"
-         version="3.1.0"/>
+         download-size="0"
+         install-size="0"
+         version="3.1.1"/>
 
 </feature>
diff --git a/pmd-eclipse/.classpath b/pmd-eclipse/.classpath
index d0f15da36c..15324edb3f 100644
--- a/pmd-eclipse/.classpath
+++ b/pmd-eclipse/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/castor-0.9.6-xml.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-logging.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/castor-0.9.6-xml.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/pmd-eclipse/.pmd b/pmd-eclipse/.pmd
index 7079cd1993..44343658fd 100644
--- a/pmd-eclipse/.pmd
+++ b/pmd-eclipse/.pmd
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<pmd><workingSet>pmd-eclipse source code</workingSet><useProjectRuleSet>false</useProjectRuleSet><rules><rule><name>EmptySynchronizedBlock</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>TooManyFields</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SystemPrintln</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ConfusingTernary</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MethodNamingConventions</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>StringToString</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>DefaultLabelNotLastInSwitchStmt</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExcessiveParameterList</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyFinallyBlock</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>FinalizeOnlyCallsSuperFinalize</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>NullAssignment</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ReturnFromFinallyBlock</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SimpleDateFormatNeedsLocale</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ConstructorCallsOverridableMethod</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidDeeplyNestedIfStmts</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyStaticInitializer</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CollapsibleIfStatements</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CloneMethodMustImplementCloneable</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnnecessaryReturn</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidReassigningParameters</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MissingBreakInSwitch</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyStatementNotInLoop</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>JumbledIncrementer</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>StringInstantiation</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UseStringBufferForStringAppends</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SwitchStmtsShouldHaveDefault</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>FinalizeDoesNotCallSuperFinalize</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnnecessaryFinalModifier</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CloseConnection</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CyclomaticComplexity</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AssignmentInOperand</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidFieldNameMatchingTypeName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExceptionAsFlowControl</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>BadComparison</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>OptimizableToArrayCall</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ImportFromSamePackage</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>OverrideBothEqualsAndHashcode</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SuspiciousHashcodeMethodName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SingularField</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MethodArgumentCouldBeFinal</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MoreThanOneLogger</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyTryBlock</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedModifier</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CouplingBetweenObjects</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>BooleanInstantiation</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>LoggerIsNotStaticFinal</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExcessiveImports</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ForLoopShouldBeWhileLoop</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidInstanceofChecksInCatchClause</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>InstantiationToGetClass</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidDollarSigns</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedPrivateField</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CallSuperInConstructor</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>IfElseStmtsMustUseBraces</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExceptionTypeChecking</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>DontImportJavaLang</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ShortMethodName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedFormalParameter</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExcessiveMethodLength</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SuspiciousConstantFieldName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidCatchingThrowable</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SimplifyBooleanReturns</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnnecessaryConstructor</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidFieldNameMatchingMethodName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SimplifyBooleanExpressions</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SimplifyStartsWith</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedPrivateMethod</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SwitchDensity</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>DontImportSun</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidProtectedFieldInFinalClass</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnnecessaryParentheses</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExplicitCallToFinalize</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>FinalizeShouldBeProtected</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MissingStaticMethodInNonInstantiatableClass</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>DuplicateImports</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>WhileLoopsMustUseBraces</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnnecessaryConversionTemporary</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AccessorClassGeneration</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>LooseCoupling</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ArrayIsStoredDirectly</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidSynchronizedAtMethodLevel</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MethodWithSameNameAsEnclosingClass</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UseSingleton</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyWhileStmt</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyCatchBlock</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExcessiveClassLength</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EqualsNull</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>FinalFieldCouldBeStatic</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ClassNamingConventions</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AbstractNaming</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidThrowingCertainExceptionTypes</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>FinalizeOverloaded</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnconditionalIfStatement</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CloneThrowsCloneNotSupportedException</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyFinalizer</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SimplifyConditional</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AssignmentToNonFinalStatic</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SuspiciousOctalEscape</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UseNotifyAllInsteadOfNotify</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>DoubleCheckedLocking</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExcessivePublicCount</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ImmutableField</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SignatureDeclareThrowsException</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>IfStmtsMustUseBraces</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>OnlyOneReturn</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedImports</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>NonCaseLabelInSwitchStatement</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MethodReturnsInternalArray</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UseArrayListInsteadOfVector</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidCatchingNPE</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ForLoopsMustUseBraces</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UseLocaleWithCaseConversions</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidCallingFinalize</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidInstantiatingObjectsInLoops</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>LocalVariableCouldBeFinal</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedLocalVariable</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidDuplicateLiterals</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidConcatenatingNonLiteralsInStringBuffer</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AbstractClassWithoutAbstractMethod</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptySwitchStatements</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ProperCloneImplementation</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>NonStaticInitializer</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SuspiciousEqualsMethodName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidNonConstructorMethodsWithClassName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>LongVariable</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>IdempotentOperations</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyIfStmt</name><ruleset>pmd-eclipse</ruleset></rule></rules></pmd>
\ No newline at end of file
+<pmd><workingSet>pmd-eclipse source code</workingSet><useProjectRuleSet>false</useProjectRuleSet><rules><rule><name>EmptySynchronizedBlock</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>TooManyFields</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SystemPrintln</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ConfusingTernary</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MethodNamingConventions</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>StringToString</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>DefaultLabelNotLastInSwitchStmt</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExcessiveParameterList</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyFinallyBlock</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>FinalizeOnlyCallsSuperFinalize</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>NullAssignment</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ReturnFromFinallyBlock</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SimpleDateFormatNeedsLocale</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ConstructorCallsOverridableMethod</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidDeeplyNestedIfStmts</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyStaticInitializer</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CollapsibleIfStatements</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CloneMethodMustImplementCloneable</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnnecessaryReturn</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidReassigningParameters</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MissingBreakInSwitch</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyStatementNotInLoop</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>JumbledIncrementer</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>StringInstantiation</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UseStringBufferForStringAppends</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SwitchStmtsShouldHaveDefault</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>FinalizeDoesNotCallSuperFinalize</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnnecessaryFinalModifier</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CloseConnection</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CyclomaticComplexity</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AssignmentInOperand</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidFieldNameMatchingTypeName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExceptionAsFlowControl</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>BadComparison</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>OptimizableToArrayCall</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ImportFromSamePackage</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>OverrideBothEqualsAndHashcode</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SuspiciousHashcodeMethodName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MethodArgumentCouldBeFinal</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SingularField</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MoreThanOneLogger</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyTryBlock</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedModifier</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CouplingBetweenObjects</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>BooleanInstantiation</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>LoggerIsNotStaticFinal</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExcessiveImports</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ForLoopShouldBeWhileLoop</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidInstanceofChecksInCatchClause</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>InstantiationToGetClass</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidDollarSigns</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedPrivateField</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CallSuperInConstructor</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>IfElseStmtsMustUseBraces</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExceptionTypeChecking</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>DontImportJavaLang</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ShortMethodName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedFormalParameter</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExcessiveMethodLength</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SuspiciousConstantFieldName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidCatchingThrowable</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SimplifyBooleanReturns</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnnecessaryConstructor</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidFieldNameMatchingMethodName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SimplifyBooleanExpressions</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SimplifyStartsWith</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedPrivateMethod</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SwitchDensity</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>DontImportSun</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidProtectedFieldInFinalClass</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnnecessaryParentheses</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExplicitCallToFinalize</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>FinalizeShouldBeProtected</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MissingStaticMethodInNonInstantiatableClass</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>DuplicateImports</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>WhileLoopsMustUseBraces</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnnecessaryConversionTemporary</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AccessorClassGeneration</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>LooseCoupling</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidSynchronizedAtMethodLevel</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>MethodWithSameNameAsEnclosingClass</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UseSingleton</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyWhileStmt</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyCatchBlock</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExcessiveClassLength</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EqualsNull</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>FinalFieldCouldBeStatic</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ClassNamingConventions</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AbstractNaming</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidThrowingCertainExceptionTypes</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>FinalizeOverloaded</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnconditionalIfStatement</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>CloneThrowsCloneNotSupportedException</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyFinalizer</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SimplifyConditional</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AssignmentToNonFinalStatic</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SuspiciousOctalEscape</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UseNotifyAllInsteadOfNotify</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>DoubleCheckedLocking</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ExcessivePublicCount</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ImmutableField</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SignatureDeclareThrowsException</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>IfStmtsMustUseBraces</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>OnlyOneReturn</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedImports</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>NonCaseLabelInSwitchStatement</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UseArrayListInsteadOfVector</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidCatchingNPE</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ForLoopsMustUseBraces</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UseLocaleWithCaseConversions</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidCallingFinalize</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidInstantiatingObjectsInLoops</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>LocalVariableCouldBeFinal</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>UnusedLocalVariable</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidDuplicateLiterals</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidConcatenatingNonLiteralsInStringBuffer</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AbstractClassWithoutAbstractMethod</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptySwitchStatements</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>ProperCloneImplementation</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>NonStaticInitializer</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>SuspiciousEqualsMethodName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>AvoidNonConstructorMethodsWithClassName</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>LongVariable</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>IdempotentOperations</name><ruleset>pmd-eclipse</ruleset></rule><rule><name>EmptyIfStmt</name><ruleset>pmd-eclipse</ruleset></rule></rules></pmd>
\ No newline at end of file
diff --git a/pmd-eclipse/.project b/pmd-eclipse/.project
index 1960eab1ac..3ebc7b9d1e 100644
--- a/pmd-eclipse/.project
+++ b/pmd-eclipse/.project
@@ -26,16 +26,10 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.pmd.eclipse.pmdBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>net.sourceforge.metrics.nature</nature>
-		<nature>net.sourceforge.pmd.eclipse.pmdNature</nature>
 	</natures>
 </projectDescription>
diff --git a/pmd-eclipse/CHANGELOG.txt b/pmd-eclipse/CHANGELOG.txt
index 29aaeffa04..d40c3c2578 100644
--- a/pmd-eclipse/CHANGELOG.txt
+++ b/pmd-eclipse/CHANGELOG.txt
@@ -2,6 +2,21 @@ Change log for the PMD Eclipse plugin
 -------------------------------------
 
 
+v3.1.1 - xx/xx/2005
+
+Runtime
+-------
+. RFE#1231112-Make the rule table columns sortable in preferences dialog (thanks to Brian R)
+. BUG#1231108-Fix the resizing issue
+. Upgrade to PMD 3.3
+. Add a PMD perspective
+. Add a Violations Overview view
+. Add a Violation Outline view
+. Add a Dataflow view
+. Continue internal code refactoring
+
+
+----------------------------------------------------------------------------------------
 v3.1.0 - 04/07/2005
 
 Runtime
diff --git a/pmd-eclipse/CREDITS.txt b/pmd-eclipse/CREDITS.txt
index ef6a310df1..91d74b22f9 100644
--- a/pmd-eclipse/CREDITS.txt
+++ b/pmd-eclipse/CREDITS.txt
@@ -6,3 +6,9 @@ Jacques Lebourgeois          fix malformed UTF-8 characters
 Eduard Naum                  fix JDK 1.3 runtime problem
 Chris Grindstaff             fix SWTException when PMD is run on a file with syntax error
 Brian Remedios               improvements in the PMDPlugin class
+                             preferences rule table have sortable columns
+
+------------------------------------------
+*** SPECIAL THANKS TO SEBASTIAN RAFFEL ***
+------------------------------------------
+for his great job on the PMD perspective, new views and dataflow analysis support.
diff --git a/pmd-eclipse/RELNOTES.txt b/pmd-eclipse/RELNOTES.txt
index 7c0fbf43a7..ad0d51a768 100644
--- a/pmd-eclipse/RELNOTES.txt
+++ b/pmd-eclipse/RELNOTES.txt
@@ -1,11 +1,28 @@
 Release notes for the PMD Eclipse Plugin
 ----------------------------------------
 
-IMPORTANT : SINCE v2.0 THE INSTALLATION PROCEDURE HAS BEEN CHANGED.
-            READ THE SETUP_README.TXT FILE IN THE DOWNLOADED PACKAGE
-            FOR INSTRUCTIONS.
-            
+v3.1.1 01/11/2005
+-----------------
 
+NEW : PMD perspective and views
+-------------------------------
+Great thanks to Sebastian Raffel.
+Sebastian has developped a PMD perspective with new views.
+The legacy "Violations view" still exists.
+By default, the PMD perspective is shown when a manual check is performed.
+Otherwise, simply go to the menu Window->Open perspective->Other... and select
+PMD in the PMD folder.
+
+UPDATED : PMD v3.3
+------------------
+This version includes version 3.3 of the PMD engine
+
+FIXED : Various bug fixes
+-------------------------
+Some internal bugs and some described in the user forum has been fixed.
+
+
+----------------------------------------------------------------------------------------
 v3.1.0 04/07/2005
 -----------------