Starting to carve out xc jar
diff --git a/build-osgi.xml b/build-osgi.xml
index 3258a96..6bda666 100644
--- a/build-osgi.xml
+++ b/build-osgi.xml
@@ -198,6 +198,9 @@
(OSGi nominally just lists ASL, not sure if/how to
add multiple?)
-->
+
+ <!-- First, JAX-RS provider jar -->
+
<!-- 06-May-2009, tatu: Removed META-INF/services
registration as it could conflict with other
JAX-RS json providers.
@@ -239,4 +242,36 @@
</osgiJar>
</target>
+ <!-- Then XC (Xml Compatibility) jar, since 1.1 -->
+ <target name="jar.xc" depends="compile.xc">
+ <osgiJar
+ outputdir="${dir.build}"
+ bundleName="${IMPL_TITLE_XC}"
+ bundleVendor="${IMPL_VENDOR}"
+ bundleSymbolicName="jackson-xc"
+ bundleVersion="${IMPL_VERSION}"
+ bundleLicense="http://www.apache.org/licenses/LICENSE-2.0.txt"
+ bundleRequiredExecutionEnvironment="${REQ_JDK_VERSION}"
+ filename="jackson-xc-${IMPL_VERSION}"
+ importPackage="
+org.codehaus.jackson;version='${IMPL_VERSION}'
+,org.codehaus.jackson.map;version='${IMPL_VERSION}'
+,org.codehaus.jackson.map.type;version='${IMPL_VERSION}'
+,org.codehaus.jackson.type;version='${IMPL_VERSION}'
+"
+ exportpackage="
+org.codehaus.jackson.xc;version=${IMPL_VERSION}"
+ includeResource="META-INF=release-notes/asl"
+ includeIncludeResourceHeader="false"
+ >
+ <classpath><pathelement path="${dir.build.classes.xc}" /></classpath>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Implementation-Title" value="${IMPL_TITLE_XC}"/>
+ <attribute name="Implementation-Version" value="${IMPL_VERSION}"/>
+ <attribute name="Implementation-Vendor" value="${IMPL_VENDOR}"/>
+ </manifest>
+ </osgiJar>
+ </target>
+
</project>
diff --git a/build.xml b/build.xml
index 56923ad..bd8c90d 100644
--- a/build.xml
+++ b/build.xml
@@ -8,6 +8,7 @@
<property name="dir.src.java.core" location="${dir.src.java}" />
<property name="dir.src.java.mapper" location="${dir.src.java}" />
<property name="dir.src.java.jaxrs" location="${dir.src}/jaxrs/java" />
+ <property name="dir.src.java.xc" location="${dir.src}/xc/java" />
<property name="dir.src.resource.jaxrs" location="${dir.src}/jaxrs/resources" />
<property name="dir.src.maven" location="${dir.src}/maven" />
<property name="dir.src.test" location="${dir.src}/test" />
@@ -22,6 +23,7 @@
<property name="dir.build.classes.core" location="${dir.build}/classes/core" />
<property name="dir.build.classes.mapper" location="${dir.build}/classes/mapper" />
<property name="dir.build.classes.jaxrs" location="${dir.build}/classes/jaxrs" />
+ <property name="dir.build.classes.xc" location="${dir.build}/classes/xc" />
<!-- both "sample" and "tools" java code goes under "extra" -->
<property name="dir.build.classes.extra" location="${dir.build}/classes/extra" />
<!-- some support for perf testing -->
@@ -49,6 +51,7 @@
<property name="IMPL_TITLE_CORE" value="Jackson JSON processor" />
<property name="IMPL_TITLE_MAPPER" value="Data mapper for Jackson JSON processor" />
<property name="IMPL_TITLE_JAXRS" value="JAX-RS provider for Json content type, using Jackson data binding" />
+ <property name="IMPL_TITLE_XC" value="XML Compatibility extensions for Jackson data binding" />
<property name="IMPL_VERSION" value="1.0.1-SNAPSHOT" />
<property name="IMPL_VENDOR" value="http://fasterxml.com" />
@@ -112,6 +115,7 @@
<mkdir dir="${dir.build.classes.core}" />
<mkdir dir="${dir.build.classes.mapper}" />
<mkdir dir="${dir.build.classes.jaxrs}" />
+ <mkdir dir="${dir.build.classes.xc}" />
<mkdir dir="${dir.build.classes.extra}" />
<!-- make docs directories -->
@@ -151,12 +155,12 @@
<target name="compile.all" depends="
compile.main, compile.test, compile.extra, compile.perf" />
<target name="compile.main"
- depends="compile.core, compile.mapper, compile.jaxrs" />
+ depends="compile.core, compile.mapper, compile.jaxrs, compile.xc" />
<target name="compile.core" depends="prepare">
<javac srcdir="${dir.src.java}" destdir="${dir.build.classes.core}"
source="1.5" target="1.5"
- debug="true"
+ debug="false"
>
<compilerarg value="-Xlint:unchecked" />
<exclude name="org/codehaus/jackson/map/**/*.java" />
@@ -199,6 +203,24 @@
</javac>
</target>
+ <target name="compile.xc" depends="compile.mapper">
+ <javac srcdir="${dir.src.java.xc}" destdir="${dir.build.classes.xc}"
+ source="1.5" target="1.5"
+ debug="true"
+ >
+ <compilerarg value="-Xlint:unchecked" />
+ <include name="org/codehaus/jackson/**/*.java" />
+ <!-- builds on core and mapper classes -->
+ <classpath>
+ <fileset dir="${dir.lib}/xc">
+ <include name="*.jar" />
+ </fileset>
+ <pathelement path="${dir.build.classes.core}"/>
+ <pathelement path="${dir.build.classes.mapper}"/>
+ </classpath>
+ </javac>
+ </target>
+
<target name="compile.extra" depends="compile.main">
<javac destdir="${dir.build.classes.extra}"
source="1.5" target="1.5" debug="true"
@@ -314,6 +336,10 @@
filesonly="true" compress="true" basedir="${dir.src.java.jaxrs}"
includes="org/codehaus/jackson/jaxrs/**"
/>
+ <jar destfile="${dir.dist}/jackson-xc-${IMPL_VERSION}-sources.jar"
+ filesonly="true" compress="true" basedir="${dir.src.java.xc}"
+ includes="org/codehaus/jackson/xc/**"
+ />
<!-- Then copy javadocs -->
<copy todir="${dir.dist}">
diff --git a/src/java/org/codehaus/jackson/xc/JaxbAnnotationIntrospector.java b/src/xc/org/codehaus/jackson/xc/JaxbAnnotationIntrospector.java
similarity index 100%
rename from src/java/org/codehaus/jackson/xc/JaxbAnnotationIntrospector.java
rename to src/xc/org/codehaus/jackson/xc/JaxbAnnotationIntrospector.java
diff --git a/src/java/org/codehaus/jackson/xc/XmlAdapterJsonDeserializer.java b/src/xc/org/codehaus/jackson/xc/XmlAdapterJsonDeserializer.java
similarity index 100%
rename from src/java/org/codehaus/jackson/xc/XmlAdapterJsonDeserializer.java
rename to src/xc/org/codehaus/jackson/xc/XmlAdapterJsonDeserializer.java
diff --git a/src/java/org/codehaus/jackson/xc/XmlAdapterJsonSerializer.java b/src/xc/org/codehaus/jackson/xc/XmlAdapterJsonSerializer.java
similarity index 100%
rename from src/java/org/codehaus/jackson/xc/XmlAdapterJsonSerializer.java
rename to src/xc/org/codehaus/jackson/xc/XmlAdapterJsonSerializer.java
