[maven-scm] copy for tag geronimo-ejb_3.1_spec-1.0

git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-ejb_3.1_spec-1.0@936764 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-ejb_3.1_spec/LICENSE b/geronimo-ejb_3.1_spec/LICENSE
deleted file mode 100644
index de4b130..0000000
--- a/geronimo-ejb_3.1_spec/LICENSE
+++ /dev/null
@@ -1,204 +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-ejb_3.1_spec/NOTICE b/geronimo-ejb_3.1_spec/NOTICE
deleted file mode 100644
index 2cd5538..0000000
--- a/geronimo-ejb_3.1_spec/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Geronimo
-Copyright 2003-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/geronimo-ejb_3.1_spec/pom.xml b/geronimo-ejb_3.1_spec/pom.xml
deleted file mode 100644
index 1530bfc..0000000
--- a/geronimo-ejb_3.1_spec/pom.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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">
-
-    <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-ejb_3.1_spec</artifactId>
-    <packaging>bundle</packaging>
-    <name>EJB 3.1</name>
-    <version>1.0</version>
-    <description>EJB 3.1 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-jta_1.1_spec</artifactId>
-            <version>1.1.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.1_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-            <version>2.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-ejb_3.1_spec-1.0</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-ejb_3.1_spec-1.0</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/tags/geronimo-ejb_3.1_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-318 Enterprise Java Beans 3.1</Specification-Title>
-                        <Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
-                        <Specification-Version>3.1</Specification-Version>
-                        <Export-Package>javax.ejb*;version=3.1</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-ejb_3.1_spec/src/main/java/javax/ejb/AccessLocalException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AccessLocalException.java
deleted file mode 100644
index 3c14401..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AccessLocalException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AccessLocalException extends EJBException {
-    public AccessLocalException() {
-        super();
-    }
-
-    public AccessLocalException(String message) {
-        super(message);
-    }
-
-    public AccessLocalException(String message, Exception ex) {
-        super(message, ex);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AccessTimeout.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AccessTimeout.java
deleted file mode 100644
index cf2fafb..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AccessTimeout.java
+++ /dev/null
@@ -1,37 +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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.util.concurrent.TimeUnit;
-
-@Target(value = {METHOD, TYPE})
-@Retention(value = RUNTIME)
-public @interface AccessTimeout {
-    long value();
-    TimeUnit unit() default TimeUnit.MILLISECONDS; 
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ActivationConfigProperty.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ActivationConfigProperty.java
deleted file mode 100644
index 8a2db8d..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ActivationConfigProperty.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target({})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ActivationConfigProperty {
-    String propertyName();
-
-    String propertyValue();
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AfterBegin.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AfterBegin.java
deleted file mode 100644
index 835fcd7..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AfterBegin.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target(value = METHOD)
-@Retention(value = RUNTIME)
-public @interface AfterBegin {
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AfterCompletion.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AfterCompletion.java
deleted file mode 100644
index 70efe51..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AfterCompletion.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target(value = METHOD)
-@Retention(value = RUNTIME)
-public @interface AfterCompletion {
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ApplicationException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ApplicationException.java
deleted file mode 100644
index 822ed02..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ApplicationException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ApplicationException {
-    boolean rollback() default false;
-    boolean inherited() default true;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AsyncResult.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AsyncResult.java
deleted file mode 100644
index c73f72f..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/AsyncResult.java
+++ /dev/null
@@ -1,56 +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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public final class AsyncResult<V> implements Future<V> {
-	private final V result;
-
-	public AsyncResult(V result) {
-		this.result = result;
-	}
-	
-	public boolean cancel(boolean mayInterruptIfRunning) {
-		throw new IllegalStateException();
-	}
-
-	public V get() throws InterruptedException, ExecutionException {
-		return result;
-	}
-
-	public V get(long timeout, TimeUnit unit) throws InterruptedException,
-			ExecutionException, TimeoutException {
-		return result;
-	}
-
-	public boolean isCancelled() {
-		return false;
-	}
-
-	public boolean isDone() {
-		return true;
-	}
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Asynchronous.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Asynchronous.java
deleted file mode 100644
index 48db8e4..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Asynchronous.java
+++ /dev/null
@@ -1,35 +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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target(value = {METHOD, TYPE})
-@Retention(value = RUNTIME)
-public @interface Asynchronous {
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/BeforeCompletion.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/BeforeCompletion.java
deleted file mode 100644
index 936f282..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/BeforeCompletion.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target(value = METHOD)
-@Retention(value = RUNTIME)
-public @interface BeforeCompletion {
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagement.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagement.java
deleted file mode 100644
index 3e3814f..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagement.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import static javax.ejb.ConcurrencyManagementType.CONTAINER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-
-@java.lang.annotation.Target(value = {TYPE})
-@java.lang.annotation.Retention(value = RUNTIME)
-public @interface ConcurrencyManagement {
-    javax.ejb.ConcurrencyManagementType value() default CONTAINER;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagementType.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagementType.java
deleted file mode 100644
index 69d9bd5..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrencyManagementType.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Revision$ $Date$
- */
-public enum ConcurrencyManagementType {
-    CONTAINER,
-    BEAN;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessException.java
deleted file mode 100644
index ad2a159..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Rev: 467742 $ $Date: 2006-10-25 12:30:38 -0700 (Wed, 25 Oct 2006) $
- */
-public class ConcurrentAccessException extends EJBException {
-    public ConcurrentAccessException() {
-        super();
-    }
-
-    public ConcurrentAccessException(String message, Exception ex) {
-        super(message, ex);
-    }
-
-    public ConcurrentAccessException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.java
deleted file mode 100644
index b87a2ac..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ConcurrentAccessTimeoutException.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Revision$ $Date$
- */
-public class ConcurrentAccessTimeoutException extends javax.ejb.ConcurrentAccessException {
-
-    public ConcurrentAccessTimeoutException() {
-    }
-
-    public ConcurrentAccessTimeoutException(String string) {
-        super(string);
-    }
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/CreateException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/CreateException.java
deleted file mode 100644
index 1515eee..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/CreateException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CreateException extends Exception {
-    public CreateException() {
-        super();
-    }
-
-    public CreateException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/DependsOn.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/DependsOn.java
deleted file mode 100644
index c674850..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/DependsOn.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE})
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface DependsOn {
-    String[] value();
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/DuplicateKeyException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/DuplicateKeyException.java
deleted file mode 100644
index 2f6911b..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/DuplicateKeyException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DuplicateKeyException extends CreateException {
-    public DuplicateKeyException() {
-        super();
-    }
-
-    public DuplicateKeyException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJB.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJB.java
deleted file mode 100644
index c73ff1a..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJB.java
+++ /dev/null
@@ -1,49 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EJB {
-    String name() default "";
-
-    Class beanInterface() default Object.class;
-
-    String beanName() default "";
-
-    String mappedName() default "";
-
-    String description() default "";
-
-    String lookup() default "";
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBAccessException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBAccessException.java
deleted file mode 100644
index 9edff9b..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBAccessException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Rev: 467742 $ $Date: 2006-10-25 12:30:38 -0700 (Wed, 25 Oct 2006) $
- */
-public class EJBAccessException extends EJBException {
-    public EJBAccessException() {
-        super();
-    }
-
-    public EJBAccessException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBContext.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBContext.java
deleted file mode 100644
index a212a83..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBContext.java
+++ /dev/null
@@ -1,73 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.security.Identity;
-import java.security.Principal;
-import java.util.Properties;
-import java.util.Map;
-import javax.transaction.UserTransaction;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EJBContext {
-    EJBHome getEJBHome();
-
-    EJBLocalHome getEJBLocalHome();
-
-    /**
-     * @deprecated
-     */
-    Properties getEnvironment();
-
-    /**
-     * @deprecated
-     */
-    Identity getCallerIdentity();
-
-    Principal getCallerPrincipal();
-
-    /**
-     * @deprecated
-     */
-    boolean isCallerInRole(Identity role);
-
-    boolean isCallerInRole(String roleName);
-
-    UserTransaction getUserTransaction() throws IllegalStateException;
-
-    void setRollbackOnly() throws IllegalStateException;
-
-    boolean getRollbackOnly() throws IllegalStateException;
-
-    TimerService getTimerService() throws IllegalStateException;
-
-    Object lookup(String name);
-
-    Map<String,Object> getContextData();
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBException.java
deleted file mode 100644
index 626ebe5..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBException.java
+++ /dev/null
@@ -1,81 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-/**
- * @version $Rev$ $Date$
- */
-public class EJBException extends RuntimeException {
-
-    private static final long serialVersionUID = 796770993296843510L;
-    private Exception causeException;
-
-    public EJBException() {
-        super();
-    }
-
-    public EJBException(Exception causeException) {
-        super(causeException);
-    }
-
-    public EJBException(String message) {
-        super(message);
-    }
-
-    public EJBException(String message, Exception causeException) {
-        super(message, causeException);
-    }
-
-    public Exception getCausedByException() {
-        Throwable cause = getCause();
-        if (cause instanceof Exception) {
-            return (Exception) cause;
-        }
-        return null;
-    }
-
-    public String getMessage() {
-        return super.getMessage();
-    }
-
-
-    public void printStackTrace(PrintStream ps) {
-        super.printStackTrace(ps);
-    }
-
-
-    public void printStackTrace() {
-        super.printStackTrace();
-    }
-
-
-    public void printStackTrace(PrintWriter pw) {
-        super.printStackTrace(pw);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBHome.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBHome.java
deleted file mode 100644
index fc7627c..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBHome.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EJBHome extends Remote {
-    EJBMetaData getEJBMetaData() throws RemoteException;
-
-    HomeHandle getHomeHandle() throws RemoteException;
-
-    void remove(Handle handle) throws RemoteException, RemoveException;
-
-    void remove(Object primaryKey) throws RemoteException, RemoveException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBLocalHome.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBLocalHome.java
deleted file mode 100644
index d116eea..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBLocalHome.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EJBLocalHome {
-    void remove(Object primaryKey) throws RemoveException, EJBException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBLocalObject.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBLocalObject.java
deleted file mode 100644
index 0b903a1..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBLocalObject.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EJBLocalObject {
-    EJBLocalHome getEJBLocalHome() throws EJBException;
-
-    Object getPrimaryKey() throws EJBException;
-
-    boolean isIdentical(EJBLocalObject obj) throws EJBException;
-
-    void remove() throws RemoveException, EJBException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBMetaData.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBMetaData.java
deleted file mode 100644
index 2771716..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBMetaData.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EJBMetaData {
-    EJBHome getEJBHome();
-
-    Class getHomeInterfaceClass();
-
-    Class getPrimaryKeyClass();
-
-    Class getRemoteInterfaceClass();
-
-    boolean isSession();
-
-    boolean isStatelessSession();
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBObject.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBObject.java
deleted file mode 100644
index 13d55b2..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBObject.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EJBObject extends Remote {
-    EJBHome getEJBHome() throws RemoteException;
-
-    Handle getHandle() throws RemoteException;
-
-    Object getPrimaryKey() throws RemoteException;
-
-    boolean isIdentical(EJBObject obj) throws RemoteException;
-
-    void remove() throws RemoteException, RemoveException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBTransactionRequiredException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBTransactionRequiredException.java
deleted file mode 100644
index d57c237..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBTransactionRequiredException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Rev: 467742 $ $Date: 2006-10-25 12:30:38 -0700 (Wed, 25 Oct 2006) $
- */
-public class EJBTransactionRequiredException extends EJBException {
-    public EJBTransactionRequiredException() {
-        super();
-    }
-
-    public EJBTransactionRequiredException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBTransactionRolledbackException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBTransactionRolledbackException.java
deleted file mode 100644
index 010fe7f..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBTransactionRolledbackException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Rev: 467742 $ $Date: 2006-10-25 12:30:38 -0700 (Wed, 25 Oct 2006) $
- */
-public class EJBTransactionRolledbackException extends EJBException {
-    public EJBTransactionRolledbackException() {
-        super();
-    }
-
-    public EJBTransactionRolledbackException(String message, Exception ex) {
-        super(message, ex);
-    }
-
-    public EJBTransactionRolledbackException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBs.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBs.java
deleted file mode 100644
index 5e1211a..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EJBs.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EJBs {
-    EJB[] value();
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EnterpriseBean.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EnterpriseBean.java
deleted file mode 100644
index d1590c8..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EnterpriseBean.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.io.Serializable;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EnterpriseBean extends Serializable {
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EntityBean.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EntityBean.java
deleted file mode 100644
index ebeeac5..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EntityBean.java
+++ /dev/null
@@ -1,47 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.rmi.RemoteException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EntityBean extends EnterpriseBean {
-    void ejbActivate() throws EJBException, RemoteException;
-
-    void ejbLoad() throws EJBException, RemoteException;
-
-    void ejbPassivate() throws EJBException, RemoteException;
-
-    void ejbRemove() throws RemoveException, EJBException, RemoteException;
-
-    void ejbStore() throws EJBException, RemoteException;
-
-    void setEntityContext(EntityContext ctx) throws EJBException, RemoteException;
-
-    void unsetEntityContext() throws EJBException, RemoteException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EntityContext.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EntityContext.java
deleted file mode 100644
index acbd2e5..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/EntityContext.java
+++ /dev/null
@@ -1,37 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface EntityContext extends EJBContext {
-    EJBLocalObject getEJBLocalObject() throws IllegalStateException;
-
-    EJBObject getEJBObject() throws IllegalStateException;
-
-    Object getPrimaryKey() throws IllegalStateException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/FinderException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/FinderException.java
deleted file mode 100644
index c038aef..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/FinderException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FinderException extends Exception {
-    public FinderException() {
-        super();
-    }
-
-    public FinderException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Handle.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Handle.java
deleted file mode 100644
index a4bdd26..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Handle.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Handle extends Serializable {
-    EJBObject getEJBObject() throws RemoteException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/HomeHandle.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/HomeHandle.java
deleted file mode 100644
index 585d12d..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/HomeHandle.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface HomeHandle extends Serializable {
-    EJBHome getEJBHome() throws RemoteException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/IllegalLoopbackException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/IllegalLoopbackException.java
deleted file mode 100644
index 8d9078d..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/IllegalLoopbackException.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Revision$ $Date$
- */
-public class IllegalLoopbackException extends javax.ejb.ConcurrentAccessException {
-
-    public IllegalLoopbackException() {
-    }
-
-    public IllegalLoopbackException(String string) {
-        super(string);
-    }
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Init.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Init.java
deleted file mode 100644
index 9e4a557..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Init.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Init {
-    String value() default "";
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Local.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Local.java
deleted file mode 100644
index 567f4d5..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Local.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Local {
-    Class[] value() default {};
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LocalBean.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LocalBean.java
deleted file mode 100644
index a36920c..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LocalBean.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target(value = TYPE)
-@Retention(value = RUNTIME)
-public @interface LocalBean {
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LocalHome.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LocalHome.java
deleted file mode 100644
index 9ca93d3..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LocalHome.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface LocalHome {
-    Class value();
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Lock.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Lock.java
deleted file mode 100644
index 7ffc95d..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Lock.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import static javax.ejb.LockType.WRITE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
-
-@java.lang.annotation.Target(value = {TYPE, METHOD})
-@java.lang.annotation.Retention(value = RUNTIME)
-public @interface Lock {
-    javax.ejb.LockType value() default WRITE;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LockType.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LockType.java
deleted file mode 100644
index 0daa76e..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/LockType.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-public enum LockType {
-    READ, WRITE;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/MessageDriven.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/MessageDriven.java
deleted file mode 100644
index f7bf82e..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/MessageDriven.java
+++ /dev/null
@@ -1,47 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MessageDriven {
-    String name() default "";
-
-    Class messageListenerInterface() default Object.class;
-
-    ActivationConfigProperty[] activationConfig() default {};
-
-    String mappedName() default "";
-
-    String description() default "";
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/MessageDrivenBean.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/MessageDrivenBean.java
deleted file mode 100644
index e81f29f..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/MessageDrivenBean.java
+++ /dev/null
@@ -1,35 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface MessageDrivenBean extends EnterpriseBean {
-    void ejbRemove() throws EJBException;
-
-    void setMessageDrivenContext(MessageDrivenContext ctx) throws EJBException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/MessageDrivenContext.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/MessageDrivenContext.java
deleted file mode 100644
index 0f26303..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/MessageDrivenContext.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface MessageDrivenContext extends EJBContext {
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoMoreTimeoutsException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoMoreTimeoutsException.java
deleted file mode 100644
index b84a333..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoMoreTimeoutsException.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Revision$ $Date$
- */
-public class NoMoreTimeoutsException extends EJBException {
-    public NoMoreTimeoutsException() {
-    }
-
-    public NoMoreTimeoutsException(String s) {
-        super(s);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoSuchEJBException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoSuchEJBException.java
deleted file mode 100644
index 2ab5d09..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoSuchEJBException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Rev: 467742 $ $Date: 2006-10-25 12:30:38 -0700 (Wed, 25 Oct 2006) $
- */
-public class NoSuchEJBException extends EJBException {
-    public NoSuchEJBException() {
-        super();
-    }
-
-    public NoSuchEJBException(String message, Exception ex) {
-        super(message, ex);
-    }
-
-    public NoSuchEJBException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoSuchEntityException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoSuchEntityException.java
deleted file mode 100644
index 4ae30a1..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoSuchEntityException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class NoSuchEntityException extends EJBException {
-    public NoSuchEntityException() {
-        super();
-    }
-
-    public NoSuchEntityException(Exception ex) {
-        super(ex);
-    }
-
-    public NoSuchEntityException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoSuchObjectLocalException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoSuchObjectLocalException.java
deleted file mode 100644
index dd0ec46..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/NoSuchObjectLocalException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class NoSuchObjectLocalException extends EJBException {
-    public NoSuchObjectLocalException() {
-        super();
-    }
-
-    public NoSuchObjectLocalException(String message) {
-        super(message);
-    }
-
-    public NoSuchObjectLocalException(String message, Exception ex) {
-        super(message, ex);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ObjectNotFoundException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ObjectNotFoundException.java
deleted file mode 100644
index 2c38f97..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ObjectNotFoundException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ObjectNotFoundException extends FinderException {
-    public ObjectNotFoundException() {
-        super();
-    }
-
-    public ObjectNotFoundException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/PostActivate.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/PostActivate.java
deleted file mode 100644
index 097251c..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/PostActivate.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PostActivate {
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/PrePassivate.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/PrePassivate.java
deleted file mode 100644
index d10fdc8..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/PrePassivate.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PrePassivate {
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Remote.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Remote.java
deleted file mode 100644
index 297db43..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Remote.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Remote {
-    Class[] value() default {};
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/RemoteHome.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/RemoteHome.java
deleted file mode 100644
index ad75034..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/RemoteHome.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface RemoteHome {
-    Class value();
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Remove.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Remove.java
deleted file mode 100644
index 7329d2b..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Remove.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Remove {
-    boolean retainIfException() default false;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/RemoveException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/RemoveException.java
deleted file mode 100644
index 66f764d..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/RemoveException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class RemoveException extends Exception {
-    public RemoveException() {
-        super();
-    }
-
-    public RemoveException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedule.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedule.java
deleted file mode 100644
index f1a09f7..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedule.java
+++ /dev/null
@@ -1,53 +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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target(value = METHOD)
-@Retention(value = RUNTIME)
-public @interface Schedule {
-	String dayOfMonth() default "*";
-	
-	String dayOfWeek() default "*";
-
-	String hour() default "0";
-
-	String info() default "";
-
-	String minute() default "0";
-
-	String month() default "*";
-
-	boolean persistent() default true;
-
-	String second() default "0";
-
-	java.lang.String timezone() default "";
-
-    java.lang.String year() default "*";
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ScheduleExpression.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ScheduleExpression.java
deleted file mode 100644
index 0048226..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/ScheduleExpression.java
+++ /dev/null
@@ -1,171 +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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class ScheduleExpression implements Serializable {
-
-    private static final long serialVersionUID = -3813254457230997879L;
-    
-	private String dayOfMonth = "*";
-	private String dayOfWeek = "*";
-	private String hour = "0";
-	private String minute = "0";
-	private String month = "*";
-	private String second = "0";
-	private String year = "*";
-	private String timezone;
-	private Date start;
-	private Date end;
-	
-	public ScheduleExpression dayOfMonth(int d) {
-		dayOfMonth = Integer.toString(d);
-		return this;
-	}
-
-	public ScheduleExpression dayOfMonth(String d) {
-		dayOfMonth = d;
-		return this;
-	}
-
-	public ScheduleExpression dayOfWeek(int d) {
-		dayOfWeek = Integer.toString(d);
-		return this;
-	}
-
-	public ScheduleExpression dayOfWeek(String d) {
-		dayOfWeek = d;
-		return this;
-	}
-
-	public ScheduleExpression end(Date e) {
-		end = e;
-		return this;
-	}
-
-	public String getDayOfMonth() {
-		return dayOfMonth;
-	}
-
-	public String getDayOfWeek() {
-		return dayOfWeek;
-	}
-
-	public Date getEnd() {
-		return end;
-	}
-
-	public String getHour() {
-		return hour;
-	}
-
-	public String getMinute() {
-		return minute;
-	}
-
-	public String getMonth() {
-		return month;
-	}
-
-	public String getSecond() {
-		return second;
-	}
-
-	public Date getStart() {
-		return start;
-	}
-
-	public String getYear() {
-		return year;
-	}
-	
-	public String getTimezone() {
-		return timezone;
-	}
-
-	public ScheduleExpression hour(int h) {
-		hour = Integer.toString(h);
-		return this;
-	}
-
-	public ScheduleExpression hour(String h) {
-		hour = h;
-		return this;
-	}
-
-	public ScheduleExpression minute(int m) {
-		minute = Integer.toString(m);
-		return this;
-	}
-
-	public ScheduleExpression minute(String m) {
-		minute = m;
-		return this;
-	}
-
-	public ScheduleExpression month(int m) {
-		month = Integer.toString(m);
-		return this;
-	}
-
-	public ScheduleExpression month(String m) {
-		month = m;
-		return this;
-	}
-
-	public ScheduleExpression second(int s) {
-		second = Integer.toString(s);
-		return this;
-	}
-
-	public ScheduleExpression second(String s) {
-		second = s;
-		return this;
-	}
-
-	public ScheduleExpression start(Date s) {
-		start = s;
-		return this;
-	}
-
-	public ScheduleExpression year(int y) {
-		year = Integer.toString(y);
-		return this;
-	}
-
-	public ScheduleExpression year(String y) {
-		year = y;
-		return this;
-	}
-
-    /**
-     * See http://en.wikipedia.org/wiki/List_of_zoneinfo_timezones for valid timezones 
-     * @param t
-     * @return
-     */
-	public ScheduleExpression timezone(String t) {
-		timezone = t;
-		return this;
-	}
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedules.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedules.java
deleted file mode 100644
index 3259005..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Schedules.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target(value = METHOD)
-@Retention(value = RUNTIME)
-public @interface Schedules {
-	Schedule[] value();
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/SessionBean.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/SessionBean.java
deleted file mode 100644
index d2f3d0b..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/SessionBean.java
+++ /dev/null
@@ -1,41 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.rmi.RemoteException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface SessionBean extends EnterpriseBean {
-    void ejbActivate() throws EJBException, RemoteException;
-
-    void ejbPassivate() throws EJBException, RemoteException;
-
-    void ejbRemove() throws EJBException, RemoteException;
-
-    void setSessionContext(SessionContext ctx) throws EJBException, RemoteException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/SessionContext.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/SessionContext.java
deleted file mode 100644
index 3ae11d4..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/SessionContext.java
+++ /dev/null
@@ -1,46 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import javax.xml.rpc.handler.MessageContext;
-import java.util.Map;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface SessionContext extends EJBContext {
-    EJBLocalObject getEJBLocalObject() throws IllegalStateException;
-
-    EJBObject getEJBObject() throws IllegalStateException;
-
-    MessageContext getMessageContext() throws IllegalStateException;
-
-    <T> T getBusinessObject(Class<T> businessInterface);
-
-    Class getInvokedBusinessInterface();
-
-    boolean wasCancelCalled();
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/SessionSynchronization.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/SessionSynchronization.java
deleted file mode 100644
index b0d1c13..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/SessionSynchronization.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.rmi.RemoteException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface SessionSynchronization {
-    void afterBegin() throws EJBException, RemoteException;
-
-    void afterCompletion(boolean committed) throws EJBException, RemoteException;
-
-    void beforeCompletion() throws EJBException, RemoteException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Singleton.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Singleton.java
deleted file mode 100644
index df283aa..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Singleton.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE})
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface Singleton {
-    java.lang.String name() default "";
-
-    java.lang.String mappedName() default "";
-
-    java.lang.String description() default "";
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Startup.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Startup.java
deleted file mode 100644
index 366404b..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Startup.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-@java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE})
-@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface Startup {
-}
\ No newline at end of file
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Stateful.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Stateful.java
deleted file mode 100644
index cf1a0b8..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Stateful.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Stateful {
-    String name() default "";
-
-    String mappedName() default "";
-
-    String description() default "";
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/StatefulTimeout.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/StatefulTimeout.java
deleted file mode 100644
index cca1579..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/StatefulTimeout.java
+++ /dev/null
@@ -1,35 +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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.util.concurrent.TimeUnit;
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-
-@Target(value = {TYPE})
-@Retention(value = RUNTIME)
-public @interface StatefulTimeout {
-    long value();
-    TimeUnit unit() default TimeUnit.MINUTES;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Stateless.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Stateless.java
deleted file mode 100644
index bb2c271..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Stateless.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import static java.lang.annotation.ElementType.TYPE;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(TYPE)
-@Retention(RUNTIME)
-public @interface Stateless {
-    String name() default "";
-
-    String mappedName() default "";
-
-    String description() default "";
-}
-
-
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimedObject.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimedObject.java
deleted file mode 100644
index aee2b79..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimedObject.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TimedObject {
-    void ejbTimeout(Timer timer);
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Timeout.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Timeout.java
deleted file mode 100644
index 2a09b12..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Timeout.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Timeout {
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Timer.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Timer.java
deleted file mode 100644
index 8c1e12e..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/Timer.java
+++ /dev/null
@@ -1,51 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Timer {
-    void cancel() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-
-    long getTimeRemaining() throws EJBException, IllegalStateException, NoSuchObjectLocalException, NoMoreTimeoutsException;
-
-    Date getNextTimeout() throws EJBException, IllegalStateException, NoSuchObjectLocalException, NoMoreTimeoutsException;
-
-    Serializable getInfo() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-
-    TimerHandle getHandle() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-
-    ScheduleExpression getSchedule() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-
-    boolean isPersistent() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-
-    boolean isCalendarTimer() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerConfig.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerConfig.java
deleted file mode 100644
index 076fb8e..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerConfig.java
+++ /dev/null
@@ -1,53 +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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.io.Serializable;
-
-public class TimerConfig {
-	private Serializable info;
-	private boolean persistent;
-
-    public TimerConfig() {
-    }
-
-    public TimerConfig(Serializable info, boolean persistent) {
-        this.info = info;
-        this.persistent = persistent;
-    }
-
-    public Serializable getInfo() {
-		return info;
-	}
-	
-	public boolean isPersistent() {
-		return persistent;
-	}
-
-	public void setInfo(Serializable i) {
-		info = i;
-	}
-
-	public void setPersistent(boolean persistent) {
-		this.persistent = persistent;
-	}
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerHandle.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerHandle.java
deleted file mode 100644
index 94fc14b..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerHandle.java
+++ /dev/null
@@ -1,35 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.io.Serializable;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TimerHandle extends Serializable {
-    Timer getTimer() throws EJBException, IllegalStateException, NoSuchObjectLocalException;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerService.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerService.java
deleted file mode 100644
index e078f42..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TimerService.java
+++ /dev/null
@@ -1,59 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Date;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TimerService {
-    Timer createTimer(Date initialExpiration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException;
-
-    Timer createTimer(Date expiration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException;
-
-    Timer createTimer(long initialDuration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException;
-
-    Timer createTimer(long duration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException;
-
-    Collection<Timer> getTimers() throws IllegalStateException, EJBException;
-
-    Timer createSingleActionTimer(long duration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException;
-
-    Timer createSingleActionTimer(java.util.Date expiration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException;
-
-    Timer createIntervalTimer(long initialDuration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException;
-
-    Timer createIntervalTimer(java.util.Date initialExpiration, long intervalDuration, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException;
-
-    Timer createCalendarTimer(ScheduleExpression schedule) throws IllegalArgumentException, IllegalStateException, EJBException;
-
-    Timer createCalendarTimer(ScheduleExpression schedule, TimerConfig timerConfig) throws IllegalArgumentException, IllegalStateException, EJBException;
-
-
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionAttribute.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionAttribute.java
deleted file mode 100644
index 4909e4a..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionAttribute.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TransactionAttribute {
-    TransactionAttributeType value()
-            default TransactionAttributeType.REQUIRED;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionAttributeType.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionAttributeType.java
deleted file mode 100644
index 853111c..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionAttributeType.java
+++ /dev/null
@@ -1,37 +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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public enum TransactionAttributeType {
-    MANDATORY,
-    REQUIRED,
-    REQUIRES_NEW,
-    SUPPORTS,
-    NOT_SUPPORTED,
-    NEVER;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionManagement.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionManagement.java
deleted file mode 100644
index 2b2e16a..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionManagement.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * @version $Rev$ $Date$
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TransactionManagement {
-    TransactionManagementType value()
-            default TransactionManagementType.CONTAINER;
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionManagementType.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionManagementType.java
deleted file mode 100644
index fc7c985..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionManagementType.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public enum TransactionManagementType {
-    CONTAINER,
-    BEAN;}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionRequiredLocalException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionRequiredLocalException.java
deleted file mode 100644
index d874ae3..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionRequiredLocalException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionRequiredLocalException extends EJBException {
-    public TransactionRequiredLocalException() {
-        super();
-    }
-
-    public TransactionRequiredLocalException(String message) {
-        super(message);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionRolledbackLocalException.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionRolledbackLocalException.java
deleted file mode 100644
index 3861f41..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/TransactionRolledbackLocalException.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TransactionRolledbackLocalException extends EJBException {
-    public TransactionRolledbackLocalException() {
-        super();
-    }
-
-    public TransactionRolledbackLocalException(String message) {
-        super(message);
-    }
-
-    public TransactionRolledbackLocalException(String message, Exception ex) {
-        super(message, ex);
-    }
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/embeddable/EJBContainer.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/embeddable/EJBContainer.java
deleted file mode 100644
index 4134a87..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/embeddable/EJBContainer.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb.embeddable;
-
-import javax.ejb.EJBException;
-import javax.ejb.spi.EJBContainerProvider;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Enumeration;
-
-import org.apache.geronimo.osgi.locator.ProviderLocator;
-
-public abstract class EJBContainer {
-
-    public static final String PROVIDER = "javax.ejb.embeddable.provider";
-    public static final String APP_NAME = "javax.ejb.embeddable.appName";
-    public static final String MODULES = "javax.ejb.embeddable.modules";
-
-    public EJBContainer() {
-    }
-
-    public abstract void close();
-
-    public static EJBContainer createEJBContainer() {
-        return createEJBContainer(Collections.EMPTY_MAP);
-    }
-
-    public static EJBContainer createEJBContainer(java.util.Map<?, ?> properties) {
-        if (properties == null) {
-            properties = Collections.EMPTY_MAP;
-        }
-
-        Object o = properties.get(PROVIDER);
-
-        if (o instanceof String) {
-            String providerName = (String) o;
-
-            Class providerClass;
-
-            try {
-                providerClass = ProviderLocator.loadClass(providerName);
-            } catch (Exception e) {
-                throw new EJBException("Invalid or inaccessible provider class: " + providerName, e);
-            }
-
-            try {
-                EJBContainerProvider provider = (EJBContainerProvider) providerClass.newInstance();
-                return provider.createEJBContainer(properties);
-            } catch (Exception e) {
-                throw new EJBException("Provider error. Provider: " + providerName, e);
-            }
-        } else {
-            // do the services search processing.
-            try {
-                ClassLoader loader = Thread.currentThread().getContextClassLoader();
-                // go check the loader files.
-                EJBContainerProvider provider = (EJBContainerProvider)ProviderLocator.getService(EJBContainerProvider.class.getName(), EJBContainer.class, loader);
-                if (provider != null) {
-                    return provider.createEJBContainer(properties);
-                }
-                else {
-                    throw new EJBException("Provider error. No provider definition found");
-                }
-            } catch (Exception e) {
-                throw new EJBException("Provider error. No provider found", e);
-            }
-        }
-    }
-
-    public abstract javax.naming.Context getContext();
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/spi/EJBContainerProvider.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/spi/EJBContainerProvider.java
deleted file mode 100644
index c4817d6..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/spi/EJBContainerProvider.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.
- */
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-package javax.ejb.spi;
-
-import javax.ejb.embeddable.EJBContainer;
-
-public interface EJBContainerProvider {
-    public EJBContainer createEJBContainer(java.util.Map<?,?> properties);
-}
diff --git a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/spi/HandleDelegate.java b/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/spi/HandleDelegate.java
deleted file mode 100644
index 2c3b110..0000000
--- a/geronimo-ejb_3.1_spec/src/main/java/javax/ejb/spi/HandleDelegate.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.
- */
-
-//
-// This source code implements specifications defined by the Java
-// Community Process. In order to remain compliant with the specification
-// DO NOT add / change / or delete method signatures!
-//
-
-package javax.ejb.spi;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import javax.ejb.EJBHome;
-import javax.ejb.EJBObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface HandleDelegate {
-    EJBHome readEJBHome(ObjectInputStream istream) throws ClassNotFoundException, IOException;
-
-    EJBObject readEJBObject(ObjectInputStream istream) throws ClassNotFoundException, IOException;
-
-    void writeEJBHome(EJBHome ejbHome, ObjectOutputStream ostream) throws IOException;
-
-    void writeEJBObject(EJBObject ejbObject, ObjectOutputStream ostream) throws IOException;
-}
diff --git a/pom.xml b/pom.xml
index 69ac2ee..1530bfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-            <version>2.0.1</version>
+            <version>2.1</version>
             <scope>provided</scope>
         </dependency>