openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From allee8...@apache.org
Subject svn commit: r1466704 - in /openjpa/branches/2.2.x: LICENSE NOTICE openjpa-project/BUILDING.txt openjpa-project/CHANGES.txt openjpa-project/LICENSE openjpa-project/NOTICE openjpa-project/RELEASE-NOTES.html
Date Wed, 10 Apr 2013 21:57:06 GMT
Author: allee8285
Date: Wed Apr 10 21:57:05 2013
New Revision: 1466704

URL: http://svn.apache.org/r1466704
Log:
Updating files for release.

Modified:
    openjpa/branches/2.2.x/LICENSE
    openjpa/branches/2.2.x/NOTICE
    openjpa/branches/2.2.x/openjpa-project/BUILDING.txt
    openjpa/branches/2.2.x/openjpa-project/CHANGES.txt
    openjpa/branches/2.2.x/openjpa-project/LICENSE
    openjpa/branches/2.2.x/openjpa-project/NOTICE
    openjpa/branches/2.2.x/openjpa-project/RELEASE-NOTES.html

Modified: openjpa/branches/2.2.x/LICENSE
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/LICENSE?rev=1466704&r1=1466703&r2=1466704&view=diff
==============================================================================
--- openjpa/branches/2.2.x/LICENSE (original)
+++ openjpa/branches/2.2.x/LICENSE Wed Apr 10 21:57:05 2013
@@ -257,23 +257,23 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICE
 
 1. Definitions.
 
-   1.1. Contributor. means each individual or entity that creates or contributes to the creation of Modifications.
+   1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications.
 
-   1.2. Contributor Version. means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+   1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
 
-   1.3. Covered Software. means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+   1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
 
-   1.4. Executable. means the Covered Software in any form other than Source Code.
+   1.4. Executable means the Covered Software in any form other than Source Code.
 
-   1.5. Initial Developer. means the individual or entity that first makes Original Software available under this License.
+   1.5. Initial Developer means the individual or entity that first makes Original Software available under this License.
 
-   1.6. Larger Work. means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+   1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
 
-   1.7. License. means this document.
+   1.7. License means this document.
 
-   1.8. Licensable. means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+   1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
 
-   1.9. Modifications. means the Source Code and Executable form of any of the following:
+   1.9. Modifications means the Source Code and Executable form of any of the following:
 
         A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
 
@@ -281,39 +281,39 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICE
 
         C. Any new file that is contributed or otherwise made available under the terms of this License.
 
-   1.10. Original Software. means the Source Code and Executable form of computer software code that is originally released under this License.
+   1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License.
 
-   1.11. Patent Claims. means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+   1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
 
-   1.12. Source Code. means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+   1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
 
-   1.13. You. (or .Your.) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, .You. includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, .control. means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+   1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
 
 2. License Grants.
 
-      2.1. The Initial Developer Grant.
+   2.1. The Initial Developer Grant.
 
-      Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
+   Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
 
-         (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
+       (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
 
-         (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
+       (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
 
-        (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
+       (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
 
-        (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
+       (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
 
     2.2. Contributor Grant.
 
     Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
 
-        (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
+       (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
 
-        (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+       (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
 
-        (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+       (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
 
-        (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+       (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
 
 3. Distribution Obligations.
 
@@ -376,7 +376,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICE
 
    NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
 
-   The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+   The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
 
 
 The GNU General Public License (GPL) Version 2, June 1991

Modified: openjpa/branches/2.2.x/NOTICE
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/NOTICE?rev=1466704&r1=1466703&r2=1466704&view=diff
==============================================================================
--- openjpa/branches/2.2.x/NOTICE (original)
+++ openjpa/branches/2.2.x/NOTICE Wed Apr 10 21:57:05 2013
@@ -1,6 +1,6 @@
 
 Apache OpenJPA
-Copyright 2006-2010 The Apache Software Foundation
+Copyright 2006-2013 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
@@ -9,7 +9,6 @@ The Apache Software Foundation (http://w
 The following copyright notice(s) were affixed to portions of this code
 with which this file is now or was at one time distributed.
 
-
 OpenJPA includes software developed by the SERP project
 Copyright (c) 2002-2006, A. Abram White. All rights reserved.
 
@@ -21,7 +20,10 @@ CDDL license.  You can obtain a copy of 
 The source code is available at:
     https://glassfish.dev.java.net/source/browse/glassfish/
 
-OpenJPA includes software written by Miroslav Nachev
+OpenJPA includes software written by Miroslav Nachev.
 
 OpenJPA uses test code written by Charles Tillman.
 
+OpenJPA includes software developed by OW2 ASM project
+Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
+

Modified: openjpa/branches/2.2.x/openjpa-project/BUILDING.txt
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-project/BUILDING.txt?rev=1466704&r1=1466703&r2=1466704&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-project/BUILDING.txt (original)
+++ openjpa/branches/2.2.x/openjpa-project/BUILDING.txt Wed Apr 10 21:57:05 2013
@@ -19,7 +19,7 @@ website at http://openjpa.apache.org/bui
    3. Extract the source archive if you have not already done so. 
       The source will create a new directory named:
       openjpa-<version>-source. Where <version> is the OpenJPA 
-      version, for example apache-openjpa-2.2.0-source.
+      version, for example apache-openjpa-2.2.2-source.
    4. Change to the OpenJPA source directory, which has already been created in
       the previous step.
    5. Build OpenJPA by running: mvn package or better mvn install. 
@@ -58,27 +58,27 @@ Apache Maven 2.2.1 (r801777; 2009-08-06 
  ...
 
 $ svn --version
-svn, version 1.5.5 (r34862)
-   compiled Jan  5 2009, 12:30:39
+svn, version 1.6.11 (r934486)
+   compiled Apr 12 2012, 11:02:08
 
-$ svn co https://svn.apache.org/repos/asf/openjpa/trunk/
-A  trunk/openjpa-lib
-A  trunk/openjpa-lib/src
-A  trunk/openjpa-lib/src/test
-A  trunk/openjpa-lib/src/test/java
-A  trunk/openjpa-lib/src/test/java/org
-A  trunk/openjpa-lib/src/test/java/org/apache
-A  trunk/openjpa-lib/src/test/java/org/apache/openjpa
-A  trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib
-A  trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/test
-A  trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
+$ svn co https://svn.apache.org/repos/asf/openjpa/branches/2.2.x
+A  2.2.x/openjpa-lib
+A  2.2.x/openjpa-lib/src
+A  2.2.x/openjpa-lib/src/test
+A  2.2.x/openjpa-lib/src/test/java
+A  2.2.x/openjpa-lib/src/test/java/org
+A  2.2.x/openjpa-lib/src/test/java/org/apache
+A  2.2.x/openjpa-lib/src/test/java/org/apache/openjpa
+A  2.2.x/openjpa-lib/src/test/java/org/apache/openjpa/lib
+A  2.2.x/openjpa-lib/src/test/java/org/apache/openjpa/lib/test
+A  2.2.x/openjpa-lib/src/test/java/org/apache/openjpa/lib/test/AbstractTestCase.java
 
  ...
 
-A  trunk/openjpa-persistence/pom.xml
+A  2.2.x/openjpa-persistence/pom.xml
 Checked out revision 1065345.
 
-$ cd trunk/
+$ cd 2.2.x/
 
 $ mvn clean install -DskipTests -DfailIfNoTests=false 
 
@@ -158,5 +158,5 @@ $ mvn clean install -DskipTests -DfailIf
 
 $ ls openjpa-project/target/site/downloads/
 
-apache-openjpa-2.2.0-SNAPSHOT-binary.zip
-apache-openjpa-2.2.0-SNAPSHOT-source.zip
+apache-openjpa-2.2.2-SNAPSHOT-binary.zip
+apache-openjpa-2.2.2-SNAPSHOT-source.zip

Modified: openjpa/branches/2.2.x/openjpa-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-project/CHANGES.txt?rev=1466704&r1=1466703&r2=1466704&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-project/CHANGES.txt (original)
+++ openjpa/branches/2.2.x/openjpa-project/CHANGES.txt Wed Apr 10 21:57:05 2013
@@ -1,4 +1,4 @@
-Apache OpenJPA 2.2.1
+Apache OpenJPA 2.2.2
 Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
 --------------------------------------------------------------------------------
 
@@ -21,7 +21,7 @@ Content
 Overview
 --------
    The Apache OpenJPA community is proud to release a maintenance distribution of
-   OpenJPA 2.2.1. This distribution is based on the final JSR 317 Java 
+   OpenJPA 2.2.2. This distribution is based on the final JSR 317 Java 
    Persistence API, Version 2.0 specification and passes the JPA 2.0 TCK,
    while remaining backwards compatible with prior releases based on the
    Java Persistence API (JPA 1.0) part of Java Community Process JSR-220
@@ -54,7 +54,7 @@ License
 
 Notices
 -------
-   Copyright 2006,2012 The Apache Software Foundation.
+   Copyright 2006,2013 The Apache Software Foundation.
    Apache, the Apache feather logo and OpenJPA are trademarks of
    The Apache Software Foundation.
 
@@ -112,57 +112,46 @@ Getting Involved
           https://issues.apache.org/jira/browse/OPENJPA
 
 
-Included Changes in OpenJPA 2.2.1
+Included Changes in OpenJPA 2.2.2
 ---------------------------------
 
-Sub-task
-
-    [OPENJPA-2168] - Do not go through LifeCycleEventManager overhead if the Entity has declared to be excluded
-
 Bug
 
-    [OPENJPA-2067] - A 'length' of '-1' passed to PreparedStatement.setBinaryStream can cause an exception on some, but not all, JDBC drivers.
-    [OPENJPA-2072] - InvalidStateException deleting an instance with a timestamp in its primary key
-    [OPENJPA-2095] - Unhandled exception thrown from within an Externalizer method causes incorrect/incomplete SQL to be generated/executed.
-    [OPENJPA-2118] - Prepared SQL query does not handle collection-valued parameter where collection is empty
-    [OPENJPA-2123] - Minor performance improvements for Connection and ResultSet processing
-    [OPENJPA-2132] - Traversal of a OneToMany relationship returns an empty list when InheritanceType.JOINED or SINGLE_TABLE is used.
-    [OPENJPA-2133] - OpenJPA doesn't find custom mappings with an applicable class loader
-    [OPENJPA-2136] - NPE when using LiteAutoDetach
-    [OPENJPA-2142] - Merge of a new object does not handle Entity Id field
-    [OPENJPA-2145] - Missing ASM depending jar in binary zip
-    [OPENJPA-2146] - StateManager for Embeddable may throw Exception while initializing
-    [OPENJPA-2149] - Criteria.function adds wrong casts to parameters making it unsuable
-    [OPENJPA-2153] - NoSuchMethodException of DBCPDriverDataSource.newInstance()
-    [OPENJPA-2154] - test-dynamic-enhancer profile failed for module more than one level deep
-    [OPENJPA-2156] - Fix bug in org.apache.openjpa.persistence.util.SourceCode to correctly generate imports.
-    [OPENJPA-2158] - LiteAutoDetach + DetachProxyFields=false can lead to Broker concurrency exceptions
-    [OPENJPA-2161] - Make some members of StateManagerImpl protected to allow for greater extensability
-    [OPENJPA-2163] - Lifecycle event callback occurs more often than expect
-    [OPENJPA-2172] - openjpa-all jar is missing slf4j runtime dependency
-    [OPENJPA-2174] - Result set mapping was not looked up when retrieving column data from a NamedNativeQuery
-    [OPENJPA-2199] - Constraint violation exception when removing relationship using (orphanRemoval = true)
-    [OPENJPA-2227] - OpenJPA doesn't find custom SequenceGenerators
-    [OPENJPA-2230] - Event Listener detection didn't work with MappedSuperClasses or Entity heirarchies
-    [OPENJPA-2236] - Trace of connection info can cause class transform/enhancement to fail
-    [OPENJPA-2247] - JoinColumn annotation is ignored when mapping a unidirectional owned OneToOne that is in a SecondaryTable
-    [OPENJPA-2260] - Parenthesis-augmented parameters are improperly processed at EM level
-    [OPENJPA-2261] - Query SQL Cache issue with NULL parameters
+    [OPENJPA-2196] - Create Sequence Postgres 9.1
+    [OPENJPA-2233] - Failed to invoke pcGetIDOwningClass method on embeddable entity with ID annotation
+    [OPENJPA-2235] - "READ_UNCOMMITTED" setting for the fetch plan isolation level is ignored in DB2Dictionary
+    [OPENJPA-2240] - JVMVRFY012 when using openjpa together with hyperjaxb3
+    [OPENJPA-2244] - Nested classpath ignored in mapping tool ant task
+    [OPENJPA-2257] - Concurreny in org.apache.openjpa.persistence.EntityManagerImpl.getProperties leads to NullPointer and ConcurrentModificationException
+    [OPENJPA-2284] - NPE occurs when <cascade-persist/> is added to a <persistence-unit-defaults> in an orm.
+    [OPENJPA-2285] - L2 cache doesn't store FK(s) back into the cache when lazy loading data.
+    [OPENJPA-2288] - MetaDataRepository should be able to filter classes from other app ClassLoaders in JEE Env
+    [OPENJPA-2289] - Additional SQL alias generated for query with subquery causes incorrect # of rows returned - Oracle only
+    [OPENJPA-2298] - VerifyError/Stack underflow due to extra 'return' statements generated by PCEnhancer.
+    [OPENJPA-2304] - Thread deadlock in CriteriaBuilder
+    [OPENJPA-2320] - CriteriaBuilder predicate construction deadlocks in multi-core VM due to static initializer
+    [OPENJPA-2321] - Synchronizing logging output stream causes deadlock when used some JDK LogManger derivative
+    [OPENJPA-2326] - Updates in TCK execution configuration
+    [OPENJPA-2334] - OpenJPA must support processing puRoot & jar-file URLs as jar-formatted InputStreams
 
 Improvement
 
-    [OPENJPA-2134] - Do not close Connections when ConnectionRetainMode is set to "always"
-    [OPENJPA-2137] - Make some members of StateManagerImpl protected to allow for greater extensibility
-    [OPENJPA-2143] - Reduce lock contention on LifecycleEventManager
-    [OPENJPA-2151] - Improve the performance of StateManagerImpl.initialize
-    [OPENJPA-2152] - Don't process query hints when LockModeType == NONE
-    [OPENJPA-2159] - Add support for no rounding of Date
-    [OPENJPA-2162] - Avoid delimited identifier processing if it's not required by application
-    [OPENJPA-2164] - Don't setPCState if field requested is already loaded
-    [OPENJPA-2167] - Misc changes to improve flush() path performance
-    [OPENJPA-2189] - Update OpenBooks example to build, install, and execute in the WAS Liberty Profile
-    [OPENJPA-2208] - Add additional Java 2 Security doPriv function
+    [OPENJPA-2264] - Upcast PreparedStatementManagerImpl.logSQLWarnings to take a Statement rather than a PreparedStatement
+    [OPENJPA-2292] - Reduce object allocations
+    [OPENJPA-2293] - Reduce LifecycleEventManager
+    [OPENJPA-2324] - Option to express literal in query string directly into generate SQL
+    [OPENJPA-2332] - Update message when unable to resolve datasource configuration
+    [OPENJPA-2346] - Optimize MetaDataRepository.getMetaDataInternal
+    [OPENJPA-2347] - Make StateManagerImpl more extensible
+    [OPENJPA-2348] - Cache calculated hashCode in OpenJPAId
+    [OPENJPA-2353] - Reduce object allocations
+    [OPENJPA-2354] - Removed synchronized from enhancer added pcReplaceStateManager method
+
+New Feature
+
+    [OPENJPA-2295] - speed up query metadata lookup
+
+Question
 
-Test
+    [OPENJPA-1532] - Should the <shared-cache-mode> element in a persistence unit definition automatically turn on the data cache?
 
-    [OPENJPA-2169] - TestOracleXmlColumn test failed using Oracle 11.2 driver

Modified: openjpa/branches/2.2.x/openjpa-project/LICENSE
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-project/LICENSE?rev=1466704&r1=1466703&r2=1466704&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-project/LICENSE (original)
+++ openjpa/branches/2.2.x/openjpa-project/LICENSE Wed Apr 10 21:57:05 2013
@@ -201,208 +201,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
-                                 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.
-
 
 ======================================
   LICENSES FOR INCLUDED DEPENDENCIES
@@ -435,118 +233,126 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICE
 
 1. Definitions.
 
-1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications.
+   1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications.
 
-1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+   1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
 
-1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+   1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
 
-1.4. Executable means the Covered Software in any form other than Source Code.
+   1.4. Executable means the Covered Software in any form other than Source Code.
 
-1.5. Initial Developer means the individual or entity that first makes Original Software available under this License.
+   1.5. Initial Developer means the individual or entity that first makes Original Software available under this License.
 
-1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+   1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
 
-1.7. License means this document.
+   1.7. License means this document.
 
-1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+   1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
 
-1.9. Modifications means the Source Code and Executable form of any of the following:
+   1.9. Modifications means the Source Code and Executable form of any of the following:
 
-A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
+        A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
 
-B. Any new file that contains any part of the Original Software or previous Modification; or
+        B. Any new file that contains any part of the Original Software or previous Modification; or
 
-C. Any new file that is contributed or otherwise made available under the terms of this License.
+        C. Any new file that is contributed or otherwise made available under the terms of this License.
 
-1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License.
+   1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License.
 
-1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+   1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
 
-1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+   1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
 
-1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)�the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)�ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+   1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
 
 2. License Grants.
 
-2.1. The Initial Developer Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
-(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
-(d) Notwithstanding Section�2.1(b) above, no patent license is granted: (1)�for code that You delete from the Original Software, or (2)�for infringements caused by: (i)�the modification of the Original Software, or (ii)�the combination of the Original Software with other software or devices.
-
-2.2. Contributor Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1)�Modifications made by that Contributor (or portions thereof); and (2)�the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-(c) The licenses granted in Sections�2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
-(d) Notwithstanding Section�2.2(b) above, no patent license is granted: (1)�for any code that Contributor has deleted from the Contributor Version; (2)�for infringements caused by: (i)�third party modifications of Contributor Version, or (ii)�the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3)�under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+   2.1. The Initial Developer Grant.
 
-3. Distribution Obligations.
+   Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
 
-3.1. Availability of Source Code.
+       (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
 
-Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
+       (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
 
-3.2. Modifications.
+       (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
 
-The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
+       (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
 
-3.3. Required Notices.
-You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
+    2.2. Contributor Grant.
 
-3.4. Application of Additional Terms.
-You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+    Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
 
-3.5. Distribution of Executable Versions.
-You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipients rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+       (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
 
-3.6. Larger Works.
-You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+       (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
 
-4. Versions of the License.
+       (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+
+       (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+      3.1. Availability of Source Code.
+      Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
+
+      3.2. Modifications.
+      The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
 
-4.1. New Versions.
-Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+      3.3. Required Notices.
+      You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
 
-4.2. Effect of New Versions.
+      3.4. Application of Additional Terms.
+      You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients. rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
 
-You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
-4.3. Modified Versions.
+      3.5. Distribution of Executable Versions.
+      You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient.s rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
 
-When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a)�rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b)�otherwise make it clear that the license contains terms which differ from this License.
+      3.6. Larger Works.
+      You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+      4.1. New Versions.
+      Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+
+      4.2. Effect of New Versions.
+      You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
+
+      4.3. Modified Versions.
+      When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
 
 5. DISCLAIMER OF WARRANTY.
 
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+   COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN .AS IS. BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
 
 6. TERMINATION.
 
-6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+      6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
 
-6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as Participant) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections�2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a w
 ritten agreement with Participant.
+      6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as .Participant.) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to 
 a written agreement with Participant.
 
-6.3. In the event of termination under Sections�6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
+      6.3. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
 
 7. LIMITATION OF LIABILITY.
 
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+   UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY.S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
 
 8. U.S. GOVERNMENT END USERS.
 
-The Covered Software is a commercial item, as that term is defined in 48�C.F.R.�2.101 (Oct. 1995), consisting of commercial computer software (as that term is defined at 48 C.F.R. �252.227-7014(a)(1)) and commercial computer software documentation as such terms are used in 48�C.F.R.�12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+   The Covered Software is a .commercial item,. as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of .commercial computer software. (as that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and .commercial computer software documentation. as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
 
 9. MISCELLANEOUS.
 
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdictions conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract 
 shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
+   This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction.s conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys. fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a cont
 ract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
 
 10. RESPONSIBILITY FOR CLAIMS.
 
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+   As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
 
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. 
+   NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+
+   The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
 
 
 serp-1.13.1.jar - BSD License
@@ -578,3 +384,35 @@ ANY THEORY OF LIABILITY, WHETHER IN CONT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+asm-3.2.jar - License
+=====================
+
+Copyright (c) 2000-2011 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

Modified: openjpa/branches/2.2.x/openjpa-project/NOTICE
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-project/NOTICE?rev=1466704&r1=1466703&r2=1466704&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-project/NOTICE (original)
+++ openjpa/branches/2.2.x/openjpa-project/NOTICE Wed Apr 10 21:57:05 2013
@@ -1,8 +1,8 @@
 
 Apache OpenJPA binary assembly
-Copyright 2006-2010 The Apache Software Foundation
+Copyright 2006-2013 The Apache Software Foundation
 
-This product includes software developed at
+This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
 The OpenJPA binary assembly and openjpa-all includes software developed by the:
@@ -17,6 +17,7 @@ The OpenJPA binary assembly and openjpa-
         Java EE Specs - JMS 1.1, JTA 1.1, Bean Validation 1.0 and JPA 2.0
     Apache Incubtor - Bean Validation project
     SERP project
+    OW2 ASM project
 
 
 The following copyright notice(s) were affixed to portions of this code
@@ -37,3 +38,6 @@ OpenJPA includes software written by Mir
 
 OpenJPA uses test code written by Charles Tillman.
 
+OpenJPA includes software developed by OW2 ASM project
+Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved.
+

Modified: openjpa/branches/2.2.x/openjpa-project/RELEASE-NOTES.html
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-project/RELEASE-NOTES.html?rev=1466704&r1=1466703&r2=1466704&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-project/RELEASE-NOTES.html (original)
+++ openjpa/branches/2.2.x/openjpa-project/RELEASE-NOTES.html Wed Apr 10 21:57:05 2013
@@ -17,9 +17,9 @@ specific language governing permissions 
 under the License. 
 --> 
 <html>
-<title>Release Notes for Apache OpenJPA 2.2.1</title>
+<title>Release Notes for Apache OpenJPA 2.2.2</title>
 <body>
-<h1>Release Notes for Apache OpenJPA 2.2.1</h1>
+<h1>Release Notes for Apache OpenJPA 2.2.2</h1>
 <p>
 <ul>
   <li><a href="#Overview">Overview</a></li>
@@ -38,7 +38,7 @@ under the License. 
 
 <P>
    The Apache OpenJPA community is proud to release a maintenance distribution of
-   OpenJPA 2.2.1. This distribution is based on the final JSR 317 Java
+   OpenJPA 2.2.2. This distribution is based on the final JSR 317 Java
    Persistence API, Version 2.0 specification and passes the JPA 2.0 TCK,
    while remaining backwards compatible with prior releases based on the
    Java Persistence API (JPA 1.0) part of Java Community Process JSR-220
@@ -111,7 +111,7 @@ under the License.</p>
 in each release of OpenJPA.</P>
 
 <h2><a name="Notice"></a>Notice</h2>
-<p>Copyright 2006,2012 The Apache Software Foundation
+<p>Copyright 2006,2013 The Apache Software Foundation
 <BR>This product includes software developed at The Apache Software Foundation (http://www.apache.org/).</p>
 <P>Apache OpenJPA includes the persistence and orm schemas from the JPA specifications.
 <BR>Copyright 2005-2009 Sun Microsystems, Inc. All rights reserved.
@@ -127,115 +127,92 @@ in each release of OpenJPA.</P>
 <h2><a name="ReleaseNotes">Release Notes</h2>
 
 <hr>
-<h3><a name="221">OpenJPA 2.2.1</h3>
+<h2><a name="221">OpenJPA 2.2.2</h2>
 
-        Release Notes - OpenJPA - Version 2.2.1
-    
-<h2>        Sub-task
-</h2>
-<ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2168'>OPENJPA-2168</a>] -         Do not go through LifeCycleEventManager overhead if the Entity has declared to be excluded
-</li>
-</ul>
-            
+        Release Notes - OpenJPA - Version 2.2.2
+                
 <h2>        Bug
 </h2>
 <ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2067'>OPENJPA-2067</a>] -         A &#39;length&#39; of &#39;-1&#39; passed to PreparedStatement.setBinaryStream can cause an exception on some, but not all, JDBC drivers.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2072'>OPENJPA-2072</a>] -         InvalidStateException deleting an instance with a timestamp in its primary key
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2095'>OPENJPA-2095</a>] -         Unhandled exception thrown from within an Externalizer method causes incorrect/incomplete SQL to be generated/executed.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2118'>OPENJPA-2118</a>] -         Prepared SQL query does not handle collection-valued parameter where collection is empty
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2123'>OPENJPA-2123</a>] -         Minor performance improvements for Connection and ResultSet processing
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2132'>OPENJPA-2132</a>] -         Traversal of a OneToMany relationship returns an empty list when InheritanceType.JOINED or SINGLE_TABLE is used.
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2133'>OPENJPA-2133</a>] -         OpenJPA doesn&#39;t find custom mappings with an applicable class loader
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2136'>OPENJPA-2136</a>] -         NPE when using LiteAutoDetach 
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2196'>OPENJPA-2196</a>] -         Create Sequence Postgres 9.1
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2142'>OPENJPA-2142</a>] -         Merge of a new object does not handle Entity Id field
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2233'>OPENJPA-2233</a>] -         Failed to invoke pcGetIDOwningClass method on embeddable entity with ID annotation
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2145'>OPENJPA-2145</a>] -         Missing ASM depending jar in binary zip
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2235'>OPENJPA-2235</a>] -         &quot;READ_UNCOMMITTED&quot; setting for the fetch plan isolation level is ignored in DB2Dictionary
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2146'>OPENJPA-2146</a>] -         StateManager for Embeddable may throw Exception while initializing
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2240'>OPENJPA-2240</a>] -         JVMVRFY012 when using openjpa together with hyperjaxb3
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2149'>OPENJPA-2149</a>] -         Criteria.function adds wrong casts to parameters making it unsuable
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2244'>OPENJPA-2244</a>] -         Nested classpath ignored in mapping tool ant task
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2153'>OPENJPA-2153</a>] -         NoSuchMethodException of DBCPDriverDataSource.newInstance()
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2257'>OPENJPA-2257</a>] -         Concurreny in org.apache.openjpa.persistence.EntityManagerImpl.getProperties leads to NullPointer and ConcurrentModificationException
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2154'>OPENJPA-2154</a>] -         test-dynamic-enhancer profile failed for module more than one level deep
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2284'>OPENJPA-2284</a>] -         NPE occurs when &lt;cascade-persist/&gt; is added to a &lt;persistence-unit-defaults&gt; in an orm.
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2156'>OPENJPA-2156</a>] -         Fix bug in org.apache.openjpa.persistence.util.SourceCode to correctly generate imports.
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2285'>OPENJPA-2285</a>] -         L2 cache doesn&#39;t store FK(s) back into the cache when lazy loading data.
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2158'>OPENJPA-2158</a>] -         LiteAutoDetach + DetachProxyFields=false can lead to Broker concurrency exceptions
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2288'>OPENJPA-2288</a>] -         MetaDataRepository should be able to filter classes from other app ClassLoaders in JEE Env
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2161'>OPENJPA-2161</a>] -         Make some members of StateManagerImpl protected to allow for greater extensability
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2289'>OPENJPA-2289</a>] -         Additional SQL alias generated for query with subquery causes incorrect # of rows returned - Oracle only
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2163'>OPENJPA-2163</a>] -         Lifecycle event callback occurs more often than expect
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2298'>OPENJPA-2298</a>] -         VerifyError/Stack underflow due to extra &#39;return&#39; statements generated by PCEnhancer.
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2172'>OPENJPA-2172</a>] -         openjpa-all jar is missing slf4j runtime dependency
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2304'>OPENJPA-2304</a>] -         Thread deadlock in CriteriaBuilder
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2174'>OPENJPA-2174</a>] -         Result set mapping was not looked up when retrieving column data from a NamedNativeQuery
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2320'>OPENJPA-2320</a>] -         CriteriaBuilder predicate construction deadlocks in multi-core VM due to static initializer
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2199'>OPENJPA-2199</a>] -         Constraint violation exception when removing relationship using (orphanRemoval = true)
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2321'>OPENJPA-2321</a>] -         Synchronizing logging output stream causes deadlock when used some JDK LogManger derivative 
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2227'>OPENJPA-2227</a>] -         OpenJPA doesn&#39;t find custom SequenceGenerators
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2326'>OPENJPA-2326</a>] -         Updates in TCK execution configuration
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2230'>OPENJPA-2230</a>] -         Event Listener detection didn&#39;t work with MappedSuperClasses or Entity heirarchies
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2236'>OPENJPA-2236</a>] -         Trace of connection info can cause class transform/enhancement to fail
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2247'>OPENJPA-2247</a>] -         JoinColumn annotation is ignored when mapping a unidirectional owned OneToOne that is in a SecondaryTable
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2260'>OPENJPA-2260</a>] -         Parenthesis-augmented parameters are improperly processed at EM level
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2261'>OPENJPA-2261</a>] -         Query SQL Cache issue with NULL parameters
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2334'>OPENJPA-2334</a>] -         OpenJPA must support processing puRoot &amp; jar-file URLs as jar-formatted InputStreams
 </li>
 </ul>
-            
+                
 <h2>        Improvement
 </h2>
 <ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2134'>OPENJPA-2134</a>] -         Do not close Connections when ConnectionRetainMode is set to &quot;always&quot;
-</li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2137'>OPENJPA-2137</a>] -         Make some members of StateManagerImpl protected to allow for greater extensibility
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2264'>OPENJPA-2264</a>] -         Upcast PreparedStatementManagerImpl.logSQLWarnings to take a Statement rather than a PreparedStatement
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2143'>OPENJPA-2143</a>] -         Reduce lock contention on LifecycleEventManager
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2292'>OPENJPA-2292</a>] -         Reduce object allocations
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2151'>OPENJPA-2151</a>] -         Improve the performance of StateManagerImpl.initialize 
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2293'>OPENJPA-2293</a>] -         Reduce LifecycleEventManager 
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2152'>OPENJPA-2152</a>] -         Don&#39;t process query hints when LockModeType == NONE
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2324'>OPENJPA-2324</a>] -         Option to express literal in query string directly into generate SQL
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2159'>OPENJPA-2159</a>] -         Add support for no rounding of Date
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2332'>OPENJPA-2332</a>] -         Update message when unable to resolve datasource configuration
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2162'>OPENJPA-2162</a>] -         Avoid delimited identifier processing if it&#39;s not required by application
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2346'>OPENJPA-2346</a>] -         Optimize MetaDataRepository.getMetaDataInternal
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2164'>OPENJPA-2164</a>] -         Don&#39;t setPCState if field requested is already loaded
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2347'>OPENJPA-2347</a>] -         Make StateManagerImpl more extensible
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2167'>OPENJPA-2167</a>] -         Misc changes to improve flush() path performance
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2348'>OPENJPA-2348</a>] -         Cache calculated hashCode in OpenJPAId
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2189'>OPENJPA-2189</a>] -         Update OpenBooks example to build, install, and execute in the WAS Liberty Profile
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2353'>OPENJPA-2353</a>] -         Reduce object allocations
 </li>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2208'>OPENJPA-2208</a>] -         Add additional Java 2 Security doPriv function
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2354'>OPENJPA-2354</a>] -         Removed synchronized from enhancer added pcReplaceStateManager method
 </li>
 </ul>
-                                        
-<h2>        Test
+    
+<h2>        New Feature
 </h2>
 <ul>
-<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2169'>OPENJPA-2169</a>] -         TestOracleXmlColumn test failed using Oracle 11.2 driver
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-2295'>OPENJPA-2295</a>] -         speed up query metadata lookup
 </li>
 </ul>
         
+<h2>        Question
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/OPENJPA-1532'>OPENJPA-1532</a>] -         Should the &lt;shared-cache-mode&gt; element in a persistence unit definition automatically turn on the data cache?
+</li>
+</ul>
+
 <BR>
 <hr>
 <h2><a name="Previous"></a>Previous Releases</h2>
 <p>Release notes for earlier releases of OpenJPA may be found in SVN at the following locations. 
 <ul>
+  <li><a href='http://svn.apache.org/viewvc/openjpa/tags/2.2.1/openjpa-project/RELEASE-NOTES.html?view=co'>OpenJPA 2.2.1 RELEASE-NOTES.html</a></li>
   <li><a href='http://svn.apache.org/viewvc/openjpa/tags/2.2.0/openjpa-project/RELEASE-NOTES.html?view=co'>OpenJPA 2.2.0 RELEASE-NOTES.html</a></li>
   <li><a href='http://svn.apache.org/viewvc/openjpa/tags/2.1.1/openjpa-project/RELEASE-NOTES.html?view=co'>OpenJPA 2.1.1 RELEASE-NOTES.html</a></li>
   <li><a href='http://svn.apache.org/viewvc/openjpa/tags/2.1.0/openjpa-project/RELEASE-NOTES.html?view=co'>OpenJPA 2.1.0 RELEASE-NOTES.html</a></li>
@@ -254,7 +231,7 @@ in each release of OpenJPA.</P>
 </ul></p>
  
 <hr>
-<p>Copyright (C) 2006,2012 Apache Software Foundation. Licensed under Apache License 2.0.<br>
+<p>Copyright (C) 2006,2013 Apache Software Foundation. Licensed under Apache License 2.0.<br>
 Apache, the Apache feather logo and OpenJPA are trademarks of Apache Software Foundation.<br>
 </body>
 </html>



Mime
View raw message