Repository: cxf Updated Branches: refs/heads/master a3cd2a98a -> f1ef25d99
[CXF-7405] Removal of commons-lang dependency and upgrade to Velocity 2 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f1ef25d9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f1ef25d9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f1ef25d9 Branch: refs/heads/master Commit: f1ef25d99cf9903af9aee0cb69ecbc1b804ce999 Parents: a3cd2a9 Author: Alessio Soldano <asold...@redhat.com> Authored: Tue Jun 13 01:49:16 2017 +0200 Committer: Alessio Soldano <asold...@redhat.com> Committed: Fri Aug 4 23:36:35 2017 +0200 ---------------------------------------------------------------------- .../cxf/jca/outbound/CXFConnectionSpec.java | 2 +- .../outbound/ManagedConnectionFactoryImpl.java | 2 +- .../cxf/maven_plugin/AbstractCodegenMoho.java | 2 +- .../apache/cxf/maven_plugin/Java2WSMojo.java | 2 +- .../wadlto/AbstractCodeGeneratorMojo.java | 2 +- .../features/src/main/resources/features.xml | 4 +- parent/pom.xml | 4 +- .../cxf/systest/jaxb/model/ExtendedWidget.java | 4 +- .../apache/cxf/systest/jaxb/model/Widget.java | 4 +- tools/common/pom.xml | 2 +- .../cxf/tools/common/VelocityGenerator.java | 9 ++-- .../java2wsdl/processor/internal/build.xml.vm | 8 ++-- .../jaxws/generator/template/javafirst-impl.vm | 4 +- .../jaxws/generator/template/javafirst-sei.vm | 2 +- .../internal/simple/generator/template/impl.vm | 4 +- .../internal/simple/generator/template/sei.vm | 2 +- .../tools/wsdlto/core/AbstractGenerator.java | 2 +- .../jaxws/customization/JAXWSBindingParser.java | 8 ++-- .../frontend/jaxws/generators/SEIGenerator.java | 4 +- .../jaxws/generators/ServiceGenerator.java | 2 +- .../wsdlto/frontend/jaxws/jaxws-toolspec.xml | 2 +- .../processor/internal/ServiceProcessor.java | 2 +- .../wsdlto/frontend/jaxws/template/build.vm | 8 ++-- .../wsdlto/frontend/jaxws/template/client.vm | 12 ++--- .../wsdlto/frontend/jaxws/template/fault.vm | 20 ++++----- .../wsdlto/frontend/jaxws/template/impl.vm | 12 ++--- .../tools/wsdlto/frontend/jaxws/template/sei.vm | 10 ++--- .../wsdlto/frontend/jaxws/template/server.vm | 8 ++-- .../wsdlto/frontend/jaxws/template/service.vm | 46 ++++++++++---------- 29 files changed, 96 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java ---------------------------------------------------------------------- diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java index b20a4d7..a9ea17c 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java @@ -23,7 +23,7 @@ import java.net.URL; import javax.resource.spi.ConnectionRequestInfo; import javax.xml.namespace.QName; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; /** * http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java index 98aa044..fc499d3 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java @@ -35,7 +35,7 @@ import javax.resource.spi.ResourceAdapterAssociation; import javax.resource.spi.work.WorkManager; import javax.security.auth.Subject; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.jca.core.logging.LoggerHelper; import org.apache.cxf.jca.cxf.ResourceAdapterImpl; http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java ---------------------------------------------------------------------- diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java index c5e5a7f..bf62453 100644 --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java @@ -35,7 +35,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.cxf.Bus; import org.apache.cxf.common.util.CollectionUtils; import org.apache.cxf.common.util.SystemPropertyAction; http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java ---------------------------------------------------------------------- diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java index 1a65cc3..5b2576f 100644 --- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java +++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.cxf.helpers.FileUtils; import org.apache.cxf.tools.common.CommandInterfaceUtils; import org.apache.cxf.tools.java2ws.JavaToWS; http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java ---------------------------------------------------------------------- diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java index 352a9d2..3e76d16 100644 --- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java +++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java @@ -32,7 +32,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.SystemUtils; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.helpers.FileUtils; http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/osgi/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index 2e1aeb4..5c55c09 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -403,8 +403,8 @@ <feature version="${project.version}">cxf-jaxrs</feature> <feature version="${project.version}">cxf-jaxws</feature> <feature version="${project.version}">cxf-javascript</feature> - <bundle start-level="35" dependency="true">mvn:commons-lang/commons-lang/2.4</bundle> - <bundle dependency="true">mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle> + <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle> + <bundle dependency="true">wrap:mvn:org.apache.velocity/velocity-engine-core/${cxf.velocity.version}</bundle> <bundle dependency="true">mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle> <bundle>mvn:org.apache.cxf/cxf-tools-common/${project.version}</bundle> <bundle>mvn:org.apache.cxf/cxf-tools-java2ws/${project.version}</bundle> http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 15a55dc..186303a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -158,7 +158,7 @@ <cxf.spring.ldap.version>2.3.1.RELEASE</cxf.spring.ldap.version> <cxf.spring.mock>spring-test</cxf.spring.mock> <cxf.swagger2.version>1.5.16</cxf.swagger2.version> - <cxf.velocity.version>1.7</cxf.velocity.version> + <cxf.velocity.version>2.0</cxf.velocity.version> <cxf.woodstox.core.version>5.0.3</cxf.woodstox.core.version> <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version> <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version> @@ -1563,7 +1563,7 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> <version>${cxf.velocity.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/ExtendedWidget.java ---------------------------------------------------------------------- diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/ExtendedWidget.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/ExtendedWidget.java index 608beb6..66742b3 100644 --- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/ExtendedWidget.java +++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/ExtendedWidget.java @@ -25,8 +25,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; @XmlType(name = "extendedwidget", namespace = "http://cxf.org.apache/model";) http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/Widget.java ---------------------------------------------------------------------- diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/Widget.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/Widget.java index 2f53d4f..12a29f5 100644 --- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/Widget.java +++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/model/Widget.java @@ -26,8 +26,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; @XmlType(name = "widget", namespace = "http://cxf.org.apache/model";) @XmlRootElement(name = "widget", namespace = "http://cxf.org.apache/model";) http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/common/pom.xml ---------------------------------------------------------------------- diff --git a/tools/common/pom.xml b/tools/common/pom.xml index bb32c1f..fcf5763 100644 --- a/tools/common/pom.xml +++ b/tools/common/pom.xml @@ -44,7 +44,7 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> <exclusions> <exclusion> <groupId>commons-collections</groupId> http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java ---------------------------------------------------------------------- diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java b/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java index 49603cb..967c57a 100644 --- a/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java +++ b/tools/common/src/main/java/org/apache/cxf/tools/common/VelocityGenerator.java @@ -37,7 +37,6 @@ import org.apache.cxf.version.Version; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; -import org.apache.velocity.runtime.RuntimeConstants; public final class VelocityGenerator { private static final Logger LOG = LogUtils.getL7dLogger(VelocityGenerator.class); @@ -72,10 +71,10 @@ public final class VelocityGenerator { props.put("resource.loader", "class"); props.put("class.resource.loader.class", clzName); props.put("runtime.log", getVelocityLogFile("velocity.log")); - if (!log) { - props.put(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, - "org.apache.velocity.runtime.log.NullLogSystem"); - } +// if (!log) { +// props.put(VelocityEngine.RUNTIME_LOG_INSTANCE, +// "org.apache.velocity.runtime.log.NullLogSystem"); +// } Velocity.init(props); } catch (Exception e) { Message msg = new Message("FAIL_TO_INITIALIZE_VELOCITY_ENGINE", LOG); http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/build.xml.vm ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/build.xml.vm b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/build.xml.vm index 6803735..623fdc4 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/build.xml.vm +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/build.xml.vm @@ -64,15 +64,15 @@ - in a source distribution, or ${cxf.home}/lib/cxf-manifest.jar in a binary - distribution. --> - <condition property="cxf-manifest.jar.file" value="${cxf.home}/build/lib/cxf-manifest.jar"> + <condition property="cxfManifest.jar.file" value="${cxf.home}/build/lib/cxf-manifest.jar"> <available file="cxf-manifest.jar" type="file" filepath="${cxf.home}/build/lib"/> </condition> - <property name="cxf-manifest.jar.file" value="${cxf.home}/lib/cxf-manifest.jar"/> + <property name="cxfManifest.jar.file" value="${cxf.home}/lib/cxf-manifest.jar"/> <fail message="The location ${cxf.home} does not seem to contain a cxf installation; if you are importing this common build file from a location other than the cxf samples directory then you need to set the cxf_HOME environment variable."> <condition> <not> - <isset property="cxf-manifest.jar.file" /> + <isset property="cxfManifest.jar.file" /> </not> </condition> </fail> @@ -93,7 +93,7 @@ <path id="cxf.classpath"> <pathelement location="${build.classes.dir}"/> - <pathelement location="${cxf-manifest.jar.file}"/> + <pathelement location="${cxfManifest.jar.file}"/> </path> #foreach ($targetName in $clientClassNamesMap.keySet()) http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/template/javafirst-impl.vm ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/template/javafirst-impl.vm b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/template/javafirst-impl.vm index bec91d5..cac050a 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/template/javafirst-impl.vm +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/template/javafirst-impl.vm @@ -33,7 +33,7 @@ import javax.jws.WebService; public class ${intf.Name}Impl implements $intf.Name { #foreach ($method in $intf.Methods) - public $method.return.ClassName ${method.Name}(#if($method.ParameterList.size() == 0))#end#if($method.ParameterList.size() != 0)#foreach ($param in ${method.ParameterList})$param#end)#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $velocityCount),#end#end#end { + public $method.return.ClassName ${method.Name}(#if($method.ParameterList.size() == 0))#end#if($method.ParameterList.size() != 0)#foreach ($param in ${method.ParameterList})$param#end)#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $foreach.count),#end#end#end { #foreach ($parameter in $method.Parameters) #if ($parameter.Style.toString() == "IN") System.out.println($parameter.Name);#end#end @@ -62,4 +62,4 @@ public class ${intf.Name}Impl implements $intf.Name { } #end -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/template/javafirst-sei.vm ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/template/javafirst-sei.vm b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/template/javafirst-sei.vm index b42acae..1307df9 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/template/javafirst-sei.vm +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/generator/template/javafirst-sei.vm @@ -43,6 +43,6 @@ public interface $intf.Name { #foreach ($param in ${method.ParameterList}) $param #end - )#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $velocityCount),#end#end#end; + )#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $foreach.count),#end#end#end; #end } http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/impl.vm ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/impl.vm b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/impl.vm index c0da17d..ddc3235 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/impl.vm +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/impl.vm @@ -32,7 +32,7 @@ package $intf.PackageName; public class ${intf.Name}Impl implements ${seiClass} { #foreach ($method in $intf.Methods) - public $method.return.ClassName ${method.Name}(#if($method.ParameterList.size() == 0))#end#if($method.ParameterList.size() != 0)#foreach ($param in ${method.ParameterList})$param#end)#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $velocityCount),#end#end#end { + public $method.return.ClassName ${method.Name}(#if($method.ParameterList.size() == 0))#end#if($method.ParameterList.size() != 0)#foreach ($param in ${method.ParameterList})$param#end)#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $foreach.count),#end#end#end { #foreach ($parameter in $method.Parameters) #if ($parameter.Style.toString() == "IN") System.out.println($parameter.Name);#end#end @@ -61,4 +61,4 @@ public class ${intf.Name}Impl implements ${seiClass} { } #end -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/sei.vm ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/sei.vm b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/sei.vm index e88e4bb..b0ce9ba 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/sei.vm +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/simple/generator/template/sei.vm @@ -43,6 +43,6 @@ public interface $intf.Name { #foreach ($param in ${method.ParameterList}) $param #end - )#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $velocityCount),#end#end#end; + )#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $foreach.count),#end#end#end; #end } http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java index 57b7f42..c1adf8f 100644 --- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java +++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java @@ -116,7 +116,7 @@ public abstract class AbstractGenerator implements FrontEndGenerator { setAttributes("version", Version.getCurrentVersion()); setAttributes("fullversion", Version.getCompleteVersionString()); setAttributes("name", Version.getName()); - setAttributes("mark-generated", env.optionSet(ToolConstants.CFG_MARK_GENERATED)); + setAttributes("markGenerated", env.optionSet(ToolConstants.CFG_MARK_GENERATED)); if (env.optionSet(ToolConstants.CFG_FRONTEND)) { setAttributes("frontend", env.get(ToolConstants.CFG_FRONTEND)); } http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java index 847bfd5..aafe2a2 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java @@ -35,7 +35,7 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.cxf.common.i18n.Message; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.common.util.StringUtils; @@ -94,14 +94,14 @@ public class JAXWSBindingParser { jaxwsBinding.setPackage(getPackageName(child)); Node docChild = DOMUtils.getChild(child, Node.ELEMENT_NODE); if (docChild != null && this.isJAXWSClassDoc(docChild)) { - jaxwsBinding.setPackageJavaDoc(StringEscapeUtils.escapeHtml(DOMUtils.getContent(docChild))); + jaxwsBinding.setPackageJavaDoc(StringEscapeUtils.escapeHtml4(DOMUtils.getContent(docChild))); } } else if (isJAXWSMethodElement(child)) { jaxwsBinding.setMethodName(getMethodName(child)); Node docChild = DOMUtils.getChild(child, Node.ELEMENT_NODE); if (docChild != null && this.isJAXWSClassDoc(docChild)) { - jaxwsBinding.setMethodJavaDoc(StringEscapeUtils.escapeHtml(DOMUtils.getContent(docChild))); + jaxwsBinding.setMethodJavaDoc(StringEscapeUtils.escapeHtml4(DOMUtils.getContent(docChild))); } } else if (isJAXWSParameterElement(child)) { Element childElement = (Element)child; @@ -140,7 +140,7 @@ public class JAXWSBindingParser { Node docChild = DOMUtils.getChild(child, Node.ELEMENT_NODE); if (docChild != null && this.isJAXWSClassDoc(docChild)) { - javadoc = StringEscapeUtils.escapeHtml(DOMUtils.getContent(docChild)); + javadoc = StringEscapeUtils.escapeHtml4(DOMUtils.getContent(docChild)); } JAXWSClass jaxwsClass = new JAXWSClass(clzName, javadoc); http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java index 209425a..0859f7f 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java @@ -24,7 +24,7 @@ import java.util.Map; import javax.jws.HandlerChain; import javax.xml.namespace.QName; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.cxf.annotations.DataBinding; import org.apache.cxf.common.i18n.Message; import org.apache.cxf.helpers.CastUtils; @@ -129,7 +129,7 @@ public class SEIGenerator extends AbstractJAXWSGenerator { if (!StringUtils.isEmpty(seiSc)) { seiSc += " "; } - setAttributes("sei-superinterface-string", seiSc); + setAttributes("seiSuperinterfaceString", seiSc); setCommonAttributes(); doWrite(SEI_TEMPLATE, parseOutputName(intf.getPackageName(), intf.getName())); http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java index 4dd3f70..13c3e21 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServiceGenerator.java @@ -158,7 +158,7 @@ public class ServiceGenerator extends AbstractJAXWSGenerator { setCommonAttributes(); String target = (String)env.get("service.target"); - setAttributes("service-target", target); + setAttributes("serviceTarget", target); if ("jaxws22".equals(target)) { setAttributes("jaxws22", true); } http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml index 54a7480..a8339e1 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-toolspec.xml @@ -363,7 +363,7 @@ Examples: <annotation>seiSuper</annotation> </associatedArgument> </option> - <option id="mark-generated" maxOccurs="1"> + <option id="markGenerated" maxOccurs="1"> <annotation> Adds @Generated annotation in all java files that are generated. </annotation> http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java index ee2c816..ee67589 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java @@ -35,7 +35,7 @@ import javax.xml.namespace.QName; import org.w3c.dom.Element; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.cxf.binding.soap.SOAPBindingUtil; import org.apache.cxf.binding.soap.wsdl.extensions.SoapBinding; import org.apache.cxf.binding.soap.wsdl.extensions.SoapBody; http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm index d31d2b7..bf40bdf 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/build.vm @@ -61,15 +61,15 @@ - in a source distribution, or ${cxf.home}/lib/cxf-manifest.jar in a binary - distribution. --> - <condition property="cxf-manifest.jar.file" value="${cxf.home}/build/lib/cxf-manifest.jar"> + <condition property="cxfManifest.jar.file" value="${cxf.home}/build/lib/cxf-manifest.jar"> <available file="cxf-manifest.jar" type="file" filepath="${cxf.home}/build/lib"/> </condition> - <property name="cxf-manifest.jar.file" value="${cxf.home}/lib/cxf-manifest.jar"/> + <property name="cxfManifest.jar.file" value="${cxf.home}/lib/cxf-manifest.jar"/> <fail message="The location ${cxf.home} does not seem to contain a cxf installation; if you are importing this common build file from a location other than the cxf samples directory then you need to set the cxf_HOME environment variable."> <condition> <not> - <isset property="cxf-manifest.jar.file" /> + <isset property="cxfManifest.jar.file" /> </not> </condition> </fail> @@ -102,7 +102,7 @@ <path id="cxf.classpath"> <pathelement location="${home.dir}" /> <pathelement location="${build.classes.dir}"/> - <pathelement location="${cxf-manifest.jar.file}"/> + <pathelement location="${cxfManifest.jar.file}"/> <fileset dir="${cxf.endorsed.dir}"> <include name="*.jar"/> </fileset> http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm index f6dc7b4..5b9f187 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/client.vm @@ -25,7 +25,7 @@ package $intf.PackageName; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -#if ($mark-generated == "true") +#if ($markGenerated == "true") import javax.annotation.Generated; #end import javax.xml.namespace.QName; @@ -42,23 +42,23 @@ import ${import}; * Generated source version: $version * */ -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate", comments = "$fullversion") #end public final class ${clientClassName} { -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end private static final QName SERVICE_NAME = new QName("$service.Namespace", "$service.ServiceName"); -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end private ${clientClassName}() { } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public static void main(String args[]) throws java.lang.Exception { @@ -100,7 +100,7 @@ public final class ${clientClassName} { try { #end #if($method.return.ClassName != "void")${indent}${method.return.ClassName} _${method.Name}__return = #else${indent}#end -port.${method.Name}(#foreach($parameter in $method.Parameters)_${method.Name}_${parameter.Name}#if($velocityCount != $method.parameterCount), #end#end); +port.${method.Name}(#foreach($parameter in $method.Parameters)_${method.Name}_${parameter.Name}#if($foreach.count != $method.parameterCount), #end#end); #if($method.return.Type != "void") ${indent}System.out.println("${method.Name}.result=" + _${method.Name}__return); #end http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm index 4ed0586..0d2208f 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/fault.vm @@ -17,7 +17,7 @@ package $expClass.PackageName; -#if ($mark-generated == "true") +#if ($markGenerated == "true") import javax.annotation.Generated; #end import javax.xml.ws.WebFault; @@ -39,45 +39,45 @@ $expClass.classJavaDoc #foreach ($field in $expClass.Fields) @WebFault(name = "$field.Name", targetNamespace = "$field.TargetNamespace") #end -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate", comments = "$fullversion") #end public class $expClass.Name extends $exceptionSuperclass { #if (${suid} != "") -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public static final long serialVersionUID = ${suid}L; #end #foreach ($field in $expClass.Fields) -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end $field.Modifier $field.ClassName $paraName; -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${expClass.Name}() { super(); } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${expClass.Name}(String message) { super(message); } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${expClass.Name}(String message, Throwable cause) { super(message, cause); } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${expClass.Name}(String message, $field.ClassName $paraName) { @@ -85,7 +85,7 @@ public class $expClass.Name extends $exceptionSuperclass { this.$paraName = $paraName; } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${expClass.Name}(String message, $field.ClassName $paraName, Throwable cause) { @@ -93,7 +93,7 @@ public class $expClass.Name extends $exceptionSuperclass { this.$paraName = $paraName; } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public $field.ClassName getFaultInfo() { http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm index d9fe1b7..fdc8ce4 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/impl.vm @@ -23,7 +23,7 @@ package $intf.PackageName; import java.util.logging.Logger; -#if ($mark-generated == "true") +#if ($markGenerated == "true") import javax.annotation.Generated; #end #foreach ($import in $intf.Imports) @@ -52,24 +52,24 @@ import ${import}; #end endpointInterface = "$intf.PackageName.$intf.Name") -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate", comments = "$fullversion") #end public class ${implName} implements $intf.Name { -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end private static final Logger LOG = Logger.getLogger(${implName}.class.getName()); #foreach ($method in $intf.Methods) /* (non-Javadoc) - * @see $intf.PackageName.$intf.Name#${method.Name}(#foreach ($parameter in $method.Parameters)$parameter.ClassName $parameter.Name#if ($velocityCount != $method.getParameters().size()), #end#end)* + * @see $intf.PackageName.$intf.Name#${method.Name}(#foreach ($parameter in $method.Parameters)$parameter.ClassName $parameter.Name#if ($foreach.count != $method.getParameters().size()), #end#end)* */ -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end - public $method.return.ClassName ${method.Name}(#if($method.ParameterListWithoutAnnotation.size() == 0))#end#if($method.ParameterListWithoutAnnotation.size() != 0)#foreach($param in ${method.ParameterListWithoutAnnotation})$param#if($velocityCount != $method.ParameterListWithoutAnnotation.size()) #end#end)#end#if($method.Exceptions.size() > 0) throws #foreach($exception in $method.Exceptions)$exception.ClassName#if($velocityCount != $method.Exceptions.size()), #end #end #end { + public $method.return.ClassName ${method.Name}(#if($method.ParameterListWithoutAnnotation.size() == 0))#end#if($method.ParameterListWithoutAnnotation.size() != 0)#foreach($param in ${method.ParameterListWithoutAnnotation})$param#if($foreach.count != $method.ParameterListWithoutAnnotation.size()) #end#end)#end#if($method.Exceptions.size() > 0) throws #foreach($exception in $method.Exceptions)$exception.ClassName#if($foreach.count != $method.Exceptions.size()), #end #end #end { #if ($method.Async) return null; /* not called */ http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm index 39479e2..4e033a9 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/sei.vm @@ -21,7 +21,7 @@ $intf.packageJavaDoc #end package $intf.PackageName; -#if ($mark-generated == "true") +#if ($markGenerated == "true") import javax.annotation.Generated; #end #foreach ($import in $intf.Imports) @@ -41,10 +41,10 @@ $intf.classJavaDoc #foreach ($annotation in $intf.Annotations) $annotation #end -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate", comments = "$fullversion") #end -public interface $intf.Name ${sei-superinterface-string}{ +public interface $intf.Name ${seiSuperinterfaceString}{ #foreach ($method in $intf.Methods) #if ($method.JavaDoc != "") @@ -55,7 +55,7 @@ ${method.JavaDoc} #foreach ($annotation in $method.Annotations) $annotation #end -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public $method.returnValue ${method.Name}(#if($method.ParameterList.size() == 0))#end @@ -64,6 +64,6 @@ ${method.JavaDoc} #foreach ($param in ${method.ParameterList}) $param #end - )#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $velocityCount),#end#end#end; + )#end#if($method.Exceptions.size() > 0) throws#foreach($exception in $method.Exceptions) $exception.ClassName#if($method.Exceptions.size() != $foreach.count),#end#end#end; #end } http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm index 6a1192d..1c43bd3 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/server.vm @@ -17,7 +17,7 @@ package $intf.PackageName; -#if ($mark-generated == "true") +#if ($markGenerated == "true") import javax.annotation.Generated; #end import javax.xml.ws.Endpoint; @@ -29,12 +29,12 @@ import javax.xml.ws.Endpoint; * */ -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate", comments = "$fullversion") #end public class ${serverClassName}{ -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end protected ${serverClassName}() throws java.lang.Exception { @@ -44,7 +44,7 @@ public class ${serverClassName}{ Endpoint.publish(address, implementor); } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public static void main(String args[]) throws java.lang.Exception { http://git-wip-us.apache.org/repos/asf/cxf/blob/f1ef25d9/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm index e22e7cb..57a2526 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/template/service.vm @@ -25,7 +25,7 @@ package $service.PackageName; import java.net.MalformedURLException; #end import java.net.URL; -#if ($mark-generated == "true") +#if ($markGenerated == "true") import javax.annotation.Generated; #end import javax.xml.namespace.QName; @@ -35,7 +35,7 @@ import javax.xml.ws.WebServiceFeature; #foreach ($import in ${service.Imports}) import ${import}; #end -#if ($service-target == "cxf") +#if ($serviceTarget == "cxf") import org.apache.cxf.Bus; import org.apache.cxf.common.logging.LogUtils; #end @@ -58,22 +58,22 @@ $service.classJavaDoc #foreach ($annotation in $service.Annotations) $annotation #end -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate", comments = "$fullversion") #end public class ${service.Name} extends ${serviceSuperclass} { -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public final static URL WSDL_LOCATION; -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public final static QName SERVICE = new QName("$service.Namespace", "$service.ServiceName"); #foreach ($port in ${service.Ports}) -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public final static QName $port.Name = new QName("$service.Namespace", "$port.PortName"); @@ -91,7 +91,7 @@ public class ${service.Name} extends ${serviceSuperclass} { } #end if (url == null) { -#if ($service-target == "cxf") +#if ($serviceTarget == "cxf") LogUtils.getL7dLogger(${service.Name}.class) #else java.util.logging.Logger.getLogger(${service.Name}.class.getName()) @@ -106,7 +106,7 @@ public class ${service.Name} extends ${serviceSuperclass} { url = ${service.Name}.class.getClassLoader().getResource("$wsdlLocation"); } if (url == null) { -#if ($service-target == "cxf") +#if ($serviceTarget == "cxf") LogUtils.getL7dLogger(${service.Name}.class) #else java.util.logging.Logger.getLogger(${service.Name}.class.getName()) @@ -120,7 +120,7 @@ public class ${service.Name} extends ${serviceSuperclass} { try { url = new URL("$wsdlLocation"); } catch (MalformedURLException e) { -#if ($service-target == "cxf") +#if ($serviceTarget == "cxf") LogUtils.getL7dLogger(${service.Name}.class) #else java.util.logging.Logger.getLogger(${service.Name}.class.getName()) @@ -132,43 +132,43 @@ public class ${service.Name} extends ${serviceSuperclass} { #end } -#if ($service-target == "cxf") -#if ($mark-generated == "true") +#if ($serviceTarget == "cxf") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${service.Name}(Bus bus, WebServiceFeature ... features) { super(bus, WSDL_LOCATION, SERVICE, features); } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${service.Name}(Bus bus, URL wsdlLocation, WebServiceFeature ... features) { super(bus, wsdlLocation, SERVICE, features); } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${service.Name}(Bus bus, URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { super(bus, wsdlLocation, serviceName, features); } #else -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${service.Name}(URL wsdlLocation) { super(wsdlLocation, SERVICE); } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${service.Name}(URL wsdlLocation, QName serviceName) { super(wsdlLocation, serviceName); } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${service.Name}() { @@ -176,22 +176,22 @@ public class ${service.Name} extends ${serviceSuperclass} { } #end -#if ($jaxws22 || $service-target == "cxf") -#if ($mark-generated == "true") +#if ($jaxws22 || $serviceTarget == "cxf") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${service.Name}(WebServiceFeature ... features) { super(WSDL_LOCATION, SERVICE, features); } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${service.Name}(URL wsdlLocation, WebServiceFeature ... features) { super(wsdlLocation, SERVICE, features); } -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${service.Name}(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) { @@ -205,7 +205,7 @@ public class ${service.Name} extends ${serviceSuperclass} { * Proxy interface the extends ${portClassName} to also provide useful methods * without having to cast to the appropriate interface. */ -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public interface ${portClassName}Proxy extends ${portClassName}, AutoCloseable, BindingProvider, Client { @@ -232,7 +232,7 @@ $port.javaDoc * returns ${port.InterfaceClass} */ @WebEndpoint(name = "${port.PortName}") -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${portClassName} ${port.MethodName}() { @@ -250,7 +250,7 @@ $port.javaDoc * returns ${port.InterfaceClass} */ @WebEndpoint(name = "${port.PortName}") -#if ($mark-generated == "true") +#if ($markGenerated == "true") @Generated(value = "org.apache.cxf.tools.wsdlto.WSDLToJava", date = "$currentdate") #end public ${portClassName} ${port.MethodName}(WebServiceFeature... features) {
