directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r359983 - in /directory/trunk: apacheds-plugin-test/pom.xml apacheds-plugin/pom.xml apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java
Date Fri, 30 Dec 2005 04:20:21 GMT
Author: akarasulu
Date: Thu Dec 29 20:20:16 2005
New Revision: 359983

URL: http://svn.apache.org/viewcvs?rev=359983&view=rev
Log:
added generated-sources to build path

Modified:
    directory/trunk/apacheds-plugin-test/pom.xml
    directory/trunk/apacheds-plugin/pom.xml
    directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java

Modified: directory/trunk/apacheds-plugin-test/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-plugin-test/pom.xml?rev=359983&r1=359982&r2=359983&view=diff
==============================================================================
--- directory/trunk/apacheds-plugin-test/pom.xml (original)
+++ directory/trunk/apacheds-plugin-test/pom.xml Thu Dec 29 20:20:16 2005
@@ -11,6 +11,16 @@
   <packaging>jar</packaging>  
   <dependencies>
     <dependency>
+      <groupId>org.apache.ldap.common</groupId>
+      <artifactId>org.apache.ldap.common</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ldap.server</groupId>
+      <artifactId>org.apache.ldap.server.shared</artifactId>
+      <version>0.9.4-SNAPSHOT</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.ldap.server</groupId>
       <artifactId>org.apache.ldap.server.plugin</artifactId>
       <version>0.9.4-SNAPSHOT</version>
@@ -52,7 +62,6 @@
 
         <executions>
           <execution>
-            <phase>compile</phase>
             <goals>
               <goal>generate</goal>
             </goals>

Modified: directory/trunk/apacheds-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-plugin/pom.xml?rev=359983&r1=359982&r2=359983&view=diff
==============================================================================
--- directory/trunk/apacheds-plugin/pom.xml (original)
+++ directory/trunk/apacheds-plugin/pom.xml Thu Dec 29 20:20:16 2005
@@ -16,6 +16,11 @@
       <version>2.0</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.5.3-1</version>

Modified: directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java
URL: http://svn.apache.org/viewcvs/directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java?rev=359983&r1=359982&r2=359983&view=diff
==============================================================================
--- directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java
(original)
+++ directory/trunk/apacheds-plugin/src/main/java/org/apache/ldap/server/tools/schema/DirectorySchemaToolMojo.java
Thu Dec 29 20:20:16 2005
@@ -33,6 +33,7 @@
 import org.apache.ldap.server.schema.bootstrap.ProducerTypeEnum;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 
@@ -42,6 +43,7 @@
  * 
  * @goal generate
  * @description Generates ApacheDS schema classes from OpenLDAP schema files
+ * @phase generate-sources
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
@@ -86,6 +88,12 @@
     // Need to figure this out from the pom - maybe make it a parameter for mojoj and set
expression for pom element
     private String javaSrcDir = "src/main/java";
 
+    /**
+     * @parameter expression="${project}"
+     * @required
+     */
+    private MavenProject project;
+
 
     public DirectorySchemaToolMojo() throws Exception
     {
@@ -386,7 +394,9 @@
             {
                 throw new MojoExecutionException( "Failed while generating sources for "
+ schemas[ii].getName(), e );
             }
-        }        
+        }
+        
+        project.addCompileSourceRoot( outputDirectory.getPath() );
     }
 
     private void report()



Mime
View raw message