[maven-scm] copy for tag geronimo-jcdi_1.0_spec-1.0
git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jcdi_1.0_spec-1.0@936705 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-jcdi_1.0_spec/LICENSE b/geronimo-jcdi_1.0_spec/LICENSE
deleted file mode 100644
index 6b0b127..0000000
--- a/geronimo-jcdi_1.0_spec/LICENSE
+++ /dev/null
@@ -1,203 +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-jcdi_1.0_spec/NOTICE b/geronimo-jcdi_1.0_spec/NOTICE
deleted file mode 100644
index ddd4a10..0000000
--- a/geronimo-jcdi_1.0_spec/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Apache Geronimo JSR-299 Context and Dependency Injection for the Java EE Platoform Spec API
-Copyright 2009,2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/geronimo-jcdi_1.0_spec/pom.xml b/geronimo-jcdi_1.0_spec/pom.xml
deleted file mode 100644
index e3c029d..0000000
--- a/geronimo-jcdi_1.0_spec/pom.xml
+++ /dev/null
@@ -1,118 +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.
--->
-<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-jcdi_1.0_spec</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Geronimo Java Contexts and Dependency Injection (JSR-299) Spec API</name>
- <version>1.0</version>
-
- <description>Apache Geronimo implementation of the JSR-299 Context and Dependency Injection for the Java EE Platform</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>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jcdi_1.0_spec-1.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jcdi_1.0_spec-1.0</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/tags/geronimo-jcdi_1.0_spec-1.0</url>
- </scm>
-
- <!-- added so the build can find staged depends -->
- <repositories>
- <repository>
- <id>apache.nexus.staging</id>
- <name>Apache Staging Repository</name>
- <layout>default</layout>
- <url>https://repository.apache.org/content/repositories/staging/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- </repository>
- </repositories>
-
- <dependencies>
- <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-el_2.2_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_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>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- javax.decorator*;version=1.0,
- javax.enterprise.context*;version=1.0,
- javax.enterprise.event*;version=1.0,
- javax.enterprise.inject*;version=1.0,
- javax.enterprise.util*;version=1.0
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/decorator/Decorator.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/decorator/Decorator.java
deleted file mode 100644
index 3d14d3d..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/decorator/Decorator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.decorator;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.Stereotype;
-
-/**
- * Defines decorator classes.
- *
- * @version $Rev$ $Date$
- *
- */
-@Target(value = ElementType.TYPE)
-@Retention(value = RetentionPolicy.RUNTIME)
-@Documented
-@Stereotype
-public @interface Decorator
-{
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/decorator/Delegate.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/decorator/Delegate.java
deleted file mode 100644
index f253b05..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/decorator/Delegate.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.
- */
-package javax.decorator;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotates delegate bean.
- *
- * @version $Rev$ $Date$
- *
- */
-@Target({FIELD,PARAMETER})
-@Retention(RUNTIME)
-@Documented
-public @interface Delegate
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ApplicationScoped.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ApplicationScoped.java
deleted file mode 100644
index 50e356e..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ApplicationScoped.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.context;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Defines the application scoped type.
- *
- * <p>
- * Please see the <b>8.5.3 Application context lifecycle</b>
- * of the specification.
- * </p>
- */
-@NormalScope
-@Target( { ElementType.TYPE, ElementType.METHOD , ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Documented
-public @interface ApplicationScoped
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java
deleted file mode 100644
index 2f841bf..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/BusyConversationException.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.context;
-
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-
-/**
- * A long running conversation must only be used by one request at the same time!
- *
- * If a parallel long running conversation gets detected, this very Exception will
- * be thrown for the new request and the 2nd request will get a
- * fresh Conversation assigned.
- *
- * The customer application may decide to catch this Exception and continue it's work
- * with the new conversation.
- *
- * @see Context#get(Contextual, CreationalContext)
- * @see Context#get(Contextual)
- * @since 1.0 PFD2
- */
-public class BusyConversationException extends ContextException
-{
-
- private static final long serialVersionUID = -3599813072560026919L ;
-
- public BusyConversationException()
- {
-
- }
-
- /**
- * Creates a new exception with message.
- *
- * @param message message
- */
- public BusyConversationException(String message)
- {
- super(message);
- }
-
- /**
- * Create a new exception with the root cause.
- *
- * @param cause cause of the exception
- */
- public BusyConversationException(Throwable cause)
- {
- super(cause);
- }
-
- /**
- * Creates a new exception with the given message and throwable cause.
- *
- * @param message exception message
- * @param cause root cause of the exception
- */
- public BusyConversationException(String message, Throwable cause)
- {
- super(message, cause);
- }
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextException.java
deleted file mode 100644
index 8fb36b1..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextException.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.
- */
-package javax.enterprise.context;
-
-public class ContextException extends RuntimeException
-{
- private static final long serialVersionUID = -3599813072560026919L;
-
- public ContextException()
- {
-
- }
-
- public ContextException(String message)
- {
- super(message);
- }
-
- public ContextException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public ContextException(Throwable cause)
- {
- super(cause);
- }
-
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java
deleted file mode 100644
index 374db48..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ContextNotActiveException.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.context;
-
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-
-/**
- * It is used by the <code>Context</code> interface.
- *
- *
- * @see Context#get(Contextual, CreationalContext)
- * @see Context#get(Contextual)
- */
-public class ContextNotActiveException extends ContextException
-{
-
- private static final long serialVersionUID = -3599813072560026919L;
-
- public ContextNotActiveException()
- {
-
- }
-
- /**
- * Creates a new exception with message.
- *
- * @param message message
- */
- public ContextNotActiveException(String message)
- {
- super(message);
- }
-
- /**
- * Create a new exception with the root cause.
- *
- * @param cause cause of the exception
- */
- public ContextNotActiveException(Throwable cause)
- {
- super(cause);
- }
-
- /**
- * Creates a new exception with the given message and throwable cause.
- *
- * @param message exception message
- * @param cause root cause of the exception
- */
- public ContextNotActiveException(String message, Throwable cause)
- {
- super(message, cause);
- }
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Conversation.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Conversation.java
deleted file mode 100644
index 489ddb3..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Conversation.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.context;
-
-/**
- * Defines the conversation instance contract for using
- * in the {@link ConversationScoped} webbeans components.
- *
- * <p>
- * Please see the <b>8.5.4 Conversation context lifecycle</b> of the specification.
- * </p>
- *
- * @see ConversationScoped
- */
-public interface Conversation
-{
- /**
- * Starts new conversation.
- */
- public void begin();
-
- /**
- * Starts new conversation with the given id.
- *
- * @param id conversation id.
- */
- public void begin(String id);
-
- /**
- * Ends of the conversation.
- */
- public void end();
-
- /**
- * @return <code>true</code> if conversation is transient,
- * <code>false</code> if it is a long running conversation.
- */
- public boolean isTransient();
-
- /**
- * Gets conversation id.
- *
- * @return conversation id
- */
- public String getId();
-
- /**
- * Returns conversation time out.
- *
- * @return conversation timeout
- */
- public long getTimeout();
-
- /**
- * Sets conversation timeout in ms.
- *
- * @param milliseconds timeout of the conversation
- */
- public void setTimeout(long milliseconds);
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ConversationScoped.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ConversationScoped.java
deleted file mode 100644
index f78c4de..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/ConversationScoped.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.
- */
-package javax.enterprise.context;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Conversation scope type.
- *
- * @see Conversation
- */
-@Target( { ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@NormalScope(passivating = true)
-@Inherited
-public @interface ConversationScoped
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Dependent.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Dependent.java
deleted file mode 100644
index 76c1d5b..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/Dependent.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.
- */
-package javax.enterprise.context;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.inject.Scope;
-
-/**
- * Dependent scope type.
- * <p>
- * If webbeans or its stereotypes do not define its scope type,
- * default scope type is <code>Dependent</code> scope.
- * </p>
- *
- * <p>
- * Every webbeans instance has an associated dependent context. Each dependent context
- * is destroyed with its parent webbeans component instance.
- * </p>
- *
- * <p>
- * Please see <b>8.3 Dependent pseudo-scope</b> of the specification
- * for getting furhter information.
- * </p>
- *
- */
-@Scope
-@Target( { ElementType.METHOD, ElementType.TYPE, ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Documented
-public @interface Dependent
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java
deleted file mode 100644
index aaf29f8..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NonexistentConversationException.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.context;
-
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-
-/**
- * If a long running conversation cannot be restored, OWB will
- * assign a fresh conversation and throws this very Exception.
- *
- * The user code is free to catch it and continue his work
- * with this new conversation.
- *
- * @see Context#get(Contextual, CreationalContext)
- * @see Context#get(Contextual)
- * @since 1.0 PFD2
- */
-public class NonexistentConversationException extends ContextException
-{
-
- private static final long serialVersionUID = -3599813072560026919L;
-
- public NonexistentConversationException()
- {
-
- }
-
- /**
- * Creates a new exception with message.
- *
- * @param message message
- */
- public NonexistentConversationException(String message)
- {
- super(message);
- }
-
- /**
- * Create a new exception with the root cause.
- *
- * @param cause cause of the exception
- */
- public NonexistentConversationException(Throwable cause)
- {
- super(cause);
- }
-
- /**
- * Creates a new exception with the given message and throwable cause.
- *
- * @param message exception message
- * @param cause root cause of the exception
- */
- public NonexistentConversationException(String message, Throwable cause)
- {
- super(message, cause);
- }
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NormalScope.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NormalScope.java
deleted file mode 100644
index 879ebc0..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/NormalScope.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.
- */
-package javax.enterprise.context;
-
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Defines normal scoped meta-data.
- *
- * @version $Rev$ $Date$
- *
- */
-@Target(ANNOTATION_TYPE)
-@Retention(RUNTIME)
-@Documented
-public @interface NormalScope
-{
- /**Defines passivation semantic*/
- boolean passivating() default false;
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/RequestScoped.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/RequestScoped.java
deleted file mode 100644
index 8aed3db..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/RequestScoped.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.
- */
-package javax.enterprise.context;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Defines the request scope.
- *
- * <p>
- * Please see <b>Request context lifecycle</b> of the specification
- * for getting furher information.
- * </p>
- *
- * @version $Rev$ $Date$
- */
-@Target( { TYPE, METHOD, FIELD })
-@Retention(RUNTIME)
-@Documented
-@NormalScope
-@Inherited
-public @interface RequestScoped
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/SessionScoped.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/SessionScoped.java
deleted file mode 100644
index 0342599..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/SessionScoped.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.context;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Session scoped.
- * @version $Rev$ $Date$
- *
- */
-@Target( { TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-@Documented
-@NormalScope(passivating=true)
-@Inherited
-public @interface SessionScoped
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/spi/Context.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/spi/Context.java
deleted file mode 100644
index 33d54b2..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/spi/Context.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.context.spi;
-
-import java.lang.annotation.Annotation;
-
-import javax.enterprise.context.ContextNotActiveException;
-import javax.enterprise.context.NormalScope;
-
-/**
- * Every webbeans component has an associated context that are
- * defined by the {@link NormalScope} annotation. Webbeans components
- * that are contained in the context are managed by the webbeans container.
- *
- * <p>
- * Every context has a well-defined lifecycle. It means that
- * in some time, context is active and some other time context may
- * be passive. Moreover, each context is created and destroyed by the container
- * according to the timing requirements. For example, request context is started by every
- * http request and destroyed at the end of the http response. According to the current thread,
- * active context is called an thread current context.
- * </p>
- *
- * <p>
- * Context is responsible for creating and destroying the {@link Contextual} instances of the
- * webbeans components.
- * </p>
- *
- * @version $Rev$ $Date$
- */
-public interface Context
-{
- /**
- * Returns the scope type of the context.
- *
- * @return the scope type of the context
- */
- public Class<? extends Annotation> getScope();
-
- /**
- * If the context is not active, throws {@link ContextNotActiveException}.
- * Otherwise, it looks for the given component instance in the context map. If
- * this context contains the given webbeans component instance, it returns the component.
- * If the component is not found in this context map, it looks for the <code>creationalContext</code>
- * argument. If it is null, it returns null, otherwise new webbeans instance is created
- * and puts into the context and returns it.
- *
- * @param <T> type of the webbeans component
- * @param component webbeans component
- * @param creationalContext {@link CreationalContext} instance
- * @return the contextual instance or null
- */
- public <T> T get(Contextual<T> component, CreationalContext<T> creationalContext);
-
- /**
- * Returns the instance of the webbeans in this context if exist otherwise return null.
- *
- * @param <T> type of the webbeans component
- * @param component webbeans component
- * @return the instance of the webbeans in this context if exist otherwise return null
- */
- public <T> T get(Contextual<T> component);
-
- /**
- * Returns true if context is active according to the current thread,
- * returns false otherwise.
- *
- * @return true if context is active according to the current thread,
- * return false otherwise
- */
- boolean isActive();
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/spi/Contextual.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/spi/Contextual.java
deleted file mode 100644
index 34db785..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/spi/Contextual.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.context.spi;
-
-import javax.enterprise.inject.CreationException;
-
-/**
- * Each webbeans instance that is contained in the <code>Context</code>
- * must be defined as <code>Contextual</code>.
- *
- * This interface defines the creating and destroying of the webbeans instances
- * that are contained in the its {@link Context} instance.
- *
- * @param <T> type of the webbeans component
- * @see Context
- *
- * @version $Rev$ $Date$
- */
-public interface Contextual<T>
-{
- /**
- * Creates and returns a new instance of the webbeans component.
- *
- * @param context new creational context instance
- * @return the new instance of the webbeans component
- * @throws CreationException if any exception occurs
- */
- public T create(CreationalContext<T> context);
-
- /**
- * Destroys the instance. Any destroy logic is encapsulated
- * in this method.
- *
- * @param instance already created webbeans instance
- * @param context creational context
- */
- public void destroy(T instance, CreationalContext<T> context);
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/spi/CreationalContext.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/spi/CreationalContext.java
deleted file mode 100644
index a6a1424..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/context/spi/CreationalContext.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.
- */
-package javax.enterprise.context.spi;
-
-/**
- * The CreationalContext holds incomplete Bean instances. This may be caused by
- * a situation like in the following example: <code>
- * @ApplicationScoped class Foo
- * {
- * @Current Bar _bar;
- * }
- *
- * @ApplicationScoped class Bar
- * {
- * @Current Foo _bar;
- * }
- * </code>
- *
- * <p>
- * Generally it is used for prohibiting the circular references of the webbeans.
- * </p>
- *
- * @version $Rev$ $Date$
- */
-public interface CreationalContext<T>
-{
- /**
- * Puts new incomplete instance into the creational context.
- *
- * @param incompleteInstance incomplete webbeans instance
- */
- public void push(T incompleteInstance);
-
- /**
- * Destorys all dependent objects of the instance
- * that is being destroyed.
- */
- public void release();
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/Event.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/Event.java
deleted file mode 100644
index 191754d..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/Event.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.event;
-
-import java.lang.annotation.Annotation;
-
-import javax.enterprise.util.TypeLiteral;
-
-/**
- * The event interface is used for firing events with specific classifiers and types.
- *
- * A built-in event bean is provided by the container.
- *
- * @param <T> the event type
- */
-public interface Event<T>
-{
-
- public void fire(T event);
-
- public Event<T> select(Annotation... qualifiers);
-
- public <U extends T> Event<U> select(Class<U> subtype, Annotation... qualifiers);
-
- public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... qualifiers);
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/ObserverException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/ObserverException.java
deleted file mode 100644
index 4b074ca..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/ObserverException.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.event;
-
-/**
- * Exception related with observers.
- *
- * @version $Rev$ $Date$
- */
-public class ObserverException extends RuntimeException
-{
- private static final long serialVersionUID = -801836224808304381L;
-
- /**
- * Creates new exception.
- */
- public ObserverException()
- {
-
- }
-
- /**
- * Creates new exception with message.
- *
- * @param message exception message
- */
- public ObserverException(String message)
- {
- super(message);
- }
-
- /**
- * Creates new exception with cause.
- *
- * @param cause exception cause
- */
- public ObserverException(Throwable cause)
- {
- super(cause);
- }
-
- /**
- * Creates new exception with given message and cause.
- *
- * @param message exception message
- * @param cause exception cause
- */
- public ObserverException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/Observes.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/Observes.java
deleted file mode 100644
index 8b2d1be..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/Observes.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.
- */
-package javax.enterprise.event;
-
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * <p>Specifies that a method is an observer method and which event should be observed.</p>
- * Sample:
- * <pre>
- * public class UserHandler
- * {
- * public void afterUserLogin(@Observes UserLoginEvent userHasLoggedIn)
- * {
- * ...
- * }
- * }
- * </pre>
- * @version $Rev$ $Date$
- * @see javax.enterprise.inject.spi.ObserverMethod
- */
-@Target(PARAMETER)
-@Retention(RUNTIME)
-@Documented
-public @interface Observes
-{
- /**Specifies whether or not call observer according to owner bean instace*/
- public Reception notifyObserver() default Reception.ALWAYS;
-
- /**Transaction phase*/
- public TransactionPhase during() default TransactionPhase.IN_PROGRESS;
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/Reception.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/Reception.java
deleted file mode 100644
index 24cfaaf..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/Reception.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.event;
-
-/**
- * Notify enums.
- *
- * @version $Rev$ $Date$
- *
- */
-public enum Reception
-{
- /**Notify observer if owner bean exist*/
- IF_EXISTS,
-
- /**Always notify observer*/
- ALWAYS
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/TransactionPhase.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/TransactionPhase.java
deleted file mode 100644
index 015049c..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/event/TransactionPhase.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.
- */
-package javax.enterprise.event;
-
-/**
- * Transactional observer phases.
- *
- * <p>
- * Observers are notified on transaction phases.
- * </p>
- *
- * @version $Rev$ $Date$
- *
- */
-public enum TransactionPhase
-{
- /**Means in trnasaction*/
- IN_PROGRESS,
-
- /**Before completion phase*/
- BEFORE_COMPLETION,
-
- /**After completion phase*/
- AFTER_COMPLETION,
-
- /**After failure phase*/
- AFTER_FAILURE,
-
- /**After success phase*/
- AFTER_SUCCESS
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Alternative.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Alternative.java
deleted file mode 100644
index 8197b38..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Alternative.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject;
-
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target({TYPE, METHOD, FIELD})
-@Retention(RUNTIME)
-@Documented
-public @interface Alternative
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.java
deleted file mode 100644
index 345bf7b..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/AmbiguousResolutionException.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.
- */
-package javax.enterprise.inject;
-
-/**
- * Ambigous resolution exception. It is thrown when more than one
- * bean exist for given injection point.
- *
- * @version $Rev$ $Date$
- */
-public class AmbiguousResolutionException extends ResolutionException
-{
- private static final long serialVersionUID = -2132733164534544788L ;
-
- public AmbiguousResolutionException()
- {
- super();
- }
-
- public AmbiguousResolutionException(String message)
- {
- super(message);
- }
-
- public AmbiguousResolutionException(Throwable e)
- {
- super(e);
- }
-
- public AmbiguousResolutionException(String message, Throwable e)
- {
- super(message, e);
- }
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Any.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Any.java
deleted file mode 100644
index d86a882..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Any.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Defines any qualifier in the injection point.
- *
- * @version $Rev$ $Date$
- */
-@Target( { TYPE, METHOD, FIELD, PARAMETER })
-@Retention(RUNTIME)
-@Documented
-@Qualifier
-public @interface Any
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/CreationException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/CreationException.java
deleted file mode 100644
index 9135852..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/CreationException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject;
-
-public class CreationException extends InjectionException
-{
- private static final long serialVersionUID = 1002854668862145298L;
-
- public CreationException()
- {
- super();
- }
-
- public CreationException(String message)
- {
- super(message);
- }
-
- public CreationException(Throwable e)
- {
- super(e);
- }
-
- public CreationException(String message, Throwable e)
- {
- super(message, e);
- }
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Default.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Default.java
deleted file mode 100644
index ae58367..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Default.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * Default qualifier.
- * @version $Rev$ $Date$
- *
- */
-@Target( { TYPE, METHOD, PARAMETER, FIELD })
-@Retention(RUNTIME)
-@Documented
-@Qualifier
-public @interface Default
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Disposes.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Disposes.java
deleted file mode 100644
index d6ae044..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Disposes.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.PARAMETER)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Disposes
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/IllegalProductException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/IllegalProductException.java
deleted file mode 100644
index e6cdda3..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/IllegalProductException.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.
- */
-package javax.enterprise.inject;
-
-/**
- * If return object of the producer method is null and its type
- * is primitive type then throws this exception.
- *
- * @version $Rev$ $Date$
- */
-public class IllegalProductException extends InjectionException
-{
- private static final long serialVersionUID = -6280627846071966243L;
-
- public IllegalProductException()
- {
- super();
- }
-
- public IllegalProductException(String message)
- {
- super(message);
- }
-
- public IllegalProductException(Throwable e)
- {
- super(e);
- }
-
- public IllegalProductException(String message, Throwable e)
- {
- super(message, e);
- }
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/InjectionException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/InjectionException.java
deleted file mode 100644
index 7c54c8b..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/InjectionException.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.
- */
-package javax.enterprise.inject;
-
-/**
- * Injection exception class.
- *
- * @version $Rev$ $Date$
- */
-public class InjectionException extends RuntimeException
-{
- private static final long serialVersionUID = -2132733164534544788L;
-
- public InjectionException()
- {
-
- }
-
- public InjectionException(String message, Throwable e)
- {
- super(message, e);
- }
-
- public InjectionException(Throwable e)
- {
- super(e);
- }
-
- public InjectionException(String message)
- {
- super(message);
- }
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Instance.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Instance.java
deleted file mode 100644
index 19615ff..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Instance.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject;
-
-import java.lang.annotation.Annotation;
-
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Provider;
-
-/**
- * The <code>Instance</code> interface provides a method for obtaining
- * instances of beans with required types and qualifiers.
- *
- * @version $Rev$ $Date$
- *
- * @param <T> bean required type
- */
-public interface Instance<T> extends Iterable<T>, Provider<T>
-{
- /**
- * Creates new <code>Instance</code> with given
- * qualifiers.
- *
- * @param qualifiers
- * @return new child instance with given qualifiers.
- */
- public Instance<T> select(Annotation... qualifiers);
-
- /**
- * Returns new child instance with given class and qualifiers.
- *
- * @param <U> subtype info
- * @param subtype subtype class
- * @param qualifiers qualifiers
- * @return new child instance with given class and qualifiers
- */
- public <U extends T> Instance<U> select(Class<U> subtype, Annotation... qualifiers);
-
- /**
- * Return new child instance with given class info and qualifiers.
- *
- * @param <U> subtype info
- * @param subtype subtype class
- * @param qualifiers qualifiers
- * @return new child instance with given class info and qualifiers
- */
- public <U extends T> Instance<U> select(TypeLiteral<U> subtype, Annotation... qualifiers);
-
- /**
- * Return true if resulotion is unsatisfied, false otherwise.
- *
- * @return true if resulotion is unsatisfied, false otherwise
- */
- public boolean isUnsatisfied();
-
- /**
- * Returns true if resolution is ambigious, false otherwise.
- *
- * @return true if resolution is ambigious, false otherwise.
- */
- public boolean isAmbiguous();
-
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Model.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Model.java
deleted file mode 100644
index 977154d..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Model.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-
-@Named
-@RequestScoped
-@Stereotype
-@Target( { TYPE, METHOD, FIELD })
-@Retention(RUNTIME)
-@Documented
-public @interface Model
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/New.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/New.java
deleted file mode 100644
index 3a13bef..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/New.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-@Target( { FIELD, PARAMETER, METHOD, TYPE})
-@Retention(RUNTIME)
-@Documented
-@Qualifier
-public @interface New
-{
- /**
- * May be used to declare which type should be used for injection.
- * This defaults to the type which is defined at the injection point.
- * @return the class of the bean which should be injected
- */
- Class<?> value() default New.class;
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Produces.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Produces.java
deleted file mode 100644
index d324591..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Produces.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.
- */
-package javax.enterprise.inject;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target({METHOD,FIELD})
-@Retention(RUNTIME)
-@Documented
-public @interface Produces
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/ResolutionException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/ResolutionException.java
deleted file mode 100644
index 60ea031..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/ResolutionException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject;
-
-/**
- * Resolution exception class.
- *
- * @version $Rev$ $Date$
- */
-public class ResolutionException extends InjectionException
-{
-
- private static final long serialVersionUID = -6280627846071966243L;
-
- public ResolutionException()
- {
-
- }
-
- public ResolutionException(String message, Throwable e)
- {
- super(message, e);
- }
-
- public ResolutionException(Throwable e)
- {
- super(e);
- }
-
- public ResolutionException(String message)
- {
- super(message);
- }
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Specializes.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Specializes.java
deleted file mode 100644
index d11b17b..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Specializes.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.
- */
-package javax.enterprise.inject;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-@Target( { TYPE, METHOD })
-@Retention(RUNTIME)
-@Documented
-public @interface Specializes
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Stereotype.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Stereotype.java
deleted file mode 100644
index 063c378..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Stereotype.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.
- */
-package javax.enterprise.inject;
-
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-
-/**
- * Steretypes are used for inheriting the meta annotations
- * that are defined on the stereotyped annotation from another webbeans
- * component.
- *
- * <p>
- * If a bean annotated with multiple stereotypes, it obeys the all of the
- * stereotypes restrictions.
- * </p>
- *
- * @see Model
- */
-@Retention(RUNTIME)
-@Target(ANNOTATION_TYPE)
-@Documented
-public @interface Stereotype
-{
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Typed.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Typed.java
deleted file mode 100644
index f6638f9..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/Typed.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.
- */
-package javax.enterprise.inject;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Used for definining explicit bean api types.
- *
- * @version $Rev$ $Date$
- *
- */
-@Target(value={ElementType.FIELD, ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface Typed
-{
-
- Class<?>[] value() default {};
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.java
deleted file mode 100644
index 642be0b..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnproxyableResolutionException.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.
- */
-package javax.enterprise.inject;
-
-
-/**
- * In DI, normal scope type bean class must be proxyable by the container.
- * If normal scoped bean is not proxyable by the container, it throws
- * this exception.
- *
- * @version $Rev$ $Date$
- */
-public class UnproxyableResolutionException extends ResolutionException
-{
- private static final long serialVersionUID = 1667539354548135465L;
-
- public UnproxyableResolutionException()
- {
- super();
- }
-
- public UnproxyableResolutionException(String message)
- {
- super(message);
- }
-
- public UnproxyableResolutionException(Throwable e)
- {
- super(e);
- }
-
- public UnproxyableResolutionException(String message, Throwable e)
- {
- super(message, e);
- }
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.java
deleted file mode 100644
index 7f3b95a..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/UnsatisfiedResolutionException.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.
- */
-package javax.enterprise.inject;
-
-/**
- * If injection point is not resolved by the container, it throws
- * unsatisfied exception.
- *
- * @version $Rev$ $Date$
- */
-public class UnsatisfiedResolutionException extends ResolutionException
-{
- private static final long serialVersionUID = 5350603312442756709L;
-
- public UnsatisfiedResolutionException()
- {
- super();
- }
-
- public UnsatisfiedResolutionException(String message)
- {
- super(message);
- }
-
- public UnsatisfiedResolutionException(Throwable e)
- {
- super(e);
- }
-
- public UnsatisfiedResolutionException(String message, Throwable e)
- {
- super(message, e);
- }
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java
deleted file mode 100644
index 79e9427..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.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.
- */
-package javax.enterprise.inject.spi;
-
-import javax.enterprise.context.spi.Context;
-
-/**
- * Events that are fired after discovery bean process.
- *
- * @version $Rev$ $Date$
- *
- */
-public interface AfterBeanDiscovery
-{
- /**
- * Adds definition error. Container aborts deployment after
- * all observer methods are called.
- *
- * @param t throwable
- */
- public void addDefinitionError(Throwable t);
-
- /**
- * Registering the bean with container.
- *
- * @param bean new bean
- */
- public void addBean(Bean<?> bean);
-
- /**
- * Registers the given observer method with container.
- *
- * @param observerMethod observer method
- */
- public void addObserverMethod(ObserverMethod<?> observerMethod);
-
- /**
- * Adds given context to the container.
- *
- * @param context new context
- */
- public void addContext(Context context);
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
deleted file mode 100644
index 68d56c5..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.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.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Event that is fired after container
- * validates all injection points are valid.
- *
- * @version $Rev$ $Date$
- *
- */
-public interface AfterDeploymentValidation
-{
- /**
- * Add deployment problem that causes
- * container aborts processing after validation.
- *
- * @param t throwable
- */
- public void addDeploymentProblem(Throwable t);
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Annotated.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Annotated.java
deleted file mode 100644
index d1e38c5..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Annotated.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Set;
-
-/**
- * Describes annotated member properties.
- *
- * @version $Rev$ $Date$
- */
-public interface Annotated
-{
- /**
- * Returns type of the element.
- *
- * @return type of the element
- */
- public Type getBaseType();
-
- /**
- * Returns set of type closures. Type closure means
- * that {@link Annotated#getBaseType()} is assignable.
- *
- * @return set of type closures.
- */
- public Set<Type> getTypeClosure();
-
- /**
- * Gets annotated element's annotation member if exist, null otherwise
- *
- * @param <T> generic annotatation class type
- * @param annotationType class of the annotation
- * @return annotated element's annotation member if exist, null otherwise
- */
- public <T extends Annotation> T getAnnotation(Class<T> annotationType);
-
- /**
- * Gets annotated member all annotations.
- *
- * @return annotated member annotations
- */
- public Set<Annotation> getAnnotations();
-
- /**
- * Returns true if annotated member has annotation for given annotation type,
- * false otherwise.
- *
- * @param annotationType type of the annotation
- * @return true if annotated member has annotation for given annotation type
- */
- public boolean isAnnotationPresent(Class<? extends Annotation> annotationType);
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedCallable.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedCallable.java
deleted file mode 100644
index 3a2c1e2..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedCallable.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.util.List;
-
-/**
- * Defines callables member contract.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> declaring type
- */
-public interface AnnotatedCallable<X> extends AnnotatedMember<X>
-{
- /**
- * Returns callable list of parameter or empty if none.
- *
- * @return list of parameters
- */
- public List<AnnotatedParameter<X>> getParameters();
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedConstructor.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedConstructor.java
deleted file mode 100644
index 15ac955..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedConstructor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.reflect.Constructor;
-
-/**
- * Defines member constructor contract.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> declaring type
- */
-public interface AnnotatedConstructor<X> extends AnnotatedCallable<X>
-{
- /**
- * {@inheritDoc}
- */
- public Constructor<X> getJavaMember();
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedField.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedField.java
deleted file mode 100644
index b4931af..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedField.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.reflect.Field;
-
-/**
- * Defines field member contract.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> declaring type
- */
-public interface AnnotatedField<X> extends AnnotatedMember<X>
-{
- /**
- * {@inheritDoc}
- */
- public Field getJavaMember();
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMember.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMember.java
deleted file mode 100644
index 60d2764..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMember.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.reflect.Member;
-
-/**
- * Defines annotated members common contract.
- *
- * <p>
- * Annotated members could be one of the followings
- * <ul>
- * <li>Class Fields</li>
- * <li>Class Methods</li>
- * <li>Class Constructors</li>
- * <li>Constructor or method Parameters</li>
- * </ul>
- * </p>
- * fields, constructors, methods.
- *
- * @version $Rev$ $Date$
- *
- */
-public interface AnnotatedMember<X> extends Annotated
-{
- /**
- * Returns base java member.
- *
- * @return java member
- */
- public Member getJavaMember();
-
- /**
- * Returns true if member modifiers contain static keyword
- * false otherwise.
- *
- * @return true if member modifiers contain static keyword
- */
- public boolean isStatic();
-
- /**
- * Returns member's declaring type.
- *
- * @return member's declaring type
- */
- public AnnotatedType<X> getDeclaringType();
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMethod.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMethod.java
deleted file mode 100644
index 409acb7..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedMethod.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.reflect.Method;
-
-/**
- * Define method member contract.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> declaring type
- */
-public interface AnnotatedMethod<X> extends AnnotatedCallable<X>
-{
- /**
- * {@inheritDoc}
- */
- public Method getJavaMember();
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedParameter.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedParameter.java
deleted file mode 100644
index 8d52854..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedParameter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Defines member parameter contract.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> declaring type
- */
-public interface AnnotatedParameter<X> extends Annotated
-{
- /**
- * Returns parameter position.
- *
- * @return parameter position
- */
- public int getPosition();
-
- /**
- * Returns declaring callable member.
- *
- * @return declaring callable member
- */
- public AnnotatedCallable<X> getDeclaringCallable();
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedType.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedType.java
deleted file mode 100644
index 6656b84..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/AnnotatedType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.util.Set;
-
-/**
- * Defines alternative meta data for bean class.
- *
- * @version $Rev$ $Date$
- */
-public interface AnnotatedType<X> extends Annotated
-{
- /**
- * Returns class of bean.
- *
- * @return class of bean
- */
- public Class<X> getJavaClass();
-
- /**
- * Returns set of bean constructors.
- *
- * @return set of constructors
- */
- public Set<AnnotatedConstructor<X>> getConstructors();
-
- /**
- * Returns set of bean methods.
- *
- * @return set of bean methods
- */
- public Set<AnnotatedMethod<? super X>> getMethods();
-
- /**
- * Returns set of bean fields.
- *
- * @return set of bean fields.
- */
- public Set<AnnotatedField<? super X>> getFields();
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Bean.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Bean.java
deleted file mode 100644
index 1a4bb52..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Bean.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import javax.enterprise.context.spi.Contextual;
-
-/**
- * Reprensts bean instances that are contextual
- * and injectable by the container.
- *
- * @version $Rev$ $Date$
- *
- * @param <T> bean representation type
- */
-public interface Bean<T> extends Contextual<T>
-{
-
- /**
- * Returns api types of a bean.
- *
- * @return api types of a bean
- */
- public abstract Set<Type> getTypes();
-
- /**
- * Returns qualifiers of a bean.
- *
- * @return qualifiers of a bean
- */
- public abstract Set<Annotation> getQualifiers();
-
- /**
- * Returns scope of a bean.
- *
- * @return scope
- */
- public abstract Class<? extends Annotation> getScope();
-
- /**
- * Returns name of a bean.
- *
- * @return name of a bean
- */
- public abstract String getName();
-
- /**
- * If bean is nullable return true, false
- * otherwise.
- *
- * <p>
- * Nullable means that if producer
- * bean api type is primitive, its nullable property
- * will be false.
- * </p>
- *
- * @return true if bean is nullable.
- */
- public abstract boolean isNullable();
-
- /**
- * Returns all injection points of this bean.
- *
- * @return injection points
- */
- public abstract Set<InjectionPoint> getInjectionPoints();
-
- /**
- * Returns class of bean.
- *
- * @return class of bean that it represents
- */
- public abstract Class<?> getBeanClass();
-
- /**
- * Returns bean stereotypes.
- *
- * @return bean stereotypes
- */
- public Set<Class<? extends Annotation>> getStereotypes();
-
- /**
- * Returns true if declares as policy
- *
- * @return true if declares as policy
- */
- public boolean isAlternative();
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/BeanManager.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/BeanManager.java
deleted file mode 100644
index dc5e96d..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/BeanManager.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.List;
-import java.util.Set;
-
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-
-
-/**
- * The interface <code>Manager</code> provides operations for
- * obtaining the contextual instance of the webbeans. There are operations
- * related with;
- *
- * <ul>
- * <li>Adding new webbeans</li>
- * <li>Adding new contexts</li>
- * <li>Adding new decorators</li>
- * <li>Adding new interceptors</li>
- * <li>Firing the observer events</li>
- * <li>Creating the instance of the contextual beans</li>
- * <li>Resolution of beans, interceptors, decorators and observers</li>
- * <li>Other utility methods etc..</li>
- * </ul>
- *
- * <p>
- * There is always one root manager in the system. You can set the
- * current activity via call to the {@link BeanManager#setCurrent(Class)} method.
- * </p>
- *
- * @version $Rev$ $Date$
- */
-public interface BeanManager
-{
- /**
- * Returns a bean instance reference for the given bean.
- *
- * @param bean bean that its reference is getting
- * @param beanType bean api type that is implemented by the proxy
- * @param ctx creational context is used to destroy any object with scope <code>@Dependent</code>
- * @return bean reference
- * @throws IllegalArgumentException if given bean type is not api type of the given bean object
- */
- public Object getReference(Bean<?> bean, Type beanType, CreationalContext<?> ctx);
-
- /**
- * Gets injection point bean reference.
- *
- * @param injectionPoint injection point definition
- * @param ctx creational context that is passed to the {@link Bean#create(CreationalContext)} method
- * @return bean reference
- * @throws UnsatisfiedResolutionException if no bean found for the given injection point
- * @throws AmbiguousResolutionException if more than one bean found
- */
- public Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> ctx);
-
- /**
- * Returns a new creational context implementation.
- *
- * @return new creational context
- */
- public <T> CreationalContext<T> createCreationalContext(Contextual<T> contextual);
-
- /**
- * Returns set of beans that their api types contain
- * given bean type and given qualifiers.
- *
- * <p>
- * If no qualifier is given, <code>@Current</code> is assumed.
- * </p>
- *
- * @param beanType required bean type
- * @param qualifiers required qualifiers
- * @return set of beans
- * @throws IllegalArgumentException given bean type is a {@link TypeVariable}
- * @throws IllegalArgumentException given qualifier annotation is not a qualifier
- * @throws IllegalArgumentException same qualifier is given
- */
- public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers);
-
- /**
- * Returns set of beans with given name.
- *
- * @param name name of the bean
- * @return set of beans with given name
- */
- public Set<Bean<?>> getBeans(String name);
-
- /**
- * Returns passivation capable bean given id.
- *
- * @param id bean id
- * @return passivation capable bean given id
- */
- public Bean<?> getPassivationCapableBean(String id);
-
- /**
- * Returns a bean object that is resolved according to the type safe resolution rules.
- *
- * @param <X> bean class info
- * @param beans set of beans
- * @return bean that is resolved according to the type safe resolution rules
- * @throws AmbiguousResolutionException if ambigious exists
- */
- public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans);
-
- /**
- * Fires an event with given even object and qualifiers.
- *
- * @param event observer event object
- * @param qualifiers event qualifiers
- * @throws IllegalArgumentException event object contains a {@link TypeVariable}
- * @throws IllegalArgumentException given qualifier annotation is not a qualifier
- * @throws IllegalArgumentException same qualifier is given
- */
- public void fireEvent(Object event, Annotation... qualifiers);
-
- /**
- * Returns set of observer methods.
- *
- * @param <T> event type
- * @param event even object
- * @param qualifiers event qualifiers
- * @return set of observer methods
- */
- public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, Annotation... qualifiers);
-
- /**
- * Returns a list of decorator.
- *
- * @param types bean types of the decorated bean
- * @param qualifiers decorated bean qualifiers
- * @return list of decorator
- * @throws IllegalArgumentException given qualifier annotation is not a qualifier
- * @throws IllegalArgumentException same qualifier is given
- * @throws IllegalArgumentException if types is empty set
- */
- List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... qualifiers);
-
- /**
- * Returns a list of interceptor.
- *
- * @param type interception type
- * @param interceptorBindings interceptor bindings
- * @return list of interceptor
- * @throws IllegalArgumentException given binding annotation is not a binding
- * @throws IllegalArgumentException same binding is given
- * @throws IllegalArgumentException binding is not an interceptor binding
- */
- List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings);
-
- /**
- * Validates injection point.
- *
- * @param injectionPoint injection point
- * @throws InjectionException if problem exist
- */
- public void validate(InjectionPoint injectionPoint);
-
- /**
- * Returns true if given type is a scope type, false otherwise.
- *
- * @param annotationType annotation type
- * @return true if given type is a scope type, false otherwise
- */
- public boolean isScope(Class<? extends Annotation> annotationType);
-
- /**
- * Returns true if given type is a normal scope type, false otherwise.
- *
- * @param annotationType annotation type
- * @return true if given type is a scope type, false otherwise
- */
- public boolean isNormalScope(Class<? extends Annotation> annotationType);
-
- /**
- * Returns true if given type is a passivating scope type, false otherwise.
- *
- * @param annotationType annotation type
- * @return true if given type is a scope type, false otherwise
- */
- public boolean isPassivatingScope(Class<? extends Annotation> annotationType);
-
-
- /**
- * Returns true if given type is a qualifier, false otherwise.
- *
- * @param annotationType annotation type
- * @return true if given type is a qualifier, false otherwise
- */
- public boolean isQualifier(Class<? extends Annotation> annotationType);
-
- /**
- * Returns true if given type is a interceptor binding, false otherwise.
- *
- * @param annotationType annotation type
- * @return true if given type is a interceptor binding, false otherwise
- */
- public boolean isInterceptorBinding(Class<? extends Annotation> annotationType);
-
-
- /**
- * Returns true if given type is a stereotype type, false otherwise.
- *
- * @param annotationType annotation type
- * @return true if given type is a stereotype, false otherwise
- */
- public boolean isStereotype(Class<? extends Annotation> annotationType);
-
- /**
- * Returns a set of meta-annotations that are defined on the binding
- *
- * @param qualifier binding class
- * @return a set of meta-annotations that are defined on the binding
- */
- public Set<Annotation> getInterceptorBindingDefinition(Class<? extends Annotation> qualifier);
-
- /**
- * Returns a set of meta-annotations that are defined on the stereotype type.
- *
- * @param stereotype stereotype type class
- * @return a set of meta-annotations that are defined on the stereotype type
- */
- public Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype);
-
- /**
- * Returns a context with given scope type.
- *
- * @param scope scope type class type
- * @return a context with given scope type
- */
- public Context getContext(Class<? extends Annotation> scope);
-
- /**
- * Returns el resolver.
- *
- * @return el resolver
- */
- public ELResolver getELResolver();
-
- /**
- * Returns a {@link AnnotatedType} instance for the given
- * class.
- *
- * @param <T> class type
- * @param type class
- * @return a {@link AnnotatedType} instance
- */
- public <T> AnnotatedType<T> createAnnotatedType(Class<T> type);
-
- /**
- * Creates a new instance of injection target.
- *
- * @param <T> bean type
- * @param type annotated type
- * @return injection target
- */
- public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type);
-
- /**
- * Wrapped around given expression factory.
- * @param expressionFactory expression factory
- * @return wrapped expression factory
- */
- public ExpressionFactory wrapExpressionFactory(javax.el.ExpressionFactory expressionFactory);
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java
deleted file mode 100644
index 95e9c09..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/BeforeBeanDiscovery.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.annotation.Annotation;
-
-/**
- * Container fires this event before discovery
- * of the beans process.
- *
- * @version $Rev$ $Date$
- *
- */
-public interface BeforeBeanDiscovery
-{
- /**
- * Declares a new qualifier.
- *
- * @param qualifier qualifier
- */
- public void addQualifier(Class<? extends Annotation> qualifier);
-
- /**
- * Declares a new scope.
- *
- * @param scope scope
- * @param normal is normal or not
- * @param passivating passivated or not
- */
- public void addScope(Class<? extends Annotation> scope, boolean normal, boolean passivating);
-
- /**
- * Declares a new stereotype.
- *
- * @param stereotype stereotype class
- * @param stereotypeDef meta annotations
- */
- public void addStereotype(Class<? extends Annotation> stereotype, Annotation... stereotypeDef);
-
- /**
- * Declares a new interceptor binding.
- *
- * @param binding binding class
- * @param bindingDef meta annotations
- */
- public void addInterceptorBinding(Class<? extends Annotation> binding, Annotation... bindingDef);
-
- /**
- * Adds new annotated type.
- *
- * @param type annotated type
- */
- public void addAnnotatedType(AnnotatedType<?> type);
-
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/BeforeShutdown.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/BeforeShutdown.java
deleted file mode 100644
index 95fa7eb..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/BeforeShutdown.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Event is fired before shut down of the
- * container.
- *
- * @version $Rev$ $Date$
- *
- */
-public interface BeforeShutdown
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Decorator.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Decorator.java
deleted file mode 100644
index daf30a0..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Decorator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Set;
-
-public interface Decorator<T> extends Bean<T>
-{
-
- public abstract Set<Type> getDecoratedTypes();
-
- public abstract Type getDelegateType();
-
- public abstract Set<Annotation> getDelegateQualifiers();
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Extension.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Extension.java
deleted file mode 100644
index 4fc5c3a..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Extension.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Marker interface that is implemented by the classes
- * that listen for the container events.
- *
- * @version $Rev$ $Date$
- *
- */
-public interface Extension
-{
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
deleted file mode 100644
index 6f8cce7..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionPoint.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Member;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.Set;
-
-/**
- * An InjectionPoint object provides metadata information about an injection point.
- * An instance of InjectionPoint may represent one of the following types:
- * <ul>
- * <li>an injected field</li>
- * <li>a parameter of a bean constructor</li>
- * <li>an initializer method</li>
- * <li>a producer method</li>
- * <li>a disposer method</li>
- * <li>an observer method</li>
- * </ul>
- *
- * @version $Rev$ $Date$
- */
-public interface InjectionPoint
-{
- /**
- * Returns required type of the injection point.
- *
- * @return type of the injection point
- */
- public Type getType();
-
- /**
- * Returns required qualifiers of the injection point.
- *
- * @return qualifiers at the injection point
- */
- public Set<Annotation> getQualifiers();
-
- /**
- * Returns the injection point owner bean.
- * <p>
- * If there is no bean for the injection point,
- * it returns null.
- * </p>
- *
- * @return injection point owner bean
- */
- public Bean<?> getBean();
-
- /**
- * Returns appered point for injection point. One of
- * <ul>
- * <li>{@link Field} object</li>
- * <li>{@link Constructor} parameter</li>
- * <li>{@link Method} producer method parameter</li>
- * <li>{@link Method} disposal method parameter</li>
- * <li>{@link Method} observer method parameter</li>
- * </ul>
- *
- * @return where the injection point is appeared
- */
- public Member getMember();
-
- /**
- * Returns annotated object representation of member.
- *
- * @return annotated
- */
- public Annotated getAnnotated();
-
- /**
- * Returns true if injection point is decorator delegate,
- * false otherwise.
- *
- * @return true if injection point is decorator delegate
- */
- public boolean isDelegate();
-
- /**
- * Returns true if injection point is transient,
- * false otherwise.
- *
- * @return true if injection point is transient
- */
- public boolean isTransient();
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
deleted file mode 100644
index bffa005..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InjectionTarget.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.spi.CreationalContext;
-
-/**
- * Provides operations for performing dependency injection and lifecycle
- * callbacks on an instance of a type.
- *
- * @version $Rev$ $Date$
- *
- * <T> bean type
- */
-public interface InjectionTarget<T> extends Producer<T>
-{
- /**
- * Performs dependency injection upon the given object.
- *
- * @param instance bean instance
- * @param ctx creational context
- */
- public void inject(T instance, CreationalContext<T> ctx);
-
- /**
- * Calls {@link PostConstruct} callback method if exists.
- *
- * @param instance bean instance
- */
- public void postConstruct(T instance);
-
- /**
- * Calls {@link PreDestroy} callback method if exists.
- *
- * @param instance bean instance
- */
- public void preDestroy(T instance);
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InterceptionType.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InterceptionType.java
deleted file mode 100644
index d6438a9..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/InterceptionType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-public enum InterceptionType
-{
- AROUND_INVOKE,
- AROUND_TIMEOUT,
- POST_CONSTRUCT,
- PRE_DESTROY,
- PRE_PASSIVATE,
- POST_ACTIVATE
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.java
deleted file mode 100644
index 47f5bf4..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Interceptor.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.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-import javax.interceptor.InvocationContext;
-
-
-public interface Interceptor<T> extends Bean<T>
-{
- public abstract Set<Annotation> getInterceptorBindings();
-
- public boolean intercepts(InterceptionType type);
-
- public Object intercept(InterceptionType type, T instance, InvocationContext ctx);
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
deleted file mode 100644
index 27c6ed1..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import javax.enterprise.event.Reception;
-import javax.enterprise.event.TransactionPhase;
-
-/**
- * <p>ObserverMethod is the SPI to handle an observer method, which is
- * an event consumer for an event of the given type T. An instance of
- * ObserverMethod exists for every observer method of every enabled bean.</p>
- *
- * <p>A class may have n observer methods.</p>
- * <p>Each observer method must have a void return value and exactly one parameter
- * which defines which event it {@code javax.enterprise.event.Observes}.
- * The observed event may be further specified by using an optional Qualifier.</p>
- *
- * Sample:
- * <pre>
- * public class UserHandler
- * {
- * public void afterUserLogin(@Observes UserLoginEvent userHasLoggedIn)
- * {
- * // prepare some data for the user, ...
- * int userId = userHadLoggedIn.getUserId();
- * ...
- * }
- *
- * public void afterAdminLogin(@Observes @Admin UserLoginEvent userHasLoggedIn)
- * {
- * // prepare stuff for the admin user
- * ...
- * }
- *
- * public void afterUserLogout(@Observes UserLogoutEvent userHasLoggedOut)
- * {
- * // cleanup afterwards
- * ...
- * }
- * }
- * </pre>
- *
- * @param <T> the event which should be observed
- * @see javax.enterprise.event.Observes
- */
-public interface ObserverMethod<T>
-{
- public Class<?> getBeanClass();
-
- /**
- * @return the type of the observed event
- */
- public Type getObservedType();
-
- /**
- * @return the defined Qualifiers plus {@code javax.enterprise.inject.Any}
- */
- public Set<Annotation> getObservedQualifiers();
-
- /**
- * @return either {@code Reception#IF_EXISTS} if the observed method must only be called if an instance
- * of the bean which defines the observer method aready exists in the specified context or {@code Reception#ALWAYS}.
- */
- public Reception getReception();
-
- /**
- * @return the appropriate {@code TransactionPhase} for a transactional observer method or
- * {@code TransactionPhase#IN_PROGRESS} otherwise.
- */
- public TransactionPhase getTransactionPhase();
-
- /**
- * will actually cann the underlying observer method
- * @param event
- */
- public void notify(T event);
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/PassivationCapable.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/PassivationCapable.java
deleted file mode 100644
index 599aefa..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/PassivationCapable.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-public interface PassivationCapable
-{
- public String getId();
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.java
deleted file mode 100644
index 8c3c46e..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessAnnotatedType.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.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Event is fired before reading any annotations on the class.
- *
- * @version $Rev$ $Date$
- *
- * <X> class type
- */
-public interface ProcessAnnotatedType<X>
-{
- /**
- * Gets annotated type.
- *
- * @return annotated type
- */
- public AnnotatedType<X> getAnnotatedType();
-
- /**
- * Replaces annotated type.
- *
- * @param type annotated type
- */
- public void setAnnotatedType(AnnotatedType<X> type);
-
- /**
- * Veto registering process.
- */
- public void veto();
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessBean.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessBean.java
deleted file mode 100644
index 8ce14de..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessBean.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.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Fires event before registering bean with container.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> bean class
- */
-public interface ProcessBean<X>
-{
- /**
- * Returns annotated.
- *
- * @return annotated
- */
- public Annotated getAnnotated();
-
- /**
- * Returns bean instance.
- *
- * @return bean
- */
- public Bean<X> getBean();
-
- /**
- * Aborts processing.
- *
- * @param t throwable
- */
- public void addDefinitionError(Throwable t);
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java
deleted file mode 100644
index 9a344a3..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessInjectionTarget.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Fired before manged bean, session bean or Java EE
- * component discovery.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> class type info
- */
-public interface ProcessInjectionTarget<X>
-{
- /**
- * Gets annotated type.
- *
- * @return annotated type
- */
- public AnnotatedType<X> getAnnotatedType();
-
- /**
- * Returns injection target.
- *
- * @return injection target
- */
- public InjectionTarget<X> getInjectionTarget();
-
- /**
- * Replaces injection target.
- *
- * @param injectionTarget new injection target
- */
- public void setInjectionTarget(InjectionTarget<X> injectionTarget);
-
- /**
- * Adding definition error. Container aborts
- * processing after calling all observers.
- *
- * @param t throwable
- */
- public void addDefinitionError(Throwable t);
-
-
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java
deleted file mode 100644
index c45a191..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessManagedBean.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Fired before registering managed bean.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> bean class
- */
-public interface ProcessManagedBean<X> extends ProcessBean<X>
-{
- /**
- * Returns annotated type.
- *
- * @return annotated type
- */
- public AnnotatedType<X> getAnnotatedBeanClass();
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java
deleted file mode 100644
index 80438c4..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.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.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Fired for each observer.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> bean class
- * @param <T> observed event type
- */
-public interface ProcessObserverMethod<T, X>
-{
- /**
- * Returns annotated method.
- *
- * @return annotated method
- */
- public AnnotatedMethod<X> getAnnotatedMethod();
-
- /**
- * Returns observer method instance that
- * is called by the container on event.
- *
- * @return observer method instance
- */
- public ObserverMethod<T> getObserverMethod();
-
- /**
- * Add throwable.
- *
- * @param t throwable
- */
- public void addDefinitionError(Throwable t);
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java
deleted file mode 100644
index 90ad4b7..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Container fires this event for each
- * producer field/method including resources.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> bean class info
- * @param <T> producer return type
- */
-public interface ProcessProducer<X, T>
-{
- /**
- * Returns annotated member.
- *
- * @return annotated member
- */
- public AnnotatedMember<X> getAnnotatedMember();
-
- /**
- * Returns producer instance.
- *
- * @return producer instance
- */
- public Producer<T> getProducer();
-
- /**
- * Replaces producer instance.
- *
- * @param producer new producer
- */
- public void setProducer(Producer<T> producer);
-
- /**
- * Adding definition error. Container aborts processing.
- *
- * @param t throwable
- */
- public void addDefinitionError(Throwable t);
-
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.java
deleted file mode 100644
index 95b51bb..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerField.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.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Fired before registering producer field.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> bean class
- * @param <T> producer field return type
- */
-public interface ProcessProducerField<X, T> extends ProcessBean<T>
-{
- /**
- * Returns annotated field.
- *
- * @return annotated field.
- */
- public AnnotatedField<X> getAnnotatedProducerField();
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java
deleted file mode 100644
index f630bb3..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessProducerMethod.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Fired before registering producer method.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> bean class
- * @param <T> producer return type
- */
-public interface ProcessProducerMethod<X, T> extends ProcessBean<T>
-{
- /**
- * Returns annotated method.
- *
- * @return annotated method
- */
- public AnnotatedMethod<X> getAnnotatedProducerMethod();
-
- /**
- * Returns annotated parameter.
- *
- * @return annotated parameter.
- */
- public AnnotatedParameter<X> getAnnotatedDisposedParameter();
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java
deleted file mode 100644
index 2fff389..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/ProcessSessionBean.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Fires event before registering session bean.
- *
- * @version $Rev$ $Date$
- *
- * @param <X> bean class
- */
-public interface ProcessSessionBean<X> extends ProcessManagedBean<Object>
-{
- /**
- * Returns ejb name.
- *
- * @return ejb name
- */
- public String getEjbName();
-
- /**
- * Returns ejb type.
- *
- * @return ejb type.
- */
- public SessionBeanType getSessionBeanType();
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Producer.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Producer.java
deleted file mode 100644
index a697607..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/Producer.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-
-/**
- * Provides a generic operation for producing an instance of a type.
- *
- * @version $Rev$ $Date$
- *
- * <T> bean type
- */
-public interface Producer<T>
-{
- /**
- * Its result depends on bean type.
- *
- * <p>
- *
- * <ul>
- *
- * <li><b>Bean Class</b> : It calls the constructor annotated with {@link Initializer} if it
- * exists, or the constructor with no parameters otherwise.</li>
- *
- * <li><b>Producer Method or Field</b> : Calls the producer method on,
- * or accesses the producer field of, a contextual instance of the most
- * specialized bean that specializes the bean that declares the producer method</li>
- *
- * </ul>
- *
- * </p>
-
- * @param creationalContext creational context
- *
- * @return an instance of bean
- */
- public T produce(CreationalContext<T> creationalContext);
-
- /**
- * Its result depends on bean type.
- * <p>
- * <ul>
- * <li><b>Bean Class</b> : Does nothing.</li>
- * <li><b>Producer Method</b> : Calls disposer method or any other cleanup.
- * </ul>
- * </p>
- *
- * @param instance dispose istance
- */
- public void dispose(T instance);
-
- /**
- * Its result depends on bean type.
- *
- * <p>
- *
- * <ul>
- * <li><b>Bean Class</b> : Returns the set of InjectionPoint objects representing all injected fields,
- * bean constructor parameters and initializer method parameters.</li>
- *
- * <li><b>Producer Method</b> : Returns the set of InjectionPoint objects
- * representing all parameters of the producer method.</li>
- *
- * </ul>
- *
- * </p>
- *
- * @return set of injection points
- */
- public Set<InjectionPoint> getInjectionPoints();
-
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/SessionBeanType.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/SessionBeanType.java
deleted file mode 100644
index 444c5e6..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/inject/spi/SessionBeanType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.inject.spi;
-
-/**
- * Session bean type enumerations.
- *
- * @version $Rev$ $Date$
- *
- */
-public enum SessionBeanType
-{
- STATELESS,
- STATEFUL,
- SINGLETON
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java
deleted file mode 100644
index aa0bbe1..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/AnnotationLiteral.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.util;
-
-import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-
-/**
- * Annotation literal utility.
- *
- * @param <T> wrapped annotation class
- * @version $Rev$ $Date$
- */
-@SuppressWarnings("unchecked")
-public abstract class AnnotationLiteral<T extends Annotation> implements Annotation, Serializable
-{
- private static final long serialVersionUID = -1885320698638161810L;
-
- private Class<T> annotationType;
-
- private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-
- protected AnnotationLiteral()
- {
- this.annotationType = getAnnotationType(getClass());
-
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return annotationType;
- }
-
- private Class<T> getAnnotationType(Class<?> definedClazz)
- {
- Type superClazz = definedClazz.getGenericSuperclass();
-
- Class<T> clazz = null;
-
- if (superClazz.equals(Object.class))
- {
- throw new RuntimeException("Super class must be parametrized type!");
- }
-
- else if (superClazz instanceof ParameterizedType)
- {
- ParameterizedType paramType = (ParameterizedType) superClazz;
- Type[] actualArgs = paramType.getActualTypeArguments();
-
- if (actualArgs.length == 1)
- {
- //Actual annotation type
- Type type = actualArgs[0];
-
- if (type instanceof Class)
- {
- clazz = (Class<T>) type;
- return clazz;
- }
- else
- {
- throw new RuntimeException("Not class type!");
- }
- }
- else
- {
- throw new RuntimeException("More than one parametric type!");
- }
- }
- else
- {
- return getAnnotationType((Class<?>) superClazz);
- }
-
- }
-
- @Override
- public boolean equals(Object other)
- {
- Method[] methods = this.annotationType.getDeclaredMethods();
-
- if(other == this)
- {
- return true;
- }
-
- if(other == null)
- {
- return false;
- }
-
- if (other instanceof Annotation)
- {
- Annotation annotOther = (Annotation) other;
- if (this.annotationType().equals(annotOther.annotationType()))
- {
- for (Method method : methods)
- {
- Object value = callMethod(this, method);
- Object annotValue = callMethod(annotOther, method);
-
- if((value == null && annotValue != null) || (value != null && annotValue == null))
- {
- return false;
- }
-
- if(value == null && annotValue == null)
- {
- continue;
- }
-
- Class<?> valueClass = value.getClass();
- Class<?> annotValueClass = annotValue.getClass();
-
- if(valueClass.isPrimitive() && annotValueClass.isPrimitive())
- {
- if((valueClass != Float.TYPE && annotValue != Float.TYPE)
- || (valueClass != Double.TYPE && annotValue != Double.TYPE))
- {
- if(value != annotValue)
- {
- return false;
- }
-
- }
- }
- else if(valueClass.isArray() && annotValueClass.isArray())
- {
- Class<?> type = valueClass.getComponentType();
- if(type.isPrimitive())
- {
- if(Long.TYPE == type)
- {
- if(!Arrays.equals(((Long[])value),(Long[])annotValue)) return false;
- }
- else if(Integer.TYPE == type)
- {
- if(!Arrays.equals(((Integer[])value),(Integer[])annotValue)) return false;
- }
- else if(Short.TYPE == type)
- {
- if(!Arrays.equals(((Short[])value),(Short[])annotValue)) return false;
- }
- else if(Double.TYPE == type)
- {
- if(!Arrays.equals(((Double[])value),(Double[])annotValue)) return false;
- }
- else if(Float.TYPE == type)
- {
- if(!Arrays.equals(((Float[])value),(Float[])annotValue)) return false;
- }
- else if(Boolean.TYPE == type)
- {
- if(!Arrays.equals(((Boolean[])value),(Boolean[])annotValue)) return false;
- }
- else if(Byte.TYPE == type)
- {
- if(!Arrays.equals(((Byte[])value),(Byte[])annotValue)) return false;
- }
- else if(Character.TYPE == type)
- {
- if(!Arrays.equals(((Character[])value),(Character[])annotValue)) return false;
- }
- }
- else
- {
- if(!Arrays.equals(((Object[])value),(Object[])annotValue)) return false;
- }
- }
-
- else if (value != null && annotValue != null)
- {
- if (!value.equals(annotValue))
- {
- return false;
- }
- }
-
- }
-
- return true;
- }
- }
-
- return false;
- }
-
- private Object callMethod(Object instance, Method method)
- {
- boolean access = method.isAccessible();
-
- try
- {
- if (!method.isAccessible())
- {
- method.setAccessible(true);
- }
-
- return method.invoke(instance, EMPTY_OBJECT_ARRAY);
- }
- catch (Exception e)
- {
- throw new RuntimeException("Exception in method call : " + method.getName());
- }
- finally
- {
- method.setAccessible(access);
- }
-
-
- }
-
- @Override
- public int hashCode()
- {
- Method[] methods = this.annotationType.getDeclaredMethods();
-
- int hashCode = 0;
- for (Method method : methods)
- {
- // Member name
- int name = 127 * method.getName().hashCode();
-
- // Member value
- Object object = callMethod(this, method);
- int value = 0;
- if(object.getClass().isArray())
- {
- Class<?> type = object.getClass().getComponentType();
- if(type.isPrimitive())
- {
- if(Long.TYPE == type)
- {
- value = Arrays.hashCode((Long[])object);
- }
- else if(Integer.TYPE == type)
- {
- value = Arrays.hashCode((Integer[])object);
- }
- else if(Short.TYPE == type)
- {
- value = Arrays.hashCode((Short[])object);
- }
- else if(Double.TYPE == type)
- {
- value = Arrays.hashCode((Double[])object);
- }
- else if(Float.TYPE == type)
- {
- value = Arrays.hashCode((Float[])object);
- }
- else if(Boolean.TYPE == type)
- {
- value = Arrays.hashCode((Long[])object);
- }
- else if(Byte.TYPE == type)
- {
- value = Arrays.hashCode((Byte[])object);
- }
- else if(Character.TYPE == type)
- {
- value = Arrays.hashCode((Character[])object);
- }
- }
- else
- {
- value = Arrays.hashCode((Object[])object);
- }
- }
- else
- {
- value = object.hashCode();
- }
-
- hashCode += name ^ value;
- }
- return hashCode;
- }
-
-
- @Override
- public String toString()
- {
- Method[] methods = this.annotationType.getDeclaredMethods();
-
- StringBuilder sb = new StringBuilder("@" + annotationType().getName() + "(");
- int lenght = methods.length;
-
- for (int i = 0; i < lenght; i++)
- {
- // Member name
- sb.append(methods[i].getName()).append("=");
-
- // Member value
- sb.append(callMethod(this, methods[i]));
-
- if (i < lenght - 1)
- {
- sb.append(",");
- }
- }
-
- sb.append(")");
-
- return sb.toString();
- }
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/Nonbinding.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/Nonbinding.java
deleted file mode 100644
index 21cfbcb..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/Nonbinding.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.util;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that <code>Qualifier</code> annotation member
- * is not contained in the type safe resolution algorithm.
- *
- * <p>
- * Example:
- *
- * <pre>
- * @Qualifier
- * public @interface Mock {
- * @NonBinding String name;
- * }
- * </pre>
- *
- * <b>Mock</b> qualifier <i>name</i> member variable is excepted from the
- * type safe resolution algorithm while comparing the qualifiers.
- *
- * </p>
- */
-@Retention(RUNTIME)
-@Target(METHOD)
-public @interface Nonbinding
-{
-}
diff --git a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java b/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java
deleted file mode 100644
index ec94b2b..0000000
--- a/geronimo-jcdi_1.0_spec/src/main/java/javax/enterprise/util/TypeLiteral.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package javax.enterprise.util;
-
-import java.io.Serializable;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-/**
- * Type literal implementation.
- * @version $Rev$ $Date$
- *
- * @param <T> wrapped type
- */
-@SuppressWarnings("unchecked")
-public abstract class TypeLiteral<T> implements Serializable
-{
- private static final long serialVersionUID = 6993258591899719600L;
-
- private Type definedType;
-
- protected TypeLiteral()
- {
- this.definedType = getDefinedType(this.getClass());
- }
-
- public final Type getType()
- {
- return definedType;
- }
-
- public final Class<T> getRawType()
- {
- Class<T> rawType = null;
-
- if (this.definedType instanceof Class)
- {
- rawType = (Class<T>) this.definedType;
- }
- else if (this.definedType instanceof ParameterizedType)
- {
- ParameterizedType pt = (ParameterizedType) this.definedType;
- rawType = (Class<T>) pt.getRawType();
-
- }
- else if (this.definedType instanceof GenericArrayType)
- {
- rawType = (Class<T>) Object[].class;
- }
- else
- {
- throw new RuntimeException("Illegal type for the Type Literal Class");
- }
-
- return rawType;
- }
-
- private Type getDefinedType(Class<?> clazz)
- {
- Type type = null;
-
- if (clazz == null)
- {
- throw new RuntimeException("Class parameter can not be null!");
- }
-
- Type superClazz = clazz.getGenericSuperclass();
-
- if (superClazz.equals(Object.class))
- {
- throw new RuntimeException("Super class must be parametrized type!");
- }
- else if (superClazz instanceof ParameterizedType)
- {
- ParameterizedType pt = (ParameterizedType) superClazz;
- Type[] actualArgs = pt.getActualTypeArguments();
-
- if (actualArgs.length == 1)
- {
- type = actualArgs[0];
- }
- else
- {
- throw new RuntimeException("More than one parametric type!");
- }
- }
- else
- {
- type = getDefinedType((Class<?>) superClazz);
- }
-
- return type;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
-
- result = prime * result + ((definedType == null) ? 0 : definedType.hashCode());
-
- return result;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
-
- if (obj == null)
- {
- return false;
- }
-
- if (getClass() != obj.getClass())
- {
- return false;
- }
-
- TypeLiteral other = (TypeLiteral) obj;
- if (definedType == null)
- {
- if (other.definedType != null)
- {
- return false;
- }
- }
- else if (!definedType.equals(other.definedType))
- {
- return false;
- }
-
- return true;
- }
-
-}
\ No newline at end of file
diff --git a/geronimo-jcdi_1.0_spec/src/site/apt/index.apt b/geronimo-jcdi_1.0_spec/src/site/apt/index.apt
deleted file mode 100644
index baa565c..0000000
--- a/geronimo-jcdi_1.0_spec/src/site/apt/index.apt
+++ /dev/null
@@ -1,16 +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.
-OpenWebBeans API
-
- Application Programming Interface for the JSR-299
- Java Contexts and Dependency Injection.
-
diff --git a/geronimo-jcdi_1.0_spec/src/site/site.xml b/geronimo-jcdi_1.0_spec/src/site/site.xml
deleted file mode 100644
index c189c77..0000000
--- a/geronimo-jcdi_1.0_spec/src/site/site.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.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.
--->
-
-<project name="OpenWebBeans-API">
-<!--
- <bannerLeft>
- <name>Apache OpenWebBeans</name>
- <src>http://incubator.apache.org/openwebbeans/images/openwebbeans.png</src>
- <href>http://incubator.apache.org/openwebbeans</href>
- </bannerLeft>
-
- <bannerRight>
- <name>Apache Banner</name>
- <src>http://incubator.apache.org/openwebbeans/images/apache-incubator-logo.png</src>
- <href>http://incubator.apache.org/openwebbeans</href>
- </bannerRight>
- -->
- <publishDate format="dd MMM yyyy" />
- <version position="left"/>
-
- <body>
- <breadcrumbs>
- <item name="Incubator" href="http://incubator.apache.org"/>
- <item name="OpenWebBeans" href="http://incubator.apache.org/openwebbeans"/>
- <item name="API" href="http://incubator.apache.org/openwebbeans/${project.version}/openwebbeans-api"/>
- </breadcrumbs>
-
- <menu name="Overview">
- <item name="Introduction" href="index.html" />
- </menu>
-
- <menu ref="reports"/>
- </body>
-</project>
-
