Skip to content
Permalink
Browse files
CXFXJC-16 - Technical upgrade for cxf-xjc-ts
  • Loading branch information
coheigea committed Dec 6, 2016
1 parent 7beda06 commit ab0547101ea9430fa12d018db2150fb6eb8608f8
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 27 deletions.
@@ -52,8 +52,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>

@@ -52,8 +52,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>

@@ -131,9 +131,9 @@
<version>3.3.3</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -42,8 +42,8 @@

<dependencies>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<optional>true</optional>
</dependency>
<dependency>
@@ -21,8 +21,8 @@

import java.util.Collection;

import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

public final class JAXBToStringBuilder {
private JAXBToStringBuilder() {
@@ -21,9 +21,9 @@

import javax.xml.bind.JAXBElement;

import org.apache.commons.lang.SystemUtils;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

/*
* Override default styles to recognise JAXBElement as needing introspection
@@ -72,7 +72,7 @@ class JAXBToStringStyleImpl extends ToStringStyle {
* Introspect into JAXBElement as a special case as it does not have a
* toString() and we loose the content
*
* @see org.apache.commons.lang.builder.ToStringStyle
* @see org.apache.commons.lang3.builder.ToStringStyle
*/
@Override
protected void appendDetail(StringBuffer buffer, String fieldName, Object value) {
@@ -23,7 +23,7 @@
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;

import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;

import org.junit.Assert;
import org.junit.Test;
@@ -54,8 +54,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>

@@ -79,7 +79,7 @@
<extension>true</extension>
<xsd>${basedir}/src/test/resources/schemas/configuration/foo.xsd</xsd>
<extensionArgs>
<arg>-Xts:style:org.apache.commons.lang.builder.ToStringStyle.DEFAULT_STYLE</arg>
<arg>-Xts:style:org.apache.commons.lang3.builder.ToStringStyle.DEFAULT_STYLE</arg>
</extensionArgs>
</xsdOption>
</xsdOptions>
@@ -47,8 +47,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>

@@ -63,7 +63,7 @@ public String getUsage() {
+ " -Xts:style:simple : Have toString produce single line terse output\n"
+ " equivalent to: "
+ "-Xts:style:org.apache.cxf.xjc.runtime.JAXBToStringStyle.SIMPLE_STYLE\n"
+ " -Xts:style:org.apache.commons.lang.builder.ToStringStyle.FIELD : The full class+field\n"
+ " -Xts:style:org.apache.commons.lang3.builder.ToStringStyle.FIELD : The full class+field\n"
+ " name of the ToStringStyle to use.";
}

@@ -100,7 +100,7 @@ public boolean run(Outline outline, Options opt, ErrorHandler errorHandler) {
}

final JClass toStringDelegateImpl = outline.getCodeModel()
.ref("org.apache.commons.lang.builder.ToStringBuilder");
.ref("org.apache.commons.lang3.builder.ToStringBuilder");
final JClass styleClass = outline.getCodeModel().ref(styleClassName);
final JFieldRef toStringDelegateStyleParam = styleClass.staticRef(styleFieldName);

@@ -54,8 +54,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
@@ -47,8 +47,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>

0 comments on commit ab05471

Please sign in to comment.