Author: ningjiang
Date: Mon Jun 29 08:12:20 2009
New Revision: 789251
URL: http://svn.apache.org/viewvc?rev=789251&view=rev
Log:
Merged revisions 789121 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r789121 | ningjiang | 2009-06-29 00:34:52 +0800 (Mon, 29 Jun 2009) | 1 line
CAMEL-1768 get eclipse pulgin configuration better for checkstyle working
........
Added:
camel/branches/camel-1.x/etc/eclipse/Camel.importorder
- copied unchanged from r789121, camel/trunk/etc/eclipse/Camel.importorder
camel/branches/camel-1.x/etc/eclipse/CamelCodeFormatter.xml
- copied unchanged from r789121,
camel/trunk/etc/eclipse/CamelCodeFormatter.xml
Removed:
camel/branches/camel-1.x/etc/eclipse/ActiveMQ.importorder
camel/branches/camel-1.x/etc/eclipse/ActiveMQCodeFormatter.xml
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/buildingtools/src/main/resources/camel-eclipse-checkstyle
camel/branches/camel-1.x/etc/eclipse/addcheckstyle.xsl
camel/branches/camel-1.x/etc/eclipse/template.checkstyle-config.xml
camel/branches/camel-1.x/parent/pom.xml
camel/branches/camel-1.x/pom.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 29 08:12:20 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-1.x/buildingtools/src/main/resources/camel-eclipse-checkstyle
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/buildingtools/src/main/resources/camel-eclipse-checkstyle?rev=789251&r1=789250&r2=789251&view=diff
==============================================================================
---
camel/branches/camel-1.x/buildingtools/src/main/resources/camel-eclipse-checkstyle
(original)
+++
camel/branches/camel-1.x/buildingtools/src/main/resources/camel-eclipse-checkstyle
Mon Jun 29 08:12:20 2009
@@ -18,10 +18,10 @@
under the License.
-->
<fileset-config file-format-version="1.1.0" simple-config="false">
- <fileset name="all" enabled="true" check-config-name="CXF Checks"
type="external" description="">
+ <fileset name="all" enabled="true" check-config-name="Camel Checks"
type="external" description="">
<file-match-pattern match-pattern="^src[/\\]." include-pattern="true"/>
<file-match-pattern match-pattern="^src[/\\]main[/\\]generated[/\\]."
include-pattern="false"/>
<file-match-pattern match-pattern="^src[/\\]test[/\\]generated[/\\]."
include-pattern="false"/>
- <file-match-pattern
match-pattern="^src[/\\]main[/\\]release[/\\]samples[/\\]jax_rs[/\\]basic_https[/\\]contrib[/\\]."
include-pattern="false"/>
+ <file-match-pattern
match-pattern="^src[/\\]main[/\\]resources[/\\]archetype-resources[/\\]."
include-pattern="false"/>
</fileset>
-</fileset-config>
\ No newline at end of file
+</fileset-config>
Modified: camel/branches/camel-1.x/etc/eclipse/addcheckstyle.xsl
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/etc/eclipse/addcheckstyle.xsl?rev=789251&r1=789250&r2=789251&view=diff
==============================================================================
--- camel/branches/camel-1.x/etc/eclipse/addcheckstyle.xsl (original)
+++ camel/branches/camel-1.x/etc/eclipse/addcheckstyle.xsl Mon Jun 29 08:12:20
2009
@@ -38,8 +38,8 @@
<xsl:choose>
- <xsl:when test="not(check-configuration/@name='ActiveMQ
Checks')">
- <check-configuration name="ActiveMQ Checks"
type="external" description="">
+ <xsl:when test="not(check-configuration/@name='Camel Checks')">
+ <check-configuration name="Camel Checks" type="external"
description="">
<xsl:attribute name="location"><xsl:value-of
select="$checkstyleconfig"/></xsl:attribute>
</check-configuration>
</xsl:when>
Modified: camel/branches/camel-1.x/etc/eclipse/template.checkstyle-config.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/etc/eclipse/template.checkstyle-config.xml?rev=789251&r1=789250&r2=789251&view=diff
==============================================================================
--- camel/branches/camel-1.x/etc/eclipse/template.checkstyle-config.xml
(original)
+++ camel/branches/camel-1.x/etc/eclipse/template.checkstyle-config.xml Mon Jun
29 08:12:20 2009
@@ -18,7 +18,7 @@
under the License.
-->
<checkstyle-configurations file-format-version="5.0.0">
- <check-configuration name="ActiveMQ Checks"
location="@CHECKSTYLE_CONFIG_FILE@" type="external" description="">
+ <check-configuration name="Camel Checks"
location="@CHECKSTYLE_CONFIG_FILE@" type="external" description="">
<property name="apache.header.file" value="@APACHE_HEADER_FILE@"/>
</check-configuration>
</checkstyle-configurations>
Modified: camel/branches/camel-1.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=789251&r1=789250&r2=789251&view=diff
==============================================================================
--- camel/branches/camel-1.x/parent/pom.xml (original)
+++ camel/branches/camel-1.x/parent/pom.xml Mon Jun 29 08:12:20 2009
@@ -871,54 +871,104 @@
</dependencies>
</dependencyManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <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.eclipse.plugin.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.eclipse.plugin.pmdNature</nature-->
+ </projectnatures>
+ <additionalConfig>
+ <file>
+ <name>.checkstyle</name>
+ <location>/camel-eclipse-checkstyle</location>
+ </file>
+ <!--file>
+ <name>.pmd</name>
+ <location>/cxf-eclipse-pmd</location>
+ </file>
+ <file>
+ <name>.ruleset</name>
+ <location>/cxf-pmd-ruleset.xml</location-->
+
+ </additionalConfig>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+
<artifactId>camel-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>validate</id>
+ <phase>validate</phase>
+ <configuration>
+
<configLocation>camel-checkstyle.xml</configLocation>
+
<consoleOutput>true</consoleOutput>
+
<failsOnError>true</failsOnError>
+ <linkXRef>false</linkXRef>
+
<suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation>
+
<sourceDirectory>${basedir}/src</sourceDirectory>
+
<excludes>**/archetype-resources/**/*.java</excludes>
+ </configuration>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <defaultGoal>install</defaultGoal>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <formats>
+ <format>html</format>
+ </formats>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
<profiles>
<profile>
<id>nochecks</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<properties>
<!-- pmd.skip>true</pmd.skip-->
<checkstyle.skip>true</checkstyle.skip>
</properties>
</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>
- <dependencies>
- <dependency>
-
<groupId>org.apache.camel</groupId>
-
<artifactId>camel-buildtools</artifactId>
-
<version>${project.version}</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>validate</id>
- <phase>validate</phase>
- <configuration>
-
<configLocation>camel-checkstyle.xml</configLocation>
-
<consoleOutput>true</consoleOutput>
-
<failsOnError>true</failsOnError>
-
<linkXRef>false</linkXRef>
-
<suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation>
-
<sourceDirectory>${basedir}/src</sourceDirectory>
-
<excludes>**/archetype-resources/**/*.java</excludes>
- </configuration>
- <goals>
- <goal>checkstyle</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profile>
+ <id>sourcecheck</id>
</profile>
</profiles>
</project>
Modified: camel/branches/camel-1.x/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/pom.xml?rev=789251&r1=789250&r2=789251&view=diff
==============================================================================
--- camel/branches/camel-1.x/pom.xml (original)
+++ camel/branches/camel-1.x/pom.xml Mon Jun 29 08:12:20 2009
@@ -256,27 +256,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.5.1</version>
- <configuration>
- <outputDirectory>${basedir}/eclipse-classes</outputDirectory>
- <downloadSources>true</downloadSources>
-
- <!-- Eclipse update site for the Checkstyle plugin is
http://eclipse-cs.sourceforge.net/update -->
- <!-- Eclipse update site for the PMD plugin is
http://pmd.sf.net/eclipse -->
- <buildcommands>
-
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
-
<java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
- <!-- Lets not enable the PMD buidler just yet..
-
<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>
- <!-- Lets not enable the PMD buidler just yet..
- <nature>net.sourceforge.pmd.runtime.pmdNature</nature>
- -->
- </projectnatures>
- </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
@@ -421,9 +407,11 @@
<phase>process-test-sources</phase>
<goals>
<goal>add-maven-repo</goal>
+ <goal>configure-workspace</goal>
</goals>
<configuration>
<workspace>${eclipse.workspace.dir}</workspace>
+
<workspaceCodeStylesURL>file:etc/eclipse/CamelCodeFormatter.xml</workspaceCodeStylesURL>
</configuration>
</execution>
</executions>
@@ -443,6 +431,11 @@
<artifactId>ant-trax</artifactId>
<version>1.6.5</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-buildtools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<executions>
<execution>
@@ -454,35 +447,27 @@
<property name="full.eclipse.workspace"
refid="ecp.ws.path" />
<path path="${basedir}/etc" id="etc.path" />
- <whichresource resource="/camel-eclipse-pmd"
property="pmd.url">
- <classpath refid="etc.path" />
- </whichresource>
- <whichresource resource="/camel-pmd-ruleset.xml"
property="pmdruleset.url">
- <classpath refid="etc.path" />
- </whichresource>
- <whichresource resource="/camel-eclipse-checkstyle"
property="eclipse.checkstyle.url">
- <classpath refid="etc.path" />
- </whichresource>
- <whichresource resource="/camel-checkstyle.xml"
property="checkstyle.url">
- <classpath refid="etc.path" />
- </whichresource>
+ <whichresource resource="/camel-eclipse-pmd"
property="pmd.url"/>
+ <whichresource resource="/camel-pmd-ruleset.xml"
property="pmdruleset.url"/>
+ <whichresource resource="/camel-eclipse-checkstyle"
property="eclipse.checkstyle.url"/>
+ <whichresource resource="/camel-checkstyle.xml"
property="checkstyle.url"/>
<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"
/>
- <get src="${checkstyle.url}"
dest="${full.eclipse.workspace}/activemq-checkstyle.xml" />
+ <get src="${checkstyle.url}"
dest="${full.eclipse.workspace}/camel-checkstyle.xml" />
<!-- Add checkstyle config -->
<copy
file="${basedir}/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}/activemq-checkstyle.xml" />
- <filter token="APACHE_HEADER_FILE"
value="${full.eclipse.workspace}/activemq-header.txt" />
+ <filter token="CHECKSTYLE_CONFIG_FILE"
value="${full.eclipse.workspace}/camel-checkstyle.xml" />
+ <filter token="APACHE_HEADER_FILE"
value="${full.eclipse.workspace}/apache-header.txt" />
</filterset>
</copy>
<xslt style="${basedir}/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}/activemq-checkstyle.xml" />
+ <param name="checkstyleconfig"
expression="${full.eclipse.workspace}/camel-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" />
@@ -498,12 +483,12 @@
<concat
destfile="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs"
append="true" fixlastline="true">
<filelist dir="${basedir}/etc/eclipse"
files="org.eclipse.jdt.core.prefs" />
</concat>
- <loadfile property="eclipse.code.format"
srcFile="${basedir}/etc/eclipse/ActiveMQCodeFormatter.xml" />
+ <loadfile property="eclipse.code.format"
srcFile="${basedir}/etc/eclipse/CamelCodeFormatter.xml" />
<loadfile property="eclipse.code.templates"
srcFile="${basedir}/etc/eclipse/codetemplates.xml" />
<loadfile property="eclipse.camel.java.code.templates"
srcFile="${basedir}/etc/eclipse/camel_java_templates.xml" />
<loadfile property="eclipse.camel.xml.code.templates"
srcFile="${basedir}/etc/eclipse/camel_xml_templates.xml" />
<propertyfile
file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs">
- <entry key="formatter_profile" value="_ActiveMQ Java
Conventions" />
+ <entry key="formatter_profile" value="Camel 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}" />
