Author: cschneider
Date: Tue Jan 31 10:17:01 2012
New Revision: 1238359
URL: http://svn.apache.org/viewvc?rev=1238359&view=rev
Log:
CXF-4069 Add a new module for JAX DataTypeAdapter and the ToString classes so
generated code does not have to depend on cxf
Removed:
cxf/trunk/rt/databinding/jaxb-adapter/
Modified:
cxf/trunk/rt/databinding/jaxb/pom.xml
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java
cxf/trunk/rt/frontend/jaxrs/pom.xml
cxf/trunk/rt/pom.xml
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
Modified: cxf/trunk/rt/databinding/jaxb/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=1238359&r1=1238358&r2=1238359&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/jaxb/pom.xml (original)
+++ cxf/trunk/rt/databinding/jaxb/pom.xml Tue Jan 31 10:17:01 2012
@@ -98,6 +98,7 @@
<scope>test</scope>
</dependency>
+ <!-- Remove when deprecated JAXBToStringBuilder is removed -->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java?rev=1238359&r1=1238358&r2=1238359&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java
(original)
+++
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringBuilder.java
Tue Jan 31 10:17:01 2012
@@ -24,6 +24,11 @@ import java.util.Collection;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
+/**
+ * Class was moved to project org.apache.cxf.xjc-utils:cxf-xjc-runtime
+ * so generated code does not have to depend on cxf
+ */
+@Deprecated
public final class JAXBToStringBuilder {
private JAXBToStringBuilder() {
}
Modified:
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java?rev=1238359&r1=1238358&r2=1238359&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java
(original)
+++
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBToStringStyle.java
Tue Jan 31 10:17:01 2012
@@ -25,9 +25,13 @@ import org.apache.commons.lang.SystemUti
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
-/*
+/**
* Override default styles to recognise JAXBElement as needing introspection
+ *
+ * Class was moved to project org.apache.cxf.xjc-utils:cxf-xjc-runtime
+ * so generated code does not have to depend on cxf
*/
+@Deprecated
public final class JAXBToStringStyle {
public static final ToStringStyle MULTI_LINE_STYLE =
Modified:
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java?rev=1238359&r1=1238358&r2=1238359&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java
(original)
+++
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBElementToStringStyleTest.java
Tue Jan 31 10:17:01 2012
@@ -28,6 +28,7 @@ import org.apache.commons.lang.builder.T
import org.junit.Assert;
import org.junit.Test;
+@Deprecated
public class JAXBElementToStringStyleTest {
class Holder {
Modified:
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java?rev=1238359&r1=1238358&r2=1238359&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java
(original)
+++
cxf/trunk/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBToStringBuilderTest.java
Tue Jan 31 10:17:01 2012
@@ -27,7 +27,7 @@ import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
-
+@Deprecated
public class JAXBToStringBuilderTest {
final String dataV = "someData";
Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1238359&r1=1238358&r2=1238359&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Tue Jan 31 10:17:01 2012
@@ -37,6 +37,9 @@
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
</cxf.osgi.import>
+ <cxf.osgi.export>
+ *, META-INF
+ </cxf.osgi.export>
</properties>
<dependencies>
Modified: cxf/trunk/rt/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/pom.xml?rev=1238359&r1=1238358&r2=1238359&view=diff
==============================================================================
--- cxf/trunk/rt/pom.xml (original)
+++ cxf/trunk/rt/pom.xml Tue Jan 31 10:17:01 2012
@@ -36,7 +36,6 @@
<module>core</module>
<module>transports/local</module>
<module>databinding/jaxb</module>
- <module>databinding/jaxb-adapter</module>
<module>databinding/xmlbeans</module>
<module>databinding/aegis</module>
<module>databinding/sdo</module>
Modified:
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java?rev=1238359&r1=1238358&r2=1238359&view=diff
==============================================================================
---
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
(original)
+++
cxf/trunk/tools/common/src/main/java/org/apache/cxf/tools/common/DataTypeAdapter.java
Tue Jan 31 10:17:01 2012
@@ -23,6 +23,11 @@ import java.util.Date;
import javax.xml.bind.DatatypeConverter;
+/**
+ *Class was moved to project org.apache.cxf.xjc-utils:cxf-xjc-runtime
+ * so generated code does not have to depend on cxf
+ */
+@Deprecated
public final class DataTypeAdapter {
private DataTypeAdapter() {
