directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r631269 - /directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
Date Tue, 26 Feb 2008 16:09:40 GMT
Author: pamarcelot
Date: Tue Feb 26 08:09:35 2008
New Revision: 631269

URL: http://svn.apache.org/viewvc?rev=631269&view=rev
Log:
Fixed a bug the daemon plugin where the targets of each type of installer were not correclty
added to the targets list. Code-formating.

Modified:
    directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java

Modified: directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewvc/directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java?rev=631269&r1=631268&r2=631269&view=diff
==============================================================================
--- directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
(original)
+++ directory/daemon/branches/bigbang/plugin/src/main/java/org/apache/directory/daemon/installers/ServiceInstallersMojo.java
Tue Feb 26 08:09:35 2008
@@ -60,7 +60,7 @@
  * @version $Rev$
  */
 public class ServiceInstallersMojo extends AbstractMojo
-{ 
+{
     static final String BOOTSTRAPPER_ARTIFACT_ID = "daemon-bootstrappers";
     static final String BOOTSTRAPPER_GROUP_ID = "org.apache.directory.daemon";
     static final String LOGGER_ARTIFACT_ID = "slf4j-api";
@@ -213,7 +213,7 @@
         setBootstrapArtifacts();
 
         // generate installers for all targets
-        for ( Target target:allTargets )
+        for ( Target target : allTargets )
         {
             // create the installation image first
             CreateImageCommand imgCmd = new CreateImageCommand( this, target );
@@ -272,10 +272,11 @@
         {
             return;
         }
-        
-        list = Arrays.asList( array );
+
+        list.addAll( Arrays.asList( array ) );
     }
 
+
     private void setDefaults() throws MojoFailureException
     {
         if ( allTargets == null )
@@ -346,10 +347,11 @@
         if ( application.getAuthors() == null )
         {
             List<String> authors = new ArrayList<String>();
-            @SuppressWarnings(value={"unchecked"})
+            @SuppressWarnings(value =
+                { "unchecked" })
             List<Developer> developers = project.getDevelopers();
-            
-            for ( Developer developer:developers )
+
+            for ( Developer developer : developers )
             {
                 if ( developer.getEmail() != null )
                 {
@@ -389,7 +391,7 @@
             application.setLicense( new File( "LICENSE" ) );
         }
 
-        for ( Target target:allTargets )
+        for ( Target target : allTargets )
         {
             if ( target.getApplication() == null )
             {
@@ -442,7 +444,7 @@
     private void setupSourcesAndDocs() throws MojoFailureException
     {
         File generatedDocs = null;
-        
+
         if ( svnBaseUrl != null )
         {
             exportedSources = new File( outputDirectory, "src" );
@@ -463,7 +465,7 @@
     {
         Artifact artifact = null;
         Iterator artifacts = project.getDependencyArtifacts().iterator();
-        
+
         while ( artifacts.hasNext() )
         {
             artifact = ( Artifact ) artifacts.next();
@@ -515,7 +517,7 @@
         getLog().info( "----------------------------- allTargets -----------------------------"
);
 
         boolean isFirst = true;
-        
+
         if ( allTargets != null )
         {
             if ( isFirst )
@@ -526,21 +528,17 @@
             {
                 getLog().info( "" );
             }
-            
-            for ( Target target:allTargets )
+
+            for ( Target target : allTargets )
             {
                 getLog().info( "id: " + target.getId() );
                 getLog().info( "osName: " + target.getOsName() );
                 getLog().info( "osArch: " + target.getOsArch() );
                 getLog().info( "osVersion: " + target.getOsVersion() );
                 getLog().info( "daemonFramework: " + target.getDaemonFramework() );
-                getLog().info(
-                    "loggerConfigurationFile: " + target.getLoggerConfigurationFile() );
-                getLog().info(
-                    "bootstrapperConfigurationFiles: "
-                        + target.getBootstrapperConfigurationFile() );
-                getLog().info(
-                    "serverConfigurationFil: " + target.getServerConfigurationFile() );
+                getLog().info( "loggerConfigurationFile: " + target.getLoggerConfigurationFile()
);
+                getLog().info( "bootstrapperConfigurationFiles: " + target.getBootstrapperConfigurationFile()
);
+                getLog().info( "serverConfigurationFil: " + target.getServerConfigurationFile()
);
             }
         }
 



Mime
View raw message