directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r618660 - in /directory/studio/branches/studio-maven: pom.xml studio/pom.xml
Date Tue, 05 Feb 2008 14:24:29 GMT
Author: pamarcelot
Date: Tue Feb  5 06:24:25 2008
New Revision: 618660

URL: http://svn.apache.org/viewvc?rev=618660&view=rev
Log:
Moved the maven-dependency-plugin to version 2.0, updated type (tar.gz) for artifacts launcher-macosx
and launcher-win32.

Modified:
    directory/studio/branches/studio-maven/pom.xml
    directory/studio/branches/studio-maven/studio/pom.xml

Modified: directory/studio/branches/studio-maven/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-maven/pom.xml?rev=618660&r1=618659&r2=618660&view=diff
==============================================================================
--- directory/studio/branches/studio-maven/pom.xml (original)
+++ directory/studio/branches/studio-maven/pom.xml Tue Feb  5 06:24:25 2008
@@ -140,7 +140,7 @@
       <dependency>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.0-alpha-4</version>
+        <version>2.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
@@ -181,13 +181,13 @@
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>launcher-macosx</artifactId>
         <version>1.1.0</version>
-        <type>zip</type>
+        <type>tar.gz</type>
       </dependency>
       <dependency>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>launcher-win32</artifactId>
         <version>1.1.0</version>
-        <type>zip</type>
+        <type>tar.gz</type>
       </dependency>
 
       <!-- Eclipse RCP artifacts -->

Modified: directory/studio/branches/studio-maven/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-maven/studio/pom.xml?rev=618660&r1=618659&r2=618660&view=diff
==============================================================================
--- directory/studio/branches/studio-maven/studio/pom.xml (original)
+++ directory/studio/branches/studio-maven/studio/pom.xml Tue Feb  5 06:24:25 2008
@@ -590,15 +590,13 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>launcher-macosx (unpack)</id>
-                <!-- Unpack the launcher and equinox launcher -->
+                <id>launcher-macosx (copy)</id>
+                <!-- Copy the launcher and equinox launcher -->
                 <phase>generate-resources</phase>
                 <goals>
-                  <goal>unpack</goal>
+                  <goal>copy</goal>
                 </goals>
                 <configuration>
-                  <overWrite>true</overWrite>
-                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/macosx</markersDirectory>
                   <artifactItems>
                     <artifactItem>
                       <groupId>org.apache.directory.studio</groupId>
@@ -607,10 +605,10 @@
                       <outputDirectory>${studio-dir}-macosx</outputDirectory>
                     </artifactItem>
                     <artifactItem>
-                      <groupId>org.eclipse.equinox.launcher.carbon</groupId>
+                    <groupId>org.eclipse.equinox.launcher.carbon</groupId>
                       <artifactId>macosx</artifactId>
                       <type>tar.gz</type>
-                      <outputDirectory>${studio-dir}-macosx/Apache Directory Studio.app/Contents/Resources/Java/plugins</outputDirectory>
+                      <outputDirectory>${studio-dir}-macosx</outputDirectory>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -618,6 +616,51 @@
             </executions>
           </plugin>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>launcher-macosx (unpack)</id>
+                <!-- Unpack the launcher and equinox launcher -->
+                <phase>generate-resources</phase>
+                <configuration>
+                  <tasks>
+                    <untar dest="${studio-dir}-macosx" compression="gzip">
+                        <fileset dir="${studio-dir}-macosx" includes="launcher-macosx*.tar.gz"/>
+                    </untar>
+                    <untar dest="${studio-dir}-macosx/Apache Directory Studio.app/Contents/Resources/Java/plugins"
compression="gzip">
+                        <fileset dir="${studio-dir}-macosx" includes="macosx*.tar.gz"/>
+                    </untar>
+                    <delete>
+                        <fileset dir="${studio-dir}-macosx/" includes="*.tar.gz"/>
+                    </delete>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>unpack-dist-macosx (for immediate use)</id>
+              <!-- 
+                Finally and after all unzip the created distribution in
+                ../target/distributions to have a working application there for
+                immediate use.
+              -->
+                <phase>install</phase>
+                <configuration>
+                  <tasks>
+                    <untar src="../target/distributions/ApacheDirectoryStudio-macosx-${pom.version}-dist.tar.gz"
dest="../target/distributions" overwrite="true" compression="gzip" />
+                    <chmod file="../target/distributions/ApacheDirectoryStudio-macosx-${pom.version}/Apache
Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" perm="755" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
             <groupId>org.apache.directory.studio</groupId>
             <artifactId>maven-studio-plugin</artifactId>
             <executions>
@@ -667,29 +710,6 @@
                 </configuration>
                 <goals>
                   <goal>attached</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <!-- 
-                Finally and after all unzip the created distribution in
-                ../target/distributions to have a working application there for
-                immediate use.
-              -->
-              <execution>
-                <id>unpack-dist-macosx (for immediate use)</id>
-                <phase>install</phase>
-                <configuration>
-                  <tasks>
-                    <untar src="../target/distributions/ApacheDirectoryStudio-macosx-${pom.version}-dist.tar.gz"
dest="../target/distributions" overwrite="true" compression="gzip" />
-                    <chmod file="../target/distributions/ApacheDirectoryStudio-macosx-${pom.version}/Apache
Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" perm="755" />
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
                 </goals>
               </execution>
             </executions>



Mime
View raw message