This is an automated email from the ASF dual-hosted git repository.
ema pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 4090001185 [CXF-8944]:Remove jaxws21 frontend in wsdl2java tool
4090001185 is described below
commit 409000118502e38492ecdfe3e9b249a2c2787cbc
Author: Jim Ma <[email protected]>
AuthorDate: Wed Oct 18 11:04:50 2023 +0800
[CXF-8944]:Remove jaxws21 frontend in wsdl2java tool
---
.../wsdlto/frontend/jaxws/JAXWS21Container.java | 55 ----------------------
.../src/main/resources/META-INF/tools-plugin.xml | 14 ------
.../wsdlto/frontend/jaxws/JAXWSProfileTest.java | 2 +-
.../cxf/tools/wsdlto/core/PluginLoaderTest.java | 2 +-
4 files changed, 2 insertions(+), 71 deletions(-)
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWS21Container.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWS21Container.java
deleted file mode 100644
index d843036dde..0000000000
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWS21Container.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * 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.frontend.jaxws;
-
-import org.apache.cxf.tools.common.ToolConstants;
-import org.apache.cxf.tools.common.ToolContext;
-import org.apache.cxf.tools.common.ToolException;
-import org.apache.cxf.tools.common.toolspec.ToolSpec;
-
-/**
- *
- */
-public class JAXWS21Container extends JAXWSContainer {
- public JAXWS21Container(ToolSpec toolspec) throws Exception {
- super(toolspec);
- }
- public String getServiceTarget() {
- return "jaxws21";
- }
- public void validate(ToolContext env) throws ToolException {
- super.validate(env);
- Object o = env.get(ToolConstants.CFG_XJC_ARGS);
- if (o instanceof String) {
- o = new String[] {(String)o, "-target", "2.1"};
- env.put(ToolConstants.CFG_XJC_ARGS, o);
- } else if (o == null) {
- o = new String[] {"-target", "2.1"};
- env.put(ToolConstants.CFG_XJC_ARGS, o);
- } else {
- String[] xjcArgs = (String[])o;
- String[] tmp = new String[xjcArgs.length + 2];
- System.arraycopy(xjcArgs, 0, tmp, 0, xjcArgs.length);
- tmp[xjcArgs.length] = "-target";
- tmp[xjcArgs.length + 1] = "2.1";
- env.put(ToolConstants.CFG_XJC_ARGS, tmp);
- }
- }
-}
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
b/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
index 9952112ceb..b3bde0ad2d 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
+++ b/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml
@@ -32,20 +32,6 @@ under the License.
<generator name="ServiceGenerator"/>
</generators>
</frontend>
- <frontend name="jaxws21"
package="org.apache.cxf.tools.wsdlto.frontend.jaxws" profile="JAXWSProfile">
- <container name="JAXWS21Container" toolspec="jaxws-toolspec.xml"/>
- <processor name="WSDLToJavaProcessor"
package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
- <builder name="JAXWSDefinitionBuilder"
package="org.apache.cxf.tools.wsdlto.frontend.jaxws.wsdl11"/>
- <generators
package="org.apache.cxf.tools.wsdlto.frontend.jaxws.generators">
- <generator name="AntGenerator"/>
- <generator name="ClientGenerator"/>
- <generator name="FaultGenerator"/>
- <generator name="ImplGenerator"/>
- <generator name="SEIGenerator"/>
- <generator name="ServerGenerator"/>
- <generator name="ServiceGenerator"/>
- </generators>
- </frontend>
<frontend name="cxf" package="org.apache.cxf.tools.wsdlto.frontend.jaxws"
profile="JAXWSProfile">
<container name="CXFJAXWSContainer" toolspec="jaxws-toolspec.xml"/>
<processor name="WSDLToJavaProcessor"
package="org.apache.cxf.tools.wsdlto.frontend.jaxws.processor"/>
diff --git
a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
index a9d1006a78..daeecf2c20 100644
---
a/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
+++
b/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java
@@ -65,7 +65,7 @@ public class JAXWSProfileTest {
Map<String, FrontEnd> frontends = loader.getFrontEnds();
assertNotNull(frontends);
- assertEquals(3, frontends.size());
+ assertEquals(2, frontends.size());
FrontEnd frontend = getFrontEnd(frontends, 0);
assertEquals("jaxws", frontend.getName());
diff --git
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
index 6778140003..07fa6f510f 100644
---
a/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
+++
b/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java
@@ -44,7 +44,7 @@ public class PluginLoaderTest {
Map<String, FrontEnd> frontends = loader.getFrontEnds();
assertNotNull(frontends);
- assertEquals(3, frontends.size());
+ assertEquals(2, frontends.size());
FrontEnd frontend = getFrontEnd(frontends, 0);
assertEquals("jaxws", frontend.getName());
