cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r701521 - in /cxf/branches/2.1.x-fixes: ./ maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java
Date Fri, 03 Oct 2008 20:29:17 GMT
Author: dkulp
Date: Fri Oct  3 13:29:17 2008
New Revision: 701521

URL: http://svn.apache.org/viewvc?rev=701521&view=rev
Log:
Merged revisions 697868 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r697868 | dkulp | 2008-09-22 11:21:42 -0400 (Mon, 22 Sep 2008) | 2 lines
  
  Only create the output dir if something will actually go into it to avoid having eclipse:eclipse
wire it in.
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct  3 13:29:17 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,698128
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java?rev=701521&r1=701520&r2=701521&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java
(original)
+++ cxf/branches/2.1.x-fixes/maven-plugins/xml2fastinfoset-plugin/src/main/java/org/apache/cxf/maven_plugin/xml2fastinfoset/XML2FastInfosetCompilerMojo.java
Fri Oct  3 13:29:17 2008
@@ -110,13 +110,6 @@
                 continue;
             }
 
-            // this part is required in case the user specified "../something"
-            // as destination
-            // see MNG-1345
-            if (!outputDirectory.exists() && !outputDirectory.mkdirs()) {
-                throw new MojoExecutionException("Cannot create resource output directory:
"
-                                                 + outputDirectory);
-            }
 
             DirectoryScanner scanner = new DirectoryScanner();
 
@@ -140,6 +133,16 @@
                               + (includedFiles.size() > 1 ? "s" : "")
                               + (targetPath == null ? "" : " to " + targetPath));
 
+            if (includedFiles.size() > 0) {
+                // this part is required in case the user specified "../something"
+                // as destination
+                // see MNG-1345
+                if (!outputDirectory.exists() && !outputDirectory.mkdirs()) {
+                    throw new MojoExecutionException("Cannot create resource output directory:
"
+                                                     + outputDirectory);
+                }
+            }
+            
             for (Iterator j = includedFiles.iterator(); j.hasNext();) {
                 String name = (String)j.next();
 



Mime
View raw message