camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject svn commit: r774545 - in /camel/branches/camel-1.x: apache-camel/ components/camel-bam/ components/camel-jpa/ components/camel-rest/ components/camel-spring/ tooling/archetypes/ tooling/archetypes/camel-archetype-component/
Date Wed, 13 May 2009 21:45:08 GMT
Author: hadrian
Date: Wed May 13 21:45:08 2009
New Revision: 774545

URL: http://svn.apache.org/viewvc?rev=774545&view=rev
Log:
CAMEL-1608

Modified:
    camel/branches/camel-1.x/apache-camel/pom.xml
    camel/branches/camel-1.x/components/camel-bam/pom.xml
    camel/branches/camel-1.x/components/camel-jpa/pom.xml
    camel/branches/camel-1.x/components/camel-rest/pom.xml
    camel/branches/camel-1.x/components/camel-spring/pom.xml
    camel/branches/camel-1.x/tooling/archetypes/camel-archetype-component/pom.xml
    camel/branches/camel-1.x/tooling/archetypes/pom.xml

Modified: camel/branches/camel-1.x/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/apache-camel/pom.xml?rev=774545&r1=774544&r2=774545&view=diff
==============================================================================
--- camel/branches/camel-1.x/apache-camel/pom.xml (original)
+++ camel/branches/camel-1.x/apache-camel/pom.xml Wed May 13 21:45:08 2009
@@ -464,7 +464,7 @@
         <artifactId>camel-maven-plugin</artifactId>
         <reportSets>
           <reportSet>
-            <configuration/>
+            <configuration />
             <reports>
               <report>converters-report</report>
             </reports>
@@ -475,11 +475,11 @@
   </reporting>
 
   <profiles>
+  
     <profile>
       <id>release</id>
       <build>
         <plugins>
-
           <!-- we only generate the javadoc jars when running the release profile -->
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -523,9 +523,7 @@
               </execution>
             </executions>
           </plugin>
-
-
-<!--
+          <!--
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
@@ -537,20 +535,17 @@
                 <phase>compile</phase>
                 <configuration>
                   <tasks>
-
                     <exec executable="rsync">
-                      <arg value="-ave"/>
-                      <arg value="ssh"/>
-                      <arg value="people.apache.org:/www/activemq.apache.org/camel/"/>
-                      <arg value="${basedir}/target/website/"/>
+                      <arg value="-ave" />
+                      <arg value="ssh" />
+                      <arg value="people.apache.org:/www/activemq.apache.org/camel/" />
+                      <arg value="${basedir}/target/website/" />
                     </exec>
-
-                    <echo message="Replaceing absolute links with relative ones"/>
+                    <echo message="Replaceing absolute links with relative ones" />
                     <replace dir="${basedir}/target/website">
-                      <replacefilter token="http://activemq.apache.org/camel/maven/" value="maven/"/>
-                      <replacefilter token="http://activemq.apache.org/camel/styles/"
value="styles/"/>
+                      <replacefilter token="http://activemq.apache.org/camel/maven/" value="maven/"
/>
+                      <replacefilter token="http://activemq.apache.org/camel/styles/"
value="styles/" />
                     </replace>
-
                   </tasks>
                 </configuration>
                 <goals>
@@ -559,10 +554,11 @@
               </execution>
             </executions>
           </plugin>
--->
+          -->
         </plugins>
       </build>
     </profile>
+	
     <profile>
       <id>assembly-src</id>
       <build>

Modified: camel/branches/camel-1.x/components/camel-bam/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-bam/pom.xml?rev=774545&r1=774544&r2=774545&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-bam/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-bam/pom.xml Wed May 13 21:45:08 2009
@@ -21,17 +21,17 @@
 
   <modelVersion>4.0.0</modelVersion>
 
+  <artifactId>camel-bam</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: BAM</name>
+  <description>Camel BAM support</description>
+
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>camel-bam</artifactId>
-  <packaging>bundle</packaging>
-  <name>Camel :: BAM</name>
-  <description>Camel BAM support</description>
-
   <properties>
 	<camel.osgi.export.pkg>org.apache.camel.bam.*</camel.osgi.export.pkg>
   </properties>
@@ -122,12 +122,7 @@
           <includes>
             <include>**/*Test.*</include>
           </includes>
-          <excludes>
-            <!-- TODO no idea yet why this seems to fail in a recursive build -
-                 but works in a build of just the camel-bam module -->
-
-            <!--<exclude>**/MultipleActivitiesConcurrentlyTest.*</exclude>-->
-          </excludes>
+          <excludes />
         </configuration>
       </plugin>
 
@@ -135,7 +130,6 @@
   </build>
 
   <profiles>
-
     <profile>
       <id>hibernate-hsqldb</id>
       <build>
@@ -274,36 +268,36 @@
                 <configuration>
                   <tasks>
                     <path id="cp">
-                      <path refid="maven.test.classpath"/>
-                      <path refid="maven.compile.classpath"/>
-                      <path refid="maven.dependency.classpath"/>
+                      <path refid="maven.test.classpath" />
+                      <path refid="maven.compile.classpath" />
+                      <path refid="maven.dependency.classpath" />
                     </path>
                     <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
-                      <classpath refid="cp"/>
+                      <classpath refid="cp" />
                     </taskdef>
 
-                    <mkdir dir="${basedir}/target/jpa-classes"/>
+                    <mkdir dir="${basedir}/target/jpa-classes" />
                     <openjpac directory="${basedir}/target/jpa-classes">
-                      <classpath refid="cp"/>
+                      <classpath refid="cp" />
                       <fileset dir="${basedir}/target/classes">
-                        <include name="org/apache/camel/bam/model/*.class"/>
+                        <include name="org/apache/camel/bam/model/*.class" />
                       </fileset>
                     </openjpac>
                     <copy overwrite="true" todir="${basedir}/target/classes">
-                      <fileset dir="${basedir}/target/jpa-classes"/>
+                      <fileset dir="${basedir}/target/jpa-classes" />
                     </copy>
 
                     <!--
-                                    <mkdir dir="${basedir}/target/jpa-test-classes"/>
-                                    <openjpac directory="${basedir}/target/jpa-test-classes">
-                                      <classpath refid="cp"/>
-                                      <fileset dir="${basedir}/target/test-classes">
-                                        <include name="org/apache/camel/examples/*.class"/>
-                                      </fileset>
-                                    </openjpac>
-                                    <copy overwrite="true" todir="${basedir}/target/test-classes">
-                                      <fileset dir="${basedir}/target/jpa-test-classes"/>
-                                    </copy>
+                    <mkdir dir="${basedir}/target/jpa-test-classes" />
+                    <openjpac directory="${basedir}/target/jpa-test-classes">
+                      <classpath refid="cp" />
+                      <fileset dir="${basedir}/target/test-classes">
+                        <include name="org/apache/camel/examples/*.class" />
+                      </fileset>
+                    </openjpac>
+                    <copy overwrite="true" todir="${basedir}/target/test-classes">
+                      <fileset dir="${basedir}/target/jpa-test-classes" />
+                    </copy>
                     -->
                   </tasks>
                 </configuration>

Modified: camel/branches/camel-1.x/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-jpa/pom.xml?rev=774545&r1=774544&r2=774545&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-jpa/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-jpa/pom.xml Wed May 13 21:45:08 2009
@@ -21,17 +21,17 @@
 
   <modelVersion>4.0.0</modelVersion>
 
+  <artifactId>camel-jpa</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: JPA</name>
+  <description>Camel JPA support</description>
+
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>camel-jpa</artifactId>
-  <packaging>bundle</packaging>
-  <name>Camel :: JPA</name>
-  <description>Camel JPA support</description>
-
   <properties>
     <camel.osgi.export.pkg>org.apache.camel.component.jpa.*,
       org.apache.camel.processor.idempotent.jpa.*</camel.osgi.export.pkg>
@@ -120,25 +120,25 @@
             <configuration>
               <tasks>
                 <path id="cp">
-                  <path refid="maven.test.classpath"/>
-                  <path refid="maven.compile.classpath"/>
-                  <path refid="maven.dependency.classpath"/>
+                  <path refid="maven.test.classpath" />
+                  <path refid="maven.compile.classpath" />
+                  <path refid="maven.dependency.classpath" />
                 </path>
                 <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
-                  <classpath refid="cp"/>
+                  <classpath refid="cp" />
                 </taskdef>
 
-                <mkdir dir="${basedir}/target/jpa-test-classes"/>
+                <mkdir dir="${basedir}/target/jpa-test-classes" />
                 <openjpac directory="${basedir}/target/jpa-test-classes">
-                  <classpath refid="cp"/>
-                    <fileset dir="${basedir}/target/classes">
-                      <include name="org/apache/camel/processor/**/MessageProcessed.class"/>
-                    </fileset>
-                  <config propertiesFile="${basedir}/src/test/resources/META-INF/persistence.xml"/>
+                  <classpath refid="cp" />
+                  <fileset dir="${basedir}/target/classes">
+                    <include name="org/apache/camel/processor/**/MessageProcessed.class"
/>
+                  </fileset>
+                  <config propertiesFile="${basedir}/src/test/resources/META-INF/persistence.xml"
/>
                 </openjpac>
 
                 <copy overwrite="true" todir="${basedir}/target/test-classes">
-                  <fileset dir="${basedir}/target/jpa-test-classes"/>
+                  <fileset dir="${basedir}/target/jpa-test-classes" />
                 </copy>
               </tasks>
             </configuration>

Modified: camel/branches/camel-1.x/components/camel-rest/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-rest/pom.xml?rev=774545&r1=774544&r2=774545&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-rest/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-rest/pom.xml Wed May 13 21:45:08 2009
@@ -200,7 +200,7 @@
             <!-- enable easy JMX connection to JConsole -->
             <systemProperty>
               <name>com.sun.management.jmxremote</name>
-              <value/>
+              <value />
             </systemProperty>
           </systemProperties>
           <scanIntervalSeconds>10</scanIntervalSeconds>

Modified: camel/branches/camel-1.x/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-spring/pom.xml?rev=774545&r1=774544&r2=774545&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-spring/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-spring/pom.xml Wed May 13 21:45:08 2009
@@ -184,17 +184,17 @@
               <tasks>
                 <echo>Copying to code together for the XSD generation</echo>
 
-                <mkdir dir="${project.build.directory}/schema-src"/>
+                <mkdir dir="${project.build.directory}/schema-src" />
                 <copy todir="${project.build.directory}/schema-src">
                   <fileset dir="${basedir}/src/main/java">
-                    <include name="org/apache/camel/spring/Camel*.java"/>
-                    <include name="org/apache/camel/spring/Endpoint*.java"/>
-                    <include name="org/apache/camel/spring/package-info.java"/>
+                    <include name="org/apache/camel/spring/Camel*.java" />
+                    <include name="org/apache/camel/spring/Endpoint*.java" />
+                    <include name="org/apache/camel/spring/package-info.java" />
                   </fileset>
                   <fileset dir="${basedir}/../../camel-core/src/main/java">
-                    <include name="org/apache/camel/model/**/*.java"/>
-                    <include name="org/apache/camel/ExchangePattern.java"/>
-                    <include name="org/apache/camel/package-info.java"/>
+                    <include name="org/apache/camel/model/**/*.java" />
+                    <include name="org/apache/camel/ExchangePattern.java" />
+                    <include name="org/apache/camel/package-info.java" />
                   </fileset>
                 </copy>
               </tasks>
@@ -210,8 +210,8 @@
             <configuration>
               <tasks>
                 <echo>Deleting unwanted resources from the test-jar</echo>
-                <delete file="${project.build.directory}/test-classes/log4j.properties"
verbose="true"/>
-                <delete file="${project.build.directory}/test-classes/META-INF/spring/*"
verbose="true"/>
+                <delete file="${project.build.directory}/test-classes/log4j.properties"
verbose="true" />
+                <delete file="${project.build.directory}/test-classes/META-INF/spring/*"
verbose="true" />
               </tasks>
             </configuration>
             <goals>

Modified: camel/branches/camel-1.x/tooling/archetypes/camel-archetype-component/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tooling/archetypes/camel-archetype-component/pom.xml?rev=774545&r1=774544&r2=774545&view=diff
==============================================================================
--- camel/branches/camel-1.x/tooling/archetypes/camel-archetype-component/pom.xml (original)
+++ camel/branches/camel-1.x/tooling/archetypes/camel-archetype-component/pom.xml Wed May
13 21:45:08 2009
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
 
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
 -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
+  <groupId>org.apache.camel.archetypes</groupId>
+  <artifactId>camel-archetype-component</artifactId>
+  <name>Camel :: Archetypes :: Component</name>
+  <description>Creates a new Camel component.</description>
+
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
     <version>1.6.1-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.camel.archetypes</groupId>
-  <artifactId>camel-archetype-component</artifactId>
-  <name>Camel :: Archetypes :: Component</name>
-  <description>Creates a new Camel component.</description>
-
   <build>
     <plugins>
       <plugin>
@@ -45,9 +45,7 @@
             </goals>
             <configuration>
               <tasks>
-                <replace file="${project.build.directory}/classes/archetype-resources/pom.xml"
-                  token="$CAMEL_VERSION_REPLACEME$"
-                  value="${project.version}" casesensitive="true">
+                <replace file="${project.build.directory}/classes/archetype-resources/pom.xml"
token="$CAMEL_VERSION_REPLACEME$" value="${project.version}" casesensitive="true">
                 </replace>
               </tasks>
             </configuration>

Modified: camel/branches/camel-1.x/tooling/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/tooling/archetypes/pom.xml?rev=774545&r1=774544&r2=774545&view=diff
==============================================================================
--- camel/branches/camel-1.x/tooling/archetypes/pom.xml (original)
+++ camel/branches/camel-1.x/tooling/archetypes/pom.xml Wed May 13 21:45:08 2009
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,6 +16,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>



Mime
View raw message