Changeset 6041 for trunk

Timestamp:

11/03/11 16:37:46 (7 months ago)

Author:

mtld

Message:

create missing target folders

Location:

trunk/pustefix-plugins

Files:

• pustefix-iwrapper-plugin/src/main/java/org/pustefixframework/maven/plugins/Apt.java (modified) (1 diff)
• pustefix-webapp-plugin/src/main/java/org/pustefixframework/maven/plugins/PustefixWebappMojo.java (modified) (3 diffs)
• pustefix-webservice-plugin/src/main/java/org/pustefixframework/maven/plugins/PustefixWebserviceMojo.java (modified) (2 diffs)

trunk/pustefix-plugins/pustefix-iwrapper-plugin/src/main/java/org/pustefixframework/maven/plugins/Apt.java

@@ -77 +77 @@
         lastRunFile.delete();
         try {
+            if(!lastRunFile.getParentFile().exists()) lastRunFile.getParentFile().mkdirs();
             lastRunFile.createNewFile();
         } catch (IOException x) {
-            throw new MojoExecutionException("cannot create " + lastRun);
+            throw new MojoExecutionException("cannot create " + lastRun, x);
         }
         return modified.size();

trunk/pustefix-plugins/pustefix-webapp-plugin/src/main/java/org/pustefixframework/maven/plugins/PustefixWebappMojo.java

@@ -19 +19 @@
 package org.pustefixframework.maven.plugins;
 
+import java.io.File;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
+
+import de.schlund.pfixxml.config.GlobalConfig;
+import de.schlund.pfixxml.config.GlobalConfigurator;
 
 /**
@@ -31 +36 @@
  * @requiresDependencyResolution compile
  */
-@Deprecated
 public class PustefixWebappMojo extends AbstractMojo {
+    
+    /**
+     * Docroot of the application
+     * 
+     * @parameter default-value="${project.build.directory}/${project.artifactId}-${project.version}"
+     */
+    private String docroot;
     
     /**
@@ -51 +62 @@
         }
         
+        // because all executions operate on the same pfixcore classes:
+        GlobalConfig.reset();
+        
+        GlobalConfigurator.setDocroot(docroot);
+        new File(docroot, "WEB-INF").mkdirs();
+
+        
         getLog().warn("************************************************************************");
         getLog().warn("* You're calling a deprecated Maven plugin goal. You should remove     *");

trunk/pustefix-plugins/pustefix-webservice-plugin/src/main/java/org/pustefixframework/maven/plugins/PustefixWebserviceMojo.java

@@ -172 +172 @@
                     }
                     // Setup WSDL repository
-                    if (!webappdir.exists()) throw new MojoExecutionException("Web application directory of project '" + projectName + "' doesn't exist: " + webappdir.getAbsolutePath());
+                    if (!webappdir.exists()) webappdir.mkdirs();
                     File wsdlDir = tmpDir;
                     if (globConf.getWSDLSupportEnabled()) {
@@ -196 +196 @@
                     // Check if WEB-INF exists
                     File webInfDir = new File(webappdir, "WEB-INF");
-                    if (!webInfDir.exists())
-                        throw new MojoExecutionException("Web application WEB-INF subdirectory of project '" + projectName + "' doesn't exist");
+                    if (!webInfDir.exists()) webInfDir.mkdirs();
                     
                     // Iterate over services