Changeset 3998

Timestamp:

02/02/09 15:07:13 (3 years ago)

Author:

mtld

Message:

added targetPath option, removed DocrootResource? usage, set version to 0.2.0

Location:

trunk/pustefix-maven/plugins/pustefix-scgenerate-plugin

Files:

• . (modified) (1 prop)
• .classpath (modified) (2 diffs)
• .project (modified) (1 diff)
• pom.xml (modified) (2 diffs)
• src/main/java/org/pustefixframework/maven/plugins/GenerateSCodes.java (added)
• src/main/java/org/pustefixframework/maven/plugins/GenerateSCodesMojo.java (modified) (5 diffs)

trunk/pustefix-maven/plugins/pustefix-scgenerate-plugin

@@ -1 +1 @@
 target
+.classpath
+.project

@@ -1 +1 @@
 target
+.classpath
+.project

trunk/pustefix-maven/plugins/pustefix-scgenerate-plugin/.classpath

@@ -4 +4 @@
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="var" path="M2_REPO/ant/ant/1.5/ant-1.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2.jar" sourcepath="M2_REPO/ant-contrib/ant-contrib/1.0b2/ant-contrib-1.0b2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/>
@@ -21 +19 @@
   <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.7/oro-2.0.7.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/pustefixframework/pfixcore/0.13.0-pre-SNAPSHOT/pfixcore-0.13.0-pre-SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/pustefixframework/pfixcore/0.13.4-SNAPSHOT/pfixcore-0.13.4-SNAPSHOT.jar" sourcepath="M2_REPO/org/pustefixframework/pfixcore/0.13.4-SNAPSHOT/pfixcore-0.13.4-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/com/icl/saxon/saxon/6.5.5/saxon-6.5.5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0.8/spring-2.0.8.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.5.6/spring-2.5.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
   <classpathentry kind="var" path="M2_REPO/xml-resolver/xml-resolver/1.1/xml-resolver-1.1.jar" sourcepath="M2_REPO/xml-resolver/xml-resolver/1.1/xml-resolver-1.1-sources.jar"/>
 </classpath>

trunk/pustefix-maven/plugins/pustefix-scgenerate-plugin/.project

@@ -1 +1 @@
 <projectDescription>
-  <name>scgenerate-plugin</name>
+  <name>pustefix-scgenerate-plugin</name>
   <comment>Pustefix Maven Plugins</comment>
   <projects/>

trunk/pustefix-maven/plugins/pustefix-scgenerate-plugin/pom.xml

@@ -13 +13 @@
   <artifactId>pustefix-scgenerate-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.1.2</version>
+  <version>0.2.0</version>
   <name>Pustefix StatusCode constants class generation plugin</name>
   <url>http://pustefixframework.org</url>
@@ -35 +35 @@
       <groupId>org.pustefixframework</groupId>
       <artifactId>pfixcore</artifactId>
-      <version>0.13.4-SNAPSHOT</version>
+      <version>[0.13,0.14)</version>
     </dependency>
     <dependency>

trunk/pustefix-maven/plugins/pustefix-scgenerate-plugin/src/main/java/org/pustefixframework/maven/plugins/GenerateSCodesMojo.java

@@ -21 +21 @@
 
 import java.io.File;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
@@ -30 +28 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.DirectoryScanner;
-
-import de.schlund.pfixcore.util.GenerateSCodes;
-import de.schlund.pfixcore.util.GenerateSCodes.Result;
-import de.schlund.pfixxml.resources.DocrootResource;
-import de.schlund.pfixxml.resources.internal.DocrootResourceOnFileSystemProvider;
+import org.pustefixframework.maven.plugins.GenerateSCodes.Result;
 
 /**
@@ -65 +59 @@
     /**
      * @parameter
+     */
+    private String targetPath;
+    
+    /**
+     * @parameter
      * @required
      */
@@ -81 +80 @@
     
     public void execute() throws MojoExecutionException {
-        
-        // FIXME We should not access an internal package from another component.
-        // However, we have no choice here, as GlobalConfigurator will not work
-        // when building a Maven multi-module module.
-        DocrootResourceOnFileSystemProvider provider = new DocrootResourceOnFileSystemProvider(docRoot.getAbsolutePath());
-        
+          
         DirectoryScanner ds = new DirectoryScanner();
         if(includes!=null) ds.setIncludes(includes);
@@ -102 +96 @@
         
         try {
-            Result result = GenerateSCodes.generateFromInfo(resList, docRoot.getAbsolutePath(), genDir, module);
+            Result result = GenerateSCodes.generateFromInfo(resList, docRoot.getAbsolutePath(), genDir, module, targetPath);
             if(result.generatedClasses.size()>0) {
                 getLog().info("Generated "+result.generatedClasses.size()+" statuscode class"+

@@ -1 +1 @@
 target
+.classpath
+.project