Author: markt
Date: Thu May 1 13:13:23 2008
New Revision: 652644
URL: http://svn.apache.org/viewvc?rev=652644&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43425
Annotations not spec compliant. Patch provided by Dain Sundstrom
Added:
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceProperty.java
- copied unchanged from r651732,
tomcat/trunk/java/javax/persistence/PersistenceProperty.java
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc6.0.x/trunk/java/javax/ejb/EJB.java
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=652644&r1=652643&r2=652644&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 1 13:13:23 2008
@@ -76,13 +76,6 @@
+1: fhanik, markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43425
- Annotations not spec compliant
- Patch provided by Dain Sundstrom
- http://svn.apache.org/viewvc?rev=651732&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Log errors for AJP signoffs at DEBUG level, since it is harmless if mod_jk
has hung up the phone.
http://svn.apache.org/viewvc?rev=651792&view=rev
+1: billbarker, markt, remm, fhanik
Modified: tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java?rev=652644&r1=652643&r2=652644&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java Thu May 1
13:13:23 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/tc6.0.x/trunk/java/javax/ejb/EJB.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/ejb/EJB.java?rev=652644&r1=652643&r2=652644&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/ejb/EJB.java (original)
+++ tomcat/tc6.0.x/trunk/java/javax/ejb/EJB.java Thu May 1 13:13:23 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/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java?rev=652644&r1=652643&r2=652644&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java Thu May
1 13:13:23 2008
@@ -30,4 +30,5 @@
String name() default "";
String unitName() default "";
PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+ PersistenceProperty[] properties() default {};
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=652644&r1=652643&r2=652644&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 1 13:13:23 2008
@@ -40,6 +40,10 @@
using the webapp class loader when we create them. (markt)
</fix>
<fix>
+ <bug>43425</bug>: Make annotations spec compliant. Patch provided by
+ Dain Sundstrom. (markt)
+ </fix>
+ <fix>
<bug>43470</bug>: Fix various class cast exceptions. Based on a patch
by Lucas Galfaso. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
