You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bi...@apache.org on 2008/12/08 15:57:09 UTC
svn commit: r724372 - in /cxf/trunk/tools/wsdlto:
databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/
test/src/test/java/org/apache/cxf/tools/wsdlto/
test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/
test/src/test/java/org/a...
Author: bimargulies
Date: Mon Dec 8 06:57:09 2008
New Revision: 724372
URL: http://svn.apache.org/viewvc?rev=724372&view=rev
Log:
Some modularity cleanup while chasing CXF-1394.
Added:
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java (with props)
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java (with props)
Modified:
cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
Modified: cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java?rev=724372&r1=724371&r2=724372&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java (original)
+++ cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java Mon Dec 8 06:57:09 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();
Added: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java?rev=724372&view=auto
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java (added)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java Mon Dec 8 06:57:09 2008
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.wsdlto;
+
+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;
+
+public abstract class AbstractCodeGenTest extends ProcessorTestBase {
+
+ protected JAXWSContainer processor;
+ protected ClassLoader classLoader;
+ protected String origCP;
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ File classFile = new java.io.File(output.getCanonicalPath() + "/classes");
+ classFile.mkdir();
+ origCP = System.getProperty("java.class.path");
+ 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() {
+ System.setProperty("java.class.path", origCP);
+ processor = null;
+ env = null;
+ super.tearDown();
+ }
+
+}
Propchange: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/AbstractCodeGenTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java?rev=724372&view=auto
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java (added)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java Mon Dec 8 06:57:09 2008
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.tools.wsdlto.jaxb;
+
+import java.io.File;
+
+import org.apache.cxf.tools.common.ToolConstants;
+import org.apache.cxf.tools.wsdlto.AbstractCodeGenTest;
+import org.junit.Test;
+
+public class JAXBCodeGenOptionTest extends AbstractCodeGenTest {
+
+ @org.junit.Ignore
+ @Test
+ public void testJaxbNpa() throws Exception {
+ env.put(ToolConstants.CFG_WSDLURL, getLocation("/wsdl2java_wsdl/echo_date.wsdl"));
+ env.put(ToolConstants.CFG_XJC_ARGS, "-npa");
+ processor.setContext(env);
+ processor.execute();
+
+ assertNotNull(output);
+
+ File piFile =
+ new File(output, "org/apache/cxf/tools/fortest/date/package-info.java");
+ assertFalse(piFile.getAbsolutePath(), piFile.exists());
+
+ }
+
+}
Propchange: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxb/JAXBCodeGenOptionTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=724372&r1=724371&r2=724372&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Mon Dec 8 06:57:09 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/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java?rev=724372&r1=724371&r2=724372&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java (original)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenOptionTest.java Mon Dec 8 06:57:09 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/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java?rev=724372&r1=724371&r2=724372&view=diff
==============================================================================
--- cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java (original)
+++ cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java Mon Dec 8 06:57:09 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 {