From 51e1ac109d939852b6ae43bb0b0dcb3023303ce9 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sun, 21 Nov 2010 19:21:52 +0100
Subject: [PATCH] improve scm-web-compressor maven-plugin

---
 maven/scm-web-compressor/pom.xml              |  13 +++--
 .../sonia/scm/maven/WebCompressorMojo.java    |   7 ++-
 .../sonia/scm/maven/YuiWebCompressor.java     |   4 +-
 .../lib/compiler-20100917.jar                 | Bin
 third-party/closure-compiler/pom.xml          |  55 ++++++++++++++++++
 .../src/main/assembly/compiler.xml            |  37 ++++++++++++
 third-party/pom.xml                           |   1 +
 7 files changed, 109 insertions(+), 8 deletions(-)
 rename {maven/scm-web-compressor => third-party/closure-compiler}/lib/compiler-20100917.jar (100%)
 create mode 100644 third-party/closure-compiler/pom.xml
 create mode 100644 third-party/closure-compiler/src/main/assembly/compiler.xml

diff --git a/maven/scm-web-compressor/pom.xml b/maven/scm-web-compressor/pom.xml
index a2025ffa38..8c04623326 100644
--- a/maven/scm-web-compressor/pom.xml
+++ b/maven/scm-web-compressor/pom.xml
@@ -11,12 +11,18 @@
 
   <groupId>sonia.scm.maven</groupId>
   <artifactId>scm-web-compressor</artifactId>
-  <packaging>jar</packaging>
+  <packaging>maven-plugin</packaging>
   <version>1.0-M2-SNAPSHOT</version>
   <name>scm-web-compressor</name>
 
   <dependencies>
 
+    <dependency>
+      <groupId>sonia.scm</groupId>
+      <artifactId>scm-core</artifactId>
+      <version>1.0-M2-SNAPSHOT</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
@@ -37,10 +43,9 @@
 
     <dependency>
       <groupId>com.google.closure</groupId>
-      <artifactId>compiler</artifactId>
+      <artifactId>repacked-compiler</artifactId>
       <version>20100917</version>
-      <scope>system</scope>
-      <systemPath>${basedir}/lib/compiler-20100917.jar</systemPath>
+      <classifier>full</classifier>
     </dependency>
 
   </dependencies>
diff --git a/maven/scm-web-compressor/src/main/java/sonia/scm/maven/WebCompressorMojo.java b/maven/scm-web-compressor/src/main/java/sonia/scm/maven/WebCompressorMojo.java
index 2f6f4deca1..8a9d6e2e11 100644
--- a/maven/scm-web-compressor/src/main/java/sonia/scm/maven/WebCompressorMojo.java
+++ b/maven/scm-web-compressor/src/main/java/sonia/scm/maven/WebCompressorMojo.java
@@ -55,7 +55,7 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 /**
- *
+ * @goal compress
  * @author Sebastian Sdorra
  */
 public class WebCompressorMojo extends AbstractMojo
@@ -68,8 +68,8 @@ public class WebCompressorMojo extends AbstractMojo
   public WebCompressorMojo()
   {
     compressorSet = new LinkedHashSet<WebCompressor>();
-    compressorSet.add(new ClosureWebCompressor());
     compressorSet.add(new YuiWebCompressor());
+    compressorSet.add(new ClosureWebCompressor());
   }
 
   //~--- methods --------------------------------------------------------------
@@ -84,6 +84,8 @@ public class WebCompressorMojo extends AbstractMojo
   @Override
   public void execute() throws MojoExecutionException, MojoFailureException
   {
+    IOUtil.mkdirs(outputDirectory);
+
     OutputStream output = null;
 
     try
@@ -97,6 +99,7 @@ public class WebCompressorMojo extends AbstractMojo
                             encoding, outputPrefix, concat);
       }
 
+      IOUtil.mkdirs(outputFile.getParentFile());
       output = new FileOutputStream(outputFile);
       output.write(document.html().getBytes(encoding));
     }
diff --git a/maven/scm-web-compressor/src/main/java/sonia/scm/maven/YuiWebCompressor.java b/maven/scm-web-compressor/src/main/java/sonia/scm/maven/YuiWebCompressor.java
index 3ce1c568fc..e7c25d97bc 100644
--- a/maven/scm-web-compressor/src/main/java/sonia/scm/maven/YuiWebCompressor.java
+++ b/maven/scm-web-compressor/src/main/java/sonia/scm/maven/YuiWebCompressor.java
@@ -75,8 +75,8 @@ public class YuiWebCompressor extends AbstractWebCompressor
   @Override
   protected void appendElement(Document document, String path)
   {
-    document.appendElement("link").attr("type", "text/css").attr("rel",
-                           "stylesheet").attr("href", path);
+    document.head().appendElement("link").attr("type", "text/css").attr("rel",
+                                  "stylesheet").attr("href", path);
   }
 
   /**
diff --git a/maven/scm-web-compressor/lib/compiler-20100917.jar b/third-party/closure-compiler/lib/compiler-20100917.jar
similarity index 100%
rename from maven/scm-web-compressor/lib/compiler-20100917.jar
rename to third-party/closure-compiler/lib/compiler-20100917.jar
diff --git a/third-party/closure-compiler/pom.xml b/third-party/closure-compiler/pom.xml
new file mode 100644
index 0000000000..5b7cae3104
--- /dev/null
+++ b/third-party/closure-compiler/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>sonia.scm.third-party</groupId>
+    <artifactId>sonia.scm.third-party</artifactId>
+    <version>1.0-M2-SNAPSHOT</version>
+  </parent>
+
+  <groupId>com.google.closure</groupId>
+  <artifactId>repacked-compiler</artifactId>
+  <packaging>pom</packaging>
+  <version>20100917</version>
+  <name>repacked-compiler</name>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>com.google.closure</groupId>
+      <artifactId>compiler</artifactId>
+      <version>20100917</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/compiler-20100917.jar</systemPath>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/compiler.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/third-party/closure-compiler/src/main/assembly/compiler.xml b/third-party/closure-compiler/src/main/assembly/compiler.xml
new file mode 100644
index 0000000000..fcc96840f9
--- /dev/null
+++ b/third-party/closure-compiler/src/main/assembly/compiler.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : descriptor.xml
+    Created on : November 21, 2010, 7:04 PM
+    Author     : sdorra
+    Description:
+        Purpose of the document follows.
+-->
+
+
+<assembly  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+   xmlns='http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1'
+   xsi:schemaLocation='http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd'>
+  <id>full</id>
+
+  <formats>
+    <format>jar</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <dependencySets>
+    <dependencySet>
+      <unpack>true</unpack>
+      <scope>system</scope>
+    </dependencySet>
+  </dependencySets>
+
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+
+</assembly>
diff --git a/third-party/pom.xml b/third-party/pom.xml
index 9eee2ea4b5..409123e67b 100644
--- a/third-party/pom.xml
+++ b/third-party/pom.xml
@@ -17,6 +17,7 @@
 
   <modules>
     <module>svnkit-dav</module>
+    <module>closure-compiler</module>
   </modules>
 
 </project>
\ No newline at end of file