cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r733896 - in /cxf/branches/2.1.x-fixes: ./ tools/common/src/main/java/org/apache/cxf/tools/common/ tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/ tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/ tools/wsdlto/core/src...
Date Mon, 12 Jan 2009 20:48:20 GMT
Author: dkulp
Date: Mon Jan 12 12:48:05 2009
New Revision: 733896

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

........
  r733512 | bimargulies | 2009-01-11 15:26:38 -0500 (Sun, 11 Jan 2009) | 2 lines
  
  CXF-1962
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
    cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
    cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/Messages.properties
    cxf/branches/2.1.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties
    cxf/branches/2.1.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
    cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
    cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/Messages.properties
    cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java
    cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java
    cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java
    cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 12 12:48:05 2009
@@ -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,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,732710,
 732827,733582
+/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,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
 4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,732710,
 732827,733512,733582

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

Modified: cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
(original)
+++ cxf/branches/2.1.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/Messages.properties
Mon Jan 12 12:48:05 2009
@@ -18,6 +18,7 @@
 #    under the License.
 #
 #
+DIRECTORY_COULD_NOT_BE_CREATED = Directory : {0} could not be created
 DIRECTORY_NOT_EXIST = Directory: {0} does not exist
 NOT_A_DIRECTORY = {0} is not a directory
 FILE_NOT_EXIST = File does not exist

Modified: cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
Mon Jan 12 12:48:05 2009
@@ -87,8 +87,8 @@
         String outdir = (String)env.get(ToolConstants.CFG_OUTPUTDIR);
         if (outdir != null) {
             File dir = new File(outdir);
-            if (!dir.exists()) {
-                Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, outdir);
+            if (!dir.exists() && !dir.mkdirs()) {
+                Message msg = new Message("DIRECTORY_COULD_NOT_BE_CREATED", LOG, outdir);
                 throw new ToolException(msg);
             }
             if (!dir.isDirectory()) {

Modified: cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/Messages.properties?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/Messages.properties
(original)
+++ cxf/branches/2.1.x-fixes/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/Messages.properties
Mon Jan 12 12:48:05 2009
@@ -18,6 +18,7 @@
 #    under the License.
 #
 #
+DIRECTORY_COULD_NOT_BE_CREATED = Directory : {0} could not be created
 DIRECTORY_NOT_EXIST = Directory : {0} does not exist
 NOT_A_DIRECTORY = {0} is not a directory
 FILE_NOT_EXIST = File does not exist

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/Messages.properties
Mon Jan 12 12:48:05 2009
@@ -18,6 +18,7 @@
 #    under the License.
 #
 #
+DIRECTORY_COULD_NOT_BE_CREATED = Directory : {0} could not be created
 DIRECTORY_NOT_EXIST = Directory: {0} does not exist
 PARAMETER_MISSING = Required parameter is missing
 SERVICE_NOT_FOUND = No service was found in wsdl: {0}

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java
Mon Jan 12 12:48:05 2009
@@ -347,8 +347,8 @@
         String outdir = (String)env.get(ToolConstants.CFG_OUTPUTDIR);
         if (outdir != null) {
             File dir = new File(outdir);
-            if (!dir.exists()) {
-                Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, outdir);
+            if (!dir.exists() && !dir.mkdirs()) {
+                Message msg = new Message("DIRECTORY_COULD_NOT_BE_CREATED", LOG, outdir);
                 throw new ToolException(msg);
             }
             if (!dir.isDirectory()) {
@@ -361,8 +361,8 @@
             String clsdir = (String)env.get(ToolConstants.CFG_CLASSDIR);
             if (clsdir != null) {
                 File dir = new File(clsdir);
-                if (!dir.exists()) {
-                    Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, clsdir);
+                if (!dir.exists() && !dir.mkdirs()) {
+                    Message msg = new Message("DIRECTORY_COULD_NOT_BE_CREATED", LOG, clsdir);
                     throw new ToolException(msg);
                 }
             }

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/JavaScriptContainer.java
Mon Jan 12 12:48:05 2009
@@ -211,7 +211,7 @@
         if (outdir != null) {
             File dir = new File(outdir);
             if (!dir.exists() && !dir.mkdirs()) {
-                Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, outdir);
+                Message msg = new Message("DIRECTORY_COULD_NOT_BE_CREATED", LOG, outdir);
                 throw new ToolException(msg);
             }
             if (!dir.isDirectory()) {
@@ -225,7 +225,7 @@
             if (clsdir != null) {
                 File dir = new File(clsdir);
                 if (!dir.exists() && !dir.mkdirs()) {
-                    Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, clsdir);
+                    Message msg = new Message("DIRECTORY_COULD_NOT_BE_CREATED", LOG, clsdir);
                     throw new ToolException(msg);
                 }
             }

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/Messages.properties?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/Messages.properties
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/Messages.properties
Mon Jan 12 12:48:05 2009
@@ -18,6 +18,7 @@
 #    under the License.
 #
 #
+DIRECTORY_COULD_NOT_BE_CREATED = Directory : {0} could not be created
 DIRECTORY_NOT_EXIST = Directory : {0} does not exist
 NOT_A_DIRECTORY = {0} is not a directory
 FILE_NOT_EXIST = File does not exist

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToService.java
Mon Jan 12 12:48:05 2009
@@ -92,8 +92,8 @@
         String outdir = (String)env.get(ToolConstants.CFG_OUTPUTDIR);
         if (outdir != null) {
             File dir = new File(outdir);
-            if (!dir.exists()) {
-                Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, outdir);
+            if (!dir.exists() && !dir.mkdirs()) {
+                Message msg = new Message("DIRECTORY_COULD_NOT_BE_CREATED", LOG, outdir);
                 throw new ToolException(msg);
             }
             if (!dir.isDirectory()) {

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java
Mon Jan 12 12:48:05 2009
@@ -106,8 +106,8 @@
         String outdir = (String)env.get(ToolConstants.CFG_OUTPUTDIR);
         if (outdir != null) {
             File dir = new File(outdir);
-            if (!dir.exists()) {
-                Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, outdir);
+            if (!dir.exists() && !dir.mkdirs()) {
+                Message msg = new Message("DIRECTORY_COULD_NOT_BE_CREATED", LOG, outdir);
                 throw new ToolException(msg);
             }
             if (!dir.isDirectory()) {

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToXML.java
Mon Jan 12 12:48:05 2009
@@ -106,8 +106,8 @@
         String outdir = (String)env.get(ToolConstants.CFG_OUTPUTDIR);
         if (outdir != null) {
             File dir = new File(outdir);
-            if (!dir.exists()) {
-                Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, outdir);
+            if (!dir.exists() && !dir.mkdirs()) {
+                Message msg = new Message("DIRECTORY_COULD_NOT_BE_CREATED", LOG, outdir);
                 throw new ToolException(msg);
             }
             if (!dir.isDirectory()) {

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java?rev=733896&r1=733895&r2=733896&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/XSDToWSDL.java
Mon Jan 12 12:48:05 2009
@@ -87,8 +87,8 @@
         String outdir = (String)env.get(ToolConstants.CFG_OUTPUTDIR);
         if (outdir != null) {
             File dir = new File(outdir);
-            if (!dir.exists()) {
-                Message msg = new Message("DIRECTORY_NOT_EXIST", LOG, outdir);
+            if (!dir.exists() && !dir.mkdirs()) {
+                Message msg = new Message("DIRECTORY_COULD_NOT_BE_CREATED", LOG, outdir);
                 throw new ToolException(msg);
             }
             if (!dir.isDirectory()) {



Mime
View raw message