geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r656887 - in /geronimo/server/trunk: ./ plugins/dojo-legacy/geronimo-dojo-legacy/ plugins/dojo/geronimo-dojo/ plugins/j2ee/geronimo-j2ee-builder/ plugins/tomcat/geronimo-tomcat6-builder/ repository/ repository/org/dojotoolkit/dojo-ajax/ rep...
Date Thu, 15 May 2008 22:52:19 GMT
Author: jdillon
Date: Thu May 15 15:52:18 2008
New Revision: 656887

URL: http://svn.apache.org/viewvc?rev=656887&view=rev
Log:
Upgrade maven-dependency-plugin to 2.0
Replace dojo .tar.gz bits with .zip ones instead, this prevents the build from having to unarchive
the .gz into /tmp, which may or may not be on another filesystem, and when its not the same
the build crawls.  Also the plexus tar.gz bits are buggy and can't handle files with spaces.
 Also using the names of the release artifacts for clarity.
Removed the need for dojoVersion and dojoLegacyVersion properties

Added:
    geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/
    geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/0.4.3/
    geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/0.4.3/dojo-ajax-0.4.3.zip 
 (with props)
    geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/0.4.3/dojo-ajax-0.4.3.zip.md5
    geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/
    geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/1.1.0/
    geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/1.1.0/dojo-release-1.1.0.zip
  (with props)
    geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/1.1.0/dojo-release-1.1.0.zip.md5
Removed:
    geronimo/server/trunk/repository/org/dojotoolkit/dojo/
    geronimo/server/trunk/repository/org/dojotoolkit/dojolegacy/
Modified:
    geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml
    geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml
    geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/repository/pom.xml

Modified: geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml?rev=656887&r1=656886&r2=656887&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml Thu May 15 15:52:18
2008
@@ -30,7 +30,7 @@
     
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-dojo-legacy</artifactId>
-    <name>Geronimo Plugins, Dojo Legacy :: Core</name>
+    <name>Geronimo Plugins, Dojo Legacy :: WAR</name>
     <packaging>war</packaging>
 
     <description>
@@ -49,13 +49,12 @@
         
         <dependency>
             <groupId>org.dojotoolkit</groupId>
-            <artifactId>dojolegacy</artifactId>
-            <version>${dojoLegacyVersion}</version>
-            <type>tgz</type>
+            <artifactId>dojo-ajax</artifactId>
+            <type>zip</type>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <!-- this build process extracts certain files from dojo.tgz into a webapp. -->
     <build>
         <plugins>
             <plugin>
@@ -63,7 +62,6 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack</id>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
@@ -71,9 +69,8 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.dojotoolkit</groupId>
-                                    <artifactId>dojolegacy</artifactId>
-                                    <version>${dojoLegacyVersion}</version>
-                                    <type>tgz</type>
+                                    <artifactId>dojo-ajax</artifactId>
+                                    <type>zip</type>
                                     <outputDirectory>${project.build.directory}</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
@@ -83,13 +80,43 @@
                 </executions>
             </plugin>
             
+            <!--
+            NOTE: This will figure out where we have upacked the dojo bits (above).
+            -->
+            
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                def targetDir = new File(project.build.directory)
+                                def unpackDir
+                                
+                                targetDir.eachFileMatch(~'dojo-.*') {
+                                    unpackDir = it
+                                }
+                                assert unpackDir
+                                
+                                session.currentProject.properties['dojoUnpackDir'] = unpackDir.absolutePath
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <webResources>
                         <resource>
-                            <directory>${project.build.directory}/dojo-${dojoLegacyVersion}-ajax/</directory>
+                            <directory>${dojoUnpackDir}</directory>
                             <includes>
                                 <include>src/**</include>
                                 <include>*.js</include>
@@ -114,7 +141,7 @@
                             </includes>
                         </resource>
                     </webResources>
-                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                    <webXml>${project.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml?rev=656887&r1=656886&r2=656887&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml (original)
+++ geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml Thu May 15 15:52:18 2008
@@ -49,13 +49,12 @@
         
         <dependency>
             <groupId>org.dojotoolkit</groupId>
-            <artifactId>dojo</artifactId>
-            <version>${dojoVersion}</version>
-            <type>tgz</type>
+            <artifactId>dojo-release</artifactId>
+            <type>zip</type>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <!-- this build process extracts certain files from dojo.tgz into a webapp. -->
     <build>
         <plugins>
             <plugin>
@@ -63,7 +62,6 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack</id>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
@@ -71,10 +69,8 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.dojotoolkit</groupId>
-                                    <artifactId>dojo</artifactId>
-                                    <version>${dojoVersion}</version>
-                                    <type>tgz</type>
-                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <artifactId>dojo-release</artifactId>
+                                    <type>zip</type>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}</outputDirectory>
@@ -83,19 +79,45 @@
                 </executions>
             </plugin>
             
+            <!--
+            NOTE: This will figure out where we have upacked the dojo bits (above).
+            -->
+            
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                def targetDir = new File(project.build.directory)
+                                def unpackDir
+                                
+                                targetDir.eachFileMatch(~'dojo-.*') {
+                                    unpackDir = it
+                                }
+                                assert unpackDir
+                                
+                                session.currentProject.properties['dojoUnpackDir'] = unpackDir.absolutePath
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <webResources>
                         <resource>
-                            <directory>${project.build.directory}/dojo-release-${dojoVersion}/</directory>
+                            <directory>${dojoUnpackDir}</directory>
                             <includes>
                                 <include>**</include>
-                                <include>dojo/**</include>
-                                <include>dojox/**</include>
-                                <include>util/**</include>
-                                <include>dijit/**</include>
                             </includes>
                         </resource>
                         
@@ -114,7 +136,7 @@
                             </includes>
                         </resource>
                     </webResources>
-                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                    <webXml>${project.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml?rev=656887&r1=656886&r2=656887&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml Thu May 15 15:52:18 2008
@@ -102,14 +102,12 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-test-deployments</id>
                         <phase>generate-test-resources</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}</outputDirectory>
-
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.apache.geronimo.testsupport</groupId>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml?rev=656887&r1=656886&r2=656887&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml Thu May 15 15:52:18
2008
@@ -127,7 +127,6 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-endorsed-jars</id>
                         <phase>process-test-resources</phase>
                         <goals>
                             <goal>copy</goal>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=656887&r1=656886&r2=656887&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu May 15 15:52:18 2008
@@ -76,8 +76,6 @@
         <derbyVersion>10.2.2.0</derbyVersion>
         <tomcatVersion>6.0.14</tomcatVersion>
         <tranqlVendorsVersion>1.4</tranqlVendorsVersion>
-        <dojoVersion>1.1.0</dojoVersion>
-        <dojoLegacyVersion>0.4.3</dojoLegacyVersion>
         <cxfVersion>2.0.2-incubator</cxfVersion>
         <axis2Version>1.3</axis2Version>
         <axiomVersion>1.2.5</axiomVersion>
@@ -1414,7 +1412,7 @@
                 <artifactId>ant-launcher</artifactId>
                 <version>1.7.0</version>
             </dependency>
-
+            
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-classworlds</artifactId>
@@ -1621,16 +1619,16 @@
 
             <dependency>
                 <groupId>org.dojotoolkit</groupId>
-                <artifactId>dojo</artifactId>
-                <version>${dojoVersion}</version>
-                <type>tgz</type>
+                <artifactId>dojo-release</artifactId>
+                <version>1.1.0</version>
+                <type>zip</type>
             </dependency>
 
             <dependency>
                 <groupId>org.dojotoolkit</groupId>
-                <artifactId>dojolegacy</artifactId>
-                <version>${dojoLegacyVersion}</version>
-                <type>tgz</type>
+                <artifactId>dojo-ajax</artifactId>
+                <version>0.4.3</version>
+                <type>zip</type>
             </dependency>
 
             <!-- archive support -->
@@ -1874,13 +1872,10 @@
     <build>
         <pluginManagement>
             <plugins>
-                <!--
-                TODO: Upgrade to 2.2-beta-2
-                -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-1</version>
+                    <version>2.2-beta-2</version>
                 </plugin>
 
                 <plugin>
@@ -2112,7 +2107,10 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0-alpha-4</version>
+                    <version>2.0</version>
+                    <configuration>
+                        <silent>true</silent>
+                    </configuration>
                 </plugin>
 
                 <plugin>

Added: geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/0.4.3/dojo-ajax-0.4.3.zip
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/0.4.3/dojo-ajax-0.4.3.zip?rev=656887&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/0.4.3/dojo-ajax-0.4.3.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/0.4.3/dojo-ajax-0.4.3.zip.md5
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/0.4.3/dojo-ajax-0.4.3.zip.md5?rev=656887&view=auto
==============================================================================
--- geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/0.4.3/dojo-ajax-0.4.3.zip.md5
(added)
+++ geronimo/server/trunk/repository/org/dojotoolkit/dojo-ajax/0.4.3/dojo-ajax-0.4.3.zip.md5
Thu May 15 15:52:18 2008
@@ -0,0 +1 @@
+MD5 (dojo-ajax-0.4.3.zip) = a18fa80100f3b9f452543fe63b957e1a

Added: geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/1.1.0/dojo-release-1.1.0.zip
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/1.1.0/dojo-release-1.1.0.zip?rev=656887&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/1.1.0/dojo-release-1.1.0.zip
------------------------------------------------------------------------------
    svn:mime-type = application/zip

Added: geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/1.1.0/dojo-release-1.1.0.zip.md5
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/1.1.0/dojo-release-1.1.0.zip.md5?rev=656887&view=auto
==============================================================================
--- geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/1.1.0/dojo-release-1.1.0.zip.md5
(added)
+++ geronimo/server/trunk/repository/org/dojotoolkit/dojo-release/1.1.0/dojo-release-1.1.0.zip.md5
Thu May 15 15:52:18 2008
@@ -0,0 +1 @@
+6ea4f962191354129ff458f4da7e74f1  dojo-release-1.1.0.zip

Modified: geronimo/server/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/pom.xml?rev=656887&r1=656886&r2=656887&view=diff
==============================================================================
--- geronimo/server/trunk/repository/pom.xml (original)
+++ geronimo/server/trunk/repository/pom.xml Thu May 15 15:52:18 2008
@@ -31,7 +31,6 @@
 
     <artifactId>repository</artifactId>
     <name>Geronimo Local Repository</name>
-    <packaging>jar</packaging>
 
     <description>
         Container for local artifacts, this is a temporary solution until a more
@@ -51,16 +50,14 @@
 
         <dependency>
             <groupId>org.dojotoolkit</groupId>
-            <artifactId>dojolegacy</artifactId>
-            <version>${dojoLegacyVersion}</version>
-            <type>tgz</type>
+            <artifactId>dojo-ajax</artifactId>
+            <type>zip</type>
         </dependency>
 
         <dependency>
             <groupId>org.dojotoolkit</groupId>
-            <artifactId>dojo</artifactId>
-            <version>${dojoVersion}</version>
-            <type>tgz</type>
+            <artifactId>dojo-release</artifactId>
+            <type>zip</type>
         </dependency>
 
         <!--



Mime
View raw message