svn commit: r1631860 - in /openjpa/trunk: ./ openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/

[hthomann]

Author: hthomann
Date: Tue Oct 14 19:57:44 2014
New Revision: 1631860

URL: http://svn.apache.org/r1631860
Log:
OPENJPA-2535: Fixed issue with DBCS characters in identifiers - merged from 
2.2.x commit.

Added:
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/
      - copied from r1631786, 
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/MyDBCSEntity.java
      - copied unchanged from r1631786, 
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/MyDBCSEntity.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/TestDBCS.java
      - copied unchanged from r1631786, 
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/dbcs/TestDBCS.java
Modified:
    openjpa/trunk/   (props changed)
    
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java

Propchange: openjpa/trunk/
------------------------------------------------------------------------------
  Merged /openjpa/branches/2.2.x:r1631786

Modified: 
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java?rev=1631860&r1=1631859&r2=1631860&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java
 (original)
+++ 
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierRule.java
 Tue Oct 14 19:57:44 2014
@@ -176,7 +176,7 @@ public class IdentifierRule {
         // Assert identifier begins with a letter
         char[] chars = identifier.toCharArray();
         if (isMustBeginWithLetter()) {
-            if (!CharUtils.isAsciiAlpha(chars[0])) {
+            if (!Character.isJavaIdentifierStart(chars[0])) {
                 return true;
             }
         }
@@ -184,7 +184,7 @@ public class IdentifierRule {
         // Iterate through chars, asserting delimiting rules 
         for (char ch : chars) {
             if (isOnlyLettersDigitsUnderscores()) {
-                if (!CharUtils.isAsciiAlphanumeric(ch) && !(ch == UNDERSCORE)) 
{
+                if (!Character.isJavaIdentifierPart(ch) && !(ch == 
UNDERSCORE)) {
                     return true;
                 }
             }