You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2011/04/13 22:48:51 UTC

svn commit: r1091915 - /karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml

Author: anierbeck
Date: Wed Apr 13 20:48:50 2011
New Revision: 1091915

URL: http://svn.apache.org/viewvc?rev=1091915&view=rev
Log:
[KARAF-568] - minimal assembly: zip and tar.gz do differ in content

Modified:
    karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml

Modified: karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml?rev=1091915&r1=1091914&r2=1091915&view=diff
==============================================================================
--- karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml (original)
+++ karaf/trunk/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin.xml Wed Apr 13 20:48:50 2011
@@ -15,7 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<assembly>
+<assembly xmlns='http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1'
+          xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+          xsi:schemaLocation='http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd'>
     <id>minimal</id>
     <!-- Used as artifact discriminator -->
     <formats>
@@ -26,7 +28,7 @@
 
         <!-- Copy license and other files from root -->
         <fileSet>
-            <directory>../..</directory>
+            <directory>${basedir}/../..</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>README</include>
@@ -39,7 +41,7 @@
 
         <!-- Copy over everything that needs to get dos line endings -->
         <fileSet>
-            <directory>target/classes/text</directory>
+            <directory>src/main/distribution/text</directory>
             <outputDirectory>/</outputDirectory>
             <lineEnding>dos</lineEnding>
         </fileSet>