geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r375204 - in /geronimo/trunk: assemblies/j2ee-installer/ assemblies/j2ee-jetty-server/ assemblies/j2ee-tomcat-server/ assemblies/minimal-tomcat-server/ assemblies/web-jms-tomcat-server/ etc/ plugins/geronimo-assembly-plugin/
Date Mon, 06 Feb 2006 06:43:40 GMT
Author: jsisson
Date: Sun Feb  5 22:43:38 2006
New Revision: 375204

URL: http://svn.apache.org/viewcvs?rev=375204&view=rev
Log:
GERONIMO-1566 - fix issue where binary distributions (both zip and tgz) contain a META-INF/manifest.mf
file under the geronimo-1.0 directory.

Modified:
    geronimo/trunk/assemblies/j2ee-installer/project.xml
    geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
    geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
    geronimo/trunk/assemblies/minimal-tomcat-server/project.xml
    geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml
    geronimo/trunk/etc/project.properties
    geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
    geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml

Modified: geronimo/trunk/assemblies/j2ee-installer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/project.xml?rev=375204&r1=375203&r2=375204&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/project.xml Sun Feb  5 22:43:38 2006
@@ -467,6 +467,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>unpack</geronimo.assemble>
+                <geronimo.assemble.unpack.exclude.manifest>true</geronimo.assemble.unpack.exclude.manifest>
             </properties>
         </dependency>
 

Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=375204&r1=375203&r2=375204&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Sun Feb  5 22:43:38 2006
@@ -362,6 +362,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>unpack</geronimo.assemble>
+                <geronimo.assemble.unpack.exclude.manifest>true</geronimo.assemble.unpack.exclude.manifest>
             </properties>
         </dependency>
 

Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml?rev=375204&r1=375203&r2=375204&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/project.xml Sun Feb  5 22:43:38 2006
@@ -362,6 +362,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>unpack</geronimo.assemble>
+                <geronimo.assemble.unpack.exclude.manifest>true</geronimo.assemble.unpack.exclude.manifest>
             </properties>
         </dependency>
 

Modified: geronimo/trunk/assemblies/minimal-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/minimal-tomcat-server/project.xml?rev=375204&r1=375203&r2=375204&view=diff
==============================================================================
--- geronimo/trunk/assemblies/minimal-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/minimal-tomcat-server/project.xml Sun Feb  5 22:43:38 2006
@@ -162,6 +162,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>unpack</geronimo.assemble>
+                <geronimo.assemble.unpack.exclude.manifest>true</geronimo.assemble.unpack.exclude.manifest>
             </properties>
         </dependency>
 

Modified: geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml?rev=375204&r1=375203&r2=375204&view=diff
==============================================================================
--- geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml (original)
+++ geronimo/trunk/assemblies/web-jms-tomcat-server/project.xml Sun Feb  5 22:43:38 2006
@@ -316,6 +316,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <geronimo.assemble>unpack</geronimo.assemble>
+                <geronimo.assemble.unpack.exclude.manifest>true</geronimo.assemble.unpack.exclude.manifest>
             </properties>
         </dependency>
 

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=375204&r1=375203&r2=375204&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Sun Feb  5 22:43:38 2006
@@ -86,7 +86,7 @@
 release_notes_version=1.0
 
 geronimo_packaging_plugin_version=1.1.3
-geronimo_assembly_plugin_version=1.1.7
+geronimo_assembly_plugin_version=1.1.8
 geronimo_deployment_plugin_version=1.1.1
 geronimo_dependency_plugin_version=1.1.1
 

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?rev=375204&r1=375203&r2=375204&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Sun Feb  5 22:43:38 2006
@@ -115,6 +115,7 @@
 
     <goal name="assemble:assemble-unpack">
         <ant:mkdir dir="${geronimo.assembly.dest}"/>
+        <j:set var="excludeManifest" value="false"/>
         <ant:unjar dest="${geronimo.assembly.dest}">
             <ant:fileset dir="${maven.repo.local}">
                 <j:set var="hasUnpack" value="false"/>
@@ -123,13 +124,26 @@
                     <j:if test="${dependency.getProperty('geronimo.assemble') == 'unpack'}">
                         <ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/>
                         <j:set var="hasUnpack" value="true"/>
+                        <j:if test="${dependency.getProperty('geronimo.assemble.unpack.exclude.manifest')
== 'true'}">
+                            <j:set var="excludeManifest" value="true"/>
+                        </j:if>
                     </j:if>
                 </j:forEach>
                 <j:if test="${hasUnpack == 'false'}">
                     <ant:exclude name="**/*"/>
                 </j:if>
             </ant:fileset>
+            <j:if test="${excludeManifest == 'true'}">
+                <ant:patternset>
+                    <!-- this exclude leaves an empty META-INF directory 
+                         that we delete below -->
+                    <ant:exclude name="META-INF/MANIFEST.MF"/>
+                </ant:patternset>        
+            </j:if>
         </ant:unjar>
+        <j:if test="${excludeManifest == 'true'}">
+           <ant:delete dir="${geronimo.assembly.dest}/META-INF"/>
+        </j:if>
         <ant:chmod dir="${geronimo.assembly.dest}/bin" perm="ugo+x" includes="*.sh"/>
     </goal>
 

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml?rev=375204&r1=375203&r2=375204&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml Sun Feb  5 22:43:38 2006
@@ -23,7 +23,7 @@
     <id>geronimo-assembly-plugin</id>
     <name>Geronimo :: Maven Assembly Plugin</name>
     <description>A plugin used to assemble a distribution of Geronimo</description>
-    <currentVersion>1.1.7</currentVersion>
+    <currentVersion>1.1.8</currentVersion>
 
     <dependencies>
         <dependency>



Mime
View raw message