You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/07/21 15:54:56 UTC
svn commit: r796300 - in /cxf/branches/2.2.x-fixes: ./
rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java
tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
Author: dkulp
Date: Tue Jul 21 13:54:55 2009
New Revision: 796300
URL: http://svn.apache.org/viewvc?rev=796300&view=rev
Log:
Merged revisions 796022 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r796022 | dkulp | 2009-07-20 17:27:19 -0400 (Mon, 20 Jul 2009) | 2 lines
[CXF-2083] Fix problem with xmlbeans when using relative paths in
xsd:imports
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java
cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 21 13:54:55 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java?rev=796300&r1=796299&r2=796300&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java (original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/XmlBeansSchemaInitializer.java Tue Jul 21 13:54:55 2009
@@ -24,6 +24,7 @@
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.net.URI;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
@@ -130,9 +131,12 @@
Element elem = DOMUtils.getFirstElement(doc.getDocumentElement());
while (elem != null) {
if (elem.getLocalName().equals("import")) {
+ URI uri = new URI(file);
String loc = elem.getAttribute("schemaLocation");
if (!StringUtils.isEmpty(loc)) {
- getSchema(sts, loc);
+ URI locUri = uri.resolve(loc);
+ String newLoc = locUri.toString();
+ getSchema(sts, newLoc);
}
}
elem = DOMUtils.getNextElement(elem);
Modified: cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java?rev=796300&r1=796299&r2=796300&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java (original)
+++ cxf/branches/2.2.x-fixes/tools/common/src/main/java/org/apache/cxf/tools/common/ClassUtils.java Tue Jul 21 13:54:55 2009
@@ -64,7 +64,12 @@
argList.add(getClass().getClassLoader().getResource(".").getFile() + "../lib/");
} else {
argList.add("-classpath");
- argList.add(javaClasspath);
+ if (context.get(ToolConstants.CFG_OUTPUTDIR) != null) {
+ argList.add(javaClasspath + File.pathSeparatorChar
+ + context.get(ToolConstants.CFG_OUTPUTDIR));
+ } else {
+ argList.add(javaClasspath);
+ }
}
String outPutDir = (String)context.get(ToolConstants.CFG_OUTPUTDIR);