You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/01/26 05:32:21 UTC
svn commit: r372431 - in /directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers: ServiceInstallersMojo.java izpack/IzPackInstallerCommand.java

Author: akarasulu
Date: Wed Jan 25 20:32:19 2006
New Revision: 372431

URL: http://svn.apache.org/viewcvs?rev=372431&view=rev
Log:
fixed tunneling of parameters for app email, url, author and javaVersion

Modified:
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java
    directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java?rev=372431&r1=372430&r2=372431&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java (original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/ServiceInstallersMojo.java Wed Jan 25 20:32:19 2006
@@ -117,29 +117,29 @@
     private String applicationVersion;
 
     /**
-     * @parameter 
+     * @parameter expression="${project.description}"
      */
     private String applicationDescription;
     
     /**
      * @parameter 
      */
-    private String applicationEmail;
+    private String applicationEmail = "general@apache.org";
 
     /**
-     * @parameter 
+     * @parameter expression="1.4"
      */
     private String applicationJavaVersion;
 
     /**
      * @parameter 
      */
-    private String applicationAuthor;
+    private String applicationAuthor = "Apache Software Foundation";
 
     /**
-     * @parameter 
+     * @parameter expression="${project.url}"
      */
-    private String applicationUrl;
+    private String applicationUrl = "http://www.apache.org";
 
     /**
      * @parameter expression="src/main/installers/logo.png"

Modified: directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java?rev=372431&r1=372430&r2=372431&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java (original)
+++ directory/trunks/apacheds/standalone/installers/plugin/src/main/java/org/apache/directory/server/standalone/installers/izpack/IzPackInstallerCommand.java Wed Jan 25 20:32:19 2006
@@ -361,10 +361,10 @@
         // -------------------------------------------------------------------
         
         // optional properties from mojo but should default:
-        filterProperties.put( "app.author" , "Directory Project Team" );
-        filterProperties.put( "app.email" , "dev@directory.apache.org" );
-        filterProperties.put( "app.url" , "http://directory.apache.org" );
-        filterProperties.put( "app.java.version" , "1.4" );
+        filterProperties.put( "app.author" , target.getApplicationAuthor() );
+        filterProperties.put( "app.email" , target.getApplicationEmail() );
+        filterProperties.put( "app.url" , target.getApplicationUrl() );
+        filterProperties.put( "app.java.version" , target.getApplicationJavaVersion() );
         
         // izpack compiler will barf if these files are not present
         // files which are user specified also from mojo