diff --git a/pmd-netbeans/CHANGES.txt b/pmd-netbeans/CHANGES.txt
index 677836bb1a..0429a20f36 100644
--- a/pmd-netbeans/CHANGES.txt
+++ b/pmd-netbeans/CHANGES.txt
@@ -1,6 +1,8 @@
Version 1.3
-- Works with IDE newer than 4.1
+- Updated pmd to version 3.3
+- Works with IDE 5.0
- Modified action shortcut
+- Progress now uses default NetBeans API
- Added few rules specific to NetBeans that can be selected
Version 1.2
diff --git a/pmd-netbeans/README.txt b/pmd-netbeans/README.txt
index 14ab3cf33a..5ca804a99d 100644
--- a/pmd-netbeans/README.txt
+++ b/pmd-netbeans/README.txt
@@ -5,18 +5,18 @@ INSTALL
------------------------
1) Start NetBeans
- 2) Goto Tools --> Update Center
- 3) Choose "Install Manually Downloaded Modules (.nbm Files).".
- 4) Press Next
- 5) Choose Add
- 6) Goto the directory where you downloaded pmd-netbeans and choose the file "pmd.nbm".
- 7) Press OK
- 8) Press Next
+ 2) Goto Tools --> Module Manager
+ 3) Press Update
+ 4) Choose "Install Manually Downloaded Modules (.nbm Files).".
+ 5) Press Next
+ 6) Choose Add
+ 7) Goto the directory where you downloaded pmd-netbeans and choose the file "pmd.nbm".
+ 8) Press OK
9) Press Next
-10) Press Accept
-11) Choose Include
-12) Press Finish
-13) Choose OK to restart, if so prompted
+10) Press Next
+11) Press Accept
+12) Choose Include and confirm to install an usined module
+13) Press Finish
------------------------
USE
@@ -35,7 +35,7 @@ XXXXXXXXXXXXXXXXXXXXXXXX
RULES
------------------------
1) Start NetBeans
-2) Goto Tools --> Options
+2) Goto Tools --> Options and click on Classic View
3) Navigate to Options/IDE Configuration/Server And External Tool Settings/PMD Settings
4) Click on "Rules"
5) Click on the [...] button
@@ -47,7 +47,7 @@ RULES
CUSTOM RULESETS
------------------------
1) Start NetBeans
-2) Goto Tools --> Options
+2) Goto Tools --> Options and click on Classic View
3) Navigate to Options/IDE Configuration/Server And External Tool Settings/PMD Settings
4) Click on the Expert tab
5) Click on "Rulesets"
@@ -61,7 +61,7 @@ CUSTOM RULESETS
REALTIME SCANNING
------------------------
1) Start NetBeans
-2) Goto Tools --> Options
+2) Goto Tools --> Options and click on Classic View
3) Navigate to Options/IDE Configuration/Server And External Tool Settings/PMD Settings
4) Click on "Enable scan"
5) Choose true to enable scan, false otherwise.
diff --git a/pmd-netbeans/build.xml b/pmd-netbeans/build.xml
index 11e43a7842..29d0fc935b 100644
--- a/pmd-netbeans/build.xml
+++ b/pmd-netbeans/build.xml
@@ -2,8 +2,8 @@
-
-
+
+
@@ -30,30 +30,29 @@
-
-
+
-
+
+
-
-
+
-
+
diff --git a/pmd-netbeans/lib/jaxen-1.1-beta-7.jar b/pmd-netbeans/lib/jaxen-1.1-beta-7.jar
new file mode 100644
index 0000000000..98ffbe3845
Binary files /dev/null and b/pmd-netbeans/lib/jaxen-1.1-beta-7.jar differ
diff --git a/pmd-netbeans/lib/jaxen-core-1.0-fcs.jar b/pmd-netbeans/lib/jaxen-core-1.0-fcs.jar
deleted file mode 100644
index e52bf679cc..0000000000
Binary files a/pmd-netbeans/lib/jaxen-core-1.0-fcs.jar and /dev/null differ
diff --git a/pmd-netbeans/lib/jaxen-license.txt b/pmd-netbeans/lib/jaxen-license.txt
new file mode 100644
index 0000000000..1800af03c8
--- /dev/null
+++ b/pmd-netbeans/lib/jaxen-license.txt
@@ -0,0 +1,45 @@
+/*
+ $Id$
+
+ Copyright 2003 (C) The Werken Company. All Rights Reserved.
+
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions of source code must retain copyright
+ statements and notices. Redistributions must also contain a
+ copy of this document.
+
+ 2. 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.
+
+ 3. The name "jaxen" must not be used to endorse or promote
+ products derived from this Software without prior written
+ permission of The Werken Company. For written permission,
+ please contact bob@werken.com.
+
+ 4. Products derived from this Software may not be called "jaxen"
+ nor may "jaxen" appear in their names without prior written
+ permission of The Werken Company. "jaxen" is a registered
+ trademark of The Werken Company.
+
+ 5. Due credit should be given to The Werken Company.
+ (http://jaxen.werken.com/).
+
+ THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESSED 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 WERKEN COMPANY OR ITS 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-netbeans/lib/pmd-3.2.jar b/pmd-netbeans/lib/pmd-3.2.jar
deleted file mode 100644
index f81ae446a0..0000000000
Binary files a/pmd-netbeans/lib/pmd-3.2.jar and /dev/null differ
diff --git a/pmd-netbeans/lib/pmd-3.3.jar b/pmd-netbeans/lib/pmd-3.3.jar
new file mode 100644
index 0000000000..df2eb2d78d
Binary files /dev/null and b/pmd-netbeans/lib/pmd-3.3.jar differ
diff --git a/pmd-netbeans/lib/saxpath-1.0-fcs.jar b/pmd-netbeans/lib/saxpath-1.0-fcs.jar
deleted file mode 100644
index 2b43955bab..0000000000
Binary files a/pmd-netbeans/lib/saxpath-1.0-fcs.jar and /dev/null differ
diff --git a/pmd-netbeans/nbproject/project.properties b/pmd-netbeans/nbproject/project.properties
index 15ea40b090..40416b211e 100644
--- a/pmd-netbeans/nbproject/project.properties
+++ b/pmd-netbeans/nbproject/project.properties
@@ -1,7 +1,6 @@
extra.module.files=\
- modules/ext/jaxen-core-1.0-fcs.jar \
- modules/ext/pmd-3.2.jar \
- modules/ext/saxpath-1.0-fcs.jar \
+ modules/ext/jaxen-1.1-beta-7.jar \
+ modules/ext/pmd-3.3.jar \
modules/ext/jakarta-oro-2.0.jar \
modules/ext/nbpmdrules.jar
nbm.distribution=http://pmd.sourceforge.net/
diff --git a/pmd-netbeans/nbproject/project.xml b/pmd-netbeans/nbproject/project.xml
index 32ec09b7d2..8a66c69d1e 100644
--- a/pmd-netbeans/nbproject/project.xml
+++ b/pmd-netbeans/nbproject/project.xml
@@ -14,21 +14,15 @@
- ext/jaxen-core-1.0-fcs.jar
+ ext/jaxen-1.1-beta-7.jar
- lib/jaxen-core-1.0-fcs.jar
+ lib/jaxen-1.1-beta-7.jar
- ext/saxpath-1.0-fcs.jar
+ ext/pmd-3.3.jar
- lib/saxpath-1.0-fcs.jar
-
-
-
- ext/pmd-3.2.jar
-
- lib/pmd-3.2.jar
+ lib/pmd-3.3.jar
@@ -156,7 +150,7 @@
libsrc
- lib/pmd-3.2.jar
+ lib/pmd-3.3.jar
build/libclasses
${cluster}/modules/ext/nbpmdrules.jar