directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1004221 - in /directory/apacheds/trunk/installers-maven-plugin: ./ src/main/java/org/apache/directory/server/installers/bin/ src/main/java/org/apache/directory/server/installers/deb/ src/main/java/org/apache/directory/server/installers/rpm/
Date Mon, 04 Oct 2010 12:46:43 GMT
Author: pamarcelot
Date: Mon Oct  4 12:46:42 2010
New Revision: 1004221

URL: http://svn.apache.org/viewvc?rev=1004221&view=rev
Log:
o Fixed the tests on the running OS.
o Added documentation in pom.xml

Modified:
    directory/apacheds/trunk/installers-maven-plugin/pom.xml
    directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java
    directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java
    directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java

Modified: directory/apacheds/trunk/installers-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/pom.xml?rev=1004221&r1=1004220&r2=1004221&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/pom.xml (original)
+++ directory/apacheds/trunk/installers-maven-plugin/pom.xml Mon Oct  4 12:46:42 2010
@@ -72,6 +72,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
+          <!-- Unpacks the config file to 'src/main/resources/[...]' -->
           <execution>
             <id>unpack-config-file</id>
             <phase>generate-resources</phase>

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java?rev=1004221&r1=1004220&r2=1004221&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java
(original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/bin/BinInstallerCommand.java
Mon Oct  4 12:46:42 2010
@@ -170,8 +170,8 @@ public class BinInstallerCommand extends
         }
 
         // Verifying the currently used OS to build the installer is Linux or Mac OS X
-        if ( !Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) )
-            || !Target.OS_NAME_MAC_OS_X.equalsIgnoreCase( System.getProperty( "os.name" )
) )
+        if ( !( Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) )
|| Target.OS_NAME_MAC_OS_X
+            .equalsIgnoreCase( System.getProperty( "os.name" ) ) ) )
         {
             log.warn( "Bin package installer can only be built on a machine running Linux
or Mac OS X!" );
             log.warn( "The build will continue, generation of this target is skipped." );

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java?rev=1004221&r1=1004220&r2=1004221&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java
(original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/deb/DebInstallerCommand.java
Mon Oct  4 12:46:42 2010
@@ -175,8 +175,8 @@ public class DebInstallerCommand extends
         }
 
         // Verifying the currently used OS to build the installer is Linux or Mac OS X
-        if ( !Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) )
-            || !Target.OS_NAME_MAC_OS_X.equalsIgnoreCase( System.getProperty( "os.name" )
) )
+        if ( !( Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) )
|| Target.OS_NAME_MAC_OS_X
+            .equalsIgnoreCase( System.getProperty( "os.name" ) ) ) )
         {
             log.warn( "Deb package installer can only be built on a machine running Linux
or Mac OS X!" );
             log.warn( "The build will continue, generation of this target is skipped." );

Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java?rev=1004221&r1=1004220&r2=1004221&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java
(original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/rpm/RpmInstallerCommand.java
Mon Oct  4 12:46:42 2010
@@ -180,8 +180,8 @@ public class RpmInstallerCommand extends
         }
 
         // Verifying the currently used OS to build the installer is Linux or Mac OS X
-        if ( !Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) )
-            || !Target.OS_NAME_MAC_OS_X.equalsIgnoreCase( System.getProperty( "os.name" )
) )
+        if ( !( Target.OS_NAME_LINUX.equalsIgnoreCase( System.getProperty( "os.name" ) )
|| Target.OS_NAME_MAC_OS_X
+            .equalsIgnoreCase( System.getProperty( "os.name" ) ) ) )
         {
             log.warn( "Rpm package installer can only be built on a machine running Linux
or Mac OS X!" );
             log.warn( "The build will continue, generation of this target is skipped." );



Mime
View raw message