You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2017/04/21 09:40:58 UTC
camel git commit: CAMEL-11180 Place Eclipse workspace setup in ca...
Repository: camel
Updated Branches:
refs/heads/master 33d111e3b -> b33fbf822
CAMEL-11180 Place Eclipse workspace setup in ca...
...mel-etc in a profile
This places the execution of Eclipse workspace setup within a profile
called `eclipse`, this way it is not run automatically with each build
overwriting the workspace settings.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b33fbf82
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b33fbf82
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b33fbf82
Branch: refs/heads/master
Commit: b33fbf822d69728856d00748359ab20c6c303c9a
Parents: 33d111e
Author: Zoran Regvart <zr...@apache.org>
Authored: Fri Apr 21 11:21:45 2017 +0200
Committer: Zoran Regvart <zr...@apache.org>
Committed: Fri Apr 21 11:23:09 2017 +0200
----------------------------------------------------------------------
etc/pom.xml | 178 ++++++++++++++++++++++++++++---------------------------
1 file changed, 91 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b33fbf82/etc/pom.xml
----------------------------------------------------------------------
diff --git a/etc/pom.xml b/etc/pom.xml
index 95d32ab..2f81b45 100755
--- a/etc/pom.xml
+++ b/etc/pom.xml
@@ -34,100 +34,104 @@
<properties>
<workspace>${basedir}/../..</workspace>
</properties>
- <build>
- <defaultGoal>process-test-sources</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>setup.eclipse.workspace</id>
- <phase>process-test-sources</phase>
- <goals>
- <goal>configure-workspace</goal>
- </goals>
- <configuration>
- <workspace>${workspace}</workspace>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>setup.workspace</id>
- <phase>validate</phase>
- <configuration>
- <target>
- <path id="ecp.ws.path" location="${workspace}" />
- <property name="full.eclipse.workspace" refid="ecp.ws.path" />
- <path path="${basedir}/../buildingtools/src/main/resources" id="buildtools.path" />
- <whichresource resource="camel-eclipse-pmd" property="pmd.url"><classpath refid="buildtools.path" /></whichresource>
- <whichresource resource="camel-pmd-ruleset.xml" property="pmdruleset.url"><classpath refid="buildtools.path" /></whichresource>
- <whichresource resource="camel-eclipse-checkstyle" property="eclipse.checkstyle.url"><classpath refid="buildtools.path" /></whichresource>
- <whichresource resource="camel-checkstyle.xml" property="checkstyle.url"><classpath refid="buildtools.path" /></whichresource>>
+ <profiles>
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <defaultGoal>process-test-sources</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>setup.eclipse.workspace</id>
+ <phase>process-test-sources</phase>
+ <goals>
+ <goal>configure-workspace</goal>
+ </goals>
+ <configuration>
+ <workspace>${workspace}</workspace>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>setup.workspace</id>
+ <phase>validate</phase>
+ <configuration>
+ <target>
+ <path id="ecp.ws.path" location="${workspace}" />
+ <property name="full.eclipse.workspace" refid="ecp.ws.path" />
+ <path path="${basedir}/../buildingtools/src/main/resources" id="buildtools.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" />
+ <whichresource resource="camel-eclipse-pmd" property="pmd.url"><classpath refid="buildtools.path" /></whichresource>
+ <whichresource resource="camel-pmd-ruleset.xml" property="pmdruleset.url"><classpath refid="buildtools.path" /></whichresource>
+ <whichresource resource="camel-eclipse-checkstyle" property="eclipse.checkstyle.url"><classpath refid="buildtools.path" /></whichresource>
+ <whichresource resource="camel-checkstyle.xml" property="checkstyle.url"><classpath refid="buildtools.path" /></whichresource>>
- <get src="${checkstyle.url}" dest="${full.eclipse.workspace}/camel-checkstyle.xml" />
+ <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" />
- <!-- Add checkstyle config -->
- <copy file="${basedir}/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}/camel-checkstyle.xml" />
- <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/camel-header.txt" />
- </filterset>
- </copy>
+ <get src="${checkstyle.url}" dest="${full.eclipse.workspace}/camel-checkstyle.xml" />
- <xslt style="${basedir}/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}/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" />
+ <!-- Add checkstyle config -->
+ <copy file="${basedir}/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}/camel-checkstyle.xml" />
+ <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/camel-header.txt" />
+ </filterset>
+ </copy>
+ <xslt style="${basedir}/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}/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" />
- <!-- 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" />
- <entry key="org.eclipse.jdt.core.compiler.problem.rawTypeReference" value="ignore" />
- </propertyfile>
+ <!-- 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" />
+ <entry key="org.eclipse.jdt.core.compiler.problem.rawTypeReference" 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}/eclipse" files="org.eclipse.jdt.core.prefs" />
+ </concat>
+ <loadfile property="eclipse.code.format" srcFile="${basedir}/eclipse/CamelCodeFormatter.xml" />
+ <loadfile property="eclipse.code.templates" srcFile="${basedir}/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="_ActiveMQ 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 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}/eclipse" files="org.eclipse.jdt.core.prefs" />
- </concat>
- <loadfile property="eclipse.code.format" srcFile="${basedir}/eclipse/CamelCodeFormatter.xml" />
- <loadfile property="eclipse.code.templates" srcFile="${basedir}/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="_ActiveMQ 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;w3c;" />
- <!-- 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>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <!-- Add import order -->
+ <entry key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;w3c;" />
+ <!-- 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>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>