Removed JPA integration.

build.gradle

@@ -179,23 +179,8 @@ task copyCompileDeps(type: Copy) {
 	into "${buildDir}/deps"
 }
 
-task enhance {
-	doLast {
-	    ant.taskdef(
-	    name      : 'openjpaenhancer',
-	    classpath : sourceSets.modules.compileClasspath.asPath,
-	    classname : 'org.apache.openjpa.ant.PCEnhancerTask'
-	    )
-
-	    ant.openjpaenhancer(classpath : sourceSets.modules.compileClasspath.asPath){
-	        fileset(dir: "${sourceSets.main.output.classesDir}/org/opencms/db/jpa/persistence"){ exclude(name: '*$*.class') }
-	        config(propertiesFile: "${projectDir}/webapp/WEB-INF/classes/META-INF/persistence.xml")
-	    }
-    }
-}
 
 jar {
-    it.dependsOn enhance
     manifest {
         attributes 'Implementation-Title': 'Alkacon OpenCms',
         'Implementation-Version': version,

dependencies.gradle

@@ -79,7 +79,6 @@ dependencies {
     distribution group: 'commons-io', name: 'commons-io', version: '2.4'
     distribution group: 'commons-lang', name: 'commons-lang', version: '2.6'
     distribution group: 'commons-logging', name: 'commons-logging', version: '1.1.3'
-    distribution group: 'commons-pool', name: 'commons-pool', version: '1.5.5'
     distribution group: 'javax.activation', name: 'activation', version: '1.1.1'
     distribution group: 'javax.annotation', name: 'jsr250-api', version: '1.0'
     distribution group: 'javax.jws', name: 'jsr181-api', version: '1.0-MR1'
@@ -92,8 +91,6 @@ dependencies {
     distribution group: 'joda-time', name: 'joda-time', version: '2.3'
     distribution group: 'log4j', name: 'log4j', version: '1.2.17'
     distribution group: 'net.arnx', name: 'jsonic', version: '1.2.7'
-    distribution group: 'net.sf.ehcache', name: 'ehcache-core', version: '2.4.7'
-    distribution group: 'net.sf.ehcache', name: 'ehcache-openjpa', version: '0.2.0'
     distribution group: 'net.sf.opencsv', name: 'opencsv', version: '2.3'
     distribution group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: '1.9.19'
     distribution group: 'net.sourceforge.serp', name: 'serp', version: '1.13.1'
@@ -109,7 +106,6 @@ dependencies {
     distribution group: 'org.apache.commons', name: 'commons-compress', version: '1.3'
     distribution group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'
     distribution group: 'org.apache.geronimo.specs', name: 'geronimo-jms_1.1_spec', version: '1.1.1'
-    distribution group: 'org.apache.geronimo.specs', name: 'geronimo-jpa_2.0_spec', version: '1.1'
     distribution group: 'org.apache.geronimo.specs', name: 'geronimo-jta_1.1_spec', version: '1.1.1'
     distribution group: 'org.apache.geronimo.specs', name: 'geronimo-validation_1.0_spec', version: '1.1'
     distribution group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.2'
@@ -127,8 +123,6 @@ dependencies {
     distribution group: 'org.apache.lucene', name: 'lucene-suggest', version: '5.5.3'
     distribution group: 'org.apache.lucene', name: 'lucene-join', version: '5.5.3'
     distribution group: 'org.apache.lucene', name: 'lucene-backward-codecs', version: '5.5.3'
-    distribution group: 'org.apache.openjpa', name: 'openjpa', version: '2.4.0'
-    distribution group: 'org.apache.xbean', name: 'xbean-asm5-shaded', version: '3.17'
     distribution group: 'org.apache.pdfbox', name: 'fontbox', version: '1.7.1'
     distribution group: 'org.apache.pdfbox', name: 'pdfbox', version: '1.7.1'
     distribution group: 'org.apache.poi', name: 'poi', version: '3.8'

modules/org.opencms.locale.cs/resources/system/workplace/locales/cs/messages/org/opencms/db/generic/messages_cs.properties

@@ -87,5 +87,4 @@ RPT_PUBLISH_FOLDERS_END_0=... ukon\u010den\u00ed publikace slo\u017eek
 RPT_PUBLISH_FOLDER_0=Publikov\u00e1n\u00ed slo\u017eky
 RPT_PUBLISH_STAT_4=Statistika: publikov\u00e1no soubor\u016f: {0}, publikov\u00e1no slo\u017eek {1}, smazan\u00e9 slo\u017eky {2}, doba trv\u00e1n\u00ed: {3}
 
-ERR_JPA_PERSITENCE_1=Runtime chyba v JPA vrstv\u011b: {0}
 ERR_SQLMANAGER_NOT_INITIALIZED_0=Chyba - SQL Manager nen\u00ed inicializov\u00e1n.

modules/org.opencms.locale.da/resources/system/workplace/locales/da/messages/org/opencms/db/generic/messages_da.properties

@@ -66,7 +66,6 @@
 #ERR_DELETE_HISTORY_VERSIONS_1               =Fehler beim Löschen der Backup Versionen der Ressource "{0}".
 #ERR_READING_ADDITIONAL_INFO_1				=Fehler beim Lesen der zusätzlichen Informationen für den Benutzer "{0}".
 #ERR_SQLMANAGER_NOT_INITIALIZED_0            =Der SQL Manager wurde noch nicht initialisiert.
-#ERR_JPA_PERSITENCE_1                        =Es ist ein JPA Laufzeit Fehler aufgetreten {0}
 
 RPT_DELETE_FILE_0                           =Sletter fil
 RPT_DELETE_FOLDER_0                         =Sletter mappe

modules/org.opencms.locale.de/resources/system/workplace/locales/de/messages/org/opencms/db/generic/messages_de.properties

@@ -66,7 +66,6 @@ ERR_JDBC_CONN_INVALID_PROJECT_ID_1          =JDBC-Connection gab nicht unterst
 ERR_DELETE_HISTORY_VERSIONS_1               =Fehler beim Löschen der Backup-Versionen der Ressource "{0}".
 ERR_READING_ADDITIONAL_INFO_1				=Fehler beim Lesen der zusätzlichen Informationen für den Benutzer "{0}".
 ERR_SQLMANAGER_NOT_INITIALIZED_0            =Der SQL-Manager wurde noch nicht initialisiert.
-ERR_JPA_PERSITENCE_1                        =Es ist ein JPA-Laufzeit-Fehler aufgetreten {0}
 
 RPT_DELETE_FOLDER_0                         =Lösche Ordner
 RPT_DELETE_FILE_0                           =Lösche Datei

modules/org.opencms.locale.it/resources/system/workplace/locales/it/messages/org/opencms/db/generic/messages_it.properties

@@ -18,7 +18,6 @@ ERR_INITIALIZING_VFS_DRIVER_0		=Errore critico durante l\u2019inizializzazione d
 ERR_INVALID_DELETE_OPTION_1		=Opzione di cancellazione non valida \u201C{0}\u201D.
 ERR_INVALID_RESOURCE_LENGTH_2		=La lunghezza {0} non è valida per la risorsa \u201C{1}\u201D.
 ERR_JDBC_CONN_INVALID_PROJECT_ID_1	=Il progetto con ID \u201C{0}\u201D non è supportato per restituire una connessione JDBC.
-ERR_JPA_PERSITENCE_1                        =Errore durante l\u2019esecuzione del layer JPA: {0}
 ERR_NO_ACE_FOUND_2			=Regola di controllo accesso non trovata per la risorsa con ID {0} e \u201Cprincipal id\u201D {1}.
 ERR_NO_GROUP_WITH_ID_1			=Non è stato trovato nessun gruppo con ID {0}.
 ERR_NO_HISTORY_PROJECT_WITH_ID_1	=Non è stato trovato nessun progetto storico con ID {0}.

modules/org.opencms.locale.ja/resources/system/workplace/locales/ja/messages/org/opencms/db/jpa/messages_ja.properties

@@ -2,7 +2,6 @@
 GUI_DEFAULTUSER_ROOT_DELETED_DESCRIPTION_0=\u30AC\u30D9\u30FC\u30B8\u30B3\u30EC\u30AF\u30BF\u30E6\u30FC\u30B6\u30FC
 LOG_DBG_CLEAR_LOCKS_1=Cleared {0} old locks in database.
 INIT_DIGEST_ALGORITHM_1=. Digest configured    \: {0}
-ERROR_JPA_PERSITENCE=JPA Layer\: Runtime error "{0}".
 ERR_READ_DELETED_RESOURCE_1=Failed to read deleted resource "{0}", because it is not allowed to read deleted resources.
 ERR_QUERY_NOT_FOUND_1=The SQL query "{0}" could not be found.
 ERR_ERROR_PUBLISHING_FILE_1=Error publishing file "{0}". 

modules/org.opencms.locale.ru/resources/system/workplace/locales/ru/messages/org/opencms/db/generic/messages_ru.properties

@@ -39,7 +39,6 @@ ERR_INVALID_RESOURCE_LENGTH_2 = \u041D\u0435\u043A\u043E\u0440\u0440\u0435\u043A
 
 ERR_JDBC_CONN_INVALID_PROJECT_ID_1 = \u041D\u0435\u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u044B\u0435\u043C\u044B\u0439 ID \u043F\u0440\u043E\u0435\u043A\u0442\u0430 "{0}" \u0434\u043B\u044F \u0432\u043E\u0437\u0432\u0440\u0430\u0442\u0430 JDBC-\u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F.
 
-ERR_JPA_PERSITENCE_1 = \u0414\u0438\u043D\u0430\u043C\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u043E\u0448\u0438\u0431\u043A\u0430 \u0432 JPA-\u0441\u043B\u043E\u0435: {0}
 
 ERR_NO_ACE_FOUND_2 = \u0417\u0430\u043F\u0438\u0441\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043A \u043A\u043E\u043D\u0442\u0440\u043E\u043B\u044F \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430 \u0434\u043B\u044F \u0440\u0435\u0441\u0443\u0440\u0441\u0430 \u0441 id {0} \u0438 \u043E\u0441\u043D\u043E\u0432\u043D\u043E\u0439 \u0432\u0435\u0440\u0441\u0438\u0438 \u0441 id {1}. 
 

modules/org.opencms.locale.ru/resources/system/workplace/locales/ru/messages/org/opencms/db/jpa/messages_ru.properties

@@ -1,5 +1,5 @@
 
-ERROR_JPA_PERSITENCE = JPA: \u041E\u0448\u0438\u0431\u043A\u0430 \u0432 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F "{0}".
+
 
 ERR_COUNTING_PROPERTIES_1 = \u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u043E\u0434\u0441\u0447\u0435\u0442\u0430 \u0441\u0432\u043E\u0439\u0441\u0442\u0432 \u0434\u043B\u044F \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u0438\u044F "{0}".
 

modules/org.opencms.locale.zh/resources/system/workplace/locales/zh/messages/org/opencms/db/generic/messages_zh.properties

@@ -123,7 +123,6 @@ LOG_WRITING_PUBLISHING_HISTORY_1=\u4E3A\u201C{0}\u201D\u5199\u5165\u5386\u53F2\u
 LOG_DEL_FILE_3=( {0} / {1} )\u6B63\u5728\u5220\u9664\u6587\u4EF6\u201C{2}\u201D
 ERR_SQLMANAGER_NOT_INITIALIZED_0=\u9519\u8BEF\uFF1ASQL \u7BA1\u7406\u5668\u672A\u521D\u59CB\u5316\u3002
 ERR_INVALID_RESOURCE_LENGTH_2=\u8D44\u6E90\u201C{1}\u201D\u7684\u957F\u5EA6\u201C{0}\u201D\u65E0\u6548\u3002
-ERR_JPA_PERSITENCE_1=\u5728JPA\u5C42{0}\u53D1\u751F\u8FD0\u884C\u65F6\u9519\u8BEF
 LOG_REMOVING_SUBSCRIPTIONS_1=\u79FB\u9664\u201C{0}\u201D\u7684\u8BA2\u9605\u65F6\u51FA\u9519\u3002
 RPT_DELETE_FOLDER_0=\u5220\u9664\u6587\u4EF6\u5939\u3002
 ERR_WRITING_TO_OUTPUT_STREAM_1=\u5199\u5165\u6570\u636E\u5230\u8F93\u51FA\u6D41\u201C{0}\u201D\u65F6\u51FA\u9519\u3002

src-setup/org/opencms/setup/CmsAutoSetup.java

@@ -268,11 +268,7 @@ public void run() throws Exception {
             if (dbExists && m_props.isCreateTables() && !m_props.isDropDb() && (db != null)) {
                 throw new Exception("You have selected to not drop existing DBs, but a DB with the given name exists.");
             }
-            if (dbExists
-                && m_props.isCreateDb()
-                && m_props.isDropDb()
-                && (db != null)
-                && (!CmsSetupBean.JPA_PROVIDER.equals(m_props.getDbProvider()))) {
+            if (dbExists && m_props.isCreateDb() && m_props.isDropDb() && (db != null)) {
                 // drop the DB
                 db.closeConnection();
                 db.setConnection(
@@ -293,7 +289,7 @@ public void run() throws Exception {
                 System.out.println("Database dropped successfully.");
             }
 
-            if (m_props.isCreateDb() && (db != null) && (!CmsSetupBean.JPA_PROVIDER.equals(m_props.getDbProvider()))) {
+            if (m_props.isCreateDb() && (db != null)) {
                 // Create Database
                 db.createDatabase(m_bean.getDatabase(), m_bean.getReplacer());
                 if (!db.noErrors()) {

src-setup/org/opencms/setup/CmsAutoSetupProperties.java

@@ -96,7 +96,7 @@ public final class CmsAutoSetupProperties {
     /** The property key <code>db.product</code> for specifying the used DBMS. Values should match the folders under the OpenCms webapp's folder <code>setup/database/</code>. */
     public static final String PROP_DB_PRODUCT = "db.product";
 
-    /** The property key <code>db.provider</code> for specifying the database provider. This either <code>jpa</code> or the DBMS' product name. <P>
+    /** The property key <code>db.provider</code> for specifying the database provider. <P>
      * Hint: The available providers are defined as constants in {@link org.opencms.setup.CmsSetupBean}. */
     public static final String PROP_DB_PROVIDER = "db.provider";