[Jboss-cvs] JBossAS SVN: r56822 - in branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x: . src/main/javax/annotation src/main/javax/annotation/security src/main/javax/ejb src/main/javax/interceptor
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 13 20:05:52 EDT 2006
Author: bill.burke at jboss.com
Date: 2006-09-13 20:05:49 -0400 (Wed, 13 Sep 2006)
New Revision: 56822
Added:
branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/security/DeclareRoles.java
branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java
branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/ejb/EJB.java
branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/ejb/EJBs.java
Removed:
branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/AuthenticationType.java
branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/EJB.java
branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/EJBs.java
Modified:
branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/.classpath
branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/Resource.java
branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/interceptor/InvocationContext.java
Log:
merge from Branch_4_0
Modified: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/.classpath
===================================================================
--- branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/.classpath 2006-09-13 22:23:29 UTC (rev 56821)
+++ branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/.classpath 2006-09-14 00:05:49 UTC (rev 56822)
@@ -4,7 +4,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
- <classpathentry kind="src" path="/common"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/common/lib/jboss-common.jar"/>
<classpathentry kind="src" path="/j2ee"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Deleted: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/AuthenticationType.java
===================================================================
--- branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/AuthenticationType.java 2006-09-13 22:23:29 UTC (rev 56821)
+++ branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/AuthenticationType.java 2006-09-14 00:05:49 UTC (rev 56822)
@@ -1,34 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package javax.annotation;
-
-/**
- * Enums for whether the container or bean is to perform authentication.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public enum AuthenticationType
-{
- CONTAINER,
- APPLICATION
-}
Deleted: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/EJB.java
===================================================================
--- branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/EJB.java 2006-09-13 22:23:29 UTC (rev 56821)
+++ branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/EJB.java 2006-09-14 00:05:49 UTC (rev 56822)
@@ -1,47 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package javax.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The EJB annotation denotes a reference to an EJB 3.0 session bean.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME)
-public @interface EJB
-{
- String name() default "";
-
- Class businessInterface() default java.lang.Object.class;
-
- String beanName() default "";
-
- String mappedName() default "";
-
- String description() default "";
-}
Deleted: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/EJBs.java
===================================================================
--- branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/EJBs.java 2006-09-13 22:23:29 UTC (rev 56821)
+++ branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/EJBs.java 2006-09-14 00:05:49 UTC (rev 56822)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package javax.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The EJBs annotation is used to specify multiple EJB 3.0 session bean
- * references on a bean class.
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME)
-public @interface EJBs
-{
- EJB[] value();
-}
Modified: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/Resource.java
===================================================================
--- branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/Resource.java 2006-09-13 22:23:29 UTC (rev 56821)
+++ branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/Resource.java 2006-09-14 00:05:49 UTC (rev 56822)
@@ -40,6 +40,18 @@
@Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME)
public @interface Resource
{
+ /**
+ * Enums for whether the container or bean is to perform authentication.
+ *
+ * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
+ * @version $Revision$
+ */
+ public enum AuthenticationType
+ {
+ CONTAINER,
+ APPLICATION
+ }
+
String name() default "";
Class type() default Object.class;
Copied: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/annotation/security/DeclareRoles.java (from rev 56787, branches/Branch_4_0/ejb3x/src/main/javax/annotation/security/DeclareRoles.java)
Copied: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java (from rev 56787, branches/Branch_4_0/ejb3x/src/main/javax/ejb/ConcurrentAccessException.java)
Copied: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/ejb/EJB.java (from rev 56787, branches/Branch_4_0/ejb3x/src/main/javax/ejb/EJB.java)
Copied: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/ejb/EJBs.java (from rev 56787, branches/Branch_4_0/ejb3x/src/main/javax/ejb/EJBs.java)
Modified: branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/interceptor/InvocationContext.java
===================================================================
--- branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/interceptor/InvocationContext.java 2006-09-13 22:23:29 UTC (rev 56821)
+++ branches/JBoss_4_0_4_GA_EJB3_RC9/ejb3x/src/main/javax/interceptor/InvocationContext.java 2006-09-14 00:05:49 UTC (rev 56822)
@@ -32,7 +32,7 @@
*/
public interface InvocationContext
{
- public Object getBean();
+ public Object getTarget();
public Method getMethod();
More information about the jboss-cvs-commits
mailing list