You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/04/04 19:03:22 UTC

svn commit: r644774 - in /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource: ApacheLicenseResourceTransformer.java ApacheNoticeResourceTransformer.java

Author: bentmann
Date: Fri Apr  4 10:03:10 2008
New Revision: 644774

URL: http://svn.apache.org/viewvc?rev=644774&view=rev
Log:
o Polished code

Modified:
    maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
    maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java?rev=644774&r1=644773&r2=644774&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java Fri Apr  4 10:03:10 2008
@@ -32,9 +32,9 @@
     implements ResourceTransformer
 {
 
-    private static final String LICENSE_PATH = "meta-inf/license";
+    private static final String LICENSE_PATH = "META-INF/LICENSE";
 
-    private static final String LICENSE_TXT_PATH = "meta-inf/license.txt";
+    private static final String LICENSE_TXT_PATH = "META-INF/LICENSE.txt";
 
     Set entries = new HashSet();
 

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java?rev=644774&r1=644773&r2=644774&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java Fri Apr  4 10:03:10 2008
@@ -66,9 +66,9 @@
      */
     String encoding = "ISO-8859-1";
 
-    private static final String NOTICE_PATH = "meta-inf/notice";
+    private static final String NOTICE_PATH = "META-INF/NOTICE";
 
-    private static final String NOTICE_TXT_PATH = "meta-inf/notice.txt";
+    private static final String NOTICE_TXT_PATH = "META-INF/NOTICE.txt";
 
     public boolean canTransformResource( String resource )
     {
@@ -190,7 +190,7 @@
     public void modifyOutputStream( JarOutputStream jos )
         throws IOException
     {
-        jos.putNextEntry( new JarEntry( "META-INF/NOTICE" ) );
+        jos.putNextEntry( new JarEntry( NOTICE_PATH ) );
 
         OutputStreamWriter pow = new OutputStreamWriter( jos, encoding );
         PrintWriter writer = new PrintWriter( pow );