directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r608665 - in /directory/sandbox/felixk: ./ studio/ studio/src/main/assembly/
Date Thu, 03 Jan 2008 22:37:08 GMT
Author: felixk
Date: Thu Jan  3 14:37:07 2008
New Revision: 608665

URL: http://svn.apache.org/viewvc?rev=608665&view=rev
Log:
Adapt the build process for distributions.

Added:
    directory/sandbox/felixk/studio/src/main/assembly/bin-linux-x86.xml
      - copied, changed from r608612, directory/sandbox/felixk/studio/src/main/assembly/bin-linux-i386.xml
    directory/sandbox/felixk/studio/src/main/assembly/bin-linux-x86_64.xml
      - copied, changed from r608612, directory/sandbox/felixk/studio/src/main/assembly/bin-linux-amd64.xml
    directory/sandbox/felixk/studio/src/main/assembly/bin-macosx.xml
      - copied, changed from r608612, directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml
    directory/sandbox/felixk/studio/src/main/assembly/bin-win32.xml
      - copied, changed from r608612, directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml
Removed:
    directory/sandbox/felixk/studio/src/main/assembly/bin-linux-amd64.xml
    directory/sandbox/felixk/studio/src/main/assembly/bin-linux-i386.xml
    directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml
    directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-ppc.xml
    directory/sandbox/felixk/studio/src/main/assembly/bin-windows-amd64.xml
    directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml
Modified:
    directory/sandbox/felixk/pom.xml
    directory/sandbox/felixk/studio/pom.xml
    directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml

Modified: directory/sandbox/felixk/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/pom.xml?rev=608665&r1=608664&r2=608665&view=diff
==============================================================================
--- directory/sandbox/felixk/pom.xml (original)
+++ directory/sandbox/felixk/pom.xml Thu Jan  3 14:37:07 2008
@@ -126,23 +126,21 @@
 
     <!-- Linux i386 GTK-->
     <profile>
-      <id>linux-i386</id>
+      <id>linux-x86</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
       <properties>
         <swt.platformrelated.groupId>org.eclipse.swt.gtk.linux</swt.platformrelated.groupId>
-        <launcher.platformrelated.groupId>org.eclipse.equinox.launcher.gtk.linux</launcher.platformrelated.groupId>
         <platformrelated.artifactId>x86</platformrelated.artifactId>
       </properties>
     </profile>
 
     <!-- Linux AMD64 GTK-->
     <profile>
-      <id>linux-amd64</id>
+      <id>linux-x86_64</id>
       <properties>
         <swt.platformrelated.groupId>org.eclipse.swt.gtk.linux</swt.platformrelated.groupId>
-        <launcher.platformrelated.groupId>org.eclipse.equinox.launcher.gtk.linux</launcher.platformrelated.groupId>
         <platformrelated.artifactId>x86_64</platformrelated.artifactId>
       </properties>
     </profile>
@@ -152,49 +150,24 @@
       <id>linux-ppc</id>
       <properties>
         <swt.platformrelated.groupId>org.eclipse.swt.gtk.linux</swt.platformrelated.groupId>
-        <launcher.platformrelated.groupId>org.eclipse.equinox.launcher.gtk.linux</launcher.platformrelated.groupId>
         <platformrelated.artifactId>ppc</platformrelated.artifactId>
       </properties>
     </profile>
 
     <!-- Windows -->
     <profile>
-      <id>windows-x86</id>
+      <id>win32</id>
       <properties>
         <swt.platformrelated.groupId>org.eclipse.swt.win32.win32</swt.platformrelated.groupId>
-        <launcher.platformrelated.groupId>org.eclipse.equinox.launcher.win32.win32</launcher.platformrelated.groupId>
         <platformrelated.artifactId>x86</platformrelated.artifactId>
       </properties>
     </profile>
 
-    <!-- Windows x86_64 -->
-    <profile>
-      <id>windows-amd64</id>
-      <properties>
-        <!-- only available for SDK/RCP >= 3.4
-          <swt.platformrelated.groupId>org.eclipse.swt.???</swt.platformrelated.groupId>
-        <launcher.platformrelated.groupId>org.eclipse.equinox.launcher.???</launcher.platformrelated.groupId>
-          <platformrelated.artifactId>???</platformrelated.artifactId>
-        -->
-      </properties>
-    </profile>
-
     <!-- Mac OS X i386 -->
     <profile>
-      <id>mac-os-x-i386</id>
-      <properties>
-        <swt.platformrelated.groupId>org.eclipse.swt.carbon</swt.platformrelated.groupId>
-        <launcher.platformrelated.groupId>org.eclipse.equinox.launcher.carbon</launcher.platformrelated.groupId>
-        <platformrelated.artifactId>macosx</platformrelated.artifactId>
-      </properties>
-    </profile>
-
-    <!-- Mac OS X PPC -->
-    <profile>
-      <id>mac-os-x-ppc</id>
+      <id>macosx</id>
       <properties>
         <swt.platformrelated.groupId>org.eclipse.swt.carbon</swt.platformrelated.groupId>
-        <launcher.platformrelated.groupId>org.eclipse.equinox.launcher.carbon</launcher.platformrelated.groupId>
         <platformrelated.artifactId>macosx</platformrelated.artifactId>
       </properties>
     </profile>
@@ -231,22 +204,22 @@
 
       <!-- Eclipse RCP binaries -->
       <dependency>
-        <groupId>org.eclipse</groupId>
-        <artifactId>eclipse-RCP-macosx-carbon</artifactId>
-        <version>3.3.1.1</version>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>launcher-linux</artifactId>
+        <version>1.1.0</version>
         <type>tar.gz</type>
       </dependency>
       <dependency>
-        <groupId>org.eclipse</groupId>
-        <artifactId>eclipse-RCP-linux-gtk</artifactId>
-        <version>3.3.1.1</version>
-        <type>tar.gz</type>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>launcher-macosx</artifactId>
+        <version>1.1.0</version>
+        <type>zip</type>
       </dependency>
       <dependency>
-        <groupId>org.eclipse</groupId>
-        <artifactId>eclipse-RCP-win32</artifactId>
-        <version>3.3.1.1</version>
-        <type>tar.gz</type>
+        <groupId>org.apache.directory.studio</groupId>
+        <artifactId>launcher-win32</artifactId>
+        <version>1.1.0</version>
+        <type>zip</type>
       </dependency>
 
       <!-- Eclipse RCP artifacts -->

Modified: directory/sandbox/felixk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/pom.xml?rev=608665&r1=608664&r2=608665&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/pom.xml (original)
+++ directory/sandbox/felixk/studio/pom.xml Thu Jan  3 14:37:07 2008
@@ -30,7 +30,24 @@
   <name>Studio Build</name>
   <packaging>jar</packaging>
 
-  <description></description>
+  <description>Building distributions for the Apache Directory Studio</description>
+
+  <!-- 
+    How building a dist works:
+    We presume that all needed dependencies are already somehow available (normally this is the case with mvn install from root)
+    
+    - Put all profile specific stuff into a specific folder (target/ApacheDirectoryStudio-{profile}
+    - Put all general stuff into a folder (target/ApacheDirectoryStudio)
+    
+    - Let the assembly plugin do its work. For each profile exists an assembly-descriptor (src/main/assembly).
+    - In general you can say a distribution is a merge of the profile specific and the general folder.
+    - The distribution stored in the ../target/distribution folder and name by its profile.
+    - In the end the distribution is unzipped in ../target/distribution for immediate use
+    
+    Note: You can build different distribution in a single run a take the benefits of the general folder. Run e.g.
+          mvn clean install -Plinux-x86,linux-x86_64,linux-ppc,macosx,win32 -Dmaven.test.skip=true
+          from the projects root to generate all available distribution in one run.
+  -->
 
   <!-- Set some properties -->
   <properties>
@@ -38,9 +55,13 @@
   </properties>
 
   <profiles>
-    <!-- Linux i386 GTK-->
     <profile>
-      <id>linux-i386</id>
+      <id>linux-x86</id>
+      <!--
+        Everything in here is linux-x86 specific. 
+        All sources/dependencies within this profile go to
+        target/ApacheDirectoryStudio-linux-x86 
+      -->
       <build>
         <plugins>
           <plugin>
@@ -48,20 +69,27 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>unpack-eclipse-rcp-linux-i386</id>
+                <id>launcher-linux-x86 (unpack)</id>
+                <!-- Unpack the launcher and equinox launcher -->
                 <phase>generate-resources</phase>
                 <goals>
                   <goal>unpack</goal>
                 </goals>
                 <configuration>
-                  <overWrite>false</overWrite>
-                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/linux-i386</markersDirectory>
+                  <overWrite>true</overWrite>
+                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/linux-x86</markersDirectory>
                   <artifactItems>
                     <artifactItem>
-                      <groupId>org.eclipse</groupId>
-                      <artifactId>eclipse-RCP-linux-gtk</artifactId>
+                      <groupId>org.apache.directory.studio</groupId>
+                      <artifactId>launcher-linux</artifactId>
                       <type>tar.gz</type>
-                      <outputDirectory>target/linux-i386</outputDirectory>
+                      <outputDirectory>${studio-dir}-linux-x86</outputDirectory>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
+                      <artifactId>x86</artifactId>
+                      <type>tar.gz</type>
+                      <outputDirectory>${studio-dir}-linux-x86/plugins</outputDirectory>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -69,63 +97,47 @@
             </executions>
           </plugin>
           <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
+            <groupId>org.apache.directory.studio</groupId>
+            <artifactId>maven-studio-plugin</artifactId>
             <executions>
               <execution>
-                <id>adapt-rcp-distribution-linux-i386</id>
+                <id>swt-linux-x86 (copy)</id>
+                <!-- Copy profile specific swt -->
                 <phase>generate-resources</phase>
-                <configuration>
-                  <tasks>
-                    <move file="target/linux-i386/eclipse" tofile="target/ApacheDirectoryStudio-linux-i386" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-i386" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-i386/about_files" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-i386/configuration" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-i386/features" />
-                    <delete>
-                      <fileset dir="target/ApacheDirectoryStudio-linux-i386/plugins" excludes="**/org.eclipse.swt.gtk.linux.x86*" />
-                    </delete>
-                    <delete dir="target/ApacheDirectoryStudio-linux-i386/readme" />
-                    <chmod file="target/ApacheDirectoryStudio-linux-i386/eclipse" perm="755" />
-                    <move file="target/ApacheDirectoryStudio-linux-i386/eclipse" tofile="target/ApacheDirectoryStudio-linux-i386/ApacheDirectoryStudio" />
-                  </tasks>
-                </configuration>
                 <goals>
-                  <goal>run</goal>
+                  <goal>copy-eclipse-artifact</goal>
                 </goals>
-              </execution>
-              <execution>
-                <id>unpack-dist-linux-i368</id>
-                <phase>install</phase>
                 <configuration>
-                  <tasks>
-                    <untar src="../target/distributions/ApacheDirectoryStudio-linux-i386-${pom.version}-dist.tar.gz" dest="../target/distributions" overwrite="true" compression="gzip" />
-                    <chmod file="../target/distributions/ApacheDirectoryStudio-linux-i386-${pom.version}/ApacheDirectoryStudio" perm="755" />
-                  </tasks>
+                  <destinationDirectory>${studio-dir}-linux-x86/plugins</destinationDirectory>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.eclipse.swt.gtk.linux</groupId>
+                      <artifactId>x86</artifactId>
+                    </artifactItem>
+                  </artifactItems>
                 </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
               </execution>
             </executions>
           </plugin>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
+            <!-- Create the distribution file -->
             <configuration>
-              <finalName>ApacheDirectoryStudio-linux-i386-${pom.version}</finalName>
+              <finalName>ApacheDirectoryStudio-linux-x86-${pom.version}</finalName>
               <outputDirectory>target/distributions</outputDirectory>
               <descriptors>
-                <descriptor>src/main/assembly/bin-linux-i386.xml</descriptor>
+                <descriptor>src/main/assembly/bin-linux-x86.xml</descriptor>
               </descriptors>
             </configuration>
             <executions>
               <execution>
-                <id>assembly-distribution-linux-i386</id>
+                <id>assembly-distribution-linux-x86</id>
                 <phase>package</phase>
                 <configuration>
-                  <finalName>ApacheDirectoryStudio-linux-i386-${pom.version}</finalName>
+                  <finalName>ApacheDirectoryStudio-linux-x86-${pom.version}</finalName>
                   <outputDirectory>../target/distributions</outputDirectory>
                   <descriptors>
-                    <descriptor>src/main/assembly/bin-linux-i386.xml</descriptor>
+                    <descriptor>src/main/assembly/bin-linux-x86.xml</descriptor>
                   </descriptors>
                 </configuration>
                 <goals>
@@ -134,13 +146,40 @@
               </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-linux-x86 (for immediate use)</id>
+                <phase>install</phase>
+                <configuration>
+                  <tasks>
+                    <untar src="../target/distributions/ApacheDirectoryStudio-linux-x86-${pom.version}-dist.tar.gz" dest="../target/distributions" overwrite="true" compression="gzip" />
+                    <chmod file="../target/distributions/ApacheDirectoryStudio-linux-x86-${pom.version}/ApacheDirectoryStudio" perm="755" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
 
-    <!-- Linux AMD64 GTK-->
     <profile>
-      <id>linux-amd64</id>
+      <id>linux-x86_64</id>
+      <!--
+        Everything in here is linux-x86_64 specific. 
+        All sources/dependencies within this profile go to
+        target/ApacheDirectoryStudio-linux-x86_64 
+      -->
       <build>
         <plugins>
           <plugin>
@@ -148,21 +187,27 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>unpack-eclipse-rcp-linux-amd64</id>
+                <id>launcher-linux-x86_64 (unpack)</id>
+                <!-- Unpack the launcher and equinox launcher -->
                 <phase>generate-resources</phase>
                 <goals>
                   <goal>unpack</goal>
                 </goals>
                 <configuration>
-                  <overWrite>false</overWrite>
-                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/linux-amd64</markersDirectory>
+                  <overWrite>true</overWrite>
+                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/linux-x86_64</markersDirectory>
                   <artifactItems>
                     <artifactItem>
-                      <groupId>org.eclipse</groupId>
-                      <artifactId>eclipse-RCP-linux-gtk</artifactId>
-                      <classifier>x86_64</classifier>
+                      <groupId>org.apache.directory.studio</groupId>
+                      <artifactId>launcher-linux</artifactId>
                       <type>tar.gz</type>
-                      <outputDirectory>target/linux-amd64</outputDirectory>
+                      <outputDirectory>${studio-dir}-linux-x86_64</outputDirectory>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
+                      <artifactId>x86_64</artifactId>
+                      <type>tar.gz</type>
+                      <outputDirectory>${studio-dir}-linux-x86_64/plugins</outputDirectory>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -170,63 +215,47 @@
             </executions>
           </plugin>
           <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
+            <groupId>org.apache.directory.studio</groupId>
+            <artifactId>maven-studio-plugin</artifactId>
             <executions>
               <execution>
-                <id>adapt-rcp-distribution-linux-amd64</id>
+                <id>swt-linux-x86_64 (copy)</id>
+                <!-- Copy profile specific swt -->
                 <phase>generate-resources</phase>
-                <configuration>
-                  <tasks>
-                    <move file="target/linux-amd64/eclipse" tofile="target/ApacheDirectoryStudio-linux-amd64" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-amd64" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-amd64/about_files" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-amd64/configuration" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-amd64/features" />
-                    <delete>
-                      <fileset dir="target/ApacheDirectoryStudio-linux-amd64/plugins" excludes="**/org.eclipse.swt.gtk.linux.x86_64*" />
-                    </delete>
-                    <delete dir="target/ApacheDirectoryStudio-linux-amd64/readme" />
-                    <chmod file="target/ApacheDirectoryStudio-linux-amd64/eclipse" perm="755" />
-                    <move file="target/ApacheDirectoryStudio-linux-amd64/eclipse" tofile="target/ApacheDirectoryStudio-linux-amd64/ApacheDirectoryStudio" />
-                  </tasks>
-                </configuration>
                 <goals>
-                  <goal>run</goal>
+                  <goal>copy-eclipse-artifact</goal>
                 </goals>
-              </execution>
-              <execution>
-                <id>unpack-dist-linux-amd64</id>
-                <phase>install</phase>
                 <configuration>
-                  <tasks>
-                    <untar src="../target/distributions/ApacheDirectoryStudio-linux-amd64-${pom.version}-dist.tar.gz" dest="../target/distributions" overwrite="true" compression="gzip" />
-                    <chmod file="../target/distributions/ApacheDirectoryStudio-linux-amd64-${pom.version}/ApacheDirectoryStudio" perm="755" />
-                  </tasks>
+                  <destinationDirectory>${studio-dir}-linux-x86_64/plugins</destinationDirectory>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.eclipse.swt.gtk.linux</groupId>
+                      <artifactId>x86_64</artifactId>
+                    </artifactItem>
+                  </artifactItems>
                 </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
               </execution>
             </executions>
           </plugin>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
+            <!-- Create the distribution file -->
             <configuration>
-              <finalName>ApacheDirectoryStudio-linux-amd64-${pom.version}</finalName>
+              <finalName>ApacheDirectoryStudio-linux-x86_64-${pom.version}</finalName>
               <outputDirectory>target/distributions</outputDirectory>
               <descriptors>
-                <descriptor>src/main/assembly/bin-linux-amd64.xml</descriptor>
+                <descriptor>src/main/assembly/bin-linux-x86_64.xml</descriptor>
               </descriptors>
             </configuration>
             <executions>
               <execution>
-                <id>assembly-distribution-linux-amd64</id>
+                <id>assembly-distribution-linux-x86_64</id>
                 <phase>package</phase>
                 <configuration>
-                  <finalName>ApacheDirectoryStudio-linux-amd64-${pom.version}</finalName>
+                  <finalName>ApacheDirectoryStudio-linux-x86_64-${pom.version}</finalName>
                   <outputDirectory>../target/distributions</outputDirectory>
                   <descriptors>
-                    <descriptor>src/main/assembly/bin-linux-amd64.xml</descriptor>
+                    <descriptor>src/main/assembly/bin-linux-x86_64.xml</descriptor>
                   </descriptors>
                 </configuration>
                 <goals>
@@ -235,13 +264,40 @@
               </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-linux-x86_64 (for immediate use)</id>
+                <phase>install</phase>
+                <configuration>
+                  <tasks>
+                    <untar src="../target/distributions/ApacheDirectoryStudio-linux-x86_64-${pom.version}-dist.tar.gz" dest="../target/distributions" overwrite="true" compression="gzip" />
+                    <chmod file="../target/distributions/ApacheDirectoryStudio-linux-x86_64-${pom.version}/ApacheDirectoryStudio" perm="755" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
 
-    <!-- Linux PPC GTK-->
     <profile>
       <id>linux-ppc</id>
+      <!--
+        Everything in here is linux-ppc specific. 
+        All sources/dependencies within this profile go to
+        target/ApacheDirectoryStudio-linux-ppc 
+      -->
       <build>
         <plugins>
           <plugin>
@@ -249,21 +305,27 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>unpack-eclipse-rcp-linux-ppc</id>
+                <id>launcher-linux-ppc (unpack)</id>
+                <!-- Unpack the launcher and equinox launcher -->
                 <phase>generate-resources</phase>
                 <goals>
                   <goal>unpack</goal>
                 </goals>
                 <configuration>
-                  <overWrite>false</overWrite>
+                  <overWrite>true</overWrite>
                   <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/linux-ppc</markersDirectory>
                   <artifactItems>
                     <artifactItem>
-                      <groupId>org.eclipse</groupId>
-                      <artifactId>eclipse-RCP-linux-gtk</artifactId>
-                      <classifier>ppc</classifier>
+                      <groupId>org.apache.directory.studio</groupId>
+                      <artifactId>launcher-linux</artifactId>
                       <type>tar.gz</type>
-                      <outputDirectory>target/linux-ppc</outputDirectory>
+                      <outputDirectory>${studio-dir}-linux-ppc</outputDirectory>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.equinox.launcher.gtk.linux</groupId>
+                      <artifactId>ppc</artifactId>
+                      <type>tar.gz</type>
+                      <outputDirectory>${studio-dir}-linux-ppc/plugins</outputDirectory>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -271,49 +333,33 @@
             </executions>
           </plugin>
           <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
+            <groupId>org.apache.directory.studio</groupId>
+            <artifactId>maven-studio-plugin</artifactId>
             <executions>
               <execution>
-                <id>adapt-rcp-distribution-linux-ppc</id>
+                <id>swt-linux-ppc (copy)</id>
+                <!-- Copy profile specific swt -->
                 <phase>generate-resources</phase>
-                <configuration>
-                  <tasks>
-                    <move file="target/linux-ppc/eclipse" tofile="target/ApacheDirectoryStudio-linux-ppc" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-ppc" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-ppc/about_files" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-ppc/configuration" />
-                    <delete dir="target/ApacheDirectoryStudio-linux-ppc/features" />
-                    <delete>
-                      <fileset dir="target/ApacheDirectoryStudio-linux-ppc/plugins" excludes="**/org.eclipse.swt.gtk.linux.ppc*" />
-                    </delete>
-                    <delete dir="target/ApacheDirectoryStudio-linux-ppc/readme" />
-                    <chmod file="target/ApacheDirectoryStudio-linux-ppc/eclipse" perm="755" />
-                    <move file="target/ApacheDirectoryStudio-linux-ppc/eclipse" tofile="target/ApacheDirectoryStudio-linux-ppc/ApacheDirectoryStudio" />
-                  </tasks>
-                </configuration>
                 <goals>
-                  <goal>run</goal>
+                  <goal>copy-eclipse-artifact</goal>
                 </goals>
-              </execution>
-              <execution>
-                <id>unpack-dist-linux-ppc</id>
-                <phase>install</phase>
                 <configuration>
-                  <tasks>
-                    <untar src="../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}-dist.tar.gz" dest="../target/distributions" overwrite="true" compression="gzip" />
-                    <chmod file="../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}/ApacheDirectoryStudio" perm="755" />
-                  </tasks>
+                  <destinationDirectory>${studio-dir}-linux-ppc/plugins</destinationDirectory>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.eclipse.swt.gtk.linux</groupId>
+                      <artifactId>ppc</artifactId>
+                    </artifactItem>
+                  </artifactItems>
                 </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
               </execution>
             </executions>
           </plugin>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
+            <!-- Create the distribution file -->
             <configuration>
-              <finalName>ApacheDirectoryStudio-linux-pcc-${pom.version}</finalName>
+              <finalName>ApacheDirectoryStudio-linux-ppc-${pom.version}</finalName>
               <outputDirectory>target/distributions</outputDirectory>
               <descriptors>
                 <descriptor>src/main/assembly/bin-linux-ppc.xml</descriptor>
@@ -336,72 +382,21 @@
               </execution>
             </executions>
           </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!-- Windows -->
-    <profile>
-      <id>windows-x86</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-eclipse-rcp-windows-x86</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <overWrite>false</overWrite>
-                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/windows-x86</markersDirectory>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.eclipse</groupId>
-                      <artifactId>eclipse-RCP-win32</artifactId>
-                      <type>zip</type>
-                      <outputDirectory>target/windows-x86</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </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>adapt-rcp-distribution-windows-x86</id>
-                <phase>generate-resources</phase>
-                <configuration>
-                  <tasks>
-                    <move file="target/windows-x86/eclipse" tofile="target/ApacheDirectoryStudio-windows-x86" />
-                    <delete dir="target/ApacheDirectoryStudio-windows-x86" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
-                    <delete dir="target/ApacheDirectoryStudio-windows-x86/about_files" />
-                    <delete dir="target/ApacheDirectoryStudio-windows-x86/configuration" />
-                    <delete dir="target/ApacheDirectoryStudio-windows-x86/features" />
-                    <delete>
-                      <fileset dir="target/ApacheDirectoryStudio-windows-x86/plugins" excludes="**/org.eclipse.swt.win32.win32.x86*" />
-                    </delete>
-                    <delete dir="target/ApacheDirectoryStudio-windows-x86/readme" />
-                    <chmod file="target/ApacheDirectoryStudio-windows-x86/eclipse.exe" perm="755" />
-                    <move file="target/ApacheDirectoryStudio-windows-x86/eclipse.exe" tofile="target/ApacheDirectoryStudio-windows-x86/Apache Directory Studio.exe" />
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>unpack-dist-windows-x86</id>
+                <id>unpack-dist-linux-ppc (for immediate use)</id>
                 <phase>install</phase>
                 <configuration>
                   <tasks>
-                    <unzip src="../target/distributions/ApacheDirectoryStudio-windows-x86-${pom.version}-dist.zip" dest="../target/distributions" overwrite="true" />
-                    <chmod file="../target/distributions/ApacheDirectoryStudio-windows-x86-${pom.version}/ApacheDirectoryStudio" perm="755" />
+                    <untar src="../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}-dist.tar.gz" dest="../target/distributions" overwrite="true" compression="gzip" />
+                    <chmod file="../target/distributions/ApacheDirectoryStudio-linux-ppc-${pom.version}/ApacheDirectoryStudio" perm="755" />
                   </tasks>
                 </configuration>
                 <goals>
@@ -410,40 +405,17 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <configuration>
-              <finalName>ApacheDirectoryStudio-windows-x86-${pom.version}</finalName>
-              <outputDirectory>target/distributions</outputDirectory>
-              <descriptors>
-                <descriptor>src/main/assembly/bin-windows-x86.xml</descriptor>
-              </descriptors>
-            </configuration>
-            <executions>
-              <execution>
-                <id>assembly-distribution-windows-x86</id>
-                <phase>package</phase>
-                <configuration>
-                  <finalName>ApacheDirectoryStudio-windows-x86-${pom.version}</finalName>
-                  <outputDirectory>../target/distributions</outputDirectory>
-                  <descriptors>
-                    <descriptor>src/main/assembly/bin-windows-x86.xml</descriptor>
-                  </descriptors>
-                </configuration>
-                <goals>
-                  <goal>attached</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
 
-    <!-- Windows x86_64 -->
     <profile>
-      <id>windows-amd64</id>
-      <!-- only available for SDK/RCP >= 3.4 -->
+      <id>win32</id>
+      <!--
+        Everything in here is win32 specific. 
+        All sources/dependencies within this profile go to
+        target/ApacheDirectoryStudio-win32 
+      -->
       <build>
         <plugins>
           <plugin>
@@ -451,21 +423,27 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>unpack-eclipse-rcp-windows-amd64</id>
+                <id>launcher-win32 (unpack)</id>
+                <!-- Unpack the launcher and equinox launcher -->
                 <phase>generate-resources</phase>
                 <goals>
                   <goal>unpack</goal>
                 </goals>
                 <configuration>
-                  <overWrite>false</overWrite>
-                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/windows-amd64</markersDirectory>
+                  <overWrite>true</overWrite>
+                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/win32</markersDirectory>
                   <artifactItems>
                     <artifactItem>
-                      <groupId>org.eclipse</groupId>
-                      <artifactId>eclipse-RCP-win32</artifactId>
-                      <classifier>x86_64</classifier>
+                      <groupId>org.apache.directory.studio</groupId>
+                      <artifactId>launcher-win32</artifactId>
                       <type>zip</type>
-                      <outputDirectory>target/windows-amd64</outputDirectory>
+                      <outputDirectory>${studio-dir}-win32</outputDirectory>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.equinox.launcher.win32.win32</groupId>
+                      <artifactId>x86</artifactId>
+                      <type>tar.gz</type>
+                      <outputDirectory>${studio-dir}-win32/plugins</outputDirectory>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -473,63 +451,47 @@
             </executions>
           </plugin>
           <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
+            <groupId>org.apache.directory.studio</groupId>
+            <artifactId>maven-studio-plugin</artifactId>
             <executions>
               <execution>
-                <id>adapt-rcp-distribution-windows-amd64</id>
+                <id>swt-win32 (copy)</id>
+                <!-- Copy profile specific swt -->
                 <phase>generate-resources</phase>
-                <configuration>
-                  <tasks>
-                    <move file="target/windows-amd64/eclipse" tofile="target/ApacheDirectoryStudio-windows-amd64" />
-                    <delete dir="target/ApacheDirectoryStudio-windows-amd64" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
-                    <delete dir="target/ApacheDirectoryStudio-windows-amd64/about_files" />
-                    <delete dir="target/ApacheDirectoryStudio-windows-amd64/configuration" />
-                    <delete dir="target/ApacheDirectoryStudio-windows-amd64/features" />
-                    <delete>
-                      <fileset dir="target/ApacheDirectoryStudio-windows-amd64/plugins" excludes="**/org.eclipse.swt.win32.*" />
-                    </delete>
-                    <delete dir="target/ApacheDirectoryStudio-windows-amd64/readme" />
-                    <chmod file="target/ApacheDirectoryStudio-windows-amd64/eclipse.exe" perm="755" />
-                    <move file="target/ApacheDirectoryStudio-windows-amd64/eclipse.exe" tofile="target/ApacheDirectoryStudio-windows-amd64/Apache Directory Studio.exe" />
-                  </tasks>
-                </configuration>
                 <goals>
-                  <goal>run</goal>
+                  <goal>copy-eclipse-artifact</goal>
                 </goals>
-              </execution>
-              <execution>
-                <id>unpack-dist-windows-amd64</id>
-                <phase>install</phase>
                 <configuration>
-                  <tasks>
-                    <unzip src="../target/distributions/ApacheDirectoryStudio-windows-amd64-${pom.version}-dist.zip" dest="../target/distributions" overwrite="true" />
-                    <chmod file="../target/distributions/ApacheDirectoryStudio-windows-amd64-${pom.version}/ApacheDirectoryStudio" perm="755" />
-                  </tasks>
+                  <destinationDirectory>${studio-dir}-win32/plugins</destinationDirectory>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.eclipse.swt.win32.win32</groupId>
+                      <artifactId>x86</artifactId>
+                    </artifactItem>
+                  </artifactItems>
                 </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
               </execution>
             </executions>
           </plugin>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
+            <!-- Create the distribution file -->
             <configuration>
-              <finalName>ApacheDirectoryStudio-windows-amd64-${pom.version}</finalName>
+              <finalName>ApacheDirectoryStudio-win32-${pom.version}</finalName>
               <outputDirectory>target/distributions</outputDirectory>
               <descriptors>
-                <descriptor>src/main/assembly/bin-windows-amd64.xml</descriptor>
+                <descriptor>src/main/assembly/bin-win32.xml</descriptor>
               </descriptors>
             </configuration>
             <executions>
               <execution>
-                <id>assembly-distribution-windows-amd64</id>
+                <id>assembly-distribution-win32</id>
                 <phase>package</phase>
                 <configuration>
-                  <finalName>ApacheDirectoryStudio-windows-amd64-${pom.version}</finalName>
+                  <finalName>ApacheDirectoryStudio-win32-${pom.version}</finalName>
                   <outputDirectory>../target/distributions</outputDirectory>
                   <descriptors>
-                    <descriptor>src/main/assembly/bin-windows-amd64.xml</descriptor>
+                    <descriptor>src/main/assembly/bin-win32.xml</descriptor>
                   </descriptors>
                 </configuration>
                 <goals>
@@ -538,75 +500,21 @@
               </execution>
             </executions>
           </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!-- Mac OS X i386 -->
-    <profile>
-      <id>mac-os-x-i386</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-eclipse-rcp-mac-os-x-i386</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <overWrite>false</overWrite>
-                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/mac-os-x-i386</markersDirectory>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.eclipse</groupId>
-                      <artifactId>eclipse-RCP-macosx-carbon</artifactId>
-                      <type>tar.gz</type>
-                      <outputDirectory>target/mac-os-x-i386</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </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>adapt-rcp-distribution-mac-os-x-i386</id>
-                <phase>generate-resources</phase>
-                <configuration>
-                  <tasks>
-                    <move file="target/mac-os-x-i386/eclipse" tofile="target/ApacheDirectoryStudio-mac-os-x-i386" />
-                    <move file="target/ApacheDirectoryStudio-mac-os-x-i386/Eclipse.app" tofile="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app" />
-                    <move file="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app/Contents/MacOS/eclipse" tofile="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" />
-                    <delete file="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app/Contents/MacOS/eclipse.ini" />
-                    <delete file="target/ApacheDirectoryStudio-mac-os-x-i386/eclipse" />
-                    <delete dir="target/ApacheDirectoryStudio-mac-os-x-i386" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
-                    <delete dir="target/ApacheDirectoryStudio-mac-os-x-i386/about_files" />
-                    <delete dir="target/ApacheDirectoryStudio-mac-os-x-i386/configuration" />
-                    <delete dir="target/ApacheDirectoryStudio-mac-os-x-i386/features" />
-                    <delete>
-                      <fileset dir="target/ApacheDirectoryStudio-mac-os-x-i386/plugins" excludes="**/org.eclipse.swt.carbon.macosx*" />
-                    </delete>
-                    <delete dir="target/ApacheDirectoryStudio-mac-os-x-i386/readme" />
-                    <chmod file="target/ApacheDirectoryStudio-mac-os-x-i386/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" perm="755" />
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>unpack-dist-mac-os-x-i386</id>
+                <id>unpack-dist-win32 (for immediate use)</id>
                 <phase>install</phase>
                 <configuration>
                   <tasks>
-                    <untar src="../target/distributions/ApacheDirectoryStudio-mac-os-x-i386-${pom.version}-dist.tar.gz" dest="../target/distributions" overwrite="true" compression="gzip" />
-                    <chmod file="../target/distributions/ApacheDirectoryStudio-mac-os-x-i386-${pom.version}/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" perm="755" />
+                    <unzip src="../target/distributions/ApacheDirectoryStudio-win32-${pom.version}-dist.zip" dest="../target/distributions" overwrite="true />
+                    <chmod file="../target/distributions/ApacheDirectoryStudio-win32-${pom.version}/ApacheDirectoryStudio" perm="755" />
                   </tasks>
                 </configuration>
                 <goals>
@@ -615,39 +523,17 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <configuration>
-              <finalName>ApacheDirectoryStudio-mac-os-x-i386-${pom.version}</finalName>
-              <outputDirectory>target/distributions</outputDirectory>
-              <descriptors>
-                <descriptor>src/main/assembly/bin-mac-os-x-i386.xml</descriptor>
-              </descriptors>
-            </configuration>
-            <executions>
-              <execution>
-                <id>assembly-distribution-mac-os-x-i386</id>
-                <phase>package</phase>
-                <configuration>
-                  <finalName>ApacheDirectoryStudio-mac-os-x-i386-${pom.version}</finalName>
-                  <outputDirectory>../target/distributions</outputDirectory>
-                  <descriptors>
-                    <descriptor>src/main/assembly/bin-mac-os-x-i386.xml</descriptor>
-                  </descriptors>
-                </configuration>
-                <goals>
-                  <goal>attached</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
 
-    <!-- Mac OS X PPC -->
     <profile>
-      <id>mac-os-x-ppc</id>
+      <id>macosx</id>
+      <!--
+        Everything in here is macosx specific. 
+        All sources/dependencies within this profile go to
+        target/ApacheDirectoryStudio-macosx 
+      -->
       <build>
         <plugins>
           <plugin>
@@ -655,20 +541,27 @@
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
               <execution>
-                <id>unpack-eclipse-rcp-mac-os-x-ppc</id>
+                <id>launcher-macosx (unpack)</id>
+                <!-- Unpack the launcher and equinox launcher -->
                 <phase>generate-resources</phase>
                 <goals>
                   <goal>unpack</goal>
                 </goals>
                 <configuration>
-                  <overWrite>false</overWrite>
-                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/mac-os-x-ppc</markersDirectory>
+                  <overWrite>true</overWrite>
+                  <markersDirectory>${project.build.directory}/dependency-maven-plugin-markers/macosx</markersDirectory>
                   <artifactItems>
                     <artifactItem>
-                      <groupId>org.eclipse</groupId>
-                      <artifactId>eclipse-RCP-macosx-carbon</artifactId>
+                      <groupId>org.apache.directory.studio</groupId>
+                      <artifactId>launcher-macosx</artifactId>
+                      <type>zip</type>
+                      <outputDirectory>${studio-dir}-macosx</outputDirectory>
+                    </artifactItem>
+                    <artifactItem>
+                      <groupId>org.eclipse.equinox.launcher.carbon</groupId>
+                      <artifactId>macosx</artifactId>
                       <type>tar.gz</type>
-                      <outputDirectory>target/mac-os-x-ppc</outputDirectory>
+                      <outputDirectory>${studio-dir}-macosx/plugins</outputDirectory>
                     </artifactItem>
                   </artifactItems>
                 </configuration>
@@ -676,66 +569,47 @@
             </executions>
           </plugin>
           <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
+            <groupId>org.apache.directory.studio</groupId>
+            <artifactId>maven-studio-plugin</artifactId>
             <executions>
               <execution>
-                <id>adapt-rcp-distribution-mac-os-x-ppc</id>
+                <id>swt-macosx (copy)</id>
+                <!-- Copy profile specific swt -->
                 <phase>generate-resources</phase>
-                <configuration>
-                  <tasks>
-                    <move file="target/mac-os-x-ppc/eclipse" tofile="target/ApacheDirectoryStudio-mac-os-x-ppc" />
-                    <move file="target/ApacheDirectoryStudio-mac-os-x-ppc/Eclipse.app" tofile="target/ApacheDirectoryStudio-mac-os-x-ppc/Apache Directory Studio.app" />
-                    <move file="target/ApacheDirectoryStudio-mac-os-x-ppc/Apache Directory Studio.app/Contents/MacOS/eclipse" tofile="target/ApacheDirectoryStudio-mac-os-x-ppc/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" />
-                    <delete file="target/ApacheDirectoryStudio-mac-os-x-ppc/Apache Directory Studio.app/Contents/MacOS/eclipse.ini" />
-                    <delete file="target/ApacheDirectoryStudio-mac-os-x-ppc/eclipse" />
-                    <delete dir="target/ApacheDirectoryStudio-mac-os-x-ppc" includes="notice.html about.html icon.xpm epl-v10.html libcairo* .eclipseproduct" />
-                    <delete dir="target/ApacheDirectoryStudio-mac-os-x-ppc/about_files" />
-                    <delete dir="target/ApacheDirectoryStudio-mac-os-x-ppc/configuration" />
-                    <delete dir="target/ApacheDirectoryStudio-mac-os-x-ppc/features" />
-                    <delete>
-                      <fileset dir="target/ApacheDirectoryStudio-mac-os-x-ppc/plugins" excludes="**/org.eclipse.swt.carbon.macosx*" />
-                    </delete>
-                    <delete dir="target/ApacheDirectoryStudio-mac-os-x-ppc/readme" />
-                    <chmod file="target/ApacheDirectoryStudio-mac-os-x-ppc/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" perm="755" />
-                  </tasks>
-                </configuration>
                 <goals>
-                  <goal>run</goal>
+                  <goal>copy-eclipse-artifact</goal>
                 </goals>
-              </execution>
-              <execution>
-                <id>unpack-dist-mac-os-x-ppc</id>
-                <phase>install</phase>
                 <configuration>
-                  <tasks>
-                    <untar src="../target/distributions/ApacheDirectoryStudio-mac-os-x-ppc-${pom.version}-dist.tar.gz" dest="../target/distributions" overwrite="true" compression="gzip" />
-                    <chmod file="../target/distributions/ApacheDirectoryStudio-mac-os-x-ppc-${pom.version}/Apache Directory Studio.app/Contents/MacOS/ApacheDirectoryStudio" perm="755" />
-                  </tasks>
+                  <destinationDirectory>${studio-dir}-macosx/plugins</destinationDirectory>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.eclipse.swt.carbon</groupId>
+                      <artifactId>macosx</artifactId>
+                    </artifactItem>
+                  </artifactItems>
                 </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
               </execution>
             </executions>
           </plugin>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
+            <!-- Create the distribution file -->
             <configuration>
-              <finalName>ApacheDirectoryStudio-mac-os-x-ppc-${pom.version}</finalName>
+              <finalName>ApacheDirectoryStudio-macosx-${pom.version}</finalName>
               <outputDirectory>target/distributions</outputDirectory>
               <descriptors>
-                <descriptor>src/main/assembly/bin-mac-os-x-ppc.xml</descriptor>
+                <descriptor>src/main/assembly/bin-macosx.xml</descriptor>
               </descriptors>
             </configuration>
             <executions>
               <execution>
-                <id>assembly-distribution-mac-os-x-ppc</id>
+                <id>assembly-distribution-macosx</id>
                 <phase>package</phase>
                 <configuration>
-                  <finalName>ApacheDirectoryStudio-mac-os-x-ppc-${pom.version}</finalName>
+                  <finalName>ApacheDirectoryStudio-macosx-${pom.version}</finalName>
                   <outputDirectory>../target/distributions</outputDirectory>
                   <descriptors>
-                    <descriptor>src/main/assembly/bin-mac-os-x-ppc.xml</descriptor>
+                    <descriptor>src/main/assembly/bin-macosx.xml</descriptor>
                   </descriptors>
                 </configuration>
                 <goals>
@@ -744,6 +618,29 @@
               </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}/ApacheDirectoryStudio" perm="755" />
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -751,6 +648,10 @@
 
   <build>
     <plugins>
+      <!--
+        Everything below this point (except test at the end) is used by all profiles
+        and goes to the target/ApacheDirectoryStudio folder
+      -->
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>maven-studio-plugin</artifactId>

Modified: directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml?rev=608665&r1=608664&r2=608665&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-linux-ppc.xml Thu Jan  3 14:37:07 2008
@@ -56,14 +56,6 @@
             <fileMode>644</fileMode>
         </fileSet>
         <fileSet>
-            <directory>src/main/configuration</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>studio.xpm</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        <fileSet>
             <directory>../docs</directory>
             <outputDirectory>/</outputDirectory>
             <includes>

Copied: directory/sandbox/felixk/studio/src/main/assembly/bin-linux-x86.xml (from r608612, directory/sandbox/felixk/studio/src/main/assembly/bin-linux-i386.xml)
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-linux-x86.xml?p2=directory/sandbox/felixk/studio/src/main/assembly/bin-linux-x86.xml&p1=directory/sandbox/felixk/studio/src/main/assembly/bin-linux-i386.xml&r1=608612&r2=608665&rev=608665&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-linux-i386.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-linux-x86.xml Thu Jan  3 14:37:07 2008
@@ -15,7 +15,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!-- $Rev:  $ $Date:  $ -->
+<!--
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+-->
 <assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
     <id>dist</id>
     <formats>
@@ -25,7 +27,7 @@
 
         <!-- Platform specific -->
         <fileSet>
-            <directory>target/ApacheDirectoryStudio-linux-i386</directory>
+            <directory>target/ApacheDirectoryStudio-linux-x86</directory>
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>ApacheDirectoryStudio</exclude>
@@ -33,7 +35,7 @@
             <fileMode>644</fileMode>
         </fileSet>
         <fileSet>
-            <directory>target/ApacheDirectoryStudio-linux-i386</directory>
+            <directory>target/ApacheDirectoryStudio-linux-x86</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>ApacheDirectoryStudio</include>
@@ -52,14 +54,6 @@
             <outputDirectory>/configuration</outputDirectory>
             <includes>
                 <include>config.ini</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/configuration</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>studio.xpm</include>
             </includes>
             <fileMode>644</fileMode>
         </fileSet>

Copied: directory/sandbox/felixk/studio/src/main/assembly/bin-linux-x86_64.xml (from r608612, directory/sandbox/felixk/studio/src/main/assembly/bin-linux-amd64.xml)
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-linux-x86_64.xml?p2=directory/sandbox/felixk/studio/src/main/assembly/bin-linux-x86_64.xml&p1=directory/sandbox/felixk/studio/src/main/assembly/bin-linux-amd64.xml&r1=608612&r2=608665&rev=608665&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-linux-amd64.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-linux-x86_64.xml Thu Jan  3 14:37:07 2008
@@ -25,7 +25,7 @@
 
         <!-- Platform specific -->
         <fileSet>
-            <directory>target/ApacheDirectoryStudio-linux-amd64</directory>
+            <directory>target/ApacheDirectoryStudio-linux-x86_64</directory>
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>ApacheDirectoryStudio</exclude>
@@ -33,7 +33,7 @@
             <fileMode>644</fileMode>
         </fileSet>
         <fileSet>
-            <directory>target/ApacheDirectoryStudio-linux-amd64</directory>
+            <directory>target/ApacheDirectoryStudio-linux-x86_64</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>ApacheDirectoryStudio</include>
@@ -52,14 +52,6 @@
             <outputDirectory>/configuration</outputDirectory>
             <includes>
                 <include>config.ini</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/configuration</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>studio.xpm</include>
             </includes>
             <fileMode>644</fileMode>
         </fileSet>

Copied: directory/sandbox/felixk/studio/src/main/assembly/bin-macosx.xml (from r608612, directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml)
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-macosx.xml?p2=directory/sandbox/felixk/studio/src/main/assembly/bin-macosx.xml&p1=directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml&r1=608612&r2=608665&rev=608665&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-mac-os-x-i386.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-macosx.xml Thu Jan  3 14:37:07 2008
@@ -25,7 +25,7 @@
 
         <!-- Platform specific -->
         <fileSet>
-            <directory>target/ApacheDirectoryStudio-mac-os-x-i386</directory>
+            <directory>target/ApacheDirectoryStudio-macosx</directory>
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>ApacheDirectoryStudio</exclude>
@@ -33,7 +33,7 @@
             <fileMode>644</fileMode>
         </fileSet>
         <fileSet>
-            <directory>target/ApacheDirectoryStudio-mac-os-x-i386</directory>
+            <directory>target/ApacheDirectoryStudio-macosx</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>ApacheDirectoryStudio</include>
@@ -52,14 +52,6 @@
             <outputDirectory>/configuration</outputDirectory>
             <includes>
                 <include>config.ini</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/configuration</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>studio.xpm</include>
             </includes>
             <fileMode>644</fileMode>
         </fileSet>

Copied: directory/sandbox/felixk/studio/src/main/assembly/bin-win32.xml (from r608612, directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml)
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/src/main/assembly/bin-win32.xml?p2=directory/sandbox/felixk/studio/src/main/assembly/bin-win32.xml&p1=directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml&r1=608612&r2=608665&rev=608665&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/src/main/assembly/bin-windows-x86.xml (original)
+++ directory/sandbox/felixk/studio/src/main/assembly/bin-win32.xml Thu Jan  3 14:37:07 2008
@@ -25,7 +25,7 @@
 
         <!-- Platform specific -->
         <fileSet>
-            <directory>target/ApacheDirectoryStudio-windows-x86</directory>
+            <directory>target/ApacheDirectoryStudio-win32</directory>
             <outputDirectory>/</outputDirectory>
             <excludes>
                 <exclude>ApacheDirectoryStudio</exclude>
@@ -33,7 +33,7 @@
             <fileMode>644</fileMode>
         </fileSet>
         <fileSet>
-            <directory>target/ApacheDirectoryStudio-windows-x86</directory>
+            <directory>target/ApacheDirectoryStudio-win32</directory>
             <outputDirectory>/</outputDirectory>
             <includes>
                 <include>ApacheDirectoryStudio</include>
@@ -52,14 +52,6 @@
             <outputDirectory>/configuration</outputDirectory>
             <includes>
                 <include>config.ini</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/configuration</directory>
-            <outputDirectory>/</outputDirectory>
-            <includes>
-                <include>studio.xpm</include>
             </includes>
             <fileMode>644</fileMode>
         </fileSet>



Mime
View raw message