You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2009/04/15 06:24:54 UTC

svn commit: r765044 - in /servicemix/smx3/trunk/distributions/apache-servicemix: pom.xml src/main/assembly/bin.xml src/main/release/conf/keystore.jks src/main/resources/conf/ src/main/resources/conf/keystore.jks

Author: ffang
Date: Wed Apr 15 04:24:53 2009
New Revision: 765044

URL: http://svn.apache.org/viewvc?rev=765044&view=rev
Log:
[SM-1845]keystore.jks should be filtered during distribution package

Added:
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/resources/conf/
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/resources/conf/keystore.jks
      - copied unchanged from r765038, servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/keystore.jks
Removed:
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/release/conf/keystore.jks
Modified:
    servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
    servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml?rev=765044&r1=765043&r2=765044&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/pom.xml Wed Apr 15 04:24:53 2009
@@ -872,6 +872,20 @@
           </execution>
 		</executions>
 	  </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>

Modified: servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml?rev=765044&r1=765043&r2=765044&view=diff
==============================================================================
--- servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml (original)
+++ servicemix/smx3/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml Wed Apr 15 04:24:53 2009
@@ -43,6 +43,10 @@
       </excludes>
     </fileSet>
     <fileSet>
+      <directory>target/classes/conf</directory>
+      <outputDirectory>/conf</outputDirectory>
+    </fileSet>
+    <fileSet>
       <directory>target/filtered/bin</directory>
       <outputDirectory>/bin</outputDirectory>
       <fileMode>755</fileMode>