Author: heiko.braun(a)jboss.com Date: 2007-10-04 10:15:08 -0400 (Thu, 04 Oct 2007) New Revision: 4679 Added: projects/jaxbintros/src/main/resources/jaxb-intros.xsd projects/jaxbintros/src/test/ projects/jaxbintros/src/test/java/ projects/jaxbintros/src/test/java/org/ projects/jaxbintros/src/test/java/org/jboss/ projects/jaxbintros/src/test/java/org/jboss/jaxb/ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/IntroductionsConfigParserUnitTest.java projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/TestBean1.java projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/TestBean2.java projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-01.xml projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-02.xml projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-03.xml projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/order-message.xml projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Address.java projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Contact.java projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/CustomerOrder.java projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Item.java projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/OrderHeader.java projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Party.java projects/jaxbintros/src/test/resources/ projects/jaxbintros/src/test/resources/log4j.xml Modified: projects/jaxbintros/build.xml Log: Include unit tests and jaxb-intros.xsd Modified: projects/jaxbintros/build.xml =================================================================== --- projects/jaxbintros/build.xml 2007-10-04 13:35:49 UTC (rev 4678) +++ projects/jaxbintros/build.xml 2007-10-04 14:15:08 UTC (rev 4679) @@ -12,7 +12,7 @@ <!-- $Id$ --> <project default="main" basedir="." name="JBossWS-JBoss42"> - + <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/build-thirdparty.xml"/> @@ -24,7 +24,7 @@ <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - + <property name="jaxbintro.dir" value="${basedir}"/> <property name="jaxbintro.src.dir" value="${jaxbintro.dir}/src/main"/> <property name="jaxbintro.etc.dir" value="${jaxbintro.src.dir}/etc"/> @@ -36,18 +36,21 @@ <property name="jaxbintro.output.etc.dir" value="${jaxbintro.output.dir}/etc"/> <property name="jaxbintro.output.lib.dir" value="${jaxbintro.output.dir}/lib"/> + <property name="tests.java.dir" value="${jaxbintro.dir}/src/test/java"/> + <property name="tests.output.dir" value="${jaxbintro.output.dir}/tests"/> + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> - + <target name="init" depends="prepare,thirdparty-get"> </target> - + <!-- ================================================================== --> <!-- Compile --> <!-- ================================================================== --> - + <!-- | Compile everything. | @@ -55,28 +58,45 @@ | different type of compile that needs to be performed, short of | documentation compiles. --> - + <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> - + <!-- Compile integration java sources --> <target name="compile-classes" depends="init, thirdparty-classpath"> <mkdir dir="${jaxbintro.output.classes.dir}"/> + <!--main sources --> <javac srcdir="${jaxbintro.java.dir}" sourcepath="" destdir="${jaxbintro.output.classes.dir}" - encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/jaxb/**"/> - <classpath refid="jaxbintro.integration.classpath"/> + <classpath refid="jaxbintro.integration.classpath"/> </javac> + + <!-- tests --> + <mkdir dir="${tests.output.dir}/classes"/> + <javac srcdir="${tests.java.dir}" sourcepath="" destdir="${tests.output.dir}/classes" + encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <include name="org/jboss/jaxb/**"/> + <classpath> + <path location="${jaxbintro.output.classes.dir}"/> + </classpath> + <classpath refid="jaxbintro.integration.classpath"/> + </javac> + <copy todir="${tests.output.dir}/classes"> + <fileset dir="${tests.java.dir}" includes="**/*.xml"></fileset> + </copy> + </target> - + <!-- Compile etc files (manifests and such) --> <target name="compile-etc" depends="init"> <mkdir dir="${jaxbintro.output.etc.dir}"/> <copy todir="${jaxbintro.output.etc.dir}" filtering="yes" overwrite="true"> <fileset dir="${jaxbintro.etc.dir}"> <include name="default.mf"/> - </fileset> + </fileset> <filterset> <filter token="java.vm.version" value="${java.vm.version}"/> <filter token="java.vm.vendor" value="${java.vm.vendor}"/> @@ -86,27 +106,52 @@ </filterset> </copy> </target> - + + + <!-- TEST --> + + <target name="test" depends="compile"> + <mkdir dir="${tests.output.dir}"/> + <mkdir dir="${tests.output.dir}/reports"/> + + <junit printsummary="yes" haltonfailure="yes"> + <classpath> + <path refid="jaxbintro.integration.classpath"/> + <pathelement location="${tests.output.dir}/classes"/> + <pathelement location="${jaxbintro.output.classes.dir}"/> + </classpath> + + <formatter type="plain"/> + + <batchtest fork="yes" todir="${tests.output.dir}/reports"> + <fileset dir="${tests.java.dir}"> + <include name="**/*UnitTest*.java"/> + <exclude name="**/AllTests.java"/> + </fileset> + </batchtest> + </junit> + </target> + <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> - + <!-- | Build all jar files. --> <target name="jars" depends="compile,module-jars" description="Builds all jar files."> </target> - + <!-- | Build all jar files. --> <target name="module-jars" depends="init"> - + <!-- Build jbossws-jboss42.jar --> <mkdir dir="${jaxbintro.output.lib.dir}"/> <jar jarfile="${jaxbintro.output.lib.dir}/jboss-jaxb-intros.jar" manifest="${jaxbintro.output.etc.dir}/default.mf"> <fileset dir="${jaxbintro.output.classes.dir}"> - <include name="org/jboss/jaxb/**"/> + <include name="org/jboss/jaxb/**"/> </fileset> <metainf dir="${jaxbintro.resources.dir}/jboss-jaxb-intros.jar/META-INF"/> </jar> @@ -115,42 +160,42 @@ <zip zipfile="${jaxbintro.output.lib.dir}/jboss-jaxb-intro-src.zip" > <fileset dir="${jaxbintro.java.dir}"/> </zip> - + </target> - <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc"> + <!-- Generate the JavaDoc --> + <target name="javadoc" depends="init" description="Generate the Javadoc"> - <mkdir dir="${jaxbintro.output.apidocs.dir}"/> - <javadoc destdir="${jaxbintro.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath> - <path refid="jaxbintro.integration.classpath"/> - </classpath> - <packageset dir="${jaxbintro.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/jaxb/**"/> - </packageset> - <doctitle><![CDATA[<h1>JBoss Web Service Framework - JAXB intros</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> - </javadoc> - </target> + <mkdir dir="${jaxbintro.output.apidocs.dir}"/> + <javadoc destdir="${jaxbintro.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> + <classpath> + <path refid="jaxbintro.integration.classpath"/> + </classpath> + <packageset dir="${jaxbintro.java.dir}" defaultexcludes="yes"> + <include name="org/jboss/jaxb/**"/> + </packageset> + <doctitle><![CDATA[<h1>JBoss Web Service Framework - JAXB intros</h1>]]></doctitle> + <tag name="todo" scope="all" description="To do:"/> + </javadoc> + </target> <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> - + <target name="clean" depends="prepare" description="Cleans up most generated files."> <delete dir="${jaxbintro.output.dir}"/> </target> - + <target name="clobber" depends="clean" description="Cleans up all generated files."> <delete dir="${jaxbintro.dir}/thirdparty"/> </target> - + <target name="main" description="Executes the default target (most)." depends="most"/> - + <target name="most" description="Builds almost everything." depends="jars"/> - + <target name="all" description="Create a distribution zip file" depends="main"> </target> - + </project> Added: projects/jaxbintros/src/main/resources/jaxb-intros.xsd =================================================================== --- projects/jaxbintros/src/main/resources/jaxb-intros.xsd (rev 0) +++ projects/jaxbintros/src/main/resources/jaxb-intros.xsd 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsd:schema + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:jaxb-intros="http://www.jboss.org/xsd/jaxb/intros" + targetNamespace="http://www.jboss.org/xsd/jaxb/intros" + elementFormDefault="qualified"> + + <xsd:element name="jaxb-intros"> + <xsd:annotation> + <xsd:documentation xml:lang="en">The jbossesb JAXB Annotation Introductions configuration. + </xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:sequence> + <xsd:element ref="jaxb-intros:Class" minOccurs="1" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="default-namespace" use="optional"/> + </xsd:complexType> + </xsd:element> + + <xsd:complexType name="Class"> + <xsd:sequence> + <xsd:element ref="jaxb-intros:XmlAccessorType" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:XmlType" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:XmlRootElement" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:Field" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element ref="jaxb-intros:Method" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + <xsd:attribute name="name" use="required"/> + </xsd:complexType> + <xsd:element name="Class" type="jaxb-intros:Class"> + <xsd:annotation> + <xsd:documentation xml:lang="en">Java Top Level Class JAXB Annotation Introductions configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:complexType name="class-member-intro-config"> + <xsd:annotation> + <xsd:documentation xml:lang="en">Java Class Member (Field, Method Constructor) JAXB Annotation Introductions configuration base type.</xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element ref="jaxb-intros:XmlElement" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="jaxb-intros:XmlAttribute" minOccurs="0" maxOccurs="1"/> + </xsd:sequence> + <xsd:attribute name="name" use="required"/> + </xsd:complexType> + <xsd:element name="class-member-intro-config" abstract="true" /> + + <xsd:complexType name="Field"> + <xsd:complexContent> + <xsd:extension base="jaxb-intros:class-member-intro-config" /> + </xsd:complexContent> + </xsd:complexType> + <xsd:element name="Field" type="jaxb-intros:Field" substitutionGroup="jaxb-intros:class-member-intro-config"> + <xsd:annotation> + <xsd:documentation xml:lang="en">Java Class Field JAXB Annotation Introductions configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:complexType name="Method"> + <xsd:complexContent> + <xsd:extension base="jaxb-intros:class-member-intro-config" /> + </xsd:complexContent> + </xsd:complexType> + <xsd:element name="Method" type="jaxb-intros:Method" substitutionGroup="jaxb-intros:class-member-intro-config"> + <xsd:annotation> + <xsd:documentation xml:lang="en">Java Class Method JAXB Annotation Introductions configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:complexType name="XmlAccessorType"> + <xsd:attribute name="value" use="optional" default="NONE"> + <xsd:simpleType> + <xsd:restriction base="xsd:NMTOKEN"> + <xsd:enumeration value="PROPERTY"/> + <xsd:enumeration value="FIELD"/> + <xsd:enumeration value="PUBLIC_MEMBER"/> + <xsd:enumeration value="NONE"/> + </xsd:restriction> + </xsd:simpleType> + </xsd:attribute> + </xsd:complexType> + <xsd:element name="XmlAccessorType" type="jaxb-intros:XmlAccessorType" /> + + <xsd:complexType name="XmlRootElement"> + <xsd:attribute name="namespace" use="optional" default="##default"/> + <xsd:attribute name="name" use="optional" default="##default"/> + </xsd:complexType> + <xsd:element name="XmlRootElement" type="jaxb-intros:XmlRootElement"/> + + <xsd:complexType name="XmlType"> + <xsd:attribute name="name" use="optional" default="##default"/> + <xsd:attribute name="propOrder" use="optional" default=""/> + <xsd:attribute name="namespace" use="optional" default="##default"/> + <xsd:attribute name="factoryClass" use="optional"/> + <xsd:attribute name="factoryMethod" use="optional" default=""/> + </xsd:complexType> + <xsd:element name="XmlType" type="jaxb-intros:XmlType"> + <xsd:annotation> + <xsd:documentation xml:lang="en">JAXB 'XmlType' Annotation Introduction configuration.</xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:complexType name="XmlElement"> + <xsd:attribute name="name" use="optional" default="##default"/> + <xsd:attribute name="nillable" type="xsd:boolean" use="optional" default="false"/> + <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/> + <xsd:attribute name="namespace" use="optional" default="##default"/> + <xsd:attribute name="defaultValue" use="optional"/> + <xsd:attribute name="type" use="optional"/> + </xsd:complexType> + <xsd:element name="XmlElement" type="jaxb-intros:XmlElement"> + <xsd:annotation> + <xsd:documentation xml:lang="en">JAXB 'XmlElement' Annotation Introduction configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + + <xsd:complexType name="XmlAttribute"> + <xsd:attribute name="name" use="optional" default="##default"/> + <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/> + <xsd:attribute name="namespace" use="optional" default="##default"/> + </xsd:complexType> + <xsd:element name="XmlAttribute" type="jaxb-intros:XmlAttribute"> + <xsd:annotation> + <xsd:documentation xml:lang="en">JAXB 'XmlAttribute' Annotation Introduction configuration. + </xsd:documentation> + </xsd:annotation> + </xsd:element> + +</xsd:schema> Property changes on: projects/jaxbintros/src/main/resources/jaxb-intros.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,98 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2006, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2005-2006, JBoss Inc. + */ +package org.jboss.jaxb.intros; + +import junit.framework.TestCase; +import org.jboss.jaxb.intros.configmodel.JaxbIntros; +import org.jboss.jaxb.intros.testbeans.*; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Unmarshaller; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.JAXBException; +import javax.xml.transform.stream.StreamSource; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Map; +import java.util.HashMap; +import java.math.BigDecimal; + +import com.sun.xml.bind.api.JAXBRIContext; + +/** + * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> + */ +public class IntroductionsAnnotationReaderUnitTest extends TestCase { + + public void test_annotation_intro() throws ConfigurationException, NoSuchMethodException, NoSuchFieldException { + JaxbIntros config = IntroductionsConfigParser.parseConfig(getClass().getResourceAsStream("intro-config-02.xml")); + IntroductionsAnnotationReader reader = new IntroductionsAnnotationReader(config); + Method testBean1Method = TestBean1.class.getMethod("getOrderDate"); + Field testBean2Field = TestBean2.class.getField("orderNumber"); + + assertTrue("Failed", reader.hasClassAnnotation(TestBean1.class, XmlType.class)); + XmlType xmlType = reader.getClassAnnotation(XmlType.class, TestBean1.class, null); + assertEquals("http://jbossesb.y.jboss.org", xmlType.namespace()); + String[] propOrder = xmlType.propOrder(); + assertEquals(3, propOrder.length); + assertTrue(propOrder[0].equals("a") && propOrder[1].equals("b") && propOrder[2].equals("c")); + assertTrue(xmlType.factoryClass() == TestBean1.class); + + XmlAttribute xmlAttribute = reader.getMethodAnnotation(XmlAttribute.class, testBean1Method, null); + assertEquals("##default", xmlAttribute.name()); + assertEquals("http://jbossesb.z.jboss.org", xmlAttribute.namespace()); + assertFalse(xmlAttribute.required()); + + XmlElement xmlElement = reader.getFieldAnnotation(XmlElement.class, testBean2Field, null); + assertEquals("OrderNum", xmlElement.name()); + assertTrue(xmlElement.nillable()); + assertTrue(xmlElement.type() == TestBean2.class); + + xmlAttribute = reader.getFieldAnnotation(XmlAttribute.class, testBean2Field, null); + assertEquals("http://jbossesb.org", xmlAttribute.namespace()); + } + + public void test_jaxb_unmarshal() throws ConfigurationException, JAXBException { + JaxbIntros config = IntroductionsConfigParser.parseConfig(getClass().getResourceAsStream("intro-config-03.xml")); + IntroductionsAnnotationReader reader = new IntroductionsAnnotationReader(config); + Map<String, Object> jaxbConfig = new HashMap<String, Object>(); + + jaxbConfig.put(JAXBRIContext.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.esb/namespace2"); + jaxbConfig.put(JAXBRIContext.ANNOTATION_READER, reader); + + JAXBContext jaxbContext = JAXBContext.newInstance(new Class[] {CustomerOrder.class}, jaxbConfig); + Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); + + JAXBElement jbe = unmarshaller.unmarshal(new StreamSource(getClass().getResourceAsStream("order-message.xml")), CustomerOrder.class); + CustomerOrder order = (CustomerOrder) jbe.getValue(); + + assertNotNull("null Order", order); + assertNotNull("null Header", order.getHeader()); + assertNotNull("null Items", order.getItems()); + assertEquals("Shelton", order.getHeader().getBillTo().getAddress().getCity()); + assertEquals("06484", order.getHeader().getBillTo().getAddress().getZip()); + assertEquals(&quot;bob(a)activeSteel.com&quot;, order.getHeader().getBillTo().getContact().getEmail()); + assertEquals(1146441600000L, order.getHeader().getOrderDate().getTimeInMillis()); + assertEquals((new BigDecimal(490.00)).toBigInteger(), (order.getItems()[0].getPrice()).toBigInteger()); + } +} Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/IntroductionsAnnotationReaderUnitTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/IntroductionsConfigParserUnitTest.java =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/IntroductionsConfigParserUnitTest.java (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/IntroductionsConfigParserUnitTest.java 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2006, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2005-2006, JBoss Inc. + */ +package org.jboss.jaxb.intros; + +import junit.framework.TestCase; +import org.jboss.jaxb.intros.configmodel.JaxbIntros; +import org.jboss.jaxb.intros.configmodel.ClassIntroConfig; + +/** + * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> + */ +public class IntroductionsConfigParserUnitTest extends TestCase { + + public void test() throws ConfigurationException { + JaxbIntros config = IntroductionsConfigParser.parseConfig(getClass().getResourceAsStream("intro-config-01.xml")); + + assertEquals("http://jbossesb.x.jboss.org", config.getDefaultNamespace()); + assertEquals(2, config.getClazz().size()); + ClassIntroConfig classIntroConfig = config.getClazz().get(0); + assertEquals(TestBean1.class.getName(), classIntroConfig.getName()); + assertEquals("http://jbossesb.y.jboss.org", classIntroConfig.getXmlType().getNamespace()); + assertEquals(1, classIntroConfig.getMethod().size()); + + // Could add more tests here but we're OK for now... JAXB seems to be working fine and + // we'll have more tests on the AnnotationReader! + } +} Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/IntroductionsConfigParserUnitTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/TestBean1.java =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/TestBean1.java (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/TestBean1.java 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2006, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2005-2006, JBoss Inc. + */ +package org.jboss.jaxb.intros; + +import java.util.Date; + +/** + * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> + */ +public class TestBean1 { + + public Date getOrderDate() { + return null; + } +} Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/TestBean1.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/TestBean2.java =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/TestBean2.java (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/TestBean2.java 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2006, JBoss Inc., and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * (C) 2005-2006, JBoss Inc. + */ +package org.jboss.jaxb.intros; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; + +/** + * @author <a href="mailto:tom.fennelly@jboss.com">tom.fennelly@jboss.com</a> + */ +public class TestBean2 { + + @XmlAttribute(namespace="http://jbossesb.org") // This should be picked up + @XmlElement(name="xyz") // This should be overridden by the introduced config (intro-config-02.xml) + public int orderNumber; +} Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/TestBean2.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-01.xml =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-01.xml (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-01.xml 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,24 @@ +<?xml version = "1.0" encoding = "UTF-8"?> +<jaxb-intros xmlns="http://www.jboss.org/xsd/jaxb/intros" + default-namespace="http://jbossesb.x.jboss.org"> + + <!-- + The XSD for the schema can be found at: + http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/extras/jaxbintr... + Register it against the http://www.jboss.org/xsd/jaxb/intros namespace in your IDE and away you go :-) + --> + + <Class name="org.jboss.jaxb.intros.TestBean1"> + <XmlType namespace="http://jbossesb.y.jboss.org" /> + <Method name="getOrderDate"> + <XmlAttribute namespace="http://jbossesb.z.jboss.org" required="false"/> + </Method> + </Class> + + <Class name="org.jboss.jaxb.intros.TestBean2"> + <Field name="orderNumber"> + <XmlElement name="OrderNum" nillable="true" /> + </Field> + </Class> + +</jaxb-intros> Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-01.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-02.xml =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-02.xml (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-02.xml 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,24 @@ +<?xml version = "1.0" encoding = "UTF-8"?> +<jaxb-intros xmlns="http://www.jboss.org/xsd/jaxb/intros" + default-namespace="http://jbossesb.x.jboss.org"> + + <!-- + The XSD for the schema can be found at: + http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/extras/jaxbintr... + Register it against the http://www.jboss.org/xsd/jaxb/intros namespace in your IDE and away you go :-) + --> + + <Class name="org.jboss.jaxb.intros.TestBean1"> + <XmlType namespace="http://jbossesb.y.jboss.org" propOrder="a,b,c" factoryClass="org.jboss.jaxb.intros.TestBean1" /> + <Method name="getOrderDate"> + <XmlAttribute namespace="http://jbossesb.z.jboss.org" required="false"/> + </Method> + </Class> + + <Class name="org.jboss.jaxb.intros.TestBean2"> + <Field name="orderNumber"> + <XmlElement name="OrderNum" nillable="true" type="org.jboss.jaxb.intros.TestBean2" /> + </Field> + </Class> + +</jaxb-intros> Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-02.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-03.xml =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-03.xml (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-03.xml 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,51 @@ +<?xml version = "1.0" encoding = "UTF-8"?> +<jaxb-intros xmlns="http://www.jboss.org/xsd/jaxb/intros"> + + <!-- + The XSD for the schema can be found at: + http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/extras/jaxbintr... + Register it against the http://www.jboss.org/xsd/jaxb/intros namespace in your IDE and away you go :-) + --> + + <!-- + Note: how the "name" attributes on class, field and method configs can be regular expressions. + --> + + <!-- + The type namespaces on the customerOrder are different from the rest of the message... + --> + <Class name="org.jboss.jaxb.intros.testbeans.CustomerOrder"> + <Method name="get.*"> + <XmlElement namespace="http://org.jboss.esb/ns" /> + </Method> + </Class> + + <Class name="org.jboss.jaxb.intros.testbeans.OrderHeader"> + <Method name="getOrderDate"> + <XmlAttribute name="date" namespace="http://org.jboss.esb/ns" /> + </Method> + <Method name="get.*"> + <XmlElement namespace="http://org.jboss.esb/ns1" /> + </Method> + </Class> + + <Class name="org.jboss.jaxb.intros.testbeans.Address"> + <XmlAccessorType value="FIELD" /> + <Field name="zip"> + <XmlAttribute /> + </Field> + <Field name=".*"> + <XmlElement namespace="http://org.jboss.esb/ns1" /> + </Field> + </Class> + + <!-- + More general namespace config... + --> + <Class name="org.jboss.jaxb.intros.testbeans.*"> + <Method name="get.*"> + <XmlElement namespace="http://org.jboss.esb/ns1" /> + </Method> + </Class> + +</jaxb-intros> Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/intro-config-03.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/order-message.xml =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/order-message.xml (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/order-message.xml 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,47 @@ +<ns:customerOrder xmlns:ns="http://org.jboss.esb/ns" xmlns:ns1="http://org.jboss.esb/ns1"> + <ns:header ns:date="2006-05-01T00:00:00.000Z"> + <ns1:billTerms/> + <ns1:billTo> + <ns1:address zip="06484"> + <ns1:city>Shelton</ns1:city> + <ns1:state>CT</ns1:state> + <ns1:street1>160 Active Lane</ns1:street1> + <ns1:street2/> + </ns1:address> + <ns1:company>Active Steel</ns1:company> + <ns1:contact> + <ns1:email>bob@activeSteel.com</ns1:email> + <ns1:fax>(203) 555-1235</ns1:fax> + <ns1:name>Bob Active</ns1:name> + <ns1:phone>(203) 555-1234</ns1:phone> + </ns1:contact> + </ns1:billTo> + <ns1:customerNumber>123456</ns1:customerNumber> + <ns1:orderTotal>88500.00</ns1:orderTotal> + <ns1:poNumber>PO000123</ns1:poNumber> + <ns1:shipTerms/> + <ns1:shipTo> + <ns1:address> + <ns1:city>Shelton</ns1:city> + <ns1:state>CT</ns1:state> + <ns1:street1>160 Active Lane</ns1:street1> + <ns1:street2/> + <ns1:zip>06484</ns1:zip> + </ns1:address> + <ns1:company>Active Steel</ns1:company> + <ns1:contact> + <ns1:email>bob@activeSteel.com</ns1:email> + <ns1:fax>(203) 555-1235</ns1:fax> + <ns1:name>Bob Active</ns1:name> + <ns1:phone>(203) 555-1234</ns1:phone> + </ns1:contact> + </ns1:shipTo> + </ns:header> + <ns:items> + <ns1:description>Flat 16 feet 100 count</ns1:description> + <ns1:extensionAmount>24500.00</ns1:extensionAmount> + <ns1:partNumber>FLT16100</ns1:partNumber> + <ns1:price>490.00</ns1:price> + <ns1:quantity>50</ns1:quantity> + </ns:items> +</ns:customerOrder> \ No newline at end of file Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/order-message.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Address.java =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Address.java (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Address.java 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,68 @@ +package org.jboss.jaxb.intros.testbeans; + +import java.io.Serializable; + +public class Address implements Serializable { + + protected String street1; + + protected String street2; + + protected String city; + + protected String state; + + protected String zip; + + public Address() { + } + + public Address(String street1, String street2, String city, String state, String zip) { + this.street1 = street1; + this.street2 = street2; + this.city = city; + this.state = state; + this.zip = zip; + } + + public String getStreet1() { + return street1; + } + + public void setStreet1(String street1) { + this.street1 = street1; + } + + public String getStreet2() { + return street2; + } + + public void setStreet2(String street2) { + this.street2 = street2; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getZip() { + return zip; + } + + public void setZip(String zip) { + this.zip = zip; + } + +} Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Address.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Contact.java =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Contact.java (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Contact.java 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,38 @@ +package org.jboss.jaxb.intros.testbeans; + +import java.io.Serializable; + +public class Contact implements Serializable { + +protected String name; + +protected String phone; + +protected String fax; + +protected String email; +public Contact(){} + +public Contact(String name, String phone, String fax, String email){ +this.name=name; +this.phone=phone; +this.fax=fax; +this.email=email; +} +public String getName() { return name ;} + +public void setName(String name){ this.name=name; } + +public String getPhone() { return phone ;} + +public void setPhone(String phone){ this.phone=phone; } + +public String getFax() { return fax ;} + +public void setFax(String fax){ this.fax=fax; } + +public String getEmail() { return email ;} + +public void setEmail(String email){ this.email=email; } + +} Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Contact.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/CustomerOrder.java =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/CustomerOrder.java (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/CustomerOrder.java 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,27 @@ +package org.jboss.jaxb.intros.testbeans; + +import java.io.Serializable; + +public class CustomerOrder implements Serializable { + + protected OrderHeader header; + + protected Item[] items; + + public OrderHeader getHeader() { + return header; + } + + public void setHeader(OrderHeader header) { + this.header = header; + } + + public Item[] getItems() { + return items; + } + + public void setItems(Item[] items) { + this.items = items; + } + +} Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/CustomerOrder.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Item.java =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Item.java (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Item.java 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,45 @@ +package org.jboss.jaxb.intros.testbeans; + +import java.io.Serializable; + +public class Item implements Serializable { + +protected String partNumber; + +protected String description; + +protected int quantity; + +protected java.math.BigDecimal price; + +protected java.math.BigDecimal extensionAmount; +public Item(){} + +public Item(String partNumber, String description, int quantity, java.math.BigDecimal price, java.math.BigDecimal extensionAmount){ +this.partNumber=partNumber; +this.description=description; +this.quantity=quantity; +this.price=price; +this.extensionAmount=extensionAmount; +} +public String getPartNumber() { return partNumber ;} + +public void setPartNumber(String partNumber){ this.partNumber=partNumber; } + +public String getDescription() { return description ;} + +public void setDescription(String description){ this.description=description; } + +public int getQuantity() { return quantity ;} + +public void setQuantity(int quantity){ this.quantity=quantity; } + +public java.math.BigDecimal getPrice() { return price ;} + +public void setPrice(java.math.BigDecimal price){ this.price=price; } + +public java.math.BigDecimal getExtensionAmount() { return extensionAmount ;} + +public void setExtensionAmount(java.math.BigDecimal extensionAmount){ this.extensionAmount=extensionAmount; } + +} Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Item.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/OrderHeader.java =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/OrderHeader.java (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/OrderHeader.java 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,101 @@ +package org.jboss.jaxb.intros.testbeans; + +import java.io.Serializable; + +public class OrderHeader implements Serializable { + + protected String customerNumber; + + protected String poNumber; + + protected java.util.Calendar orderDate; + + protected java.math.BigDecimal orderTotal; + + protected Party billTo; + + protected Party shipTo; + + protected String billTerms; + + protected String shipTerms; + + public OrderHeader() { + } + + public OrderHeader(String customerNumber, String poNumber, java.util.Calendar orderDate, java.math.BigDecimal orderTotal, Party billTo, Party shipTo, String billTerms, String shipTerms) { + this.customerNumber = customerNumber; + this.poNumber = poNumber; + this.orderDate = orderDate; + this.orderTotal = orderTotal; + this.billTo = billTo; + this.shipTo = shipTo; + this.billTerms = billTerms; + this.shipTerms = shipTerms; + } + + public String getCustomerNumber() { + return customerNumber; + } + + public void setCustomerNumber(String customerNumber) { + this.customerNumber = customerNumber; + } + + public String getPoNumber() { + return poNumber; + } + + public void setPoNumber(String poNumber) { + this.poNumber = poNumber; + } + + public java.util.Calendar getOrderDate() { + return orderDate; + } + + public void setOrderDate(java.util.Calendar orderDate) { + this.orderDate = orderDate; + } + + public java.math.BigDecimal getOrderTotal() { + return orderTotal; + } + + public void setOrderTotal(java.math.BigDecimal orderTotal) { + this.orderTotal = orderTotal; + } + + public Party getBillTo() { + return billTo; + } + + public void setBillTo(Party billTo) { + this.billTo = billTo; + } + + public Party getShipTo() { + return shipTo; + } + + public void setShipTo(Party shipTo) { + this.shipTo = shipTo; + } + + public String getBillTerms() { + return billTerms; + } + + public void setBillTerms(String billTerms) { + this.billTerms = billTerms; + } + + public String getShipTerms() { + return shipTerms; + } + + public void setShipTerms(String shipTerms) { + this.shipTerms = shipTerms; + } + +} Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/OrderHeader.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Party.java =================================================================== --- projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Party.java (rev 0) +++ projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Party.java 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,31 @@ +package org.jboss.jaxb.intros.testbeans; + +import java.io.Serializable; + +public class Party implements Serializable { + +protected String company; + +protected Contact contact; + +protected Address address; +public Party(){} + +public Party(String company, Contact contact, Address address){ +this.company=company; +this.contact=contact; +this.address=address; +} +public String getCompany() { return company ;} + +public void setCompany(String company){ this.company=company; } + +public Contact getContact() { return contact ;} + +public void setContact(Contact contact){ this.contact=contact; } + +public Address getAddress() { return address ;} + +public void setAddress(Address address){ this.address=address; } + +} Property changes on: projects/jaxbintros/src/test/java/org/jboss/jaxb/intros/testbeans/Party.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jaxbintros/src/test/resources/log4j.xml =================================================================== --- projects/jaxbintros/src/test/resources/log4j.xml (rev 0) +++ projects/jaxbintros/src/test/resources/log4j.xml 2007-10-04 14:15:08 UTC (rev 4679) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<!-- ===================================================================== --> +<!-- --> +<!-- Log4j Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<!-- $Id$ --> + +<!-- + | For more configuration infromation and examples see the Jakarta Log4j + | owebsite: http://jakarta.apache.org/log4j + --> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%t][%c{1}] %m%n"/> + </layout> + </appender> + + <!-- ================ --> + <!-- Limit categories --> + <!-- ================ --> + + <category name="org.jbpm"> + <priority value="INFO"/> + </category> + <category name="org.hibernate"> + <priority value="ERROR"/> + </category> + <category name="org.jboss"> + <priority value="WARN"/> + </category> + <category name="org.jboss.soa.esb"> + <priority value="ERROR"/> + </category> + <category name="org.jboss.internal.soa.esb"> + <priority value="ERROR"/> + </category> + <category name="org.apache"> + <priority value="ERROR"/> + </category> + <category name="org.jboss.soa.esb.services.jbpm"> + <priority value="DEBUG"/> + </category> + <!-- ======================= --> + <!-- Setup the Root category --> + <!-- ======================= --> + + <root> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Property changes on: projects/jaxbintros/src/test/resources/log4j.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF