Author: bvahdat
Date: Fri Apr 26 23:00:07 2013
New Revision: 1476443

URL: http://svn.apache.org/r1476443
Log:
Merged revisions 1476442 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1476442 | bvahdat | 2013-04-27 00:56:52 +0200 (Sa, 27 Apr 2013) | 1 line
  
  Fixed the broken build of camel-etc module.
........

Modified:
    camel/branches/camel-2.11.x/   (props changed)
    camel/branches/camel-2.11.x/components/camel-http/   (props changed)
    camel/branches/camel-2.11.x/components/camel-jms/   (props changed)
    camel/branches/camel-2.11.x/etc/pom.xml

Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1476442

Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr 26 23:00:07 2013
@@ -1 +1 @@
-/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508,1471293,1471330,1471407-1471408,1471543,1475657,1475677,1475742,1475786,1476113
+/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508,1471293,1471330,1471407-1471408,1471543,1475657,1475677,1475742,1475786,1476113,1476442

Propchange: camel/branches/camel-2.11.x/components/camel-http/
------------------------------------------------------------------------------
  Merged /camel/trunk/components/camel-http:r1476442

Propchange: camel/branches/camel-2.11.x/components/camel-jms/
------------------------------------------------------------------------------
  Merged /camel/trunk/components/camel-jms:r1476442

Modified: camel/branches/camel-2.11.x/etc/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/etc/pom.xml?rev=1476443&r1=1476442&r2=1476443&view=diff
==============================================================================
--- camel/branches/camel-2.11.x/etc/pom.xml (original)
+++ camel/branches/camel-2.11.x/etc/pom.xml Fri Apr 26 23:00:07 2013
@@ -24,6 +24,7 @@
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
     <version>2.11-SNAPSHOT</version>
+    <relativePath>../parent</relativePath>
   </parent>
 
   <artifactId>camel-etc</artifactId>
@@ -32,7 +33,7 @@
   <description>Misc stuff</description>
 
   <properties>
-    <workspace>${basedir}../../workspace</workspace>
+    <workspace>${basedir}/../..</workspace>
   </properties>
   <build>
       <defaultGoal>process-test-sources</defaultGoal>
@@ -66,29 +67,29 @@
                           <target>
                               <path id="ecp.ws.path" location="${workspace}" />
                               <property name="full.eclipse.workspace" 
refid="ecp.ws.path" />
-                              <path path="${basedir}" id="etc.path"/>
+                              <path 
path="${basedir}/../buildingtools/src/main/resources" id="buildtools.path"/>
 
-                              <whichresource resource="/activemq-eclipse-pmd" 
property="pmd.url"><classpath refid="etc.path"/></whichresource>
-                              <whichresource 
resource="/activemq-pmd-ruleset.xml" property="pmdruleset.url"><classpath 
refid="etc.path"/></whichresource>
-                              <whichresource 
resource="/activemq-eclipse-checkstyle" 
property="eclipse.checkstyle.url"><classpath refid="etc.path"/></whichresource>
-                              <whichresource 
resource="/activemq-checkstyle.xml" property="checkstyle.url"><classpath 
refid="etc.path"/></whichresource>>
+                              <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>>
 
                               <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}/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}/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}/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" />
 
@@ -106,7 +107,7 @@
                               <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/ActiveMQCodeFormatter.xml" />
+                              <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" />


Reply via email to