Merge branch 'xml-catalog'

Author: adangel

ReleaseNotes.md

@@ -21,6 +21,7 @@ Eclipse Update Site:
 
 *   [#48](https://github.com/pmd/pmd-eclipse-plugin/issues/48): Upgrade to PMD 6.7.0
 *   [#65](https://github.com/pmd/pmd-eclipse-plugin/issues/65): Support multiple rulesets
+*   [#67](https://github.com/pmd/pmd-eclipse-plugin/issues/67): PMD's XML Schemas should be registered in XML Catalog
 
 ### External Contributions
 

net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF

@@ -15,7 +15,8 @@ Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4",
  org.eclipse.team.core,
  org.eclipse.search,
  org.eclipse.help,
- org.eclipse.help.ui
+ org.eclipse.help.ui,
+ org.eclipse.wst.xml.core
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: %plugin.provider
@@ -61,6 +62,7 @@ Bundle-ClassPath: target/lib/antlr-runtime.jar,
  target/lib/scala-library.jar,
  target/lib/scala-reflect.jar,
  target/classes/,
+ target/schema/,
  .
 Bundle-Localization: plugin
 Export-Package: name.herlin.command,

net.sourceforge.pmd.eclipse.plugin/build.properties

@@ -15,7 +15,8 @@ bin.includes = .,\
                toc.xml,\
                welcome.xml,\
                doc/,\
-               target/lib/
+               target/lib/,\
+               target/schema/,\
 src.includes = icons/,\
                META-INF/,\
                plugin.xml,\

net.sourceforge.pmd.eclipse.plugin/plugin.xml

@@ -668,5 +668,26 @@
             name="PMD UI Commands">
       </category>
    </extension>
+   <extension
+         point="org.eclipse.wst.xml.core.catalogContributions">
+      <catalogContribution
+            id="PMD schemas">
+         <public
+               id="ruleset_2_0_0"
+               publicId="http://pmd.sourceforge.net/ruleset/2.0.0"
+               uri="platform:/plugin/net.sourceforge.pmd.eclipse.plugin/ruleset_2_0_0.xsd">
+         </public>
+         <public
+               id="report_2_0_0"
+               publicId="http://pmd.sourceforge.net/report/2.0.0"
+               uri="platform:/plugin/net.sourceforge.pmd.eclipse.plugin/report_2_0_0.xsd">
+         </public>
+         <public
+               id="rule-tests_1_0_0"
+               publicId="http://pmd.sourceforge.net/rule-tests"
+               uri="platform:/plugin/net.sourceforge.pmd.eclipse.plugin/rule-tests_1_0_0.xsd">
+         </public>
+      </catalogContribution>
+   </extension>
 
 </plugin>

net.sourceforge.pmd.eclipse.plugin/pom.xml

@@ -47,6 +47,24 @@
                     <phase>process-sources</phase>
                     <goals><goal>copy-dependencies</goal></goals>
                 </execution>
+                <execution>
+                    <id>copy-rule-tests-schema</id>
+                    <phase>process-sources</phase>
+                    <goals>
+                        <goal>unpack</goal>
+                    </goals>
+                    <configuration>
+                        <artifactItems>
+                            <artifactItem>
+                                <groupId>net.sourceforge.pmd</groupId>
+                                <artifactId>pmd-test</artifactId>
+                                <version>${pmd.version}</version>
+                                <includes>rule-tests_1_0_0.xsd</includes>
+                            </artifactItem>
+                        </artifactItems>
+                        <outputDirectory>${project.build.directory}/schema</outputDirectory>
+                    </configuration>
+                </execution>
             </executions>
         </plugin>
         <plugin>