commit 487fef225e51abdb3db07b1c7d6ea9a1f90095bf
author Richard S. Hall <rickhall@apache.org> Wed Dec 22 19:06:38 2010 +0000
committer Richard S. Hall <rickhall@apache.org> Wed Dec 22 19:06:38 2010 +0000
tree 2a8fac07a9e8f4fcb063b49fb1fae5a80c0c992e
parent f3a9aea196976e047511865def9e9b8107c3a400

Fix minor property substitution issue. (FELIX-2695)


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1052030 13f79535-47bb-0310-9956-ffa450edef68

main.distribution/assembly.xml

diff --git a/main.distribution/assembly.xml b/main.distribution/assembly.xml
index 63724d5..3d143e5 100644
--- a/main.distribution/assembly.xml
+++ b/main.distribution/assembly.xml
@@ -22,40 +22,32 @@
     <format>zip</format>
     <format>tar.gz</format>
   </formats>
-    <fileSets>
-  <fileSet>
+  <fileSets>
+    <fileSet>
       <directory>${project.basedir}/bin</directory>
       <outputDirectory>bin</outputDirectory>
       <useDefaultExcludes>true</useDefaultExcludes>
       <includes>
         <include>*.jar</include>
       </includes>
-  </fileSet>
-   <fileSet>
+    </fileSet>
+    <fileSet>
       <directory>${project.basedir}/bundle</directory>
       <outputDirectory>bundle</outputDirectory>
       <useDefaultExcludes>true</useDefaultExcludes>
       <includes>
         <include>*.jar</include>
       </includes>
-  </fileSet>
-  <fileSet>
-      <directory>${project.basedir}/conf</directory>
-      <outputDirectory>conf</outputDirectory>
-      <useDefaultExcludes>true</useDefaultExcludes>
-      <includes>
-        <include>*.properties</include>
-      </includes>
-  </fileSet>
-  <fileSet>
+    </fileSet>
+    <fileSet>
       <directory>${project.basedir}/doc</directory>
       <outputDirectory>doc</outputDirectory>
       <useDefaultExcludes>true</useDefaultExcludes>
       <includes>
         <include>**</include>
       </includes>                                                                                    
-  </fileSet>
-  <fileSet>
+    </fileSet>
+    <fileSet>
       <directory>${project.basedir}</directory>
       <includes>
         <include>README*</include>
@@ -65,6 +57,13 @@
       </includes>
       <outputDirectory>.</outputDirectory>
       <useDefaultExcludes>true</useDefaultExcludes>
-  </fileSet>
+    </fileSet>
   </fileSets>
+  <files>
+    <file>
+      <source>${project.basedir}/conf/config.properties</source>
+      <outputDirectory>conf</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+  </files>
 </assembly>

main.distribution/pom.xml

diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index 15459fc..9f85c7c 100644
--- a/main.distribution/pom.xml
+++ b/main.distribution/pom.xml
@@ -29,6 +29,7 @@
   <artifactId>org.apache.felix.main.distribution</artifactId>
   <version>3.1.0-SNAPSHOT</version>
   <properties>
+    <dollar>$</dollar>
     <framework.version>3.1.0-SNAPSHOT</framework.version>
     <gogo.runtime.version>0.6.1</gogo.runtime.version>
     <gogo.shell.version>0.6.1</gogo.shell.version>