camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r564189 - in /activemq/camel/trunk: camel-core/pom.xml components/camel-spring/pom.xml
Date Thu, 09 Aug 2007 12:56:08 GMT
Author: jstrachan
Date: Thu Aug  9 05:56:07 2007
New Revision: 564189

URL: http://svn.apache.org/viewvc?view=rev&rev=564189
Log:
zapped the log4j.properties files from the test-jars (to avoid confusion when reused in other
projects, such as examples etc)

Modified:
    activemq/camel/trunk/camel-core/pom.xml
    activemq/camel/trunk/components/camel-spring/pom.xml

Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?view=diff&rev=564189&r1=564188&r2=564189
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Thu Aug  9 05:56:07 2007
@@ -70,6 +70,27 @@
   <build>
     <plugins>
 
+      <!-- lets delete the log4j.properties from the test-jar -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>package</id>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+                <echo>Deleting unwanted resources from the test-jar</echo>
+                <delete file="${project.build.directory}/test-classes/log4j.properties"
verbose="true"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
       <!-- generate the attached tests jar -->
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
@@ -80,8 +101,13 @@
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <!-- TODO this doesn't work - if ever we can figure out the maven ninja to get
it working, we can zap the Ant stuff above -->
+          <excludes>
+            <exclude>**/*/log4j.properties</exclude>
+          </excludes>
+        </configuration>
       </plugin>
-
     </plugins>
   </build>
 

Modified: activemq/camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?view=diff&rev=564189&r1=564188&r2=564189
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Thu Aug  9 05:56:07 2007
@@ -118,25 +118,13 @@
         </configuration>
       </plugin>
 
-      <!-- lets distribute the test cases as a jar -->
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-          <id>process-sources</id>
-          <phase>process-sources</phase>
+            <id>process-sources</id>
+            <phase>process-sources</phase>
             <configuration>
               <tasks>
                 <echo>Copying to code together for the XSD generation</echo>
@@ -182,6 +170,20 @@
               <goal>run</goal>
             </goals>
           </execution>
+
+          <execution>
+            <id>package</id>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+                <echo>Deleting unwanted resources from the test-jar</echo>
+                <delete file="${project.build.directory}/test-classes/log4j.properties"
verbose="true"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
         </executions>
         <dependencies>
           <dependency>
@@ -191,6 +193,27 @@
           </dependency>
         </dependencies>
       </plugin>
+
+
+      <!-- generate the attached tests jar -->
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <!-- TODO: this doesn't work - if ever we can figure out the maven ninja to
get it working -->
+          <!-- TODO: we can zap the Ant package phase stuff above -->
+          <excludes>
+            <exclude>**/*/log4j.properties</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+
 
       <plugin>
         <groupId>com.sun.tools.jxc.maven2</groupId>



Mime
View raw message