Author: markt
Date: Thu Aug 4 20:40:16 2016
New Revision: 1755230
URL: http://svn.apache.org/viewvc?rev=1755230&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59899
Update Tomcat's copy of the Java Persistence annotations to include the changes
made in 2.1 / JavaEE 7.
Added:
tomcat/trunk/java/javax/persistence/SynchronizationType.java (with props)
Modified:
tomcat/trunk/java/javax/persistence/PersistenceContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/javax/persistence/PersistenceContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/PersistenceContext.java?rev=1755230&r1=1755229&r2=1755230&view=diff
==============================================================================
--- tomcat/trunk/java/javax/persistence/PersistenceContext.java (original)
+++ tomcat/trunk/java/javax/persistence/PersistenceContext.java Thu Aug 4
20:40:16 2016
@@ -14,8 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package javax.persistence;
import java.lang.annotation.ElementType;
@@ -31,4 +29,5 @@ public @interface PersistenceContext {
String unitName() default "";
PersistenceContextType type() default PersistenceContextType.TRANSACTION;
PersistenceProperty[] properties() default {};
+ SynchronizationType synchronization() default
SynchronizationType.SYNCHRONIZED;
}
Added: tomcat/trunk/java/javax/persistence/SynchronizationType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/persistence/SynchronizationType.java?rev=1755230&view=auto
==============================================================================
--- tomcat/trunk/java/javax/persistence/SynchronizationType.java (added)
+++ tomcat/trunk/java/javax/persistence/SynchronizationType.java Thu Aug 4
20:40:16 2016
@@ -0,0 +1,22 @@
+/*
+ * 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;
+
+public enum SynchronizationType {
+ SYNCHRONIZED,
+ UNSYNCHRONIZED
+}
Propchange: tomcat/trunk/java/javax/persistence/SynchronizationType.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1755230&r1=1755229&r2=1755230&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Aug 4 20:40:16 2016
@@ -184,6 +184,10 @@
JULI's <code>OneLineFormatter</code> to enable the format of the
time stamp used in log messages to be configured. (markt)
</add>
+ <fix>
+ <bug>59899</bug>: Update Tomcat's copy of the Java Persistence
+ annotations to include the changes made in 2.1 / JavaEE 7. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
