You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/11/25 09:25:18 UTC
svn commit: r720438 - in /activemq/camel/branches/camel-1.x: ./
camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/
Author: ningjiang
Date: Tue Nov 25 00:25:17 2008
New Revision: 720438
URL: http://svn.apache.org/viewvc?rev=720438&view=rev
Log:
Merged revisions 720435,720437 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r720435 | ningjiang | 2008-11-25 16:09:27 +0800 (Tue, 25 Nov 2008) | 1 line
Added comments for the profiles in the parent pom.xml
........
r720437 | ningjiang | 2008-11-25 16:17:56 +0800 (Tue, 25 Nov 2008) | 1 line
Added comments for the release profiles in the parent pom.xml
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java (props changed)
activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java (props changed)
activemq/camel/branches/camel-1.x/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 25 00:25:17 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719864,719978-719979,720207
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719864,719978-719979,720207,720435-720437
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 25 00:25:17 2008
@@ -1 +1 @@
-/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java:720207
+/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyUsingWhenTest.java:720207,720435-720437
Propchange: activemq/camel/branches/camel-1.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 25 00:25:17 2008
@@ -1 +1 @@
-/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java:719848,719864,720207
+/activemq/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyResponseBodyWhenErrorTest.java:719848,719864,720207,720435-720437
Modified: activemq/camel/branches/camel-1.x/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/pom.xml?rev=720438&r1=720437&r2=720438&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/pom.xml Tue Nov 25 00:25:17 2008
@@ -1186,10 +1186,7 @@
<profile>
<id>setup.eclipse</id>
<!--
- <modules>
- <module>distribution</module>
- <module>tools/eclipse-plugin</module>
- </modules>
+ set up the eclipse workspace and generate the .classpath and .project files for modules
-->
<properties>
<eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>
@@ -1334,9 +1331,11 @@
</profile>
<profile>
<id>nochecks</id>
+ <!-- skip the checkstyle source code checking -->
</profile>
<profile>
<id>sourcecheck</id>
+ <!-- endable the checkstyle source code checking -->
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -1378,6 +1377,7 @@
<profile>
<id>rat</id>
+ <!-- The profile for Apache Release Audit Tool http://incubator.apache.org/rat/ -->
<build>
<plugins>
<plugin>
@@ -1454,6 +1454,7 @@
<profile>
<id>integration</id>
+ <!--The profile for running the unit and integration test-->
<build>
<plugins>
<plugin>
@@ -1474,6 +1475,7 @@
<profile>
<id>release</id>
+ <!-- this profile will be hit when you do relase work for camel -->
<build>
<plugins>
<!-- We want to deploy the artifact to a staging location for perusal -->