Author: markt
Date: Fri Apr 25 15:55:38 2008
New Revision: 651732
URL: http://svn.apache.org/viewvc?rev=651732&view=rev
Log:
Fix bug https://issues.apache.org/bugzilla/show_bug.cgi?id=43425
Annotations not spec compliant.
Patch provided by Dain Sundstrom.
Added:
tomcat/trunk/java/javax/persistence/PersistenceProperty.java (with props)
Modified:
tomcat/trunk/java/javax/annotation/security/DenyAll.java
tomcat/trunk/java/javax/ejb/EJB.java
tomcat/trunk/java/javax/persistence/PersistenceContext.java
Modified: tomcat/trunk/java/javax/annotation/security/DenyAll.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/annotation/security/DenyAll.java?rev=651732&r1=651731&r2=651732&view=diff
==============================================================================
--- tomcat/trunk/java/javax/annotation/security/DenyAll.java (original)
+++ tomcat/trunk/java/javax/annotation/security/DenyAll.java Fri Apr 25
15:55:38 2008
@@ -23,7 +23,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
[EMAIL PROTECTED]({ElementType.TYPE, ElementType.METHOD})
[EMAIL PROTECTED]({ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
public @interface DenyAll {
Modified: tomcat/trunk/java/javax/ejb/EJB.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/ejb/EJB.java?rev=651732&r1=651731&r2=651732&view=diff
==============================================================================
--- tomcat/trunk/java/javax/ejb/EJB.java (original)
+++ tomcat/trunk/java/javax/ejb/EJB.java Fri Apr 25 15:55:38 2008
@@ -28,6 +28,7 @@
public @interface EJB {
String name() default "";
+ String description() default "";
Class beanInterface() default java.lang.Object.class;
String beanName() default "";
String mappedName() default "";
Modified: tomcat/trunk/java/javax/persistence/PersistenceContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceContext.java?rev=651732&r1=651731&r2=651732&view=diff
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceContext.java (original)
+++ tomcat/trunk/java/javax/persistence/PersistenceContext.java Fri Apr 25
15:55:38 2008
@@ -30,4 +30,5 @@
String name() default "";
String unitName() default "";
PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+ PersistenceProperty[] properties() default {};
}
Added: tomcat/trunk/java/javax/persistence/PersistenceProperty.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceProperty.java?rev=651732&view=auto
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceProperty.java (added)
+++ tomcat/trunk/java/javax/persistence/PersistenceProperty.java Fri Apr 25
15:55:38 2008
@@ -0,0 +1,30 @@
+/*
+ * 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.persistence;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
[EMAIL PROTECTED]({})
[EMAIL PROTECTED](RetentionPolicy.RUNTIME)
+
+public @interface PersistenceProperty {
+ String name();
+ String value();
+}
Propchange: tomcat/trunk/java/javax/persistence/PersistenceProperty.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
