directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r643392 - in /directory/sandbox/pamarcelot/trunks/apacheds-additional-installers: daemon/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/PkgInstallerCommand.java installers/apacheds/pom.xml
Date Tue, 01 Apr 2008 13:36:11 GMT
Author: pamarcelot
Date: Tue Apr  1 06:36:10 2008
New Revision: 643392

URL: http://svn.apache.org/viewvc?rev=643392&view=rev
Log:
Fixed a bug in the name of the Disk iMaGe generated for the Mac OS X installer package. Targets
reorganization in the 'server-installer' profile with the addition of the PKG, BIN and DEB
targets.

Modified:
    directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/PkgInstallerCommand.java
    directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/installers/apacheds/pom.xml

Modified: directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/PkgInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/PkgInstallerCommand.java?rev=643392&r1=643391&r2=643392&view=diff
==============================================================================
--- directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/PkgInstallerCommand.java
(original)
+++ directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/pkg/PkgInstallerCommand.java
Tue Apr  1 06:36:10 2008
@@ -283,9 +283,9 @@
         // Generating the DMG
         log.info( "Generating Mac OS X DMG Installer" );
         String finalName = target.getFinalName();
-        if ( !finalName.endsWith( ".pkg" ) )
+        if ( !finalName.endsWith( ".dmg" ) )
         {
-            finalName = finalName + ".pkg";
+            finalName = finalName + ".dmg";
         }
         try
         {

Modified: directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/installers/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/installers/apacheds/pom.xml?rev=643392&r1=643391&r2=643392&view=diff
==============================================================================
--- directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/installers/apacheds/pom.xml
(original)
+++ directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/installers/apacheds/pom.xml
Tue Apr  1 06:36:10 2008
@@ -129,311 +129,6 @@
   </dependencies>
 
   <profiles>
-  	<profile>
-      <id>macosx</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.directory.daemon</groupId>
-            <artifactId>daemon-plugin</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
-            <configuration>
-              <application>
-                <name>apacheds</name>
-                <version>1.5.2-SNAPSHOT</version>
-                <description>Apache Directory Suite</description>
-
-                <icon>src/main/resources/feather.ico</icon>
-                <copyrightYear>2007</copyrightYear>
-                <minimumJavaVersion>1.5</minimumJavaVersion>
-                <url>http://directory.apache.org</url>
-                <email>users@directory.apache.org</email>
-                <license>target/classes/META-INF/LICENSE</license>
-                <authors>
-                  <author>Apache Directory Team</author>
-                  <author>akarasulu@apache.org</author>
-                  <author>ckoppelt@apache.org</author>
-                  <author>elecharny@apache.org</author>
-                  <author>erodriguez@apache.org</author>
-                  <author>ersiner@apache.org</author>
-                  <author>oersoy@apache.org</author>
-                  <author>pamarcelot@apache.org</author>
-                  <author>szoerner@apache.org</author>
-                  <author>seelmann@apache.org</author>
-                  <author>trustin@apache.org</author>
-                </authors>
-              </application>
-              <packagedFiles>
-                <packagedFile>
-                  <source>org.apache.directory.server:apacheds-server-tools</source>
-                  <destinationPath>bin/apacheds-tools.jar</destinationPath>
-                  <dependency>true</dependency>
-                  <installationBundleId>Binaries</installationBundleId>
-                </packagedFile>
-                <packagedFile>
-                  <source>target/classes/META-INF/NOTICE</source>
-                  <destinationPath>NOTICE</destinationPath>
-                  <executable>false</executable>
-                  <filtered>true</filtered>
-                </packagedFile>
-              </packagedFiles>
-              <applicationClass>
-                org.apache.ldap.server.Service
-              </applicationClass>
-              <pkgTargets>
-                <pkgTarget>
-                 <id>apacheds-macosx</id>
-                  <finalName>apacheds-macosx</finalName>
-                  <osName>Mac OS X</osName>
-                  <osFamily>macosx</osFamily>
-                  <osVersion>10.5</osVersion>
-                  <osArch>x86</osArch>
-                  <daemonFramework>tanuki</daemonFramework>
-                </pkgTarget>
-              </pkgTargets>
-
-              <excludes>
-                <!-- apacheds-tools.jar does not get put in lib directory -->
-                <exclude>org.apache.directory.server:apacheds-server-tools</exclude>
-
-                <exclude>ant:ant</exclude>
-                <exclude>aopalliance:aopalliance</exclude>
-                <exclude>xerces:xerces</exclude>
-                <!--exclude>commons-pool:commons-pool</exclude-->
-                <exclude>xml-apis:xml-apis</exclude>
-                <exclude>aspectwerkz:aspectwerkz-core</exclude>
-                <exclude>velocity:velocity</exclude>
-                <exclude>org.springframework:spring-aop</exclude>
-                <exclude>qdox:qdox</exclude>
-                <exclude>oro:oro</exclude>
-                <exclude>commons-attributes:commons-attributes-compiler</exclude>
-                <exclude>commons-attributes:commons-attributes-api</exclude>
-                <exclude>cglib:cglib</exclude>
-                <exclude>velocity:velocity-dep</exclude>
-                <exclude>com.jamonapi:jamon</exclude>
-                <exclude>asm:asm</exclude>
-                <exclude>freemarker:freemarker</exclude>
-                <exclude>asm:asm-util</exclude>
-                <exclude>jasperreports:jasperreports</exclude>
-              </excludes>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>generate</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    
-    <profile>
-      <id>bin</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.directory.daemon</groupId>
-            <artifactId>daemon-plugin</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
-            <configuration>
-              <application>
-                <name>apacheds</name>
-                <version>1.5.2-SNAPSHOT</version>
-                <description>Apache Directory Server</description>
-                <icon>src/main/resources/feather.ico</icon>
-                <copyrightYear>2007</copyrightYear>
-                <minimumJavaVersion>1.5</minimumJavaVersion>
-                <url>http://directory.apache.org</url>
-                <email>users@directory.apache.org</email>
-                <license>target/classes/META-INF/LICENSE</license>
-                <authors>
-                  <author>Apache Directory Team</author>
-                  <author>akarasulu@apache.org</author>
-                  <author>ckoppelt@apache.org</author>
-                  <author>elecharny@apache.org</author>
-                  <author>erodriguez@apache.org</author>
-                  <author>ersiner@apache.org</author>
-                  <author>oersoy@apache.org</author>
-                  <author>pamarcelot@apache.org</author>
-                  <author>szoerner@apache.org</author>
-                  <author>seelmann@apache.org</author>
-                  <author>trustin@apache.org</author>
-                </authors>
-              </application>
-              <packagedFiles>
-                <packagedFile>
-                  <source>org.apache.directory.server:apacheds-server-tools</source>
-                  <destinationPath>bin/apacheds-tools.jar</destinationPath>
-                  <dependency>true</dependency>
-                  <installationBundleId>Binaries</installationBundleId>
-                </packagedFile>
-                <packagedFile>
-                  <source>target/classes/META-INF/NOTICE</source>
-                  <destinationPath>NOTICE</destinationPath>
-                  <executable>false</executable>
-                  <filtered>true</filtered>
-                </packagedFile>
-              </packagedFiles>
-              <applicationClass>
-                org.apache.ldap.server.Service
-              </applicationClass>
-              <binTargets>
-                <binTarget>
-                 <id>apacheds-bin-installer</id>
-                  <finalName>apacheds-linux.bin</finalName>
-                  <osName>Linux</osName>
-                  <osFamily>linux</osFamily>
-                  <osArch>i386</osArch>
-                  <daemonFramework>tanuki</daemonFramework>
-                </binTarget>
-              </binTargets>
-
-              <excludes> 
-                <!-- apacheds-tools.jar does not get put in lib directory -->
-                <exclude>org.apache.directory.server:apacheds-server-tools</exclude>
-
-                <exclude>ant:ant</exclude>
-                <exclude>aopalliance:aopalliance</exclude>
-                <exclude>xerces:xerces</exclude>
-                <!--exclude>commons-pool:commons-pool</exclude-->
-                <exclude>xml-apis:xml-apis</exclude>
-                <exclude>aspectwerkz:aspectwerkz-core</exclude>
-                <exclude>velocity:velocity</exclude>
-                <exclude>org.springframework:spring-aop</exclude>
-                <exclude>qdox:qdox</exclude>
-                <exclude>oro:oro</exclude>
-                <exclude>commons-attributes:commons-attributes-compiler</exclude>
-                <exclude>commons-attributes:commons-attributes-api</exclude>
-                <exclude>cglib:cglib</exclude>
-                <exclude>velocity:velocity-dep</exclude>
-                <exclude>com.jamonapi:jamon</exclude>
-                <exclude>asm:asm</exclude>
-                <exclude>freemarker:freemarker</exclude>
-                <exclude>asm:asm-util</exclude>
-                <exclude>jasperreports:jasperreports</exclude>
-              </excludes>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>generate</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  
-  <profile>
-      <id>deb</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.directory.daemon</groupId>
-            <artifactId>daemon-plugin</artifactId>
-            <version>1.1.2-SNAPSHOT</version>
-            <configuration>
-              <application>
-                <name>apacheds</name>
-                <version>1.5.2-SNAPSHOT</version>
-                <description>Apache Directory Server Debian</description>
-
-                <icon>src/main/resources/feather.ico</icon>
-                <copyrightYear>2007</copyrightYear>
-                <minimumJavaVersion>1.5</minimumJavaVersion>
-                <url>http://directory.apache.org</url>
-                <email>users@directory.apache.org</email>
-                <license>target/classes/META-INF/LICENSE</license>
-                <authors>
-                  <author>Apache Directory Team</author>
-                  <author>akarasulu@apache.org</author>
-                  <author>ckoppelt@apache.org</author>
-                  <author>elecharny@apache.org</author>
-                  <author>erodriguez@apache.org</author>
-                  <author>ersiner@apache.org</author>
-                  <author>oersoy@apache.org</author>
-                  <author>pamarcelot@apache.org</author>
-                  <author>szoerner@apache.org</author>
-                  <author>seelmann@apache.org</author>
-                  <author>trustin@apache.org</author>
-                </authors>
-              </application>
-              <packagedFiles>
-                <packagedFile>
-                  <source>org.apache.directory.server:apacheds-server-tools</source>
-                  <destinationPath>bin/apacheds-tools.jar</destinationPath>
-                  <dependency>true</dependency>
-                  <installationBundleId>Binaries</installationBundleId>
-                </packagedFile>
-                <packagedFile>
-                  <source>target/classes/META-INF/NOTICE</source>
-                  <destinationPath>NOTICE</destinationPath>
-                  <executable>false</executable>
-                  <filtered>true</filtered>
-                </packagedFile>
-              </packagedFiles>
-              <applicationClass>
-                org.apache.ldap.server.Service
-              </applicationClass>
-              <debTargets>
-                <debTarget>
-                 <id>apacheds-debian-i386</id>
-                  <finalName>apacheds-debian-i386</finalName>
-                  <osName>linux</osName>
-                  <osFamily>linux</osFamily>
-                  <osArch>i386</osArch>
-                  <daemonFramework>tanuki</daemonFramework>
-                </debTarget>
-                <debTarget>
-                 <id>apacheds-debian-amd64</id>
-                  <finalName>apacheds-debian-amd64</finalName>
-                  <osName>linux</osName>
-                  <osFamily>linux</osFamily>
-                  <osArch>amd64</osArch>
-                  <daemonFramework>tanuki</daemonFramework>
-                </debTarget>
-              </debTargets>
-
-              <excludes>
-                <!-- apacheds-tools.jar does not get put in lib directory -->
-                <exclude>org.apache.directory.server:apacheds-server-tools</exclude>
-
-                <exclude>ant:ant</exclude>
-                <exclude>aopalliance:aopalliance</exclude>
-                <exclude>xerces:xerces</exclude>
-                <!--exclude>commons-pool:commons-pool</exclude-->
-                <exclude>xml-apis:xml-apis</exclude>
-                <exclude>aspectwerkz:aspectwerkz-core</exclude>
-                <exclude>velocity:velocity</exclude>
-                <exclude>org.springframework:spring-aop</exclude>
-                <exclude>qdox:qdox</exclude>
-                <exclude>oro:oro</exclude>
-                <exclude>commons-attributes:commons-attributes-compiler</exclude>
-                <exclude>commons-attributes:commons-attributes-api</exclude>
-                <exclude>cglib:cglib</exclude>
-                <exclude>velocity:velocity-dep</exclude>
-                <exclude>com.jamonapi:jamon</exclude>
-                <exclude>asm:asm</exclude>
-                <exclude>freemarker:freemarker</exclude>
-                <exclude>asm:asm-util</exclude>
-                <exclude>jasperreports:jasperreports</exclude>
-              </excludes>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>generate</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  
     <profile>
       <id>suite-installer</id>
       <build>
@@ -586,6 +281,7 @@
         </plugins>
       </build>
     </profile>
+    
     <profile>
       <id>studio-installer</id>
       <build>
@@ -927,7 +623,7 @@
                   <nsisCompiler>/usr/local/share/nsis/makensis</nsisCompiler>
                   <nsisConfigurationFile>src/main/installers/apacheds-server-win.nsi</nsisConfigurationFile>
                   <finalName>
-                    apacheds-server-1.5.2-SNAPSHOT-setup
+                    apacheds-${pom.version}-setup
                   </finalName>
                   <osName>Windows XP</osName>
                   <osFamily>windows</osFamily>
@@ -936,7 +632,51 @@
                   <daemonFramework>tanuki</daemonFramework>
                 </nsisTarget>
               </nsisTargets>
-
+              
+              <!-- Targets for Mac OS X .pkg installer package -->
+              <pkgTargets>
+                <pkgTarget>
+                 <id>apacheds-macosx</id>
+                  <finalName>apacheds-macosx-${pom.version}.dmg</finalName>
+                  <osName>Mac OS X</osName>
+                  <osFamily>macosx</osFamily>
+                  <osArch>x86</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </pkgTarget>
+              </pkgTargets>
+              
+              <!-- Targets for Debian .deb installer package -->
+              <debTargets>
+                <debTarget>
+                 <id>apacheds-debian-i386</id>
+                  <finalName>apacheds-debian-i386-${pom.version}.deb</finalName>
+                  <osName>linux</osName>
+                  <osFamily>linux</osFamily>
+                  <osArch>i386</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </debTarget>
+                <debTarget>
+                 <id>apacheds-debian-amd64</id>
+                  <finalName>apacheds-debian-amd64-${pom.version}.deb</finalName>
+                  <osName>linux</osName>
+                  <osFamily>linux</osFamily>
+                  <osArch>amd64</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </debTarget>
+              </debTargets>
+              
+              <!-- Targets for Linux Binary .bin installer -->
+              <binTargets>
+                <binTarget>
+                 <id>apacheds-bin-installer</id>
+                  <finalName>apacheds-linux-${pom.version}.bin</finalName>
+                  <osName>Linux</osName>
+                  <osFamily>linux</osFamily>
+                  <osArch>i386</osArch>
+                  <daemonFramework>tanuki</daemonFramework>
+                </binTarget>
+              </binTargets>
+              
             </configuration>
             <executions>
               <execution>



Mime
View raw message