Author: dkulp
Date: Mon Dec 8 09:09:48 2008
New Revision: 724407
URL: http://svn.apache.org/viewvc?rev=724407&view=rev
Log:
Merged revisions 724372 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r724372 | bimargulies | 2008-12-08 09:57:09 -0500 (Mon, 08 Dec 2008) | 2 lines
Some modularity cleanup while chasing CXF-1394.
........
Added:
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
- copied unchanged from r724372,
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/
- copied from r724372,
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java
- copied unchanged from r724372,
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 09:09:48 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,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,719354-719680,720053,720119,720218,720238,720293-720316,720497,721221,721241,721501,722129,723024,723338,723716,723778,723791,724333
+/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,719354-719680,720053,720119,720218,720238,720293-720316,720497,721221,721241,721501,722129,723024,723338,723716,723778,723791,724333,724372
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=724407&r1=724406&r2=724407&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
Mon Dec 8 09:09:48 2008
@@ -31,7 +31,6 @@
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
-import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -146,32 +145,10 @@
Options opts = null;
opts = getOptions(schemaCompiler);
-
- addSchemas(opts, schemaCompiler, schemaLists);
-
- for (InputSource binding : jaxbBindings) {
- opts.addBindFile(binding);
- }
-
-
- for (String ns : context.getNamespacePackageMap().keySet()) {
- File file = JAXBUtils.getPackageMappingSchemaBindingFile(ns,
context.mapPackageName(ns));
- try {
- InputSource ins = new InputSource(file.toURI().toString());
- schemaCompiler.parseSchema(ins);
- } finally {
- FileUtils.delete(file);
- }
- }
+ List<String> args = new ArrayList<String>();
- if (context.getPackageName() != null) {
- schemaCompiler.setDefaultPackageName(context.getPackageName());
- }
-
-
- Vector<String> args = new Vector<String>();
if (context.get(ToolConstants.CFG_NO_ADDRESS_BINDING) == null) {
- //hard code to enabale jaxb extensions
+ //hard code to enable jaxb extensions
args.add("-extension");
URL bindingFileUrl =
getClass().getResource("W3CEPRJaxbBinding.xml");
InputSource ins = new InputSource(bindingFileUrl.toString());
@@ -187,6 +164,7 @@
LOG.log(Level.FINE, "xjc arg:" + arg);
}
}
+
if (context.get(ToolConstants.CFG_NO_ADDRESS_BINDING) == null
|| context.get(ToolConstants.CFG_XJC_ARGS) != null) {
try {
@@ -213,6 +191,29 @@
throw new ToolException(msg, e);
}
}
+
+
+ addSchemas(opts, schemaCompiler, schemaLists);
+
+ for (InputSource binding : jaxbBindings) {
+ opts.addBindFile(binding);
+ }
+
+
+ for (String ns : context.getNamespacePackageMap().keySet()) {
+ File file = JAXBUtils.getPackageMappingSchemaBindingFile(ns,
context.mapPackageName(ns));
+ try {
+ InputSource ins = new InputSource(file.toURI().toString());
+ schemaCompiler.parseSchema(ins);
+ } finally {
+ FileUtils.delete(file);
+ }
+ }
+
+ if (context.getPackageName() != null) {
+ schemaCompiler.setDefaultPackageName(context.getPackageName());
+ }
+
rawJaxbModelGenCode = schemaCompiler.bind();
Modified:
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=724407&r1=724406&r2=724407&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Mon Dec 8 09:09:48 2008
@@ -34,54 +34,17 @@
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.util.AnnotationUtil;
+import org.apache.cxf.tools.wsdlto.AbstractCodeGenTest;
import org.apache.cxf.tools.wsdlto.WSDLToJava;
-import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
-import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
-import org.apache.cxf.tools.wsdlto.core.PluginLoader;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
import
org.apache.cxf.tools.wsdlto.frontend.jaxws.validator.UniqueBodyValidator;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.handler.ResourceHandler;
-public class CodeGenBugTest extends ProcessorTestBase {
-
- private JAXWSContainer processor;
- private ClassLoader classLoader;
-
-
- @Before
- public void setUp() throws Exception {
- super.setUp();
- File classFile = new java.io.File(output.getCanonicalPath() +
"/classes");
- classFile.mkdir();
- System.setProperty("java.class.path", getClassPath() +
classFile.getCanonicalPath()
- + File.separatorChar);
- classLoader =
AnnotationUtil.getClassLoader(Thread.currentThread().getContextClassLoader());
- env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE);
- env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() +
"/classes");
- env.put(FrontEndProfile.class,
PluginLoader.getInstance().getFrontEndProfile("jaxws"));
- env.put(DataBindingProfile.class,
PluginLoader.getInstance().getDataBindingProfile("jaxb"));
- env.put(ToolConstants.CFG_IMPL, "impl");
- env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
- env.put(ToolConstants.CFG_SUPPRESS_WARNINGS, true);
- processor = new JAXWSContainer(null);
-
- }
-
-
- @After
- public void tearDown() {
- super.tearDown();
- //processor = null;
- env = null;
- }
+public class CodeGenBugTest extends AbstractCodeGenTest {
@Test
// Test for CXF-1678
Modified:
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java?rev=724407&r1=724406&r2=724407&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
Mon Dec 8 09:09:48 2008
@@ -20,46 +20,11 @@
import java.io.File;
-import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
-import org.apache.cxf.tools.util.AnnotationUtil;
-import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
-import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
-import org.apache.cxf.tools.wsdlto.core.PluginLoader;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.cxf.tools.wsdlto.AbstractCodeGenTest;
import org.junit.Test;
-public class CodeGenOptionTest extends ProcessorTestBase {
- private JAXWSContainer processor;
- private ClassLoader classLoader;
-
- @Before
- public void setUp() throws Exception {
- super.setUp();
- File classFile = new java.io.File(output.getCanonicalPath() +
"/classes");
- classFile.mkdir();
- System.setProperty("java.class.path", getClassPath() +
classFile.getCanonicalPath()
- + File.separatorChar);
- classLoader =
AnnotationUtil.getClassLoader(Thread.currentThread().getContextClassLoader());
- env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE);
- env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() +
"/classes");
- env.put(FrontEndProfile.class,
PluginLoader.getInstance().getFrontEndProfile("jaxws"));
- env.put(DataBindingProfile.class,
PluginLoader.getInstance().getDataBindingProfile("jaxb"));
- env.put(ToolConstants.CFG_IMPL, "impl");
- env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
-
- processor = new JAXWSContainer(null);
-
- }
-
- @After
- public void tearDown() {
- super.tearDown();
- processor = null;
- env = null;
- }
+public class CodeGenOptionTest extends AbstractCodeGenTest {
@Test
Modified:
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?rev=724407&r1=724406&r2=724407&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
(original)
+++
cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Mon Dec 8 09:09:48 2008
@@ -40,49 +40,13 @@
import javax.xml.ws.WebFault;
import org.apache.cxf.helpers.FileUtils;
-import org.apache.cxf.tools.common.ProcessorTestBase;
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolException;
import org.apache.cxf.tools.util.AnnotationUtil;
-import org.apache.cxf.tools.wsdlto.core.DataBindingProfile;
-import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
-import org.apache.cxf.tools.wsdlto.core.PluginLoader;
-import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.cxf.tools.wsdlto.AbstractCodeGenTest;
import org.junit.Test;
-public class CodeGenTest extends ProcessorTestBase {
- private JAXWSContainer processor;
- private ClassLoader classLoader;
- private String origCP;
-
- @Before
- public void setUp() throws Exception {
- super.setUp();
- origCP = System.getProperty("java.class.path");
- File classFile = new java.io.File(output.getCanonicalPath() +
"/classes");
- classFile.mkdir();
- System.setProperty("java.class.path", getClassPath() +
classFile.getCanonicalPath()
- + File.separatorChar);
- classLoader =
AnnotationUtil.getClassLoader(Thread.currentThread().getContextClassLoader());
- env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE);
- env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() +
"/classes");
- env.put(FrontEndProfile.class,
PluginLoader.getInstance().getFrontEndProfile("jaxws"));
- env.put(DataBindingProfile.class,
PluginLoader.getInstance().getDataBindingProfile("jaxb"));
- env.put(ToolConstants.CFG_IMPL, "impl");
- env.put(ToolConstants.CFG_OUTPUTDIR, output.getCanonicalPath());
-
- processor = new JAXWSContainer(null);
- }
-
- @After
- public void tearDown() {
- super.tearDown();
- System.setProperty("java.class.path", origCP);
- processor = null;
- env = null;
- }
+public class CodeGenTest extends AbstractCodeGenTest {
@Test
public void testHeaderFromAnotherMessage1() throws Exception {
