[maven-scm] copy for tag geronimo-jaxb_2.2_spec-1.0

git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jaxb_2.2_spec-1.0@936694 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-jaxb_2.2_spec/LICENSE b/geronimo-jaxb_2.2_spec/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/geronimo-jaxb_2.2_spec/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/geronimo-jaxb_2.2_spec/NOTICE b/geronimo-jaxb_2.2_spec/NOTICE
deleted file mode 100644
index 49aa8cb..0000000
--- a/geronimo-jaxb_2.2_spec/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-
-Apache JAXB 2.2 Spec
-Copyright 2003-2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-
diff --git a/geronimo-jaxb_2.2_spec/pom.xml b/geronimo-jaxb_2.2_spec/pom.xml
deleted file mode 100644
index ffc1289..0000000
--- a/geronimo-jaxb_2.2_spec/pom.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-

-    <!--

-

-        Licensed to the Apache Software Foundation (ASF) under one or more

-        contributor license agreements.  See the NOTICE file distributed with

-        this work for additional information regarding copyright ownership.

-        The ASF licenses this file to You under the Apache License, Version 2.0

-        (the "License"); you may not use this file except in compliance with

-        the License.  You may obtain a copy of the License at

-

-           http://www.apache.org/licenses/LICENSE-2.0

-

-        Unless required by applicable law or agreed to in writing, software

-        distributed under the License is distributed on an "AS IS" BASIS,

-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-        See the License for the specific language governing permissions and

-        limitations under the License.

-    -->

-

-    <modelVersion>4.0.0</modelVersion>

-

-    <parent>

-        <groupId>org.apache.geronimo.genesis</groupId>

-        <artifactId>genesis-java5-flava</artifactId>

-        <version>2.0</version>

-    </parent>

-

-    <groupId>org.apache.geronimo.specs</groupId>

-    <artifactId>geronimo-jaxb_2.2_spec</artifactId>

-    <packaging>bundle</packaging>

-    <version>1.0</version>

-    <name>Apache JAXB 2.2 Spec</name>

-    <description>Java API for XML binding 2.2 API</description>

-

-    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>

-    <distributionManagement>

-        <site>

-            <id>apache-website</id>

-            <url>${site.deploy.url}/maven/${siteId}/${version}</url>

-        </site>

-    </distributionManagement>

-

-    <properties>

-        <siteId>specs/${artifactId}</siteId>

-    </properties>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-stax-api_1.2_spec</artifactId>

-            <version>1.0</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-activation_1.1_spec</artifactId>

-            <version>1.1</version>

-            <scope>provided</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.geronimo.specs</groupId>

-            <artifactId>geronimo-osgi-locator</artifactId>

-            <version>1.0</version>

-            <scope>provided</scope>

-        </dependency>

-    </dependencies>

-

-    <scm>

-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jaxb_2.2_spec-1.0</connection>

-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jaxb_2.2_spec-1.0</developerConnection>

-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/tags/geronimo-jaxb_2.2_spec-1.0</url>

-    </scm>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.felix</groupId>

-                <artifactId>maven-bundle-plugin</artifactId>

-                <configuration>

-                    <instructions>

-                        <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>

-                        <Specification-Title>JSR-222 Java Architecture for XML Binding 2.2</Specification-Title>

-                        <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>

-                        <Specification-Version>2.2</Specification-Version>

-                        <Export-Package>javax.xml.bind*;version=2.2</Export-Package>

-                        <Import-Package>org.apache.geronimo.osgi.registry.api;resolution:=optional,*</Import-Package>

-                        <Private-Package>org.apache.geronimo.osgi.locator</Private-Package>

-                        <Bundle-Activator>org.apache.geronimo.osgi.locator.Activator</Bundle-Activator>

-                    </instructions>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Binder.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Binder.java
deleted file mode 100644
index 125a1be..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Binder.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import javax.xml.validation.Schema;
-
-public abstract class Binder<XmlNode> {
-
-    public abstract ValidationEventHandler getEventHandler() throws JAXBException;
-
-    public abstract Object getJAXBNode(XmlNode xmlNode);
-
-    public abstract Object getProperty(String name) throws PropertyException;
-
-    public abstract Schema getSchema();
-
-    public abstract XmlNode getXMLNode(Object jaxbObject);
-
-    public abstract void marshal(Object jaxbObject, XmlNode xmlNode) throws JAXBException;
-
-    public abstract void setEventHandler(ValidationEventHandler handler) throws JAXBException;
-
-    public abstract void setProperty(String name, Object value) throws PropertyException;
-
-    public abstract void setSchema(Schema schema);
-
-    public abstract Object unmarshal(XmlNode xmlNode) throws JAXBException;
-
-    public abstract <T> JAXBElement<T> unmarshal(XmlNode xmlNode, Class<T> declaredType) throws JAXBException;
-
-    public abstract Object updateJAXB(XmlNode xmlNode) throws JAXBException;
-
-    public abstract XmlNode updateXML(Object jaxbObject) throws JAXBException;
-
-    public abstract XmlNode updateXML(Object jaxbObject, XmlNode xmlNode) throws JAXBException; 
-
-    
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ContextFinder.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ContextFinder.java
deleted file mode 100644
index 4909cbd..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ContextFinder.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.Properties;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import org.apache.geronimo.osgi.locator.ProviderLocator;
-
-class ContextFinder {
-
-    private static final String PLATFORM_DEFAULT_FACTORY_CLASS = "com.sun.xml.bind.v2.ContextFactory";
-    private static final String JAXB_CONTEXT_PROPERTY = JAXBContext.class.getName();
-    private static final String JAXB_CONTEXT_FACTORY = JAXBContext.JAXB_CONTEXT_FACTORY;
-
-    public static JAXBContext find(String contextPath, ClassLoader classLoader, Map properties) throws JAXBException {
-        contextPath = contextPath.trim();
-        if (contextPath.length() == 0 || contextPath.equals(":")) {
-            throw new JAXBException("Invalid contextPath");
-        }
-        String className = null;
-        String[] packages = contextPath.split("[:]");
-        for (String pkg : packages) {
-            String url = pkg.replace('.', '/') + "/jaxb.properties";
-            className = loadClassNameFromProperties(url, classLoader);
-            if (className != null) {
-                break;
-            }
-        }
-        if (className == null) {
-            className = System.getProperty(JAXB_CONTEXT_PROPERTY);
-        }
-        Class spi = null;
-        // if no specifically specified name, check for META-INF/services, and
-        // fall back to the default factory class if that fails
-        if (className == null) {
-            spi = loadSPIClass(JAXBContext.class, classLoader);
-            if (spi == null) {
-                spi = loadSpi(PLATFORM_DEFAULT_FACTORY_CLASS, classLoader);
-            }
-        }
-        else {
-            spi = loadSpi(className, classLoader);
-        }
-        try {
-            Method m = spi.getMethod("createContext", new Class[] { String.class, ClassLoader.class, Map.class });
-            return (JAXBContext) m.invoke(null, new Object[] { contextPath, classLoader, properties });
-        } catch (NoSuchMethodException e) {
-            // will try JAXB 1.0 compatible createContext() method
-        } catch (Throwable t) {
-            throw new JAXBException("Unable to create context", t);
-        }
-
-        // try old JAXB 1.0 compatible createContext() method
-        try {
-            Method m = spi.getMethod("createContext", new Class[] { String.class, ClassLoader.class });
-            return (JAXBContext) m.invoke(null, new Object[] { contextPath, classLoader });
-        } catch (Throwable t) {
-            throw new JAXBException("Unable to create context", t);
-        }
-    }
-
-
-    public static JAXBContext find(Class[] classes, Map properties) throws JAXBException {
-        String className = null;
-        for (Class cl : classes) {
-            Package pkg = cl.getPackage();
-            if (pkg != null) {
-                String url = pkg.getName().replace('.', '/') + "/jaxb.properties";
-                className = loadClassNameFromProperties(url, cl.getClassLoader());
-                if (className != null) {
-                    break;
-                }
-            }
-        }
-        if (className == null) {
-            className = System.getProperty(JAXB_CONTEXT_PROPERTY);
-        }
-        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
-        Class spi = null;
-        // if no specifically specified name, check for META-INF/services, and
-        // fall back to the default factory class if that fails
-        if (className == null) {
-            spi = loadSPIClass(JAXBContext.class, classLoader);
-            if (spi == null) {
-                spi = loadSpi(PLATFORM_DEFAULT_FACTORY_CLASS, classLoader);
-            }
-        }
-        else {
-            spi = loadSpi(className, classLoader);
-        }
-        try {
-            Method m = spi.getMethod("createContext", new Class[] { Class[].class, Map.class });
-            return (JAXBContext) m.invoke(null, new Object[] { classes, properties });
-        } catch (Throwable t) {
-            throw new JAXBException("Unable to create context", t);
-        }
-    }
-
-    private static String loadClassNameFromProperties(String url, ClassLoader classLoader) throws JAXBException {
-        try {
-            InputStream is;
-            if (classLoader != null) {
-                is = classLoader.getResourceAsStream(url);
-            } else {
-                is = ClassLoader.getSystemResourceAsStream(url);
-            }
-            if (is != null) {
-                try {
-                    Properties props = new Properties();
-                    props.load(is);
-                    String className = props.getProperty(JAXB_CONTEXT_FACTORY);
-                    if (className == null) {
-                        throw new JAXBException("jaxb.properties file " + url + " should contain a " + JAXB_CONTEXT_FACTORY + " property");
-                    }
-                    return className.trim();
-                } finally {
-                    is.close();
-                }
-            } else {
-                return null;
-            }
-        } catch (IOException e) {
-            throw new JAXBException(e);
-        }
-    }
-
-    private static Class<?> loadSPIClass(Class<?> iface, ClassLoader classLoader) throws JAXBException {
-        try {
-            // delegate this to common processing
-            return ProviderLocator.getServiceClass(iface.getName(), ContextFinder.class,classLoader );
-        } catch (ClassNotFoundException e) {
-            throw new JAXBException("Provider " + iface.getName() + " not found", e);
-        }
-    }
-
-    private static Class loadSpi(String className, ClassLoader classLoader) throws JAXBException {
-        try {
-            return ProviderLocator.loadClass(className, ContextFinder.class, classLoader);
-        } catch (ClassNotFoundException e) {
-            throw new JAXBException("Provider " + className + " not found", e);
-        }
-    }
-
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/DataBindingException.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/DataBindingException.java
deleted file mode 100644
index a5484b7..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/DataBindingException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public class DataBindingException extends RuntimeException {
-
-    public DataBindingException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public DataBindingException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/DatatypeConverter.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/DatatypeConverter.java
deleted file mode 100644
index 8538a86..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/DatatypeConverter.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.util.Calendar;
-import java.math.BigInteger;
-import java.math.BigDecimal;
-
-import javax.xml.namespace.QName;
-import javax.xml.namespace.NamespaceContext;
-
-public final class DatatypeConverter {
-
-    private static DatatypeConverterInterface converter = null;
-
-    private DatatypeConverter() {
-    }
-
-    public static void setDatatypeConverter(DatatypeConverterInterface converter) {
-        if (converter == null) {
-            throw new IllegalArgumentException("The DatatypeConverterInterface parameter must not be null");
-        }
-        if (DatatypeConverter.converter == null) {
-
-            SecurityManager sm = System.getSecurityManager();           
-            if (sm != null) {
-                sm.checkPermission(new JAXBPermission("setDatatypeConverter"));
-            }
-            
-            DatatypeConverter.converter = converter;
-        }
-    }
-
-    public static String parseString(String lexicalXSDString) {
-        return converter.parseString(lexicalXSDString);
-    }
-
-    public static BigInteger parseInteger(String lexicalXSDInteger) {
-        return converter.parseInteger(lexicalXSDInteger);
-    }
-
-    public static int parseInt(String lexicalXSDInt) {
-        return converter.parseInt(lexicalXSDInt);
-    }
-
-    public static long parseLong(String lexicalXSDLong) {
-        return converter.parseLong(lexicalXSDLong);
-    }
-
-    public static short parseShort(String lexicalXSDShort) {
-        return converter.parseShort(lexicalXSDShort);
-    }
-
-    public static BigDecimal parseDecimal(String lexicalXSDDecimal) {
-        return converter.parseDecimal(lexicalXSDDecimal);
-    }
-
-    public static float parseFloat(String lexicalXSDFloat) {
-        return converter.parseFloat(lexicalXSDFloat);
-    }
-
-    public static double parseDouble(String lexicalXSDDouble) {
-        return converter.parseDouble(lexicalXSDDouble);
-    }
-
-    public static boolean parseBoolean(String lexicalXSDBoolean) {
-        return converter.parseBoolean(lexicalXSDBoolean);
-    }
-
-    public static byte parseByte(String lexicalXSDByte) {
-        return converter.parseByte(lexicalXSDByte);
-    }
-
-    public static QName parseQName(String lexicalXSDQName, NamespaceContext nsc) {
-        return converter.parseQName(lexicalXSDQName, nsc);
-    }
-
-    public static Calendar parseDateTime(String lexicalXSDDateTime) {
-        return converter.parseDateTime(lexicalXSDDateTime);
-    }
-
-    public static byte[] parseBase64Binary(String lexicalXSDBase64Binary) {
-        return converter.parseBase64Binary(lexicalXSDBase64Binary);
-    }
-
-    public static byte[] parseHexBinary(String lexicalXSDHexBinary) {
-        return converter.parseHexBinary(lexicalXSDHexBinary);
-    }
-
-    public static long parseUnsignedInt(String lexicalXSDUnsignedInt) {
-        return converter.parseUnsignedInt(lexicalXSDUnsignedInt);
-    }
-
-    public static int parseUnsignedShort(String lexicalXSDUnsignedShort) {
-        return converter.parseUnsignedShort(lexicalXSDUnsignedShort);
-    }
-
-    public static Calendar parseTime(String lexicalXSDTime) {
-        return converter.parseTime(lexicalXSDTime);
-    }
-
-    public static Calendar parseDate(String lexicalXSDDate) {
-        return converter.parseDate(lexicalXSDDate);
-    }
-
-    public static String parseAnySimpleType(String lexicalXSDAnySimpleType) {
-        return converter.parseAnySimpleType(lexicalXSDAnySimpleType);
-    }
-
-    public static String printString(String val) {
-        return converter.printString(val);
-    }
-
-    public static String printInteger(BigInteger val) {
-        return converter.printInteger(val);
-    }
-
-    public static String printInt(int val) {
-        return converter.printInt(val);
-    }
-
-    public static String printLong(long val) {
-        return converter.printLong(val);
-    }
-
-    public static String printShort(short val) {
-        return converter.printShort(val);
-    }
-
-    public static String printDecimal(BigDecimal val) {
-        return converter.printDecimal(val);
-    }
-
-    public static String printFloat(float val) {
-        return converter.printFloat(val);
-    }
-
-    public static String printDouble(double val) {
-        return converter.printDouble(val);
-    }
-
-    public static String printBoolean(boolean val) {
-        return converter.printBoolean(val);
-    }
-
-    public static String printByte(byte val) {
-        return converter.printByte(val);
-    }
-
-    public static String printQName(QName val, NamespaceContext nsc) {
-        return converter.printQName(val, nsc);
-    }
-
-    public static String printDateTime(Calendar val) {
-        return converter.printDateTime(val);
-    }
-
-    public static String printBase64Binary(byte val[]) {
-        return converter.printBase64Binary(val);
-    }
-
-    public static String printHexBinary(byte val[]) {
-        return converter.printHexBinary(val);
-    }
-
-    public static String printUnsignedInt(long val) {
-        return converter.printUnsignedInt(val);
-    }
-
-    public static String printUnsignedShort(int val) {
-        return converter.printUnsignedShort(val);
-    }
-
-    public static String printTime(Calendar val) {
-        return converter.printTime(val);
-    }
-
-    public static String printDate(Calendar val) {
-        return converter.printDate(val);
-    }
-
-    public static String printAnySimpleType(String val) {
-        return converter.printAnySimpleType(val);
-    }
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/DatatypeConverterInterface.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/DatatypeConverterInterface.java
deleted file mode 100644
index d0a4a63..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/DatatypeConverterInterface.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.util.Calendar;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import javax.xml.namespace.QName;
-import javax.xml.namespace.NamespaceContext;
-
-public interface DatatypeConverterInterface {
-
-    String parseAnySimpleType(String lexicalXSDAnySimpleType);
-
-    byte[] parseBase64Binary(String lexicalXSDBase64Binary);
-
-    boolean parseBoolean(String lexicalXSDBoolean);
-
-    byte parseByte(String lexicalXSDByte);
-
-    Calendar parseDate(String lexicalXSDDate);
-
-    Calendar parseDateTime(String lexicalXSDDateTime);
-
-    BigDecimal parseDecimal(String lexicalXSDDecimal);
-
-    double parseDouble(String lexicalXSDDouble);
-
-    float parseFloat(String lexicalXSDFloat);
-
-    byte[] parseHexBinary(String lexicalXSDHexBinary);
-
-    int parseInt(String lexicalXSDInt);
-
-    BigInteger parseInteger(String lexicalXSDInteger);
-
-    long parseLong(String lexicalXSDLong);
-
-    QName parseQName(String lexicalXSDQName, NamespaceContext nsc);
-
-    short parseShort(String lexicalXSDShort);
-
-    String parseString(String lexicalXSDString);
-
-    Calendar parseTime(String lexicalXSDTime);
-
-    long parseUnsignedInt(String lexicalXSDUnsignedInt);
-
-    int parseUnsignedShort(String lexicalXSDUnsignedShort);
-
-    String printAnySimpleType(String val);
-
-    String printBase64Binary(byte[] val);
-
-    String printBoolean(boolean val);
-
-    String printByte(byte val);
-
-    String printDate(Calendar val);
-
-    String printDateTime(Calendar val);
-
-    String printDecimal(BigDecimal val);
-
-    String printDouble(double val);
-
-    String printFloat(float val);
-
-    String printHexBinary(byte[] val);
-
-    String printInt(int val);
-
-    String printInteger(BigInteger val);
-
-    String printLong(long val);
-
-    String printQName(QName val, NamespaceContext nsc);
-
-    String printShort(short val);
-
-    String printString(String val);
-
-    String printTime(Calendar val);
-
-    String printUnsignedInt(long val);
-
-    String printUnsignedShort(int val);
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Element.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Element.java
deleted file mode 100644
index 1d9d263..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Element.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public interface Element {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXB.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXB.java
deleted file mode 100644
index da2fdd6..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXB.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.io.File;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URISyntaxException;
-import java.net.MalformedURLException;
-import java.beans.Introspector;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.namespace.QName;
-
-final public class JAXB {
-
-    private JAXB() {
-    }
-
-    public static void marshal(Object object, File file) {
-        if (file == null) {
-            throw new IllegalStateException("No file is given");
-        }
-        marshal(object, new StreamResult(file));
-    }
-
-    public static void marshal(Object object, OutputStream os) {
-        if (os == null) {
-            throw new IllegalStateException("No output stream is given");
-        }
-        marshal(object, new StreamResult(os));
-    }
-
-    public static void marshal(Object object, Writer writer) {
-        if (writer == null) {
-            throw new IllegalStateException("No writer is given");
-        }
-        marshal(object, new StreamResult(writer));
-    }
-
-    public static void marshal(Object object, String str) {
-        if (str == null) {
-            throw new IllegalStateException("No string destination is given");
-        }
-        try {
-            marshal(object, new URI(str));
-        } catch (URISyntaxException e) {
-            marshal(object, new File(str));
-        }
-    }
-
-    public static void marshal(Object object, URI uri) {
-        if (uri == null) {
-            throw new IllegalStateException("No uri is given");
-        }
-        try {
-            marshal(object, uri.toURL());
-        } catch (IOException e) {
-            throw new DataBindingException(e);
-        }
-    }
-
-    public static void marshal(Object object, URL url) {
-        if (url == null) {
-            throw new IllegalStateException("No url is given");
-        }
-        try {
-            URLConnection con = url.openConnection();
-            con.setDoOutput(true);
-            con.setDoInput(false);
-            con.connect();
-            marshal(object, new StreamResult(con.getOutputStream()));
-        } catch (IOException e) {
-            throw new DataBindingException(e);
-        }
-    }
-
-    public static void marshal(Object object, Result result) {
-        try {
-            JAXBContext context;
-            if (object instanceof JAXBElement) {
-                context = getContext(((JAXBElement<?>) object).getDeclaredType());
-            } else {
-                Class<?> clazz = object.getClass();
-                XmlRootElement r = clazz.getAnnotation(XmlRootElement.class);
-                if (r == null) {
-                    // we need to infer the name
-                    object = new JAXBElement(new QName(Introspector.decapitalize(clazz.getSimpleName())),
-                                             clazz, object);
-                }
-                context = getContext(clazz);
-            }
-            Marshaller m = context.createMarshaller();
-            m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,true);
-            m.marshal(object, result);
-        } catch (JAXBException e) {
-            throw new DataBindingException(e);
-        }
-    }
-
-    public static <T> T unmarshal(File file, Class<T> type) {
-        if (file == null) {
-            throw new IllegalStateException("No file is given");
-        }
-        return unmarshal(new StreamSource(file), type);
-    }
-
-    public static <T> T unmarshal(URL url, Class<T> type) {
-        if (url == null) {
-            throw new IllegalStateException("No url is given");
-        }
-        return unmarshal(new StreamSource(url.toExternalForm()), type);
-    }
-
-    public static <T> T unmarshal(URI uri, Class<T> type) {
-        if (uri == null) {
-            throw new IllegalStateException("No uri is given");
-        }
-        try {
-            return unmarshal(uri.toURL(), type);
-        } catch (MalformedURLException e) {
-            throw new DataBindingException(e);
-        }
-    }
-
-    public static <T> T unmarshal(String str, Class<T> type) {
-        if (str == null) {
-            throw new IllegalStateException("No string destination is given");
-        }
-        try {
-            return unmarshal(new URI(str), type);
-        } catch (URISyntaxException e) {
-            return unmarshal(new File(str), type);
-        }
-    }
-
-    public static <T> T unmarshal(InputStream is, Class<T> type) {
-        if (is == null) {
-            throw new IllegalStateException("No input stream is given");
-        }
-        return unmarshal(new StreamSource(is), type);
-    }
-
-    public static <T> T unmarshal(Reader reader, Class<T> type) {
-        if (reader == null) {
-            throw new IllegalStateException("No reader is given");
-        }
-        return unmarshal(new StreamSource(reader), type);
-    }
-
-    public static <T> T unmarshal(Source source, Class<T> type) {
-        try {
-            JAXBElement<T> item = getContext(type).createUnmarshaller().unmarshal(source, type);
-            return item.getValue();
-        } catch (JAXBException e) {
-            throw new DataBindingException(e);
-        }
-    }
-
-    private static <T> JAXBContext getContext(Class<T> type) throws JAXBException {
-        return JAXBContext.newInstance(type);
-    }
-
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBContext.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBContext.java
deleted file mode 100644
index 849ba92..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBContext.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.io.IOException;
-
-import java.util.Map;
-import java.util.Collections;
-
-import org.w3c.dom.Node;
-
-public abstract class JAXBContext {
-
-    public static final String JAXB_CONTEXT_FACTORY = "javax.xml.bind.context.factory";
-
-    protected JAXBContext() {
-    }
-
-    public Binder<Node> createBinder() {
-        throw new UnsupportedOperationException();
-    }
-
-    public <T> Binder<T> createBinder(Class<T> domType) {
-        throw new UnsupportedOperationException();
-    }
-
-    public JAXBIntrospector createJAXBIntrospector() {
-        throw new UnsupportedOperationException();
-    }
-
-    public abstract Marshaller createMarshaller() throws JAXBException;
-
-    public abstract Unmarshaller createUnmarshaller() throws JAXBException;
-
-    public abstract Validator createValidator() throws JAXBException;
-
-    public void generateSchema(SchemaOutputResolver resolver) throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    public static JAXBContext newInstance(Class... classesToBeBound) throws JAXBException {
-        return newInstance(classesToBeBound, Collections.<String, Object>emptyMap());
-    }
-
-    public static JAXBContext newInstance(Class[] classesToBeBound, Map<String, ?> properties) throws JAXBException {
-        for (Class cl : classesToBeBound) {
-            if (cl == null) {
-                throw new IllegalArgumentException();
-            }
-        }
-        return ContextFinder.find(classesToBeBound, properties);
-    }
-
-    public static JAXBContext newInstance(String contextPath) throws JAXBException {
-        return newInstance(contextPath, Thread.currentThread().getContextClassLoader());
-    }
-
-    public static JAXBContext newInstance(String contextPath, ClassLoader classLoader) throws JAXBException {
-        return newInstance(contextPath, classLoader, Collections.<String, Object>emptyMap());
-    }
-
-    public static JAXBContext newInstance(String contextPath, ClassLoader classLoader, Map<String, ?> properties) throws JAXBException {
-        return ContextFinder.find(contextPath, classLoader, properties);
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBElement.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBElement.java
deleted file mode 100644
index fdfcf2d..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBElement.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.io.Serializable;
-
-import javax.xml.namespace.QName;
-
-public class JAXBElement<T> implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    public final static class GlobalScope {
-    }
-
-    protected final QName name;
-    protected final Class<T> declaredType;
-    protected final Class scope;
-    protected T value;
-    protected boolean nil;
-
-    public JAXBElement(QName name, Class<T> declaredType, Class scope, T value) {
-        this.nil = false;
-        if (declaredType == null || name == null) {
-            throw new IllegalArgumentException();
-        }
-        this.declaredType = declaredType;
-        if (scope == null) {
-            scope = GlobalScope.class;
-        }
-        this.scope = scope;
-        this.name = name;
-        setValue(value);
-    }
-
-    public JAXBElement(QName name, Class<T> declaredType, T value) {
-        this(name, declaredType, GlobalScope.class, value);
-    }
-
-    public Class<T> getDeclaredType() {
-        return declaredType;
-    }
-
-    public QName getName() {
-        return name;
-    }
-
-    public void setValue(T value) {
-        this.value = value;
-    }
-
-    public T getValue() {
-        return value;
-    }
-
-    public Class getScope() {
-        return scope;
-    }
-
-    public boolean isNil() {
-        return value == null || nil;
-    }
-
-    public void setNil(boolean nil) {
-        this.nil = nil;
-    }
-
-    public boolean isGlobalScope() {
-        return scope == GlobalScope.class;
-    }
-
-    public boolean isTypeSubstituted() {
-        if (value == null) {
-            return false;
-        } else {
-            return value.getClass() != declaredType;
-        }
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBException.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBException.java
deleted file mode 100644
index b606c0d..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBException.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-public class JAXBException extends Exception {
-
-    private static final long serialVersionUID = -5621384651494307979L;
-
-    private String errorCode;
-    private Throwable linkedException;
-
-    public JAXBException(String message) {
-        this(message, null, null);
-    }
-
-    public JAXBException(String message, String errorCode) {
-        this(message, errorCode, null);
-    }
-
-    public JAXBException(String message, String errorCode, Throwable cause) {
-        super(message);
-        this.errorCode = errorCode;
-        this.linkedException = cause;
-    }
-
-    public JAXBException(String message, Throwable cause) {
-        this(message, null, cause);
-    }
-
-    public JAXBException(Throwable cause) {
-        this(null, null, cause);
-    }
-
-    public String getErrorCode() {
-        return errorCode;
-    }
-
-    public Throwable getLinkedException() {
-        return getCause();
-    }
-
-    public synchronized void setLinkedException(Throwable linkedException) {
-        this.linkedException = linkedException;
-    }
-
-    public String toString() {
-        return linkedException != null ?
-                super.toString() + "\n - with linked exception:\n[" + linkedException.toString() + "]" : 
-                super.toString();
-    }
-
-    @Override
-    public Throwable getCause() {
-        return linkedException;
-    }
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBIntrospector.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBIntrospector.java
deleted file mode 100644
index 29323b8..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBIntrospector.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import javax.xml.namespace.QName;
-
-public abstract class JAXBIntrospector {
-
-    public abstract QName getElementName(Object jaxbElement);
-
-    public static Object getValue(Object jaxbElement) {
-        if (jaxbElement instanceof JAXBElement) {
-            return ((JAXBElement) jaxbElement).getValue();
-        } else {
-            return jaxbElement;
-        }
-    }
-
-    public abstract boolean isElement(Object object);
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBPermission.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBPermission.java
deleted file mode 100644
index 291a8f1..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/JAXBPermission.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.security.BasicPermission;
-
-public final class JAXBPermission extends BasicPermission {
-
-    private static final long serialVersionUID = 1L;
-    
-    public JAXBPermission(String name) {
-        super(name);
-    }
-
-}
\ No newline at end of file
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/MarshalException.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/MarshalException.java
deleted file mode 100644
index 3f6377b..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/MarshalException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public class MarshalException extends JAXBException {
-
-    public MarshalException(String message) {
-        super(message);
-    }
-
-    public MarshalException(String message, String errorCode) {
-        super(message, errorCode);
-    }
-
-    public MarshalException(String message, String errorCode, Throwable cause) {
-        super(message, errorCode, cause);
-    }
-
-    public MarshalException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public MarshalException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Marshaller.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Marshaller.java
deleted file mode 100644
index 12b00b9..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Marshaller.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.io.OutputStream;
-import java.io.Writer;
-import java.io.File;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.attachment.AttachmentMarshaller;
-import javax.xml.validation.Schema;
-import javax.xml.transform.Result;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.w3c.dom.Node;
-
-import org.xml.sax.ContentHandler;
-
-public interface Marshaller {
-
-    String JAXB_ENCODING = "jaxb.encoding";
-    String JAXB_FORMATTED_OUTPUT = "jaxb.formatted.output";
-    String JAXB_FRAGMENT = "jaxb.fragment";
-    String JAXB_NO_NAMESPACE_SCHEMA_LOCATION = "jaxb.noNamespaceSchemaLocation";
-    String JAXB_SCHEMA_LOCATION = "jaxb.schemaLocation";
-
-    abstract class Listener {
-        public void beforeMarshal(Object source) {
-        }
-        public void afterMarshal(Object source) {
-        }
-    }
-
-    <A extends XmlAdapter> A getAdapter(Class<A> type);
-
-    AttachmentMarshaller getAttachmentMarshaller();
-
-    ValidationEventHandler getEventHandler() throws JAXBException;
-
-    Listener getListener();
-
-    Node getNode(Object contentTree) throws JAXBException;
-
-    Object getProperty(String name) throws PropertyException;
-
-    Schema getSchema();
-
-    void marshal(Object jaxbElement, ContentHandler handler) throws JAXBException;
-
-    void marshal(Object jaxbElement, File file) throws JAXBException;
-
-    void marshal(Object jaxbElement, Node node) throws JAXBException;
-
-    void marshal(Object jaxbElement, OutputStream os) throws JAXBException;
-
-    void marshal(Object jaxbElement, Result result) throws JAXBException;
-
-    void marshal(Object jaxbElement, Writer writer) throws JAXBException;
-
-    void marshal(Object jaxbElement, XMLEventWriter writer) throws JAXBException;
-
-    void marshal(Object jaxbElement, XMLStreamWriter writer) throws JAXBException;
-
-    <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter);
-
-    void setAdapter(XmlAdapter adapter);
-
-    void setAttachmentMarshaller(AttachmentMarshaller am);
-
-    void setEventHandler(ValidationEventHandler handler) throws JAXBException;
-
-    void setListener(Listener listener);
-
-    void setProperty(String name, Object value) throws PropertyException;
-
-    void setSchema(Schema schema);
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/NotIdentifiableEvent.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/NotIdentifiableEvent.java
deleted file mode 100644
index 7ab70c2..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/NotIdentifiableEvent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public interface NotIdentifiableEvent extends ValidationEvent {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ParseConversionEvent.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ParseConversionEvent.java
deleted file mode 100644
index fc16ae4..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ParseConversionEvent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public interface ParseConversionEvent extends ValidationEvent {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/PrintConversionEvent.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/PrintConversionEvent.java
deleted file mode 100644
index 4a9f94f..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/PrintConversionEvent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public interface PrintConversionEvent extends ValidationEvent {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/PropertyException.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/PropertyException.java
deleted file mode 100644
index 23bc367..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/PropertyException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public class PropertyException extends JAXBException {
-
-    public PropertyException(String message) {
-        super(message);
-    }
-
-    public PropertyException(String message, String errorCode) {
-        super(message, errorCode);
-    }
-
-    public PropertyException(Throwable cause) {
-        super(cause);
-    }
-
-    public PropertyException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public PropertyException(String message, String errorCode, Throwable cause) {
-        super(message, errorCode, cause);
-    }
-
-    public PropertyException(String name, Object value) {
-        super("name: " + name + ", value: " + value);
-    }
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/SchemaOutputResolver.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/SchemaOutputResolver.java
deleted file mode 100644
index d74e563..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/SchemaOutputResolver.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.io.IOException;
-
-import javax.xml.transform.Result;
-
-public abstract class SchemaOutputResolver {
-
-    public abstract Result createOutput(String namespaceUri, String suggestedFileName) throws IOException;
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/TypeConstraintException.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/TypeConstraintException.java
deleted file mode 100644
index f63bce1..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/TypeConstraintException.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-public class TypeConstraintException extends RuntimeException {
-
-    private String errorCode;
-    private Throwable linkedException;
-
-    public TypeConstraintException(String message) {
-        this(message, null, null);
-    }
-
-    public TypeConstraintException(String message, String errorCode) {
-        this(message, errorCode, null);
-    }
-
-    public TypeConstraintException(String message, String errorCode, Throwable cause) {
-        super(message);
-        this.errorCode = errorCode;
-        this.linkedException = cause;
-    }
-
-    public TypeConstraintException(String message, Throwable cause) {
-        this(message, null, cause);
-    }
-
-    public TypeConstraintException(Throwable cause) {
-        this(null, null, cause);
-    }
-
-    public String getErrorCode() {
-        return errorCode;
-    }
-
-    public Throwable getLinkedException() {
-        return getCause();
-    }
-
-    public synchronized void setLinkedException(Throwable linkedException) {
-        this.linkedException = linkedException;
-    }
-
-    public String toString() {
-        return linkedException != null ?
-                super.toString() + "\n - with linked exception:\n[" + linkedException.toString() + "]" :
-                super.toString();
-    }
-
-    @Override
-    public Throwable getCause() {
-        return linkedException;
-    }
-
-    @Override
-    public void printStackTrace(PrintStream s) {
-        synchronized (s) {
-            s.println(this);
-            StackTraceElement[] trace = getStackTrace();
-            for (int i=0; i < trace.length; i++) {
-                s.println("\tat " + trace[i]);
-            }
-            Throwable ourCause = getCause();
-            if (ourCause != null) {
-                ourCause.printStackTrace(s);
-            }
-        }
-    }
-
-    @Override
-    public void printStackTrace(PrintWriter s) {
-        synchronized (s) {
-            s.println(this);
-            StackTraceElement[] trace = getStackTrace();
-            for (int i=0; i < trace.length; i++) {
-                s.println("\tat " + trace[i]);
-            }
-            Throwable ourCause = getCause();
-            if (ourCause != null) {
-                ourCause.printStackTrace(s);
-            }
-        }
-    }
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/UnmarshalException.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/UnmarshalException.java
deleted file mode 100644
index d17cdb1..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/UnmarshalException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public class UnmarshalException extends JAXBException {
-
-    public UnmarshalException(String message) {
-        super(message);
-    }
-
-    public UnmarshalException(String message, String errorCode) {
-        super(message, errorCode);
-    }
-
-    public UnmarshalException(String message, String errorCode, Throwable cause) {
-        super(message, errorCode, cause);
-    }
-
-    public UnmarshalException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public UnmarshalException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Unmarshaller.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Unmarshaller.java
deleted file mode 100644
index 40a774a..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Unmarshaller.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URL;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.attachment.AttachmentUnmarshaller;
-import javax.xml.validation.Schema;
-import javax.xml.transform.Source;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLStreamReader;
-
-import org.w3c.dom.Node;
-
-import org.xml.sax.InputSource;
-
-public interface Unmarshaller {
-
-    abstract class Listener {
-        public void beforeUnmarshal(Object target, Object parent) {
-        }
-        public void afterUnmarshal(Object target, Object parent) {
-        }
-    }
-
-    <A extends XmlAdapter> A getAdapter(Class<A> type);
-
-    AttachmentUnmarshaller getAttachmentUnmarshaller();
-
-    ValidationEventHandler getEventHandler() throws JAXBException;
-
-    Listener getListener();
-
-    Object getProperty(String name) throws PropertyException;
-
-    Schema getSchema();
-
-    UnmarshallerHandler getUnmarshallerHandler();
-
-    boolean isValidating() throws JAXBException;
-
-    <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter);
-
-    void setAdapter(XmlAdapter adapter);
-
-    void setAttachmentUnmarshaller(AttachmentUnmarshaller au);
-
-    void setEventHandler(ValidationEventHandler handler) throws JAXBException;
-
-    void setListener(Listener listener);
-
-    void setProperty(String name, Object value) throws PropertyException;
-
-    void setSchema(Schema schema);
-
-    void setValidating(boolean validating) throws JAXBException;
-
-    Object unmarshal(File f) throws JAXBException;
-
-    Object unmarshal(InputSource source) throws JAXBException;
-
-    Object unmarshal(InputStream is) throws JAXBException;
-
-    Object unmarshal(Node node) throws JAXBException;
-
-    <T> JAXBElement<T> unmarshal(Node node, Class<T> declaredType) throws JAXBException;
-
-    Object unmarshal(Reader reader) throws JAXBException;
-
-    Object unmarshal(Source source) throws JAXBException;
-
-    <T> JAXBElement<T> unmarshal(Source source, Class<T> declaredType) throws JAXBException;
-
-    Object unmarshal(URL url) throws JAXBException;
-
-    Object unmarshal(XMLEventReader reader) throws JAXBException;
-
-    <T> JAXBElement<T> unmarshal(XMLEventReader reader, Class<T> declaredType) throws JAXBException;
-
-    Object unmarshal(XMLStreamReader reader) throws JAXBException;
-
-    <T> JAXBElement<T> unmarshal(XMLStreamReader reader, Class<T> declaredType) throws JAXBException;
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/UnmarshallerHandler.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/UnmarshallerHandler.java
deleted file mode 100644
index b4bb32b..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/UnmarshallerHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import org.xml.sax.ContentHandler;
-
-public interface UnmarshallerHandler extends ContentHandler {
-
-    Object getResult() throws JAXBException, IllegalStateException;
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationEvent.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationEvent.java
deleted file mode 100644
index 64646df..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationEvent.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public interface ValidationEvent {
-
-    int ERROR = 1;
-    int FATAL_ERROR = 2;
-    int WARNING = 0;
-
-    Throwable getLinkedException();
-
-    ValidationEventLocator getLocator();
-
-    String getMessage();
-
-    int getSeverity();
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationEventHandler.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationEventHandler.java
deleted file mode 100644
index 36a8388..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationEventHandler.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public interface ValidationEventHandler {
-
-    boolean handleEvent(ValidationEvent event);
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationEventLocator.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationEventLocator.java
deleted file mode 100644
index a5fd082..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationEventLocator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-import java.net.URL;
-
-import org.w3c.dom.Node;
-
-public interface ValidationEventLocator {
-
-    int getColumnNumber();
-
-    int getLineNumber();
-
-    Node getNode();
-
-    Object getObject();
-
-    int getOffset();
-
-    URL getURL();
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationException.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationException.java
deleted file mode 100644
index 78b1a2b..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/ValidationException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public class ValidationException extends JAXBException {
-
-    public ValidationException(String message) {
-        super(message);
-    }
-
-    public ValidationException(String message, String errorCode) {
-        super(message, errorCode);
-    }
-
-    public ValidationException(String message, String errorCode, Throwable cause) {
-        super(message, errorCode, cause);
-    }
-
-    public ValidationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ValidationException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Validator.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Validator.java
deleted file mode 100644
index 94790bb..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/Validator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind;
-
-public interface Validator {
-
-    ValidationEventHandler getEventHandler() throws JAXBException;
-
-    Object getProperty(String name) throws PropertyException;
-
-    void setEventHandler(ValidationEventHandler handler) throws JAXBException;
-
-    void setProperty(String name, Object value) throws PropertyException;
-
-    boolean validate(Object subRoot) throws JAXBException;
-
-    boolean validateRoot(Object rootObj) throws JAXBException;
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/DomHandler.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/DomHandler.java
deleted file mode 100644
index e5fbf90..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/DomHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.bind.ValidationEventHandler;
-
-public interface DomHandler<ElementT, ResultT extends Result> {
-
-    ResultT createUnmarshaller(ValidationEventHandler errorHandler);
-
-    ElementT getElement(ResultT rt);
-
-    Source marshal(ElementT n, ValidationEventHandler errorHandler);
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/W3CDomHandler.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/W3CDomHandler.java
deleted file mode 100644
index 2794e14..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/W3CDomHandler.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.Source;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.bind.ValidationEventHandler;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.DocumentFragment;
-
-public class W3CDomHandler implements DomHandler<Element, DOMResult> {
-
-    private DocumentBuilder builder;
-
-    public W3CDomHandler() {
-    }
-
-    public W3CDomHandler(DocumentBuilder builder) {
-        if (builder == null) {
-            throw new IllegalArgumentException();
-        }
-        this.builder = builder;
-    }
-
-    public DOMResult createUnmarshaller(ValidationEventHandler errorHandler) {
-        if (builder == null) {
-            return new DOMResult();
-        } else {
-            return new DOMResult(builder.newDocument());
-        }
-    }
-
-    public DocumentBuilder getBuilder() {
-        return builder;
-    }
-
-    public Element getElement(DOMResult rt) {
-        Node n = rt.getNode();
-        if (n instanceof Document) {
-            return ((Document)n).getDocumentElement();
-        }
-        if (n instanceof Element) {
-            return (Element)n;
-        }
-        if (n instanceof DocumentFragment) {
-            return (Element)n.getChildNodes().item(0);
-        } else {
-            throw new IllegalStateException(n.toString());
-        }
-    }
-
-    public Source marshal(Element n, ValidationEventHandler errorHandler) {
-        return new DOMSource(n);
-    }
-
-    public void setBuilder(DocumentBuilder builder) {
-        this.builder = builder;
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessOrder.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessOrder.java
deleted file mode 100644
index 559bd05..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessOrder.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-public enum XmlAccessOrder {
-
-    UNDEFINED,
-    ALPHABETICAL
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessType.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessType.java
deleted file mode 100644
index 4e91e6c..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessType.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-public enum XmlAccessType {
-
-    PROPERTY,
-    FIELD,
-    PUBLIC_MEMBER,
-    NONE
-
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessorOrder.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessorOrder.java
deleted file mode 100644
index d800634..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessorOrder.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.PACKAGE, ElementType.TYPE})
-public @interface XmlAccessorOrder {
-
-    XmlAccessOrder value() default XmlAccessOrder.UNDEFINED;
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessorType.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessorType.java
deleted file mode 100644
index 6662588..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAccessorType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value  = {ElementType.PACKAGE, ElementType.TYPE })
-public @interface XmlAccessorType {
-
-    XmlAccessType value() default XmlAccessType.PUBLIC_MEMBER;
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAnyAttribute.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAnyAttribute.java
deleted file mode 100644
index 41ab490..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAnyAttribute.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value  = {ElementType.FIELD, ElementType.METHOD })
-public @interface XmlAnyAttribute {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAnyElement.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAnyElement.java
deleted file mode 100644
index 3828a9e..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAnyElement.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value  = {ElementType.FIELD, ElementType.METHOD })
-public @interface XmlAnyElement {
-
-    boolean lax() default false;
-
-    Class<? extends DomHandler> value() default W3CDomHandler.class;
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAttachmentRef.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAttachmentRef.java
deleted file mode 100644
index 23bd034..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAttachmentRef.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value  = {ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
-public @interface XmlAttachmentRef {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAttribute.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAttribute.java
deleted file mode 100644
index ed2fb7c..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlAttribute.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value  = {ElementType.FIELD, ElementType.METHOD })
-public @interface XmlAttribute {
-
-    String name() default "##default";
-
-    boolean required() default false;
-
-    String namespace() default "##default";
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElement.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElement.java
deleted file mode 100644
index 99d13ae..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElement.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value  = {ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-public @interface XmlElement {
-
-    final class DEFAULT {
-    }
-
-    String name() default "##default";
-
-    boolean nillable() default false;
-
-    boolean required() default false;
-
-    String namespace() default "##default";
-
-    String defaultValue() default "\u0000";
-
-    Class type() default DEFAULT.class;
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementDecl.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementDecl.java
deleted file mode 100644
index 783370b..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementDecl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface XmlElementDecl {
-
-    final class GLOBAL {
-    }
-
-    String name();
-
-    Class scope() default GLOBAL.class;
-
-    String namespace() default "##default";
-
-    String substitutionHeadNamespace() default "##default";
-
-    String substitutionHeadName() default "";
-
-    String defaultValue() default "\u0000";
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementRef.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementRef.java
deleted file mode 100644
index 4fb87df..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementRef.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD})
-public @interface XmlElementRef {
-
-    final class DEFAULT {
-    }
-
-    String name() default "##default";
-
-    String namespace() default "";
-
-    Class type() default DEFAULT.class;
-
-    boolean required() default true;
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementRefs.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementRefs.java
deleted file mode 100644
index 2e56e41..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementRefs.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD})
-public @interface XmlElementRefs {
-
-    XmlElementRef[] value();
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementWrapper.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementWrapper.java
deleted file mode 100644
index a6a1a04..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElementWrapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD})
-public @interface XmlElementWrapper {
-
-    String name() default "##default";
-
-    String namespace() default "##default";
-
-    boolean nillable() default false;
-
-    boolean required() default false;
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElements.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElements.java
deleted file mode 100644
index f213cb6..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlElements.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD})
-public @interface XmlElements {
-
-    XmlElement[] value();
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlEnum.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlEnum.java
deleted file mode 100644
index 6700a99..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlEnum.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface XmlEnum {
-
-    Class<?> value() default String.class;
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlEnumValue.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlEnumValue.java
deleted file mode 100644
index 62a97eb..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlEnumValue.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface XmlEnumValue {
-
-    String value();
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlID.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlID.java
deleted file mode 100644
index 8a5bfdb..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlID.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD})
-public @interface XmlID {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlIDREF.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlIDREF.java
deleted file mode 100644
index 3cd2c98..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlIDREF.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD})
-public @interface XmlIDREF {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlInlineBinaryData.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlInlineBinaryData.java
deleted file mode 100644
index ded1639..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlInlineBinaryData.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD, ElementType.TYPE})
-public @interface XmlInlineBinaryData {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlList.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlList.java
deleted file mode 100644
index d28b510..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlList.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-public @interface XmlList {
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlMimeType.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlMimeType.java
deleted file mode 100644
index f7f8ec3..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlMimeType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-public @interface XmlMimeType {
-
-    String value();
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlMixed.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlMixed.java
deleted file mode 100644
index ac052fe..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlMixed.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD})
-public @interface XmlMixed {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlNs.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlNs.java
deleted file mode 100644
index c43f6f9..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlNs.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {})
-public @interface XmlNs {
-
-    String namespaceURI();
-
-    String prefix();
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlNsForm.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlNsForm.java
deleted file mode 100644
index 60e93f9..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlNsForm.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-public enum XmlNsForm {
-
-    UNQUALIFIED,
-    QUALIFIED,
-    UNSET
-    
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlRegistry.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlRegistry.java
deleted file mode 100644
index 06733ec..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlRegistry.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface XmlRegistry {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlRootElement.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlRootElement.java
deleted file mode 100644
index 981043d..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlRootElement.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface XmlRootElement {
-
-    String name() default "##default";
-
-    String namespace() default "##default";
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSchema.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSchema.java
deleted file mode 100644
index 9541225..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSchema.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PACKAGE)
-public @interface XmlSchema {
-
-    XmlNsForm attributeFormDefault() default XmlNsForm.UNSET;
-
-    XmlNsForm elementFormDefault() default XmlNsForm.UNSET;
-
-    String namespace() default "";
-
-    XmlNs[] xmlns() default {};
-
-    String location() default NO_LOCATION;
-
-    static final String NO_LOCATION = "##generate";
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSchemaType.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSchemaType.java
deleted file mode 100644
index 0ab565a..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSchemaType.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD, ElementType.PACKAGE})
-public @interface XmlSchemaType {
-
-    final class DEFAULT {
-    }
-
-    String name();
-
-    String namespace() default "http://www.w3.org/2001/XMLSchema";
-
-    Class type() default DEFAULT.class;
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSchemaTypes.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSchemaTypes.java
deleted file mode 100644
index 0dc20e1..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSchemaTypes.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PACKAGE)
-public @interface XmlSchemaTypes {
-
-    XmlSchemaType[] value();
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSeeAlso.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSeeAlso.java
deleted file mode 100644
index 8a2f1c9..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlSeeAlso.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-public @interface XmlSeeAlso {
-
-    Class[] value();
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlTransient.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlTransient.java
deleted file mode 100644
index 74179a1..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlTransient.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD, ElementType.TYPE})
-public @interface XmlTransient {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlType.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlType.java
deleted file mode 100644
index 596fc96..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlType.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface XmlType {
-
-    final class DEFAULT {
-    }
-
-    Class factoryClass() default DEFAULT.class;
-
-    String factoryMethod() default "";
-
-    String name() default "##default";
-
-    String namespace() default "##default";
-
-    String[] propOrder() default "";
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlValue.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlValue.java
deleted file mode 100644
index ee9a41d..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/XmlValue.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.FIELD, ElementType.METHOD})
-public @interface XmlValue {
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
deleted file mode 100644
index 4266ab6..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation.adapters;
-
-public class CollapsedStringAdapter extends XmlAdapter<String, String> {
-
-    public String marshal(String v) {
-        return v;
-    }
-
-    public String unmarshal(String v) {
-        if(v == null) {
-            return null;
-        }
-        int len = v.length();
-        int s;
-        for (s = 0; s < len && !isWhiteSpace(v.charAt(s)); s++);
-        if (s == len) {
-            return v;
-        }
-        StringBuffer result = new StringBuffer(len);
-        if (s != 0) {
-            for(int i = 0; i < s; i++) {
-                result.append(v.charAt(i));
-            }
-            result.append(' ');
-        }
-        boolean inStripMode = true;
-        for (int i = s + 1; i < len; i++) {
-            char ch = v.charAt(i);
-            boolean b = isWhiteSpace(ch);
-            if (inStripMode && b) {
-                continue;
-            }
-            inStripMode = b;
-            result.append(inStripMode ? ' ' : ch);
-        }
-        len = result.length();
-        if (len > 0 && result.charAt(len - 1) == ' ') {
-            result.setLength(len - 1);
-        }
-        return result.toString();
-    }
-
-    protected static boolean isWhiteSpace(char ch) {
-        if (ch > ' ') {
-            return false;
-        } else {
-            return ch == '\t' || ch == '\n' || ch == '\r' || ch == ' ';
-        }
-    }
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
deleted file mode 100644
index a3359f1..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation.adapters;
-
-import javax.xml.bind.DatatypeConverter;
-
-public final class HexBinaryAdapter extends XmlAdapter<String, byte[]> {
-
-    public String marshal(byte[] v) {
-        return DatatypeConverter.printHexBinary(v);
-    }
-
-    public byte[] unmarshal(String v) {
-        return DatatypeConverter.parseHexBinary(v);
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
deleted file mode 100644
index f0071e9..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation.adapters;
-
-public final class NormalizedStringAdapter extends XmlAdapter<String, String> {
-
-    public String marshal(String v) {
-        return v;
-    }
-
-    public String unmarshal(String v) {
-        if (v == null) {
-            return null;
-        }
-        int i;
-        for (i = v.length() - 1; i >= 0 && !isWhiteSpaceExceptSpace(v.charAt(i)); i--);
-        if (i < 0) {
-            return v;
-        }
-        char buf[] = v.toCharArray();
-        buf[i--] = ' ';
-        for(; i >= 0; i--) {
-            if(isWhiteSpaceExceptSpace(buf[i])) {
-                buf[i] = ' ';
-            }
-        }
-        return new String(buf);
-    }
-
-    protected static boolean isWhiteSpaceExceptSpace(char ch) {
-        if (ch >= ' ') {
-            return false;
-        } else {
-            return ch == '\t' || ch == '\n' || ch == '\r';
-        }
-    }
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/XmlAdapter.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/XmlAdapter.java
deleted file mode 100644
index 0a1c2fe..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/XmlAdapter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation.adapters;
-
-public abstract class XmlAdapter<ValueType, BoundType> {
-
-    protected XmlAdapter() {
-    }
-
-    public abstract ValueType marshal(BoundType v) throws Exception;
-
-    public abstract BoundType unmarshal(ValueType v) throws Exception;
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
deleted file mode 100644
index cb8e530..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation.adapters;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.PACKAGE, ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER})
-public @interface XmlJavaTypeAdapter {
-
-    final class DEFAULT {
-    }
-
-    Class<? extends XmlAdapter> value();
-
-    Class type() default DEFAULT.class;
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
deleted file mode 100644
index a3c85ce..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.annotation.adapters;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(value = {ElementType.PACKAGE})
-public @interface XmlJavaTypeAdapters {
-
-    XmlJavaTypeAdapter[] value();
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/attachment/AttachmentMarshaller.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/attachment/AttachmentMarshaller.java
deleted file mode 100644
index 6a768b3..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/attachment/AttachmentMarshaller.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.attachment;
-
-import javax.activation.DataHandler;
-
-public abstract class AttachmentMarshaller {
-
-    public abstract String addMtomAttachment(byte[] data, int offset, int length, String mimeType, String elementNamespace, String elementLocalName);
-
-    public abstract String addMtomAttachment(DataHandler data, String elementNamespace, String elementLocalName);
-
-    public abstract String addSwaRefAttachment(DataHandler data);
-
-    public boolean isXOPPackage() {
-        return false;
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/attachment/AttachmentUnmarshaller.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/attachment/AttachmentUnmarshaller.java
deleted file mode 100644
index d67426b..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/attachment/AttachmentUnmarshaller.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.attachment;
-
-import javax.activation.DataHandler;
-
-public abstract class AttachmentUnmarshaller {
-
-    public abstract byte[] getAttachmentAsByteArray(String cid);
-
-    public abstract DataHandler getAttachmentAsDataHandler(String cid);
-
-    public boolean isXOPPackage() {
-        return false;
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java
deleted file mode 100644
index a00dcb3..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/AbstractMarshallerImpl.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.helpers;
-
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.attachment.AttachmentMarshaller;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.Result;
-import javax.xml.validation.Schema;
-
-import org.w3c.dom.Node;
-
-import org.xml.sax.ContentHandler;
-
-public abstract class AbstractMarshallerImpl implements Marshaller {
-
-    static String aliases[] = {
-            "UTF-8", "UTF8",
-            "UTF-16", "Unicode",
-            "UTF-16BE", "UnicodeBigUnmarked",
-            "UTF-16LE", "UnicodeLittleUnmarked",
-            "US-ASCII", "ASCII",
-            "TIS-620", "TIS620",
-            "ISO-10646-UCS-2", "Unicode",
-            "EBCDIC-CP-US", "cp037",
-            "EBCDIC-CP-CA", "cp037",
-            "EBCDIC-CP-NL", "cp037",
-            "EBCDIC-CP-WT", "cp037",
-            "EBCDIC-CP-DK", "cp277",
-            "EBCDIC-CP-NO", "cp277",
-            "EBCDIC-CP-FI", "cp278",
-            "EBCDIC-CP-SE", "cp278",
-            "EBCDIC-CP-IT", "cp280",
-            "EBCDIC-CP-ES", "cp284",
-            "EBCDIC-CP-GB", "cp285",
-            "EBCDIC-CP-FR", "cp297",
-            "EBCDIC-CP-AR1", "cp420",
-            "EBCDIC-CP-HE", "cp424",
-            "EBCDIC-CP-BE", "cp500",
-            "EBCDIC-CP-CH", "cp500",
-            "EBCDIC-CP-ROECE", "cp870",
-            "EBCDIC-CP-YU", "cp870",
-            "EBCDIC-CP-IS", "cp871",
-            "EBCDIC-CP-AR2", "cp918"
-    };
-
-    private ValidationEventHandler eventHandler = new DefaultValidationEventHandler();
-    private String encoding = "UTF-8";
-    private String schemaLocation;
-    private String noNSSchemaLocation;
-    private boolean formattedOutput;
-    private boolean fragment;
-
-    public void marshal(Object obj, File file) throws JAXBException {
-        checkNotNull(obj, "obj", file, "file");
-        try {
-            OutputStream os = new BufferedOutputStream(new FileOutputStream(file));
-            try {
-                marshal(obj, new StreamResult(os));
-            } finally {
-                os.close();
-            }
-        } catch (IOException e) {
-            throw new JAXBException(e);
-        }
-    }
-
-    public final void marshal(Object obj, OutputStream os) throws JAXBException {
-        checkNotNull(obj, "obj", os, "os");
-        marshal(obj, new StreamResult(os));
-    }
-
-    public final void marshal(Object obj, Writer w) throws JAXBException {
-        checkNotNull(obj, "obj", w, "writer");
-        marshal(obj, new StreamResult(w));
-    }
-
-    public final void marshal(Object obj, ContentHandler handler) throws JAXBException {
-        checkNotNull(obj, "obj", handler, "handler");
-        marshal(obj, new SAXResult(handler));
-    }
-
-    public final void marshal(Object obj, Node node) throws JAXBException {
-        checkNotNull(obj, "obj", node, "node");
-        marshal(obj, new DOMResult(node));
-    }
-
-    public Node getNode(Object obj) throws JAXBException {
-        checkNotNull(obj, "obj", "foo", "bar");
-        throw new UnsupportedOperationException();
-    }
-
-    protected String getEncoding() {
-        return encoding;
-    }
-
-    protected void setEncoding(String encoding) {
-        this.encoding = encoding;
-    }
-
-    protected String getSchemaLocation() {
-        return schemaLocation;
-    }
-
-    protected void setSchemaLocation(String location) {
-        schemaLocation = location;
-    }
-
-    protected String getNoNSSchemaLocation() {
-        return noNSSchemaLocation;
-    }
-
-    protected void setNoNSSchemaLocation(String location) {
-        noNSSchemaLocation = location;
-    }
-
-    protected boolean isFormattedOutput() {
-        return formattedOutput;
-    }
-
-    protected void setFormattedOutput(boolean v) {
-        formattedOutput = v;
-    }
-
-    protected boolean isFragment() {
-        return fragment;
-    }
-
-    protected void setFragment(boolean v) {
-        fragment = v;
-    }
-
-    protected String getJavaEncoding(String encoding) throws UnsupportedEncodingException {
-        try {
-            "dummy".getBytes(encoding);
-            return encoding;
-        }
-        catch (UnsupportedEncodingException e) {
-        }
-        for (int i = 0; i < aliases.length; i += 2) {
-            if (encoding.equals(aliases[i])) {
-                "dummy".getBytes(aliases[i + 1]);
-                return aliases[i + 1];
-            }
-        }
-        throw new UnsupportedEncodingException(encoding);
-    }
-
-    public void setProperty(String name, Object value) throws PropertyException {
-        if (name == null) {
-            throw new IllegalArgumentException("name must not be null");
-        }
-        if (JAXB_ENCODING.equals(name)) {
-            checkString(name, value);
-            setEncoding((String) value);
-        } else if (JAXB_FORMATTED_OUTPUT.equals(name)) {
-            checkBoolean(name, value);
-            setFormattedOutput(((Boolean) value).booleanValue());
-        } else if (JAXB_NO_NAMESPACE_SCHEMA_LOCATION.equals(name)) {
-            checkString(name, value);
-            setNoNSSchemaLocation((String) value);
-        } else if (JAXB_SCHEMA_LOCATION.equals(name)) {
-            checkString(name, value);
-            setSchemaLocation((String) value);
-        } else if (JAXB_FRAGMENT.equals(name)) {
-            checkBoolean(name, value);
-            setFragment(((Boolean) value).booleanValue());
-        } else {
-            throw new PropertyException(name, value);
-        }
-    }
-
-    public Object getProperty(String name) throws PropertyException {
-        if (name == null) {
-            throw new IllegalArgumentException("name must not be null");
-        }
-        if (JAXB_ENCODING.equals(name)) {
-            return getEncoding();
-        } else if (JAXB_FORMATTED_OUTPUT.equals(name)) {
-            return isFormattedOutput() ? Boolean.TRUE : Boolean.FALSE;
-        } else if (JAXB_NO_NAMESPACE_SCHEMA_LOCATION.equals(name)) {
-            return getNoNSSchemaLocation();
-        } else if (JAXB_SCHEMA_LOCATION.equals(name)) {
-            return getSchemaLocation();
-        } else if (JAXB_FRAGMENT.equals(name)) {
-            return isFragment() ? Boolean.TRUE : Boolean.FALSE;
-        } else {
-            throw new PropertyException(name);
-        }
-    }
-
-    public ValidationEventHandler getEventHandler() throws JAXBException {
-        return eventHandler;
-    }
-
-    public void setEventHandler(ValidationEventHandler handler) throws JAXBException {
-        if (handler == null) {
-            eventHandler = new DefaultValidationEventHandler();
-        } else {
-            eventHandler = handler;
-        }
-    }
-
-    private void checkBoolean(String name, Object value) throws PropertyException {
-        if (!(value instanceof Boolean)) {
-            throw new PropertyException(name + " must be a boolean");
-        }
-    }
-
-    private void checkString(String name, Object value) throws PropertyException {
-        if (!(value instanceof String)) {
-            throw new PropertyException(name + " must be a string");
-        }
-    }
-
-    private void checkNotNull(Object o1, String o1Name, Object o2, String o2Name) {
-        if (o1 == null) {
-            throw new IllegalArgumentException(o1Name + " must not be null");
-        }
-        if (o2 == null) {
-            throw new IllegalArgumentException(o2Name + " must not be null");
-        }
-    }
-
-    public void marshal(Object obj, XMLEventWriter writer)
-            throws JAXBException {
-        throw new UnsupportedOperationException();
-    }
-
-    public void marshal(Object obj, XMLStreamWriter writer) throws JAXBException {
-        throw new UnsupportedOperationException();
-    }
-
-    public void setSchema(Schema schema) {
-        throw new UnsupportedOperationException();
-    }
-
-    public Schema getSchema() {
-        throw new UnsupportedOperationException();
-    }
-
-    public void setAdapter(XmlAdapter adapter) {
-        if (adapter == null) {
-            throw new IllegalArgumentException();
-        }
-        setAdapter((Class<XmlAdapter>) adapter.getClass(), adapter);
-    }
-
-    public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
-        throw new UnsupportedOperationException();
-    }
-
-    public <A extends XmlAdapter> A getAdapter(Class<A> type) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void setAttachmentMarshaller(AttachmentMarshaller am) {
-        throw new UnsupportedOperationException();
-    }
-
-    public AttachmentMarshaller getAttachmentMarshaller() {
-        throw new UnsupportedOperationException();
-    }
-
-    public void setListener(javax.xml.bind.Marshaller.Listener listener) {
-        throw new UnsupportedOperationException();
-    }
-
-    public javax.xml.bind.Marshaller.Listener getListener() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
deleted file mode 100644
index fe14154..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.helpers;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.UnmarshallerHandler;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.UnmarshalException;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.PropertyException;
-import javax.xml.bind.attachment.AttachmentUnmarshaller;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.validation.Schema;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.w3c.dom.Node;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-public abstract class AbstractUnmarshallerImpl implements Unmarshaller {
-
-    protected boolean validating;
-    private ValidationEventHandler eventHandler;
-    private XMLReader reader;
-
-    protected UnmarshalException createUnmarshalException(SAXException e) {
-        Exception nested = e.getException();
-        if (nested instanceof UnmarshalException) {
-            return (UnmarshalException)nested;
-        } else if(nested instanceof RuntimeException) {
-            throw (RuntimeException)nested;
-        } else if (nested != null) {
-            return new UnmarshalException(nested);
-        } else {
-            return new UnmarshalException(e);
-        }
-    }
-
-    protected XMLReader getXMLReader() throws JAXBException {
-        if (reader == null) {
-            try {
-                SAXParserFactory parserFactory = SAXParserFactory.newInstance();
-                parserFactory.setNamespaceAware(true);
-                parserFactory.setValidating(false);
-                reader = parserFactory.newSAXParser().getXMLReader();
-            } catch(ParserConfigurationException e) {
-                throw new JAXBException(e);
-            } catch(SAXException e) {
-                throw new JAXBException(e);
-            }
-        }
-        return reader;
-    }
-
-    public <A extends XmlAdapter> A getAdapter(Class<A> type) {
-        throw new UnsupportedOperationException();
-    }
-
-    public AttachmentUnmarshaller getAttachmentUnmarshaller() {
-        throw new UnsupportedOperationException();
-    }
-
-    public ValidationEventHandler getEventHandler() throws JAXBException {
-        return eventHandler;
-    }
-
-    public Listener getListener() {
-        throw new UnsupportedOperationException();
-    }
-
-    public Object getProperty(String name) throws PropertyException {
-        if(name == null) {
-            throw new IllegalArgumentException("name must not be null");
-        }
-        throw new PropertyException(name);
-    }
-
-    public Schema getSchema() {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean isValidating() throws JAXBException {
-        return validating;
-    }
-
-    public <A extends XmlAdapter> void setAdapter(Class<A> type, A adapter) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void setAdapter(XmlAdapter adapter) {
-        if (adapter == null) {
-            throw new IllegalArgumentException();
-        }
-        setAdapter((Class<XmlAdapter>) adapter.getClass(), adapter);
-    }
-
-    public void setAttachmentUnmarshaller(AttachmentUnmarshaller au) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void setEventHandler(ValidationEventHandler handler) throws JAXBException {
-        if (handler == null) {
-            handler = new DefaultValidationEventHandler();
-        }
-        eventHandler = handler;
-    }
-
-    public void setListener(Listener listener) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void setProperty(String name, Object value) throws PropertyException {
-        if(name == null) {
-            throw new IllegalArgumentException("name must not be null");
-        }
-        throw new PropertyException(name, value);
-    }
-
-    public void setSchema(Schema schema) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void setValidating(boolean validating) throws JAXBException {
-        this.validating = validating;
-    }
-
-    public final Object unmarshal(File file) throws JAXBException {
-        if (file == null) {
-            throw new IllegalArgumentException("file must not be null");
-        }
-        try
-        {
-            String path = file.getAbsolutePath();
-            if (File.separatorChar != '/') {
-                path = path.replace(File.separatorChar, '/');
-            }
-            if (!path.startsWith("/")) {
-                path = "/" + path;
-            }
-            if (!path.endsWith("/") && file.isDirectory()) {
-                path = path + "/";
-            }
-            return unmarshal(new URL("file", "", path));
-        }
-        catch(MalformedURLException e) {
-            throw new IllegalArgumentException(e.getMessage());
-        }
-    }
-
-    public final Object unmarshal(InputSource source) throws JAXBException {
-        if (source == null) {
-            throw new IllegalArgumentException("source must not be null");
-        }
-        return unmarshal(getXMLReader(), source);
-    }
-
-    public final Object unmarshal(InputStream is) throws JAXBException {
-        if (is == null) {
-            throw new IllegalArgumentException("is must not be null");
-        }
-        return unmarshal(new InputSource(is));
-    }
-
-    public <T> JAXBElement<T> unmarshal(Node node, Class<T> declaredType) throws JAXBException {
-        throw new UnsupportedOperationException();
-    }
-
-    public final Object unmarshal(Reader reader) throws JAXBException {
-        if (reader == null) {
-            throw new IllegalArgumentException("reader must not be null");
-        }
-        return unmarshal(new InputSource(reader));
-    }
-
-    public Object unmarshal(Source source) throws JAXBException {
-        if (source == null) {
-            throw new IllegalArgumentException("source must not be null");
-        } else if (source instanceof SAXSource) {
-            SAXSource saxSource = (SAXSource) source;
-            XMLReader reader = saxSource.getXMLReader();
-            if (reader == null) {
-                reader = getXMLReader();
-            }
-            return unmarshal(reader, saxSource.getInputSource());
-        } else if (source instanceof StreamSource) {
-            StreamSource ss = (StreamSource) source;
-            InputSource is = new InputSource();
-            is.setSystemId(ss.getSystemId());
-            is.setByteStream(ss.getInputStream());
-            is.setCharacterStream(ss.getReader());
-            return unmarshal(is);
-        } else if (source instanceof DOMSource)
-            return unmarshal(((DOMSource) source).getNode());
-        else
-            throw new IllegalArgumentException();
-    }
-
-    protected abstract Object unmarshal(XMLReader xmlreader, InputSource inputsource) throws JAXBException;
-
-    public <T> JAXBElement<T> unmarshal(Source source, Class<T> declaredType) throws JAXBException {
-        throw new UnsupportedOperationException();
-    }
-
-    public final Object unmarshal(URL url) throws JAXBException {
-        if(url == null) {
-            throw new IllegalArgumentException("url must not be null");
-        }
-        return unmarshal(new InputSource(url.toExternalForm()));
-    }
-
-    public Object unmarshal(XMLEventReader reader) throws JAXBException {
-        throw new UnsupportedOperationException();
-    }
-
-    public <T> JAXBElement<T> unmarshal(XMLEventReader reader, Class<T> declaredType) throws JAXBException {
-        throw new UnsupportedOperationException();
-    }
-
-    public Object unmarshal(XMLStreamReader reader) throws JAXBException {
-        throw new UnsupportedOperationException();
-    }
-
-    public <T> JAXBElement<T> unmarshal(XMLStreamReader reader, Class<T> declaredType) throws JAXBException {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/DefaultValidationEventHandler.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/DefaultValidationEventHandler.java
deleted file mode 100644
index d54d458..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/DefaultValidationEventHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.helpers;
-
-import java.net.URL;
-
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.ValidationEvent;
-import javax.xml.bind.ValidationEventLocator;
-
-import org.w3c.dom.Node;
-
-public class DefaultValidationEventHandler implements ValidationEventHandler {
-
-    public boolean handleEvent(ValidationEvent event) {
-        if (event == null) {
-            throw new IllegalArgumentException();
-        }
-        String severity = null;
-        boolean retVal = false;
-        switch(event.getSeverity()) {
-        case ValidationEvent.WARNING:
-            severity = "[WARNING]: ";
-            retVal = true;
-            break;
-
-        case ValidationEvent.ERROR:
-            severity = "[ERROR]: ";
-            retVal = false;
-            break;
-
-        case ValidationEvent.FATAL_ERROR:
-            severity = "[FATAL_ERROR]: ";
-            retVal = false;
-            break;
-        }
-        String location = getLocation(event);
-        System.out.println("DefaultValidationEventHandler " + severity + " " + event.getMessage() + "\n     Location: " + location);
-        return retVal;
-    }
-
-    private String getLocation(ValidationEvent event) {
-        StringBuffer msg = new StringBuffer();
-        ValidationEventLocator locator = event.getLocator();
-        if (locator != null) {
-            URL url = locator.getURL();
-            Object obj = locator.getObject();
-            Node node = locator.getNode();
-            int line = locator.getLineNumber();
-            if(url != null || line != -1) {
-                msg.append("line ").append(line);
-                if(url != null) {
-                    msg.append(" of ").append(url);
-                }
-            } else {
-                if (obj != null) {
-                    msg.append(" obj: ").append(obj.toString());
-                } else if(node != null) {
-                    msg.append(" node: ").append(node.toString());
-                }
-            }
-        } else {
-            msg.append("unavailable");
-        }
-        return msg.toString();
-    }
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/NotIdentifiableEventImpl.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
deleted file mode 100644
index 8a08cdd..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/NotIdentifiableEventImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.helpers;
-
-import javax.xml.bind.NotIdentifiableEvent;
-import javax.xml.bind.ValidationEventLocator;
-
-public class NotIdentifiableEventImpl extends ValidationEventImpl implements NotIdentifiableEvent {
-
-    public NotIdentifiableEventImpl(int severity, String message, ValidationEventLocator locator) {
-        super(severity, message, locator);
-    }
-
-    public NotIdentifiableEventImpl(int severity, String message, ValidationEventLocator locator, Throwable linkedException) {
-        super(severity, message, locator, linkedException);
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/ParseConversionEventImpl.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/ParseConversionEventImpl.java
deleted file mode 100644
index 5e88c93..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/ParseConversionEventImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.helpers;
-
-import javax.xml.bind.ParseConversionEvent;
-import javax.xml.bind.ValidationEventLocator;
-
-public class ParseConversionEventImpl extends ValidationEventImpl implements ParseConversionEvent {
-
-    public ParseConversionEventImpl(int severity, String message, ValidationEventLocator locator) { 
-        super(severity, message, locator);
-    }
-
-    public ParseConversionEventImpl(int severity, String message, ValidationEventLocator locator, Throwable linkedException) {
-        super(severity, message, locator, linkedException);
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/PrintConversionEventImpl.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/PrintConversionEventImpl.java
deleted file mode 100644
index b0eb10f..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/PrintConversionEventImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.helpers;
-
-import javax.xml.bind.PrintConversionEvent;
-import javax.xml.bind.ValidationEventLocator;
-
-public class PrintConversionEventImpl extends ValidationEventImpl implements PrintConversionEvent {
-
-    public PrintConversionEventImpl(int severity, String message, ValidationEventLocator locator) {
-        super(severity, message, locator);
-    }
-
-    public PrintConversionEventImpl(int severity, String message, ValidationEventLocator locator, Throwable linkedException) {
-        super(severity, message, locator, linkedException);
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/ValidationEventImpl.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/ValidationEventImpl.java
deleted file mode 100644
index ca5e8b1..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/ValidationEventImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.helpers;
-
-import javax.xml.bind.ValidationEvent;
-import javax.xml.bind.ValidationEventLocator;
-
-public class ValidationEventImpl implements ValidationEvent {
-
-    private int severity;
-    private String message;
-    private Throwable linkedException;
-    private ValidationEventLocator locator;
-
-    public ValidationEventImpl(int severity, String message, ValidationEventLocator locator) {
-        this(severity, message, locator, null);
-    }
-
-    public ValidationEventImpl(int severity, String message, ValidationEventLocator locator, Throwable linkedException) {
-        setSeverity(severity);
-        this.message = message;
-        this.locator = locator;
-        this.linkedException = linkedException;
-    }
-
-    public int getSeverity() {
-        return severity;
-    }
-
-    public void setSeverity(int severity) {
-        if (severity != 0 && severity != 1 && severity != 2) {
-            throw new IllegalArgumentException("Illegal severity");
-        }
-        this.severity = severity;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Throwable getLinkedException() {
-        return linkedException;
-    }
-
-    public void setLinkedException(Throwable linkedException) {
-        this.linkedException = linkedException;
-    }
-
-    public ValidationEventLocator getLocator() {
-        return locator;
-    }
-
-    public void setLocator(ValidationEventLocator locator) {
-        this.locator = locator;
-    }
-
-    public String toString() {
-        String s;
-        switch (getSeverity()) {
-            case WARNING:
-                s = "WARNING";
-                break;
-            case ERROR:
-                s = "ERROR";
-                break;
-            case FATAL_ERROR:
-                s = "FATAL_ERROR";
-                break;
-            default:
-                s = String.valueOf(getSeverity());
-                break;
-        }
-        return "[severity=" + s + ", message=" + getMessage() + ", locator=" + getLocator() + "]";
-    }
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/ValidationEventLocatorImpl.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
deleted file mode 100644
index b1ddf78..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/helpers/ValidationEventLocatorImpl.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.helpers;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import javax.xml.bind.ValidationEventLocator;
-
-import org.w3c.dom.Node;
-
-import org.xml.sax.SAXParseException;
-import org.xml.sax.Locator;
-
-public class ValidationEventLocatorImpl implements ValidationEventLocator {
-
-    private URL url;
-    private int offset = -1;
-    private int lineNumber = -1;
-    private int columnNumber = -1;
-    private Object object;
-    private Node node;
-
-    public ValidationEventLocatorImpl() {
-    }
-
-    public ValidationEventLocatorImpl(Locator loc) {
-        if (loc == null) {
-            throw new IllegalArgumentException("loc must not be null");
-        }
-        url = toURL(loc.getSystemId());
-        columnNumber = loc.getColumnNumber();
-        lineNumber = loc.getLineNumber();
-    }
-
-    public ValidationEventLocatorImpl(SAXParseException e) {
-        if (e == null) {
-            throw new IllegalArgumentException("e must not be null");
-        }
-        url = toURL(e.getSystemId());
-        columnNumber = e.getColumnNumber();
-        lineNumber = e.getLineNumber();
-    }
-
-    public ValidationEventLocatorImpl(Node node) {
-        if (node == null) {
-            throw new IllegalArgumentException("node must not be null");
-        }
-        this.node = node;
-    }
-
-    public ValidationEventLocatorImpl(Object object) {
-        if (object == null) {
-            throw new IllegalArgumentException("object must not be null");
-        }
-        this.object = object;
-    }
-
-    private static URL toURL(String systemId) {
-        try {
-            return new URL(systemId);
-        }
-        catch (MalformedURLException e) {
-            return null;
-        }
-    }
-
-    public URL getURL() {
-        return url;
-    }
-
-    public void setURL(URL url) {
-        this.url = url;
-    }
-
-    public int getOffset() {
-        return offset;
-    }
-
-    public void setOffset(int offset) {
-        this.offset = offset;
-    }
-
-    public int getLineNumber() {
-        return lineNumber;
-    }
-
-    public void setLineNumber(int lineNumber) {
-        this.lineNumber = lineNumber;
-    }
-
-    public int getColumnNumber() {
-        return columnNumber;
-    }
-
-    public void setColumnNumber(int columnNumber) {
-        this.columnNumber = columnNumber;
-    }
-
-    public Object getObject() {
-        return object;
-    }
-
-    public void setObject(Object object) {
-        this.object = object;
-    }
-
-    public Node getNode() {
-        return node;
-    }
-
-    public void setNode(Node node) {
-        this.node = node;
-    }
-
-    public String toString() {
-        return "[node=" + getNode() + ", " +
-                "object=" + getObject() + ", " +
-                "url=" + getURL() + ", " +
-                "line=" + String.valueOf(getLineNumber()) + "," +
-                "col=" + String.valueOf(getColumnNumber()) + "," +
-                "offset=" + String.valueOf(getOffset()) + "]";
-    }
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/util/JAXBResult.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/util/JAXBResult.java
deleted file mode 100644
index 1584b41..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/util/JAXBResult.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.util;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.bind.UnmarshallerHandler;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
-public class JAXBResult extends SAXResult {
-
-    private final UnmarshallerHandler unmarshallerHandler;
-
-    public JAXBResult(JAXBContext context) throws JAXBException {
-        if (context == null) {
-            throw new JAXBException("context must not be null");
-        }
-        unmarshallerHandler = context.createUnmarshaller().getUnmarshallerHandler();
-        super.setHandler(unmarshallerHandler);
-    }
-
-    public JAXBResult(Unmarshaller unmarshaller) throws JAXBException {
-        if (unmarshaller == null) {
-            throw new JAXBException("unmarshaller must not be null");
-        }
-        unmarshallerHandler = unmarshaller.getUnmarshallerHandler();
-        super.setHandler(unmarshallerHandler);
-    }
-
-    public Object getResult() throws JAXBException {
-        return unmarshallerHandler.getResult();
-    }
-
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/util/JAXBSource.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/util/JAXBSource.java
deleted file mode 100644
index abd6457..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/util/JAXBSource.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.util;
-
-import javax.xml.transform.Source;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-
-import org.xml.sax.XMLReader;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.XMLFilterImpl;
-import org.xml.sax.ext.LexicalHandler;
-
-public class JAXBSource extends SAXSource {
-
-    public JAXBSource(JAXBContext context, Object contentObject) throws JAXBException {
-        if (context == null) {
-            throw new JAXBException("context must not be null");
-        }
-        if (contentObject == null) {
-            throw new JAXBException("contentObject must not be null");
-        }
-        setXMLReader(new Reader(context.createMarshaller(), contentObject));
-        setInputSource(new InputSource());
-    }
-
-    public JAXBSource(final Marshaller marshaller, final Object contentObject) throws JAXBException {
-        if (marshaller == null) {
-            throw new JAXBException("marshaller must not be null");
-        }
-        if (contentObject == null) {
-            throw new JAXBException("contentObject must not be null");
-        }
-        setXMLReader(new Reader(marshaller, contentObject));
-        setInputSource(new InputSource());
-    }
-
-    private static class Reader implements XMLReader {
-
-        private LexicalHandler lexicalHandler;
-        private EntityResolver entityResolver;
-        private DTDHandler dtdHandler;
-        private XMLFilterImpl repeater;
-        private ErrorHandler errorHandler;
-        private final Marshaller marshaller;
-        private final Object contentObject;
-
-        public Reader(Marshaller marshaller, Object contentObject) {
-            this.marshaller = marshaller;
-            this.contentObject = contentObject;
-            repeater = new XMLFilterImpl();
-        }
-
-        public boolean getFeature(String name) throws SAXNotRecognizedException {
-            if (name.equals("http://xml.org/sax/features/namespaces")) {
-                return true;
-            }
-            if (name.equals("http://xml.org/sax/features/namespace-prefixes")) {
-                return false;
-            }
-            throw new SAXNotRecognizedException(name);
-        }
-
-        public void setFeature(String name, boolean value) throws SAXNotRecognizedException {
-            if (name.equals("http://xml.org/sax/features/namespaces") && value) {
-                return;
-            }
-            if (name.equals("http://xml.org/sax/features/namespace-prefixes") && !value) {
-                return;
-            }
-            throw new SAXNotRecognizedException(name);
-        }
-
-        public Object getProperty(String name) throws SAXNotRecognizedException {
-            if("http://xml.org/sax/properties/lexical-handler".equals(name)) {
-                return lexicalHandler;
-            }
-            throw new SAXNotRecognizedException(name);
-        }
-
-        public void setProperty(String name, Object value) throws SAXNotRecognizedException {
-            if("http://xml.org/sax/properties/lexical-handler".equals(name)) {
-                lexicalHandler = (LexicalHandler) value;
-                return;
-            }
-            throw new SAXNotRecognizedException(name);
-        }
-
-        public void setEntityResolver(EntityResolver resolver) {
-            entityResolver = resolver;
-        }
-
-        public EntityResolver getEntityResolver() {
-            return entityResolver;
-        }
-
-        public void setDTDHandler(DTDHandler handler) {
-            dtdHandler = handler;
-        }
-
-        public DTDHandler getDTDHandler() {
-            return dtdHandler;
-        }
-
-        public void setContentHandler(ContentHandler handler) {
-            repeater.setContentHandler(handler);
-        }
-
-        public ContentHandler getContentHandler() {
-            return repeater.getContentHandler();
-        }
-
-        public void setErrorHandler(ErrorHandler handler) {
-            errorHandler = handler;
-        }
-
-        public ErrorHandler getErrorHandler() {
-            return errorHandler;
-        }
-
-        public void parse(InputSource input) throws SAXException {
-            parse();
-        }
-
-        public void parse(String systemId) throws SAXException {
-            parse();
-        }
-
-        public void parse() throws SAXException {
-            try {
-                marshaller.marshal(contentObject, repeater);
-            } catch(JAXBException e) {
-                SAXParseException se = new SAXParseException(e.getMessage(), null, null, -1, -1, e);
-                if (errorHandler != null) {
-                    errorHandler.fatalError(se);
-                }
-                throw se;
-            }
-        }
-
-    }
-}
diff --git a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/util/ValidationEventCollector.java b/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/util/ValidationEventCollector.java
deleted file mode 100644
index e4cc436..0000000
--- a/geronimo-jaxb_2.2_spec/src/main/java/javax/xml/bind/util/ValidationEventCollector.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package javax.xml.bind.util;
-
-import java.util.ArrayList;
-
-import javax.xml.bind.ValidationEventHandler;
-import javax.xml.bind.ValidationEvent;
-
-public class ValidationEventCollector implements ValidationEventHandler {
-
-    private ArrayList<ValidationEvent> events = new ArrayList<ValidationEvent>();
-
-    public ValidationEvent[] getEvents() {
-        return events.toArray(new ValidationEvent[events.size()]);
-    }
-
-    public boolean handleEvent(ValidationEvent event) {
-        events.add(event);
-        return event.getSeverity() != ValidationEvent.FATAL_ERROR;
-    }
-
-    public boolean hasEvents() {
-        return !events.isEmpty();
-    }
-
-    public void reset() {
-        events.clear();
-    }
-}
diff --git a/pom.xml b/pom.xml
index 62ecfc2..ffc1289 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
         <dependency>

             <groupId>org.apache.geronimo.specs</groupId>

             <artifactId>geronimo-activation_1.1_spec</artifactId>

-            <version>1.0.3</version>

+            <version>1.1</version>

             <scope>provided</scope>

         </dependency>

         <dependency>