Author: vinoski
Date: Thu Dec 7 13:23:09 2006
New Revision: 483671
URL: http://svn.apache.org/viewvc?view=rev&rev=483671
Log:
changes for Eclipse support
removed all the checkstyle and pmd dependencies and configuration, as we
don't use any of that stuff. we can always add it back later if we decide
that code style rules should be checked.
Modified:
incubator/qpid/trunk/qpid/java/pom.xml
Modified: incubator/qpid/trunk/qpid/java/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/pom.xml?view=diff&rev=483671&r1=483670&r2=483671
==============================================================================
--- incubator/qpid/trunk/qpid/java/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/pom.xml Thu Dec 7 13:23:09 2006
@@ -227,13 +227,9 @@
<!--downloadSources>true</downloadSources-->
<buildcommands>
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
-
<java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
-
<java.lang.String>net.sourceforge.pmd.runtime.pmdBuilder</java.lang.String>
</buildcommands>
<projectnatures>
<nature>org.eclipse.jdt.core.javanature</nature>
-
<nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
-
<nature>net.sourceforge.pmd.runtime.pmdNature</nature>
</projectnatures>
</configuration>
</plugin>
@@ -403,23 +399,6 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.version}</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
-
<configLocation>${basedir}/${topDirectoryLocation}/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>${java.source.version}</targetJdk>
- <rulesets>
- <ruleset>${basedir}/.ruleset</ruleset>
- </rulesets>
- </configuration>
- </plugin>
</plugins>
</reporting>
@@ -459,36 +438,6 @@
</profile>
<profile>
- <!-- default profile enables checkstyle and Xlint stuff -->
- <id>sourcecheck</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>false</showDeprecation>
-
<compilerArgument>${compile.flags}</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>setup.eclipse</id>
<build>
<defaultGoal>process-test-sources</defaultGoal>
@@ -513,109 +462,6 @@
<configuration>
<workspace>${eclipse.workspace.dir}</workspace>
</configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${antrun.version}</version>
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.6.5</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>setup.workspace</id>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <path id="ecp.ws.path"
location="${eclipse.workspace.dir}"/>
- <property
name="full.eclipse.workspace" refid="ecp.ws.path"/>
-
- <mkdir
dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings"/>
- <mkdir
dir="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle"/>
- <mkdir
dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse"/>
- <copy
file="${basedir}/${topDirectoryLocation}/checkstyle.xml"
-
tofile="${full.eclipse.workspace}/qpid-checkstyle.xml"/>
- <copy
file="${basedir}/${topDirectoryLocation}/etc/apache-header.txt"
-
tofile="${full.eclipse.workspace}/apache-header.txt"/>
-
- <!-- Add checkstyle config -->
- <copy
file="${basedir}/${topDirectoryLocation}/etc/eclipse/template.checkstyle-config.xml"
-
tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml"
- overwrite="no">
- <filterset>
- <filter
token="CHECKSTYLE_CONFIG_FILE"
-
value="${full.eclipse.workspace}/qpid-checkstyle.xml"/>
- <filter
token="APACHE_HEADER_FILE"
-
value="${full.eclipse.workspace}/apache-header.txt"/>
- </filterset>
- </copy>
-
- <xslt
style="${basedir}/${topDirectoryLocation}/etc/eclipse/addcheckstyle.xsl"
-
in="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml"
-
out="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new">
- <param name="checkstyleconfig"
-
expression="${full.eclipse.workspace}/qpid-checkstyle.xml"/>
- </xslt>
- <copy
-
file="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new"
-
tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml"
- overwrite="yes"/>
-
-
- <!-- Add warning flags that we want -->
- <propertyfile
-
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs">
- <entry
key="org.eclipse.jdt.core.compiler.problem.missingSerialVersion"
- value="ignore"/>
- <entry
key="org.eclipse.jdt.core.compiler.problem.unusedImport"
- value="ignore"/>
- <entry
key="org.eclipse.jdt.core.compiler.problem.annotationSuperInterface"
- value="ignore"/>
- </propertyfile>
-
-
- <!-- Add code format rules -->
- <concat
destfile="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs"
- append="true"
fixlastline="true">
- <filelist
dir="${basedir}/${topDirectoryLocation}/etc/eclipse"
-
files="org.eclipse.jdt.core.prefs"/>
- </concat>
- <loadfile
property="eclipse.code.format"
-
srcFile="${basedir}/${topDirectoryLocation}/etc/eclipse/QpidCodeFormatter.xml"/>
- <loadfile
property="eclipse.code.templates"
-
srcFile="${basedir}/${topDirectoryLocation}/etc/eclipse/codetemplates.xml"/>
- <propertyfile
-
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">
- <entry key="formatter_profile"
value="_Qpid Java Conventions"/>
- <entry
key="org.eclipse.jdt.ui.formatterprofiles"
-
value="${eclipse.code.format}"/>
- <entry
key="org.eclipse.jdt.ui.text.custom_code_templates"
-
value="${eclipse.code.templates}"/>
-
- <!-- Add import order -->
- <entry
key="org.eclipse.jdt.ui.importorder"
-
value="java;javax;org.w3c;org.xml;junit;com;org;"/>
- <!-- Sort order -->
- <entry
key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V,"/>
- <entry key="outlinesortoption"
value="T,SF,F,SI,I,C,SM,M,"/>
- <entry
key="org.eclipse.jdt.ui.enable.visibility.order" value="true"/>
- </propertyfile>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
</executions>
</plugin>
