[jboss-svn-commits] JBL Code SVN: r21280 - in labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin: src/main/java/org/jboss/maven/plugins/jdocbook and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2008-07-29 13:38:43 -0400 (Tue, 29 Jul 2008)
New Revision: 21280

Modified:
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/pom.xml
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/AbstractDocBookMojo.java
Log:
MPJDOCBOOK-12 : use MavenSession to access sys props

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/pom.xml
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/pom.xml	2008-07-29 12:35:56 UTC (rev 21279)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/pom.xml	2008-07-29 17:38:43 UTC (rev 21280)
@@ -139,6 +139,11 @@
         <!-- Maven Plugin deps -->
         <dependency>
             <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>2.0.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
             <version>2.0</version>
         </dependency>

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/AbstractDocBookMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/AbstractDocBookMojo.java	2008-07-29 12:35:56 UTC (rev 21279)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/AbstractDocBookMojo.java	2008-07-29 17:38:43 UTC (rev 21280)
@@ -40,6 +40,7 @@
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
+import org.apache.maven.execution.MavenSession;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 import org.jboss.jdocbook.JDocBookProcessException;
 import org.jboss.jdocbook.Log;
@@ -68,6 +69,15 @@
     protected MavenProject project;
 
 	/**
+	 * INTERNAL : The representation of the maven execution.
+	 *
+     * @parameter expression="${session}"
+     * @required
+     * @readonly
+     */
+	protected MavenSession session;
+
+	/**
 	 * INTERNAL : The artifacts associated with the dependencies defined as part
 	 * of the project to which we are being attached.
 	 *
@@ -298,7 +308,7 @@
 	}
 
 	protected String getRequestedFormat() {
-		String requestedFormat = project.getProperties().getProperty( "jdocbook.format" );
+		String requestedFormat = session.getExecutionProperties().getProperty( "jdocbook.format" );
 		if ( requestedFormat != null ) {
 			getLog().info( "requested processing limited to [" + requestedFormat + "] format" );
 		}
@@ -306,7 +316,7 @@
 	}
 
 	protected Locale getRequestedLocale() {
-		String requestedLocaleStr = project.getProperties().getProperty( "jdocbook.lang" );
+		String requestedLocaleStr = session.getExecutionProperties().getProperty( "jdocbook.lang" );
 		Locale requestedLocale = requestedLocaleStr == null ? null : parseLocale( requestedLocaleStr );
 		if ( requestedLocale != null ) {
 			getLog().info( "requested processing limited to [" + stringify( requestedLocale ) + "] lang" ) ;