directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1055457 - in /directory/studio/trunk/application: ./ application-macosx-dmg/ application-macosx-x86-dmg/ application-macosx-x86/ application-macosx-x86_64-dmg/ application-macosx-x86_64/ application-macosx/ application-win32-exe/ applicati...
Date Wed, 05 Jan 2011 13:50:46 GMT
Author: pamarcelot
Date: Wed Jan  5 13:50:45 2011
New Revision: 1055457

URL: http://svn.apache.org/viewvc?rev=1055457&view=rev
Log:
Part of a fix for DIRSTUDIO-718 (Update Eclipse dependencies to version 3.6.1).
Modified the Application sub-modules to match all the distributions (Linux, Mac OS X, Win32)
for both 32 and 64 bit architectures.

Added:
    directory/studio/trunk/application/application-macosx-x86/
      - copied from r1055026, directory/studio/trunk/application/application-macosx/
    directory/studio/trunk/application/application-macosx-x86-dmg/
      - copied from r1055026, directory/studio/trunk/application/application-macosx-dmg/
    directory/studio/trunk/application/application-macosx-x86/pom.xml
      - copied, changed from r1055446, directory/studio/trunk/application/application-macosx/pom.xml
    directory/studio/trunk/application/application-macosx-x86_64/
      - copied from r1055026, directory/studio/trunk/application/application-macosx/
    directory/studio/trunk/application/application-macosx-x86_64-dmg/
      - copied from r1055026, directory/studio/trunk/application/application-macosx-dmg/
    directory/studio/trunk/application/application-macosx-x86_64/pom.xml
      - copied, changed from r1055446, directory/studio/trunk/application/application-macosx/pom.xml
    directory/studio/trunk/application/application-win32-x86/
      - copied from r1055026, directory/studio/trunk/application/application-win32/
    directory/studio/trunk/application/application-win32-x86-exe/
      - copied from r1055026, directory/studio/trunk/application/application-win32-exe/
    directory/studio/trunk/application/application-win32-x86_64/
      - copied from r1055026, directory/studio/trunk/application/application-win32/
    directory/studio/trunk/application/application-win32-x86_64-exe/
      - copied from r1055026, directory/studio/trunk/application/application-win32-exe/
Removed:
    directory/studio/trunk/application/application-macosx/
    directory/studio/trunk/application/application-macosx-dmg/
    directory/studio/trunk/application/application-win32/
    directory/studio/trunk/application/application-win32-exe/
Modified:
    directory/studio/trunk/application/application-macosx-x86-dmg/pom.xml
    directory/studio/trunk/application/application-macosx-x86_64-dmg/pom.xml
    directory/studio/trunk/application/application-win32-x86-exe/pom.xml
    directory/studio/trunk/application/application-win32-x86/pom.xml
    directory/studio/trunk/application/application-win32-x86_64-exe/pom.xml
    directory/studio/trunk/application/application-win32-x86_64/pom.xml
    directory/studio/trunk/application/pom.xml

Modified: directory/studio/trunk/application/application-macosx-x86-dmg/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-macosx-x86-dmg/pom.xml?rev=1055457&r1=1055026&r2=1055457&view=diff
==============================================================================
--- directory/studio/trunk/application/application-macosx-x86-dmg/pom.xml (original)
+++ directory/studio/trunk/application/application-macosx-x86-dmg/pom.xml Wed Jan  5 13:50:45
2011
@@ -26,14 +26,14 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <artifactId>ApacheDirectoryStudio-macosx-dmg</artifactId>
-  <name>Apache Directory Studio Application Mac OS X DMG</name>
+  <artifactId>ApacheDirectoryStudio-macosx-x86-dmg</artifactId>
+  <name>Apache Directory Studio Application Mac OS X x86 DMG</name>
   <packaging>pom</packaging>
   
   <properties>
-    <dmg-dir>${project.build.directory}/ApacheDirectoryStudio-macosx-${version}</dmg-dir>
-    <tmp-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-${version}-tmp.dmg</tmp-dmg>
-    <final-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-${version}.dmg</final-dmg>
+    <dmg-dir>${project.build.directory}/ApacheDirectoryStudio-macosx-x86-${version}</dmg-dir>
+    <tmp-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86-${version}-tmp.dmg</tmp-dmg>
+    <final-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86-${version}.dmg</final-dmg>
   </properties>
   
   <build>
@@ -51,7 +51,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>ApacheDirectoryStudio-macosx</artifactId>
+                  <artifactId>ApacheDirectoryStudio-macosx-x86</artifactId>
                   <type>zip</type>
                   <version>${project.version}</version> <!-- TODO -->
                   <outputDirectory>${project.build.directory}</outputDirectory>

Copied: directory/studio/trunk/application/application-macosx-x86/pom.xml (from r1055446,
directory/studio/trunk/application/application-macosx/pom.xml)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-macosx-x86/pom.xml?p2=directory/studio/trunk/application/application-macosx-x86/pom.xml&p1=directory/studio/trunk/application/application-macosx/pom.xml&r1=1055446&r2=1055457&rev=1055457&view=diff
==============================================================================
--- directory/studio/trunk/application/application-macosx/pom.xml (original)
+++ directory/studio/trunk/application/application-macosx-x86/pom.xml Wed Jan  5 13:50:45
2011
@@ -26,12 +26,12 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <artifactId>ApacheDirectoryStudio-macosx</artifactId>
-  <name>Apache Directory Studio Application Mac OS X</name>
+  <artifactId>ApacheDirectoryStudio-macosx-x86</artifactId>
+  <name>Apache Directory Studio Application Mac OS X x86</name>
   <packaging>pom</packaging>
   
   <properties>
-    <app-dir>${studio-dir}-macosx</app-dir>
+    <app-dir>${studio-dir}-macosx-x86</app-dir>
     <plugins-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/plugins</plugins-dir>
     <features-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/features</features-dir>
     <configuration-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/configuration</configuration-dir>

Modified: directory/studio/trunk/application/application-macosx-x86_64-dmg/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-macosx-x86_64-dmg/pom.xml?rev=1055457&r1=1055026&r2=1055457&view=diff
==============================================================================
--- directory/studio/trunk/application/application-macosx-x86_64-dmg/pom.xml (original)
+++ directory/studio/trunk/application/application-macosx-x86_64-dmg/pom.xml Wed Jan  5 13:50:45
2011
@@ -26,14 +26,14 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <artifactId>ApacheDirectoryStudio-macosx-dmg</artifactId>
-  <name>Apache Directory Studio Application Mac OS X DMG</name>
+  <artifactId>ApacheDirectoryStudio-macosx-x86_64-dmg</artifactId>
+  <name>Apache Directory Studio Application Mac OS X x86_64 DMG</name>
   <packaging>pom</packaging>
   
   <properties>
-    <dmg-dir>${project.build.directory}/ApacheDirectoryStudio-macosx-${version}</dmg-dir>
-    <tmp-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-${version}-tmp.dmg</tmp-dmg>
-    <final-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-${version}.dmg</final-dmg>
+    <dmg-dir>${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-${version}</dmg-dir>
+    <tmp-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-${version}-tmp.dmg</tmp-dmg>
+    <final-dmg>${project.build.directory}/ApacheDirectoryStudio-macosx-x86_64-${version}.dmg</final-dmg>
   </properties>
   
   <build>
@@ -51,7 +51,7 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>ApacheDirectoryStudio-macosx</artifactId>
+                  <artifactId>ApacheDirectoryStudio-macosx-x86_64</artifactId>
                   <type>zip</type>
                   <version>${project.version}</version> <!-- TODO -->
                   <outputDirectory>${project.build.directory}</outputDirectory>

Copied: directory/studio/trunk/application/application-macosx-x86_64/pom.xml (from r1055446,
directory/studio/trunk/application/application-macosx/pom.xml)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-macosx-x86_64/pom.xml?p2=directory/studio/trunk/application/application-macosx-x86_64/pom.xml&p1=directory/studio/trunk/application/application-macosx/pom.xml&r1=1055446&r2=1055457&rev=1055457&view=diff
==============================================================================
--- directory/studio/trunk/application/application-macosx/pom.xml (original)
+++ directory/studio/trunk/application/application-macosx-x86_64/pom.xml Wed Jan  5 13:50:45
2011
@@ -26,12 +26,12 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <artifactId>ApacheDirectoryStudio-macosx</artifactId>
-  <name>Apache Directory Studio Application Mac OS X</name>
+  <artifactId>ApacheDirectoryStudio-macosx-x86_64</artifactId>
+  <name>Apache Directory Studio Application Mac OS X x86_64</name>
   <packaging>pom</packaging>
   
   <properties>
-    <app-dir>${studio-dir}-macosx</app-dir>
+    <app-dir>${studio-dir}-macosx-x86_64</app-dir>
     <plugins-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/plugins</plugins-dir>
     <features-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/features</features-dir>
     <configuration-dir>${app-dir}/Apache Directory Studio.app/Contents/Resources/Java/configuration</configuration-dir>

Modified: directory/studio/trunk/application/application-win32-x86-exe/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-win32-x86-exe/pom.xml?rev=1055457&r1=1055026&r2=1055457&view=diff
==============================================================================
--- directory/studio/trunk/application/application-win32-x86-exe/pom.xml (original)
+++ directory/studio/trunk/application/application-win32-x86-exe/pom.xml Wed Jan  5 13:50:45
2011
@@ -26,14 +26,14 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <artifactId>ApacheDirectoryStudio-win32-exe</artifactId>
-  <name>Apache Directory Studio Application Win32 Exe</name>
+  <artifactId>ApacheDirectoryStudio-win32-x86-exe</artifactId>
+  <name>Apache Directory Studio Application Win32 x86 Exe</name>
   <packaging>pom</packaging>
   
   <properties>
-    <tmp-dir>${project.build.directory}/ApacheDirectoryStudio-win32-exe-tmp</tmp-dir>
+    <tmp-dir>${project.build.directory}/ApacheDirectoryStudio-win32-x86-exe-tmp</tmp-dir>
     <files-dir>${tmp-dir}/files</files-dir>
-    <installer-file-name>ApacheDirectoryStudio-win32-${version}.exe</installer-file-name>
+    <installer-file-name>ApacheDirectoryStudio-win32-x86-${version}.exe</installer-file-name>
     <installers.makensis>makensis</installers.makensis>
   </properties>
   
@@ -52,9 +52,9 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>ApacheDirectoryStudio-win32</artifactId>
+                  <artifactId>ApacheDirectoryStudio-win32-x86</artifactId>
                   <type>zip</type>
-                  <version>${project.version}</version> <!-- TODO -->
+                  <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}</outputDirectory>
                 </artifactItem>
               </artifactItems>

Modified: directory/studio/trunk/application/application-win32-x86/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-win32-x86/pom.xml?rev=1055457&r1=1055026&r2=1055457&view=diff
==============================================================================
--- directory/studio/trunk/application/application-win32-x86/pom.xml (original)
+++ directory/studio/trunk/application/application-win32-x86/pom.xml Wed Jan  5 13:50:45 2011
@@ -26,12 +26,12 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <artifactId>ApacheDirectoryStudio-win32</artifactId>
-  <name>Apache Directory Studio Application Win32</name>
+  <artifactId>ApacheDirectoryStudio-win32-x86</artifactId>
+  <name>Apache Directory Studio Application Win32 x86</name>
   <packaging>pom</packaging>
   
   <properties>
-    <app-dir>${studio-dir}-win32</app-dir>
+    <app-dir>${studio-dir}-win32-x86</app-dir>
     <plugins-dir>${app-dir}/plugins</plugins-dir>
     <features-dir>${app-dir}/features</features-dir>
     <configuration-dir>${app-dir}/configuration</configuration-dir>

Modified: directory/studio/trunk/application/application-win32-x86_64-exe/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-win32-x86_64-exe/pom.xml?rev=1055457&r1=1055026&r2=1055457&view=diff
==============================================================================
--- directory/studio/trunk/application/application-win32-x86_64-exe/pom.xml (original)
+++ directory/studio/trunk/application/application-win32-x86_64-exe/pom.xml Wed Jan  5 13:50:45
2011
@@ -26,14 +26,14 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <artifactId>ApacheDirectoryStudio-win32-exe</artifactId>
-  <name>Apache Directory Studio Application Win32 Exe</name>
+  <artifactId>ApacheDirectoryStudio-win32-x86_64-exe</artifactId>
+  <name>Apache Directory Studio Application Win32 x86_64 Exe</name>
   <packaging>pom</packaging>
   
   <properties>
-    <tmp-dir>${project.build.directory}/ApacheDirectoryStudio-win32-exe-tmp</tmp-dir>
+    <tmp-dir>${project.build.directory}/ApacheDirectoryStudio-win32-x86_64-exe-tmp</tmp-dir>
     <files-dir>${tmp-dir}/files</files-dir>
-    <installer-file-name>ApacheDirectoryStudio-win32-${version}.exe</installer-file-name>
+    <installer-file-name>ApacheDirectoryStudio-win32-x86_64-${version}.exe</installer-file-name>
     <installers.makensis>makensis</installers.makensis>
   </properties>
   
@@ -52,9 +52,9 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>ApacheDirectoryStudio-win32</artifactId>
+                  <artifactId>ApacheDirectoryStudio-win32-x86_64</artifactId>
                   <type>zip</type>
-                  <version>${project.version}</version> <!-- TODO -->
+                  <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}</outputDirectory>
                 </artifactItem>
               </artifactItems>

Modified: directory/studio/trunk/application/application-win32-x86_64/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-win32-x86_64/pom.xml?rev=1055457&r1=1055026&r2=1055457&view=diff
==============================================================================
--- directory/studio/trunk/application/application-win32-x86_64/pom.xml (original)
+++ directory/studio/trunk/application/application-win32-x86_64/pom.xml Wed Jan  5 13:50:45
2011
@@ -26,12 +26,12 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <artifactId>ApacheDirectoryStudio-win32</artifactId>
-  <name>Apache Directory Studio Application Win32</name>
+  <artifactId>ApacheDirectoryStudio-win32-x86_64</artifactId>
+  <name>Apache Directory Studio Application Win32 x86_64</name>
   <packaging>pom</packaging>
   
   <properties>
-    <app-dir>${studio-dir}-win32</app-dir>
+    <app-dir>${studio-dir}-win32-x86_64</app-dir>
     <plugins-dir>${app-dir}/plugins</plugins-dir>
     <features-dir>${app-dir}/features</features-dir>
     <configuration-dir>${app-dir}/configuration</configuration-dir>

Modified: directory/studio/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/pom.xml?rev=1055457&r1=1055456&r2=1055457&view=diff
==============================================================================
--- directory/studio/trunk/application/pom.xml (original)
+++ directory/studio/trunk/application/pom.xml Wed Jan  5 13:50:45 2011
@@ -41,6 +41,7 @@
   </modules>
   
   <profiles>
+    <!-- Linux 32 Bit -->
     <profile>
       <id>linux-x86</id>
       <activation>
@@ -54,6 +55,7 @@
         <module>application-linux-x86</module>
       </modules>
     </profile>
+    <!-- Linux 64 Bit -->
     <profile>
       <id>linux-x86_64</id>
       <activation>
@@ -67,20 +69,37 @@
         <module>application-linux-x86_64</module>
       </modules>
     </profile>
+    <!-- Mac OS X 32 Bit -->
     <profile>
-      <id>macosx</id>
+      <id>macosx-x86</id>
       <activation>
         <os>
+          <arch>x86</arch>
+          <family>unix</family>
+          <name>mac os x</name>
+        </os>
+      </activation>
+      <modules>
+        <module>application-macosx-x86</module>
+      </modules>
+    </profile>
+    <!-- Mac OS X 64 Bit -->
+    <profile>
+      <id>macosx-x86_64</id>
+      <activation>
+        <os>
+          <arch>x86_64</arch>
           <family>unix</family>
           <name>mac os x</name>
         </os>
       </activation>
       <modules>
-        <module>application-macosx</module>
+        <module>application-macosx-x86_64</module>
       </modules>
     </profile>
+    <!-- Windows 32 Bit -->
     <profile>
-      <id>win32</id>
+      <id>win32-x86</id>
       <activation>
         <os>
           <arch>x86</arch>
@@ -88,34 +107,62 @@
         </os>
       </activation>
       <modules>
-        <module>application-win32</module>
+        <module>application-win32-x86</module>
+      </modules>
+    </profile>
+    <!-- Windows 64 Bit -->
+    <profile>
+      <id>win32-x86_64</id>
+      <activation>
+        <os>
+          <arch>x86_64</arch>
+          <family>windows</family>
+        </os>
+      </activation>
+      <modules>
+        <module>application-win32-x86_64</module>
       </modules>
     </profile>
+    <!-- Update Site -->
     <profile>
       <id>updatesite</id>
       <modules>
         <module>application-updatesite</module>
       </modules>
     </profile>
+    <!-- Release -->
     <profile>
       <id>release</id>
       <modules>
         <module>application-updatesite</module>
-        <module>application-macosx-dmg</module>
-        <module>application-win32-exe</module>
+        <module>application-linux-x86</module>
+        <module>application-linux-x86_64</module>
+        <module>application-macosx-x86</module>
+        <module>application-macosx-x86-dmg</module>
+        <module>application-macosx-x86_64</module>
+        <module>application-macosx-x86_64-dmg</module>
+        <module>application-win32-x86</module>
+        <module>application-win32-x86-exe</module>
+        <module>application-win32-x86_64</module>
+        <module>application-win32-x86_64-exe</module>
         <module>application-release</module>
       </modules>
     </profile>
+    <!-- Installers -->
     <profile>
       <id>installers</id>
       <modules>
+        <module>application-updatesite</module>
         <module>application-linux-x86</module>
         <module>application-linux-x86_64</module>
-        <module>application-macosx</module>
-        <module>application-macosx-dmg</module>
-        <module>application-win32</module>
-        <module>application-win32-exe</module>
-        <module>application-updatesite</module>
+        <module>application-macosx-x86</module>
+        <module>application-macosx-x86-dmg</module>
+        <module>application-macosx-x86_64</module>
+        <module>application-macosx-x86_64-dmg</module>
+        <module>application-win32-x86</module>
+        <module>application-win32-x86-exe</module>
+        <module>application-win32-x86_64</module>
+        <module>application-win32-x86_64-exe</module>
       </modules>
     </profile>
   </profiles>



Mime
View raw message