diff -urN opencms_7.0.5_src/build.xml trunk/build.xml
--- opencms_7.0.5_src/build.xml	2008-07-02 10:59:12.000000000 +0300
+++ trunk/build.xml	2008-09-02 11:15:19.579884646 +0300
@@ -43,6 +43,8 @@
     
     <property environment="env" />
 	
+	<property name="should.enhanced"					value="1" />
+
 	<!-- comma separated list of jar archives to be removed during update -->
 	<property name="updater.jars.remove"				value="alkacon-diff-0.9.1.jar,commons-collections-3.1.jar,commons-dbcp-1.2.1.jar,commons-digester-1.7.jar,commons-logging-1.0.4.jar,commons-pool-1.2.jar,htmlparser-1.5-20050925.jar,jaxen-1.1-beta-4.jar,jstl-1.0.6.jar,jug-1.1.jar,jug-1.1.1.jar,jug-1.1.2.jar,log4j-1.2.9.jar,lucene-analyzers-1.9.1.jar,lucene-core-1.9.1.jar,lucene-analyzers-2.1.0.jar,lucene-core-2.1.0.jar,lucene-highlighter-2.1.0.jar,lucene-snowball-2.1.0.jar,lucene-analyzers-2.2.0.jar,lucene-core-2.2.0.jar,lucene-highlighter-2.2.0.jar,lucene-snowball-2.2.0.jar,mysql-connector-java-3.1.12-bin.jar,mysql-connector-java-5.0.5-bin.jar,quartz-1.4.5.jar,standard-1.0.6.jar,xercesImpl-2.6.2.jar,xml-apis-2.6.2.jar,alkacon-simapi-0.9.2.jar,alkacon-simapi-0.9.3.jar,alkacon-simapi-0.9.4.jar,alkacon-simapi-0.9.5.jar,alkacon-simapi-0.9.6.jar,jtidy-r8-05102004.jar,postgresql-8.32-505.jdbc3.jar" />
 	<!-- comma separated list of files in WEB-INF/ to be updated -->
@@ -131,6 +133,35 @@
        		<!-- compilerarg value="-Xlint:unchecked"/ -->
        	</javac>
 		
+    	<taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
+    		<classpath>
+    			<fileset dir="${opencms.input.libs.compile}">
+    				<include name="**/*.jar"/>
+    			</fileset>
+    			<fileset dir="${opencms.input.libs.runtime}">
+    				<include name="**/*.jar"/>
+    			</fileset>
+    				</classpath>
+    			</taskdef>
+
+    			<!-- invoke OpenJPA enhancer on all .class files below the persistence directory -->
+    			<if>
+    	        <equals arg1="${should.enhanced}" arg2="1" />
+    	        <then>
+    	        <echo message="Enhancing entity classes !!!"/>
+    			<openjpac>
+    				<fileset dir="${opencms.output.classes}/org/opencms/db/jpa/persistence">
+    					<include name="*.class" />
+    					<exclude name="*$*.class" />
+    				</fileset>
+    				<classpath>
+    					<pathelement location="${opencms.output.classes}" />
+    				</classpath>
+    				<config propertiesFile="${opencms.input}/webapp/WEB-INF/classes/META-INF/persistence.xml" />
+    			</openjpac>
+    	        </then>
+    			</if>
+    	
         <copy todir="${opencms.output.classes}">
             <fileset dir="${opencms.input}/src" includes="**/*.properties,**/*.txt,**/*.xml,**/*.xsd,**/*.dtd,**/*.sql" excludes="${excludes}"/>
         </copy>              
@@ -480,7 +511,7 @@
 
     </target>
 		
-    <target name="compile-tests" depends="setup-jar" description="Compile the OpenCms test classes">
+    <target name="compile-tests" description="Compile the OpenCms test classes">
     	
         <mkdir dir="${opencms.output.tests}" />    	
     	
@@ -510,7 +541,7 @@
        	</javac>
 		
         <copy todir="${opencms.output.tests}">
-            <fileset dir="${opencms.input}/test" includes="**/*.properties,**/*.txt,**/*.xml,**/*.xsd,**/*.dtd" excludes="${excludes},**/data/**"/>
+            <fileset dir="${opencms.input}/test" excludes="${excludes},**/data/**, **/*.java"/>
         </copy>
     	
         <mkdir dir="${opencms.output.tests}/../webapp/" />      	
@@ -590,6 +621,32 @@
 			<test name="org.opencms.test.AllTests" />			
 		</junit>
 	</target>
+
+    <target name="single-unittests" depends="compile-tests"
+		description="Runs the core Junit test cases">
+		
+		<junit showoutput="yes" printsummary="yes" fork="yes" haltonfailure="no" haltonerror="no">
+			<classpath>
+				<pathelement path="${opencms.output.tests}"/>
+        	    <fileset dir="${opencms.output}/build">
+	       	        <include name="**/*.jar"/>
+	       	    </fileset>
+        	    <fileset dir="${opencms.input.libs.compile}">
+	       	        <include name="**/*.jar"/>
+	       	    </fileset>
+	     	    <fileset dir="${opencms.input.libs.runtime}">
+	     	        <include name="**/*.jar"/>
+	     	    </fileset>
+	       	    <fileset dir="${opencms.input.libs.db.base}">
+	       	        <include name="**/*.jar"/>
+	       	    </fileset>
+	       	</classpath>
+			
+			<formatter type="plain" />
+			
+			<test name="org.opencms.${test}.AllTests" />			
+		</junit>
+	</target>
 
     <property name="signjar.storepass" value="secret" />
 
diff -urN opencms_7.0.5_src/modules/build.xml trunk/modules/build.xml
--- opencms_7.0.5_src/modules/build.xml	2007-09-12 13:31:04.000000000 +0300
+++ trunk/modules/build.xml	2008-06-10 18:51:57.000000000 +0300
@@ -10,7 +10,9 @@
     <property name="opencms.input.libs.compile"			location="${opencms.input}/lib/compile" />
     <property name="opencms.output.distfiles"           location="${opencms.output}/zip" />    
     <property name="excludes"                  			value="**/CVS/*,**/.cvsignore,**/.nbattrs,**/.project,**/.classpath" />
-    <property name="java.target.version"                value="1.5" />    
+    <property name="java.target.version"                value="1.5" />
+	
+	<property name="should.enhanced"						value="0" />
 	<!-- 
 		Set/Override this property to one of the following values: 
 		- interactive: interactive GUI based module selection.
diff -urN opencms_7.0.5_src/src/org/opencms/configuration/CmsPersistenceUnitConfigurator.java trunk/src/org/opencms/configuration/CmsPersistenceUnitConfigurator.java
--- opencms_7.0.5_src/src/org/opencms/configuration/CmsPersistenceUnitConfigurator.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/configuration/CmsPersistenceUnitConfigurator.java	2008-09-02 11:14:34.011886152 +0300
@@ -0,0 +1,271 @@
+package org.opencms.configuration;
+import java.io.File;
+import java.util.Properties;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.commons.lang.StringUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+/*
+ * This class allow to be managed (reading and writing) JPA 
+ * persistence.xml configuration file. 
+ */
+
+public class CmsPersistenceUnitConfigurator {
+	
+	/** Tag constant */
+	public static final String TAG_PERSISTENCE_UNIT = "persistence-unit" ;
+	
+	/** Tag constant */
+	public static final String TAG_PROPERTIES = "properties" ;
+	
+	/** Tag constant */
+	public static final String TAG_PROPERTY = "property" ;
+	
+	/** Attribute name for attribute "name" of property */
+	public static final String ATTR_NAME="name" ;
+	
+	/** Attribute name for attribute "value" of property */
+	public static final String ATTR_VALUE = "value" ;
+	
+	/** Attribute name for connection settings for Apache OpenJPA & DBCP */
+	public static final String ATTR_CONNECTION_PROPERTIES = "openjpa.ConnectionProperties" ;
+	
+	public static final String ATTR_GENERATE_SCHEMA = "openjpa.jdbc.SynchronizeMappings" ;
+	
+	public static final String ATTR_GENERATE_SCHEMA_VALUE ="buildSchema(ForeignKeys=true)" ;
+	
+	/** Place holder for JDBC URL */
+	public static final String PLACEHOLDER_JDBC_URL = "__jdbcUrl__" ;
+	
+	/** Place holder for JDBC driver class name */
+	public static final String PLACEHOLDER_JDBC_DRIVER_NAME = "__driverName__" ;
+	
+	/** Place holder for database user name */
+	public static final String PLACEHOLDER_USER_NAME = "__userName__" ;
+	
+	/** Place holder for database user password */
+	public static final String PLACEHOLDER_USER_PASSWORD = "__userPassword__" ;
+	
+	/** Configuration file name (usually it's persistence.xml file)*/
+	private String m_fileName ;
+	
+	/** Persistence unit name to be configured*/
+	private String m_persistenceUnitName ;
+	
+	/** DOM document*/
+	private Document m_document ;
+	
+	/** DOM element represents persistence node/element */
+	private Element m_persistenceUnit ;
+	
+	private Element m_propertiesElement ;
+	
+	/** List of nodes/elements with specific configuration parameters for particular JPA implementation */
+	NodeList m_properties ;
+	
+
+	/**
+	 * Public constructor which initialize the object
+	 * @param unitName - persistence unit name to be managed 
+	 * @param fileName - configuration file name 
+	 */
+	public CmsPersistenceUnitConfigurator(String unitName, String fileName){
+		m_fileName = new String(fileName) ;
+		m_persistenceUnitName = unitName ;
+		m_document = readDocument(m_fileName) ;
+		m_persistenceUnit = getPersistenceUnit(m_document.getDocumentElement()) ;
+		m_propertiesElement = 
+			(Element) m_persistenceUnit.getElementsByTagName(TAG_PROPERTIES).item(0) ;
+		refreshProperties() ;
+	}
+	
+
+	/**
+	 * Reads property value with given attribute name
+	 * @param name - value of attribute name of given property 
+	 * @return String representation of the value property or null value if that property does not exist.
+	 */
+	public String getPropertyValue(String name){
+		String value = null ;
+		Element el = null;
+		for(int i=0 ; i < m_properties.getLength() ; i++){
+			el = (Element) m_properties.item(i) ;
+			if(name.equalsIgnoreCase(el.getAttribute(ATTR_NAME))){
+				value = el.getAttribute(ATTR_VALUE) ;
+			}
+		}
+		return value;
+	}
+	
+	
+	/**
+	 * Sets property value with given name and value. 
+	 * @param name - value of the name attribute
+	 * @param value - value of the value attribute
+	 */
+	public void setPropertyValue(String name, String value){
+		boolean exist = false ; 
+		
+		Element el = null;
+		for(int i=0 ; i < m_properties.getLength() ; i++){
+			el = (Element) m_properties.item(i) ;
+			if(name.equalsIgnoreCase(el.getAttribute(ATTR_NAME))){
+				el.setAttribute(ATTR_VALUE, value) ;
+				exist = true ;
+				break;
+			}
+		}
+		
+		if(!exist){
+			addProperty(name, value) ;
+		}
+	}
+	
+	/**
+	 * Removes property with given name. 
+	 * @param name - value of the name attribute
+	 */
+	public void removeProperty(String name){
+		Element el = null;
+		for(int i=0 ; i < m_properties.getLength() ; i++){
+			el = (Element) m_properties.item(i) ;
+			if(name.equalsIgnoreCase(el.getAttribute(ATTR_NAME))){
+				m_propertiesElement.removeChild(el) ;
+				break ;
+			}
+		}
+		refreshProperties() ;
+	}
+	
+	private void addProperty(String name, String value){
+		Element el = m_document.createElement(TAG_PROPERTY) ;
+		el.setAttribute(ATTR_NAME, name) ;
+		el.setAttribute(ATTR_VALUE, value) ;
+		m_propertiesElement.appendChild(el) ;
+		refreshProperties(); 
+	}
+	
+	/**
+	 * Reads the configuration file. 
+	 * @param fileName - file name
+	 * @return - DOM model of configuration file
+	 */
+	private Document readDocument(String fileName){
+		Document doc = null;
+		try{
+			DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder() ;
+			File f = new File(fileName) ;
+			doc = builder.parse(f) ;
+		} catch(Exception e){
+			e.printStackTrace() ;
+		}
+		return doc ;
+	}
+		
+	
+	/**
+	 * Returns DOM element of persistence unit with name represents by m_persistenceUnitName
+	 * @param DOM document root element of xml document
+	 * @return Element for given name or null value if it does not exist.
+	 */
+	private Element getPersistenceUnit(Element e){
+		NodeList list = e.getElementsByTagName(TAG_PERSISTENCE_UNIT) ;
+		Element el = null ;
+		for(int i=0 ; i < list.getLength() ; i++){
+			el = (Element) list.item(i) ;
+			if(m_persistenceUnitName.equalsIgnoreCase(el.getAttribute(ATTR_NAME))){
+				break ;
+			}
+		}
+		return el ;
+	}
+	
+	
+	/**
+	 * Refresh list with all properties for particular persistence unit
+	 * @param el - root element for these properties
+	 * @return - list with properties
+	 */
+	private void refreshProperties(){
+		m_properties =  m_propertiesElement.getElementsByTagName(TAG_PROPERTY) ;
+	}
+	
+	
+	/**
+	 * Save the configuration to file.
+	 * @param fileName - file name
+	 */
+	public void save(String fileName){
+		try{
+			Transformer transformer = TransformerFactory.newInstance().newTransformer() ;
+			DOMSource source = new DOMSource(m_document) ;
+			File file = new File(fileName) ;
+			StreamResult result = new StreamResult(file) ;
+			transformer.transform(source, result);
+		} catch(Exception e){
+			e.printStackTrace() ;
+		}
+	}
+	
+	/**
+	 * Replace value of the element with given search pattern and value to be replaced with.  
+	 * @param propertyName - property's attribute name
+	 * @param searchString - string to be replaced
+	 * @param replaceString - value to be replaced with.
+	 */
+	public void replace(String propertyName, String searchString, String replaceString){
+		String value = getPropertyValue(propertyName) ;
+		value = StringUtils.replace(value, searchString, replaceString) ;
+		setPropertyValue(propertyName, value) ;
+	}
+	
+	/**
+	 * Method which replace defined place holders with given values.
+	 * @param jdbcDriver - JDBC driver name
+	 * @param jdbcUrl - JDBC URL
+	 * @param userName - database user name
+	 * @param userPassword - database user password
+	 */
+	public void setUpConfiguration(String jdbcDriver, String jdbcUrl, String userName, String userPassword){
+		replace(ATTR_CONNECTION_PROPERTIES, PLACEHOLDER_JDBC_DRIVER_NAME, jdbcDriver) ;
+		replace(ATTR_CONNECTION_PROPERTIES, PLACEHOLDER_JDBC_URL, jdbcUrl) ;
+		replace(ATTR_CONNECTION_PROPERTIES, PLACEHOLDER_USER_NAME, userName) ;
+		replace(ATTR_CONNECTION_PROPERTIES, PLACEHOLDER_USER_PASSWORD, userPassword) ;
+	}
+	
+	/**
+	 * Save configuration to original file.
+	 */
+	public void save(){
+		save(m_fileName) ;
+	}
+	
+	/** 
+	 * Returns JPA configuration parameters. 
+	 * @return - properties with configuration parameter
+	 */
+	public Properties getProperties(){
+		Properties props = new Properties() ;
+		Element el ;
+		String propName ;
+		String propValue ;
+		for(int i=0 ; i < m_properties.getLength() ; i++){
+			el = (Element) m_properties.item(i) ;
+			propName = el.getAttribute(ATTR_NAME) ;
+			propValue = el.getAttribute(ATTR_VALUE) ;
+			props.setProperty(propName, propValue) ;
+		}
+		
+		return props ;
+	}
+	
+}
diff -urN opencms_7.0.5_src/src/org/opencms/db/CmsDbContextFactory.java trunk/src/org/opencms/db/CmsDbContextFactory.java
--- opencms_7.0.5_src/src/org/opencms/db/CmsDbContextFactory.java	2008-03-01 10:32:20.000000000 +0200
+++ trunk/src/org/opencms/db/CmsDbContextFactory.java	2008-09-02 11:14:29.391885482 +0300
@@ -44,12 +44,21 @@
  */
 public class CmsDbContextFactory implements I_CmsDbContextFactory {
 
+	/** JPA driver compatibility */
+	private boolean m_supportsJpa ;
+	
+	public CmsDbContextFactory(){
+		m_supportsJpa = false ;
+	}
+	
     /**
      * @see org.opencms.db.I_CmsDbContextFactory#getDbContext()
      */
     public CmsDbContext getDbContext() {
 
-        return new CmsDbContext();
+        return m_supportsJpa ? 
+        		org.opencms.db.jpa.CmsDbContext.newInstance() 
+        		:new CmsDbContext();
     }
 
     /**
@@ -57,7 +66,9 @@
      */
     public CmsDbContext getDbContext(CmsRequestContext context) {
 
-        return new CmsDbContext(context);
+        return m_supportsJpa ?
+        		org.opencms.db.jpa.CmsDbContext.newInstance(context)
+        		: new CmsDbContext(context);
     }
 
     /**
@@ -67,4 +78,14 @@
 
         // noop
     }
+
+	/*
+	 * @see org.opencms.db.I_CmsDbContextFactory#setSupportsJpa(boolean)
+	 */
+	@Override
+	public void setSupportsJpa(boolean supportsJpa) {
+		
+		m_supportsJpa = supportsJpa ;
+	}
+    
 }
diff -urN opencms_7.0.5_src/src/org/opencms/db/CmsDbContext.java trunk/src/org/opencms/db/CmsDbContext.java
--- opencms_7.0.5_src/src/org/opencms/db/CmsDbContext.java	2008-03-01 10:12:50.000000000 +0200
+++ trunk/src/org/opencms/db/CmsDbContext.java	2008-09-02 11:14:29.395885305 +0300
@@ -31,6 +31,9 @@
 
 package org.opencms.db;
 
+import javax.persistence.EntityManager;
+
+import org.opencms.db.jpa.CmsSqlManager;
 import org.opencms.file.CmsProject;
 import org.opencms.file.CmsRequestContext;
 import org.opencms.file.CmsUser;
@@ -66,8 +69,7 @@
     /**
      * Creates a new, empty database context.<p> 
      */
-    public CmsDbContext() {
-
+    protected CmsDbContext() {
         this(null);
     }
 
@@ -76,21 +78,41 @@
      *  
      * @param context the current users request context
      */
-    public CmsDbContext(CmsRequestContext context) {
+    protected CmsDbContext(CmsRequestContext context) {
 
         m_requestContext = context;
         m_projectId = CmsUUID.getNullUUID();
-
+        
         if (m_requestContext != null) {
             m_flexRequestContextInfo = (CmsFlexRequestContextInfo)m_requestContext.getAttribute(CmsRequestUtil.HEADER_LAST_MODIFIED);
         }
     }
-
+    
+    /** 
+     * Creates a new instance of CmsDbContext
+     * @param supportsJpa - should be compatible with JPA driver
+     * @return a new instance
+     */
+    public static CmsDbContext newInstance(boolean supportsJpa){
+    	return new CmsDbContext() ;
+    }
+
+    /** 
+     * Creates a new instance of CmsDbContext
+     * @param context
+     * @param supportsJpa - should be compatible with JPA driver
+     * @return a new instance
+     */
+    public static CmsDbContext newInstance(CmsRequestContext context){
+    	
+    	return new CmsDbContext(context) ;
+    }
+    
     /**
      * Clears this database context.<p>
      */
     public void clear() {
-
+    	
         m_requestContext = null;
         m_flexRequestContextInfo = null;
     }
@@ -232,7 +254,7 @@
      * @throws CmsVfsException if throwable is not an OpenCms Exception
      * @throws CmsException of the same type as throwable if throwable is an OpenCms Exception
      */
-    void throwException(CmsMessageContainer message, Throwable throwable) throws CmsVfsException, CmsException {
+    public void throwException(CmsMessageContainer message, Throwable throwable) throws CmsVfsException, CmsException {
 
         if (throwable instanceof CmsException) {
             throw ((CmsException)throwable).createException(message, throwable);
@@ -242,4 +264,47 @@
             throw new CmsVfsException(message, throwable);
         }
     }
+    
+    /**
+     * Return the EntityManager associated with this context.
+     * @return the instance of EntityManager.
+     */
+    public EntityManager getEntityManager(){
+    	return null ;
+    }
+    
+    /**
+     * Starts a new database transaction.
+     */
+    public void beginTransaction(){
+    
+    }
+    
+    /**
+     * Commits current database transaction.
+     */
+    public void commitAndClose(){
+    	
+    }
+    
+    /**
+     * Rolls back current database transaction.
+     */
+    public void rollbackAndClose(){
+    	
+    }
+
+    /**
+     * Closes current instance of EntityManager.
+     */
+    public void closeEntityManager(){
+
+    }
+    
+    /*
+     * Rollbacks current transaction and starts new.
+     */
+    public void rollback(){
+    	
+    }
 }
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/CmsDriverManager.java trunk/src/org/opencms/db/CmsDriverManager.java
--- opencms_7.0.5_src/src/org/opencms/db/CmsDriverManager.java	2008-07-01 11:38:06.000000000 +0300
+++ trunk/src/org/opencms/db/CmsDriverManager.java	2008-09-02 11:14:29.403884352 +0300
@@ -348,159 +348,166 @@
      * @throws CmsInitException if the driver manager couldn't be instantiated
      */
     public static CmsDriverManager newInstance(
-        CmsConfigurationManager configurationManager,
-        CmsSecurityManager securityManager,
-        I_CmsDbContextFactory runtimeInfoFactory,
-        CmsPublishEngine publishEngine) throws CmsInitException {
-
-        // read the opencms.properties from the configuration
-        ExtendedProperties config = (ExtendedProperties)configurationManager.getConfiguration();
-
-        List drivers = null;
-        String driverName = null;
-
-        I_CmsVfsDriver vfsDriver = null;
-        I_CmsUserDriver userDriver = null;
-        I_CmsProjectDriver projectDriver = null;
-        I_CmsHistoryDriver historyDriver = null;
+    		CmsConfigurationManager configurationManager,
+            CmsSecurityManager securityManager,
+            I_CmsDbContextFactory runtimeInfoFactory,
+            CmsPublishEngine publishEngine) throws CmsInitException {
+
+            // read the opencms.properties from the configuration
+            ExtendedProperties config = (ExtendedProperties)configurationManager.getConfiguration();
+
+            List drivers = null;
+            String driverName = null;
+
+            I_CmsVfsDriver vfsDriver = null;
+            I_CmsUserDriver userDriver = null;
+            I_CmsProjectDriver projectDriver = null;
+            I_CmsHistoryDriver historyDriver = null;
 
-        CmsDriverManager driverManager = null;
-        try {
-            // create a driver manager instance
-            driverManager = new CmsDriverManager();
-            if (CmsLog.INIT.isInfoEnabled()) {
-                CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_PHASE1_0));
-            }
-            if ((runtimeInfoFactory == null) && CmsLog.INIT.isDebugEnabled()) {
-                CmsLog.INIT.debug(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_RT_0));
-            }
-        } catch (Exception exc) {
-            CmsMessageContainer message = Messages.get().container(Messages.LOG_ERR_DRIVER_MANAGER_START_0);
-            if (LOG.isFatalEnabled()) {
-                LOG.fatal(message.key(), exc);
+            CmsDriverManager driverManager = null;
+            try {
+                // create a driver manager instance
+                driverManager = new CmsDriverManager();
+                if (CmsLog.INIT.isInfoEnabled()) {
+                    CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_PHASE1_0));
+                }
+                if ((runtimeInfoFactory == null) && CmsLog.INIT.isDebugEnabled()) {
+                    CmsLog.INIT.debug(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_RT_0));
+                }
+            } catch (Exception exc) {
+                CmsMessageContainer message = Messages.get().container(Messages.LOG_ERR_DRIVER_MANAGER_START_0);
+                if (LOG.isFatalEnabled()) {
+                    LOG.fatal(message.key(), exc);
+                }
+                throw new CmsInitException(message, exc);
             }
-            throw new CmsInitException(message, exc);
-        }
 
-        // set the security manager
-        driverManager.m_securityManager = securityManager;
+            // set the security manager
+            driverManager.m_securityManager = securityManager;
 
-        // set connection pools
-        driverManager.m_connectionPools = new ArrayList();
+            // set connection pools
+            driverManager.m_connectionPools = new ArrayList();
 
-        // set the lock manager
-        driverManager.m_lockManager = new CmsLockManager(driverManager);
+            // set the lock manager
+            driverManager.m_lockManager = new CmsLockManager(driverManager);
 
-        // create and set the sql manager
-        driverManager.m_sqlManager = new CmsSqlManager(driverManager);
+            // create and set the sql manager
+            driverManager.m_sqlManager = new CmsSqlManager(driverManager);
 
-        // set the publish engine
-        driverManager.m_publishEngine = publishEngine;
+            // set the publish engine
+            driverManager.m_publishEngine = publishEngine;
 
-        if (CmsLog.INIT.isInfoEnabled()) {
-            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_PHASE2_0));
-        }
+            if (CmsLog.INIT.isInfoEnabled()) {
+                CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_PHASE2_0));
+            }
 
-        // read the pool names to initialize
-        String[] driverPoolNames = config.getStringArray(CmsDriverManager.CONFIGURATION_DB + ".pools");
-        if (CmsLog.INIT.isInfoEnabled()) {
-            String names = "";
-            for (int p = 0; p < driverPoolNames.length; p++) {
-                names += driverPoolNames[p] + " ";
+            // read the pool names to initialize
+            String[] driverPoolNames = config.getStringArray(CmsDriverManager.CONFIGURATION_DB + ".pools");
+            if (CmsLog.INIT.isInfoEnabled()) {
+                String names = "";
+                for (int p = 0; p < driverPoolNames.length; p++) {
+                    names += driverPoolNames[p] + " ";
+                }
+                CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_POOLS_1, names));
             }
-            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_POOLS_1, names));
-        }
 
-        // initialize each pool
-        for (int p = 0; p < driverPoolNames.length; p++) {
-            driverManager.newPoolInstance(config, driverPoolNames[p]);
-        }
+            // initialize each pool
+            for (int p = 0; p < driverPoolNames.length; p++) {
+                driverManager.newPoolInstance(config, driverPoolNames[p]);
+            }
 
-        // initialize the runtime info factory with the generated driver manager
-        if (runtimeInfoFactory != null) {
-            runtimeInfoFactory.initialize(driverManager);
-        }
+            // initialize the runtime info factory with the generated driver manager
+            if (runtimeInfoFactory != null) {
+                runtimeInfoFactory.initialize(driverManager);
+            }
 
-        if (CmsLog.INIT.isInfoEnabled()) {
-            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_PHASE3_0));
-        }
+            if (CmsLog.INIT.isInfoEnabled()) {
+                CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_PHASE3_0));
+            }
 
-        // read the vfs driver class properties and initialize a new instance 
-        drivers = Arrays.asList(config.getStringArray(CmsDriverManager.CONFIGURATION_VFS));
-        String driverKey = (String)drivers.get(0) + ".vfs.driver";
-        driverName = config.getString(driverKey);
-        drivers = (drivers.size() > 1) ? drivers.subList(1, drivers.size()) : null;
-        if (driverName == null) {
-            CmsLog.INIT.error(Messages.get().getBundle().key(Messages.INIT_DRIVER_FAILED_1, driverKey));
-        }
-        vfsDriver = (I_CmsVfsDriver)driverManager.newDriverInstance(configurationManager, driverName, drivers);
-
-        // read the user driver class properties and initialize a new instance 
-        drivers = Arrays.asList(config.getStringArray(CmsDriverManager.CONFIGURATION_USER));
-        driverKey = (String)drivers.get(0) + ".user.driver";
-        driverName = config.getString(driverKey);
-        drivers = (drivers.size() > 1) ? drivers.subList(1, drivers.size()) : null;
-        if (driverName == null) {
-            CmsLog.INIT.error(Messages.get().getBundle().key(Messages.INIT_DRIVER_FAILED_1, driverKey));
-        }
-        userDriver = (I_CmsUserDriver)driverManager.newDriverInstance(configurationManager, driverName, drivers);
-
-        // read the project driver class properties and initialize a new instance 
-        drivers = Arrays.asList(config.getStringArray(CmsDriverManager.CONFIGURATION_PROJECT));
-        driverKey = (String)drivers.get(0) + ".project.driver";
-        driverName = config.getString(driverKey);
-        drivers = (drivers.size() > 1) ? drivers.subList(1, drivers.size()) : null;
-        if (driverName == null) {
-            CmsLog.INIT.error(Messages.get().getBundle().key(Messages.INIT_DRIVER_FAILED_1, driverKey));
-        }
-        projectDriver = (I_CmsProjectDriver)driverManager.newDriverInstance(configurationManager, driverName, drivers);
-
-        // read the history driver class properties and initialize a new instance 
-        if (config.get(CmsDriverManager.CONFIGURATION_HISTORY) != null) {
-            drivers = Arrays.asList(config.getStringArray(CmsDriverManager.CONFIGURATION_HISTORY));
-            driverKey = (String)drivers.get(0) + ".history.driver";
+            // read the vfs driver class properties and initialize a new instance 
+            drivers = Arrays.asList(config.getStringArray(CmsDriverManager.CONFIGURATION_VFS));
+            String driverKey = (String)drivers.get(0) + ".vfs.driver";
             driverName = config.getString(driverKey);
             drivers = (drivers.size() > 1) ? drivers.subList(1, drivers.size()) : null;
             if (driverName == null) {
                 CmsLog.INIT.error(Messages.get().getBundle().key(Messages.INIT_DRIVER_FAILED_1, driverKey));
             }
-            historyDriver = (I_CmsHistoryDriver)driverManager.newDriverInstance(
-                configurationManager,
-                driverName,
-                drivers);
-        } else {
-            drivers = Arrays.asList(config.getStringArray(CmsDriverManager.CONFIGURATION_BACKUP));
-            driverKey = (String)drivers.get(0) + ".backup.driver";
+            if(driverName.indexOf("org.opencms.db.jpa.") != -1){
+            	runtimeInfoFactory.setSupportsJpa(true) ;
+            	org.opencms.db.jpa.CmsSqlManager.setOpenCmsEmPoolSize(
+            			config.getInteger(org.opencms.db.jpa.CmsSqlManager.JPA_POOL_SIZE_PROPERTY_NAME,
+            					org.opencms.db.jpa.CmsSqlManager.DEFAULT_EM_POOL_SIZE)) ;
+            	org.opencms.db.jpa.CmsSqlManager.init() ;
+            }
+            vfsDriver = (I_CmsVfsDriver)driverManager.newDriverInstance(configurationManager, driverName, drivers);
+
+            // read the user driver class properties and initialize a new instance 
+            drivers = Arrays.asList(config.getStringArray(CmsDriverManager.CONFIGURATION_USER));
+            driverKey = (String)drivers.get(0) + ".user.driver";
             driverName = config.getString(driverKey);
             drivers = (drivers.size() > 1) ? drivers.subList(1, drivers.size()) : null;
             if (driverName == null) {
                 CmsLog.INIT.error(Messages.get().getBundle().key(Messages.INIT_DRIVER_FAILED_1, driverKey));
             }
-            historyDriver = (I_CmsHistoryDriver)driverManager.newDriverInstance(
-                configurationManager,
-                driverName,
-                drivers);
-        }
-
-        // store the access objects
-        driverManager.m_vfsDriver = vfsDriver;
-        driverManager.m_userDriver = userDriver;
-        driverManager.m_projectDriver = projectDriver;
-        driverManager.m_historyDriver = historyDriver;
-
-        // store the configuration
-        driverManager.m_propertyConfiguration = config;
-
-        // register the driver manager for required events
-        org.opencms.main.OpenCms.addCmsEventListener(driverManager, new int[] {
-            I_CmsEventListener.EVENT_UPDATE_EXPORTS,
-            I_CmsEventListener.EVENT_CLEAR_CACHES,
-            I_CmsEventListener.EVENT_CLEAR_PRINCIPAL_CACHES,
-            I_CmsEventListener.EVENT_PUBLISH_PROJECT});
+            userDriver = (I_CmsUserDriver)driverManager.newDriverInstance(configurationManager, driverName, drivers);
 
-        // return the configured driver manager
-        return driverManager;
-    }
+            // read the project driver class properties and initialize a new instance 
+            drivers = Arrays.asList(config.getStringArray(CmsDriverManager.CONFIGURATION_PROJECT));
+            driverKey = (String)drivers.get(0) + ".project.driver";
+            driverName = config.getString(driverKey);
+            drivers = (drivers.size() > 1) ? drivers.subList(1, drivers.size()) : null;
+            if (driverName == null) {
+                CmsLog.INIT.error(Messages.get().getBundle().key(Messages.INIT_DRIVER_FAILED_1, driverKey));
+            }
+            projectDriver = (I_CmsProjectDriver)driverManager.newDriverInstance(configurationManager, driverName, drivers);
+
+            // read the history driver class properties and initialize a new instance 
+            if (config.get(CmsDriverManager.CONFIGURATION_HISTORY) != null) {
+                drivers = Arrays.asList(config.getStringArray(CmsDriverManager.CONFIGURATION_HISTORY));
+                driverKey = (String)drivers.get(0) + ".history.driver";
+                driverName = config.getString(driverKey);
+                drivers = (drivers.size() > 1) ? drivers.subList(1, drivers.size()) : null;
+                if (driverName == null) {
+                    CmsLog.INIT.error(Messages.get().getBundle().key(Messages.INIT_DRIVER_FAILED_1, driverKey));
+                }
+                historyDriver = (I_CmsHistoryDriver)driverManager.newDriverInstance(
+                    configurationManager,
+                    driverName,
+                    drivers);
+            } else {
+                drivers = Arrays.asList(config.getStringArray(CmsDriverManager.CONFIGURATION_BACKUP));
+                driverKey = (String)drivers.get(0) + ".backup.driver";
+                driverName = config.getString(driverKey);
+                drivers = (drivers.size() > 1) ? drivers.subList(1, drivers.size()) : null;
+                if (driverName == null) {
+                    CmsLog.INIT.error(Messages.get().getBundle().key(Messages.INIT_DRIVER_FAILED_1, driverKey));
+                }
+                historyDriver = (I_CmsHistoryDriver)driverManager.newDriverInstance(
+                    configurationManager,
+                    driverName,
+                    drivers);
+            }
+
+            // store the access objects
+            driverManager.m_vfsDriver = vfsDriver;
+            driverManager.m_userDriver = userDriver;
+            driverManager.m_projectDriver = projectDriver;
+            driverManager.m_historyDriver = historyDriver;
+
+            // store the configuration
+            driverManager.m_propertyConfiguration = config;
+
+            // register the driver manager for required events
+            org.opencms.main.OpenCms.addCmsEventListener(driverManager, new int[] {
+                I_CmsEventListener.EVENT_UPDATE_EXPORTS,
+                I_CmsEventListener.EVENT_CLEAR_CACHES,
+                I_CmsEventListener.EVENT_CLEAR_PRINCIPAL_CACHES,
+                I_CmsEventListener.EVENT_PUBLISH_PROJECT});
+
+            // return the configured driver manager
+            return driverManager;
+        }
 
     /**
      * Adds a new relation to the given resource.<p>
@@ -2993,6 +3000,9 @@
                 Messages.INIT_DRIVER_MANAGER_DESTROY_1,
                 getClass().getName()));
         }
+        if(m_sqlManager instanceof org.opencms.db.jpa.CmsSqlManager){
+        	org.opencms.db.jpa.CmsSqlManager.destroy() ;
+        }
     }
 
     /**
@@ -4464,7 +4474,9 @@
      * @throws CmsException if something goes wrong
      * @throws Exception if something goes wrong
      */
-    public void init(CmsConfigurationManager configurationManager) throws CmsException, Exception {
+    public void init(CmsConfigurationManager configurationManager,
+    				I_CmsDbContextFactory dbcf
+    		) throws CmsException, Exception {
 
         // initialize the access-module.
         if (CmsLog.INIT.isInfoEnabled()) {
@@ -4481,14 +4493,15 @@
         m_htmlLinkValidator = new CmsRelationSystemValidator(this);
 
         // fills the defaults if needed
-        getUserDriver().fillDefaults(new CmsDbContext());
-        getProjectDriver().fillDefaults(new CmsDbContext());
+        CmsDbContext dbc = dbcf.getDbContext() ;
+        getUserDriver().fillDefaults(dbc);
+        getProjectDriver().fillDefaults(dbc);
         // set the driver manager in the publish engine
         m_publishEngine.setDriverManager(this);
         // create the root organizational unit if needed
-        CmsDbContext dbc = new CmsDbContext(new CmsRequestContext(
-            readUser(new CmsDbContext(), OpenCms.getDefaultUsers().getUserAdmin()),
-            readProject(new CmsDbContext(), CmsProject.ONLINE_PROJECT_ID),
+        CmsDbContext dbc1 = dbcf.getDbContext(new CmsRequestContext(
+            readUser(dbc, OpenCms.getDefaultUsers().getUserAdmin()),
+            readProject(dbc, CmsProject.ONLINE_PROJECT_ID),
             null,
             "",
             null,
@@ -4498,7 +4511,9 @@
             null,
             null,
             ""));
-        getUserDriver().createRootOrganizationalUnit(dbc);
+        dbc.clear() ;
+        getUserDriver().createRootOrganizationalUnit(dbc1);
+        dbc1.clear() ;
     }
 
     /**
@@ -5087,7 +5102,7 @@
 
         Class driverClass = null;
         I_CmsDriver driver = null;
-        CmsDbContext dbc = new CmsDbContext();
+        CmsDbContext dbc = null;
 
         try {
             // try to get the class
diff -urN opencms_7.0.5_src/src/org/opencms/db/CmsSecurityManager.java trunk/src/org/opencms/db/CmsSecurityManager.java
--- opencms_7.0.5_src/src/org/opencms/db/CmsSecurityManager.java	2008-04-21 09:35:04.000000000 +0300
+++ trunk/src/org/opencms/db/CmsSecurityManager.java	2008-09-02 11:14:29.399884929 +0300
@@ -2741,7 +2741,7 @@
 
         try {
             // invoke the init method of the driver manager
-            m_driverManager.init(configurationManager);
+            m_driverManager.init(configurationManager, m_dbContextFactory);
             if (CmsLog.INIT.isInfoEnabled()) {
                 CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DRIVER_MANAGER_START_PHASE4_OK_0));
             }
diff -urN opencms_7.0.5_src/src/org/opencms/db/generic/CmsUserDriver.java trunk/src/org/opencms/db/generic/CmsUserDriver.java
--- opencms_7.0.5_src/src/org/opencms/db/generic/CmsUserDriver.java	2008-07-02 08:41:26.000000000 +0300
+++ trunk/src/org/opencms/db/generic/CmsUserDriver.java	2008-09-02 11:14:29.375884229 +0300
@@ -409,12 +409,12 @@
                 try {
                     // this if setting up OpenCms
                     setupProject = m_driverManager.readProject(
-                        new CmsDbContext(),
+                        dbc,
                         I_CmsProjectDriver.SETUP_PROJECT_NAME);
                 } catch (CmsException exc) {
                     // this if updating OpenCms
                     try {
-                        setupProject = m_driverManager.readProject(new CmsDbContext(), "Offline");
+                        setupProject = m_driverManager.readProject(dbc, "Offline");
                     } catch (CmsException exc2) {
                         // there is nothing to do, if no offline project found
                     }
diff -urN opencms_7.0.5_src/src/org/opencms/db/I_CmsBackupDriver.java trunk/src/org/opencms/db/I_CmsBackupDriver.java
--- opencms_7.0.5_src/src/org/opencms/db/I_CmsBackupDriver.java	2008-03-01 10:32:24.000000000 +0200
+++ trunk/src/org/opencms/db/I_CmsBackupDriver.java	2008-09-02 11:14:29.403884352 +0300
@@ -31,7 +31,6 @@
 
 package org.opencms.db;
 
-import org.opencms.db.generic.CmsSqlManager;
 
 /**
  * Definitions of all required backup driver methods.<p>
diff -urN opencms_7.0.5_src/src/org/opencms/db/I_CmsDbContextFactory.java trunk/src/org/opencms/db/I_CmsDbContextFactory.java
--- opencms_7.0.5_src/src/org/opencms/db/I_CmsDbContextFactory.java	2008-03-01 10:32:34.000000000 +0200
+++ trunk/src/org/opencms/db/I_CmsDbContextFactory.java	2008-09-02 11:14:29.395885305 +0300
@@ -66,4 +66,12 @@
      * @return a new database context
      */
     CmsDbContext getDbContext();
+    
+    
+    /**
+     * Set/Unset compatibility with JPA driver
+     * @param supportsJpa - when is true this factory is compatible
+     * with JPA driver.
+     */
+    void setSupportsJpa(boolean supportsJpa) ;
 }
diff -urN opencms_7.0.5_src/src/org/opencms/db/I_CmsHistoryDriver.java trunk/src/org/opencms/db/I_CmsHistoryDriver.java
--- opencms_7.0.5_src/src/org/opencms/db/I_CmsHistoryDriver.java	2008-04-21 16:38:42.000000000 +0300
+++ trunk/src/org/opencms/db/I_CmsHistoryDriver.java	2008-09-02 11:14:29.395885305 +0300
@@ -31,7 +31,6 @@
 
 package org.opencms.db;
 
-import org.opencms.db.generic.CmsSqlManager;
 import org.opencms.file.CmsDataAccessException;
 import org.opencms.file.CmsPropertyDefinition;
 import org.opencms.file.CmsResource;
@@ -153,7 +152,7 @@
      * 
      * @return the SQL manager for this driver
      */
-    org.opencms.db.generic.CmsSqlManager initSqlManager(String classname);
+    CmsSqlManager initSqlManager(String classname);
 
     /**
      * Reads all file headers of the resource with the given structure id.<p>
diff -urN opencms_7.0.5_src/src/org/opencms/db/I_CmsProjectDriver.java trunk/src/org/opencms/db/I_CmsProjectDriver.java
--- opencms_7.0.5_src/src/org/opencms/db/I_CmsProjectDriver.java	2008-03-01 10:32:16.000000000 +0200
+++ trunk/src/org/opencms/db/I_CmsProjectDriver.java	2008-09-02 11:14:29.395885305 +0300
@@ -31,7 +31,6 @@
 
 package org.opencms.db;
 
-import org.opencms.db.generic.CmsSqlManager;
 import org.opencms.file.CmsDataAccessException;
 import org.opencms.file.CmsFile;
 import org.opencms.file.CmsFolder;
@@ -247,7 +246,7 @@
      * 
      * @return the SQL manager for this driver
      */
-    org.opencms.db.generic.CmsSqlManager initSqlManager(String classname);
+    CmsSqlManager initSqlManager(String classname);
 
     /**
      * Publishes a deleted folder.<p>
diff -urN opencms_7.0.5_src/src/org/opencms/db/I_CmsUserDriver.java trunk/src/org/opencms/db/I_CmsUserDriver.java
--- opencms_7.0.5_src/src/org/opencms/db/I_CmsUserDriver.java	2008-03-01 10:31:46.000000000 +0200
+++ trunk/src/org/opencms/db/I_CmsUserDriver.java	2008-09-02 11:14:29.399884929 +0300
@@ -31,7 +31,6 @@
 
 package org.opencms.db;
 
-import org.opencms.db.generic.CmsSqlManager;
 import org.opencms.file.CmsDataAccessException;
 import org.opencms.file.CmsGroup;
 import org.opencms.file.CmsProject;
@@ -371,7 +370,7 @@
      * 
      * @return the SQL manager for this driver
      */
-    org.opencms.db.generic.CmsSqlManager initSqlManager(String classname);
+    CmsSqlManager initSqlManager(String classname);
 
     /**
      * Publish all access control entries of a resource from the given offline project to the online project.<p>
diff -urN opencms_7.0.5_src/src/org/opencms/db/I_CmsVfsDriver.java trunk/src/org/opencms/db/I_CmsVfsDriver.java
--- opencms_7.0.5_src/src/org/opencms/db/I_CmsVfsDriver.java	2008-04-21 16:38:14.000000000 +0300
+++ trunk/src/org/opencms/db/I_CmsVfsDriver.java	2008-09-02 11:14:29.391885482 +0300
@@ -31,7 +31,6 @@
 
 package org.opencms.db;
 
-import org.opencms.db.generic.CmsSqlManager;
 import org.opencms.file.CmsDataAccessException;
 import org.opencms.file.CmsFile;
 import org.opencms.file.CmsFolder;
@@ -287,7 +286,7 @@
      * 
      * @return the SQL manager for this driver
      */
-    org.opencms.db.generic.CmsSqlManager initSqlManager(String classname);
+    CmsSqlManager initSqlManager(String classname);
 
     /**
      * Moves the given resource to the specified destination path.<p>
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/CmsDbContext.java trunk/src/org/opencms/db/jpa/CmsDbContext.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/CmsDbContext.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/CmsDbContext.java	2008-09-02 11:14:29.187884133 +0300
@@ -0,0 +1,157 @@
+/**
+ * 
+ */
+package org.opencms.db.jpa;
+
+import javax.persistence.EntityManager;
+
+
+import org.opencms.file.CmsRequestContext;
+import org.opencms.file.CmsVfsException;
+import org.opencms.i18n.CmsMessageContainer;
+import org.opencms.main.CmsException;
+import org.opencms.report.I_CmsReport;
+
+/**
+ * @author gosho
+ *
+ */
+public class CmsDbContext extends org.opencms.db.CmsDbContext {
+    
+    /** The EntityManager instance for this context. */
+    protected EntityManager m_entityManager ;
+    
+    /** Tells when the current transaction should be commit or rollback*/
+    protected boolean m_shouldCommit ;
+
+    /**
+     * Creates a new, empty database context.<p> 
+     */
+    private CmsDbContext() {
+        this(null);
+    }
+
+    /**
+     * Creates a new database context initialized with the given user request context.<p>
+     *  
+     * @param context the current users request context
+     */
+    private CmsDbContext(CmsRequestContext context) {
+    	
+    	super(context) ;
+
+    	m_entityManager = CmsSqlManager.getEntityManager() ;
+        m_shouldCommit = true ;
+        m_entityManager.getTransaction().begin() ;
+    }
+    
+    /** 
+     * Creates a new instance of CmsDbContext
+     * @param supportsJpa - should be compatible with JPA driver
+     * @return a new instance
+     */
+    public static CmsDbContext newInstance(){
+    	return new CmsDbContext() ;
+    }
+
+    /** 
+     * Creates a new instance of CmsDbContext
+     * @param context
+     * @param supportsJpa - should be compatible with JPA driver
+     * @return a new instance
+     */
+    public static CmsDbContext newInstance(CmsRequestContext context){
+    	return new CmsDbContext(context) ;
+    }
+    
+    /**
+     * Clears this database context.<p>
+     */
+    public void clear() {
+
+    	if(m_shouldCommit){
+    		commitAndClose() ;
+    	}
+    	else {
+    		rollbackAndClose() ;
+    	}
+    	CmsSqlManager.returnEntityManager(m_entityManager) ;
+    	
+        m_requestContext = null;
+        m_flexRequestContextInfo = null;
+    }
+
+    /**
+     * Reports an error to the given report (if available) and to the OpenCms log file.<p>
+     *  
+     * @param report the report to write the error to
+     * @param message the message to write to the report / log
+     * @param throwable the exception to write to the report / log
+     * 
+     * @throws CmsException if the throwable parameter is not null and a CmsException
+     * @throws CmsVfsException if the throwable parameter is not null and no CmsException
+     */
+    public void report(I_CmsReport report, CmsMessageContainer message, Throwable throwable)
+    throws CmsVfsException, CmsException {
+
+    	m_shouldCommit = false ;
+        if (report != null) {
+            if (message != null) {
+                report.println(message, I_CmsReport.FORMAT_ERROR);
+            }
+            if (throwable != null) {
+                report.println(throwable);
+            }
+        }
+
+        throwException(message, throwable);
+    }
+    
+    /**
+     * Return the EntityManager associated with this context.
+     * @return the instance of EntityManager.
+     */
+    public EntityManager getEntityManager(){
+    	return m_entityManager ;
+    }
+    
+    /**
+     * Starts a new database transaction.
+     */
+    public void beginTransaction(){
+    	m_entityManager.getTransaction().begin() ;
+    }
+    
+    /**
+     * Commits current database transaction.
+     */
+    public void commitAndClose(){
+    	m_entityManager.getTransaction().commit() ;
+    }
+    
+    /**
+     * Rolls back current database transaction.
+     */
+    public void rollbackAndClose(){
+    	m_entityManager.getTransaction().rollback() ;
+    }
+
+    /**
+     * Closes current instance of EntityManager.
+     */
+    public void closeEntityManager(){
+
+    }
+    
+    /*
+     * Rollbacks current transaction and starts new.
+     */
+    public void rollback(){
+    	
+    	if(m_entityManager.getTransaction().isActive()){
+    		m_entityManager.getTransaction().rollback() ;
+    		m_entityManager.getTransaction().begin() ;
+    		m_shouldCommit = true ;
+    	}
+    }
+}
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/CmsHistoryDriver.java trunk/src/org/opencms/db/jpa/CmsHistoryDriver.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/CmsHistoryDriver.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/CmsHistoryDriver.java	2008-09-02 11:14:29.183884150 +0300
@@ -0,0 +1,1773 @@
+/*
+ *
+ * This work is derivate of generic SQL driver and it's part of 
+ * OpenCms - the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceException;
+import javax.persistence.Query;
+
+import org.apache.commons.logging.Log;
+import org.opencms.configuration.CmsConfigurationManager;
+import org.opencms.db.CmsDbConsistencyException;
+import org.opencms.db.CmsDbContext;
+import org.opencms.db.CmsDbEntryNotFoundException;
+import org.opencms.db.CmsDbSqlException;
+import org.opencms.db.CmsDriverManager;
+import org.opencms.db.CmsResourceState;
+import org.opencms.db.I_CmsDriver;
+import org.opencms.db.I_CmsHistoryDriver;
+import org.opencms.db.jpa.persistence.CmsDAOContents;
+import org.opencms.db.jpa.persistence.CmsDAOHistoryPrincipals;
+import org.opencms.db.jpa.persistence.CmsDAOHistoryProjectResources;
+import org.opencms.db.jpa.persistence.CmsDAOHistoryProjects;
+import org.opencms.db.jpa.persistence.CmsDAOHistoryProperties;
+import org.opencms.db.jpa.persistence.CmsDAOHistoryPropertyDef;
+import org.opencms.db.jpa.persistence.CmsDAOHistoryResources;
+import org.opencms.db.jpa.persistence.CmsDAOHistoryStructure;
+import org.opencms.file.CmsDataAccessException;
+import org.opencms.file.CmsFile;
+import org.opencms.file.CmsFolder;
+import org.opencms.file.CmsProject;
+import org.opencms.file.CmsProperty;
+import org.opencms.file.CmsPropertyDefinition;
+import org.opencms.file.CmsResource;
+import org.opencms.file.CmsUser;
+import org.opencms.file.CmsVfsResourceNotFoundException;
+import org.opencms.file.CmsPropertyDefinition.CmsPropertyType;
+import org.opencms.file.history.CmsHistoryFile;
+import org.opencms.file.history.CmsHistoryFolder;
+import org.opencms.file.history.CmsHistoryPrincipal;
+import org.opencms.file.history.CmsHistoryProject;
+import org.opencms.file.history.I_CmsHistoryResource;
+import org.opencms.main.CmsException;
+import org.opencms.main.CmsLog;
+import org.opencms.security.CmsOrganizationalUnit;
+import org.opencms.security.I_CmsPrincipal;
+import org.opencms.util.CmsDataTypeUtil;
+import org.opencms.util.CmsStringUtil;
+import org.opencms.util.CmsUUID;
+
+/**
+ * @author gosho
+ *
+ */
+public class CmsHistoryDriver implements I_CmsDriver, I_CmsHistoryDriver{
+
+	/** The log object for this class. */
+    private static final Log LOG = CmsLog.getLog(org.opencms.db.jpa.CmsHistoryDriver.class);
+
+    /** The driver manager instance. */
+    protected CmsDriverManager m_driverManager;
+
+    /** The SQL manager instance. */
+    protected CmsSqlManager m_sqlManager;
+    
+    private static final String C_STRUCTURE_HISTORY_MAXVER = "C_STRUCTURE_HISTORY_MAXVER" ;
+    
+    private static final String C_STRUCTURE_HISTORY_MAXVER_BYTIME = "C_STRUCTURE_HISTORY_MAXVER_BYTIME" ;
+    
+    private static final String C_HISTORY_READ_MAXTAG_FOR_VERSION = "C_HISTORY_READ_MAXTAG_FOR_VERSION" ;
+    
+    private static final String C_PROPERTIES_HISTORY_DELETE = "C_PROPERTIES_HISTORY_DELETE" ;
+    
+    private static final String C_STRUCTURE_HISTORY_DELETE = "C_STRUCTURE_HISTORY_DELETE" ;
+    
+    private static final String C_HISTORY_READ_MIN_USED_TAG = "C_HISTORY_READ_MIN_USED_TAG" ;
+    
+    private static final String C_RESOURCES_HISTORY_DELETE = "C_RESOURCES_HISTORY_DELETE" ;
+    
+    private static final String C_CONTENT_HISTORY_DELETE = "C_CONTENT_HISTORY_DELETE" ;
+    
+    private static final String C_STRUCTURE_HISTORY_READ_SUBRESOURCES = "C_STRUCTURE_HISTORY_READ_SUBRESOURCES" ;
+    
+    private static final String C_PROPERTYDEF_DELETE_HISTORY = "C_PROPERTYDEF_DELETE_HISTORY" ;
+    
+    private static final String C_STRUCTURE_HISTORY_READ_DELETED = "C_STRUCTURE_HISTORY_READ_DELETED" ;
+    
+    private static final String C_RESOURCES_HISTORY_READ_ALL_VERSIONS = "C_RESOURCES_HISTORY_READ_ALL_VERSIONS" ;
+    
+    private static final String C_RESOURCES_HISTORY_READ_NEW_VERSIONS = "C_RESOURCES_HISTORY_READ_NEW_VERSIONS" ;
+    
+    private static final String C_RESOURCES_HISTORY_READ_BTW_VERSIONS = "C_RESOURCES_HISTORY_READ_BTW_VERSIONS" ;
+    
+    private static final String C_RESOURCES_HISTORY_READ_OLD_VERSIONS = "C_RESOURCES_HISTORY_READ_OLD_VERSIONS" ;
+    
+    private static final String C_PROPERTIES_READALL_COUNT = "C_PROPERTIES_READALL_COUNT" ;
+    
+    private static final String C_RESOURCES_HISTORY_READ_VERSION = "C_RESOURCES_HISTORY_READ_VERSION" ;
+    
+    private static final String C_HISTORY_READ_CONTENT = "C_HISTORY_READ_CONTENT" ;
+    
+    private static final String C_RESOURCES_HISTORY_READ_DELETED = "C_RESOURCES_HISTORY_READ_DELETED" ;
+    
+    private static final String C_RESOURCES_HISTORY_READ_DELETED_RESTRICTED = "C_RESOURCES_HISTORY_READ_DELETED_RESTRICTED" ;
+    
+    private static final String C_FILES_READ_HISTORY_BYID = "C_FILES_READ_HISTORY_BYID" ;
+    
+    private static final String  C_RESOURCES_READ_MAX_PUBLISH_TAG = "C_RESOURCES_READ_MAX_PUBLISH_TAG" ;
+    
+    private static final String C_PROJECTS_HISTORY_MAXTAG = "C_PROJECTS_HISTORY_MAXTAG" ;
+    
+    private static final String C_RESOURCES_HISTORY_MAXTAG = "C_RESOURCES_HISTORY_MAXTAG" ;
+    
+    private static final String C_HISTORY_PRINCIPAL_READ = "C_HISTORY_PRINCIPAL_READ" ;
+    
+    private static final String C_PROJECTS_HISTORY_READ = "C_PROJECTS_HISTORY_READ" ;
+    
+    private static final String C_PROJECTRESOURCES_HISTORY_READ = "C_PROJECTRESOURCES_HISTORY_READ" ;
+    
+    private static final String C_PROJECTS_HISTORY_READ_ALL = "C_PROJECTS_HISTORY_READ_ALL" ;
+    
+    private static final String C_PROPERTIES_HISTORY_READ_PUBTAG = "C_PROPERTIES_HISTORY_READ_PUBTAG" ;
+    
+    private static final String C_PROPERTIES_HISTORY_READALL_STR = "C_PROPERTIES_HISTORY_READALL_STR" ;
+    
+    private static final String C_PROPERTIES_HISTORY_READALL_RES = "C_PROPERTIES_HISTORY_READALL_RES" ;
+    
+    private static final String C_PROPERTYDEF_READ_HISTORY = "C_PROPERTYDEF_READ_HISTORY" ;
+    
+    private static final String C_PROJECTS_HISTORY_READ_TAG_FOR_DATE = "C_PROJECTS_HISTORY_READ_TAG_FOR_DATE" ;
+    
+    private static final String C_HISTORY_EXISTS_RESOURCE = "C_HISTORY_EXISTS_RESOURCE" ;
+    
+    private static final String C_STRUCTURE_HISTORY_READ_NOTDELETED = "C_STRUCTURE_HISTORY_READ_NOTDELETED" ;
+    
+    private static final String C_RESOURCES_HISTORY_READ_DELETED_NAME = "C_RESOURCES_HISTORY_READ_DELETED_NAME" ;
+    
+    private static final String C_RESOURCES_HISTORY_READ_DELETED_NAME_RESTRICTED = "C_RESOURCES_HISTORY_READ_DELETED_NAME_RESTRICTED" ;
+    
+    private static final String C_CONTENT_PUBLISH_MAXTAG = "C_CONTENT_PUBLISH_MAXTAG" ;
+    
+    private static final String C_PROJECTS_HISTORY_READ_BYID = "C_PROJECTS_HISTORY_READ_BYID" ;
+	/* 
+	 * @see org.opencms.db.I_CmsDriver#init(org.opencms.db.CmsDbContext, org.opencms.configuration.CmsConfigurationManager, java.util.List, org.opencms.db.CmsDriverManager)
+	 */
+	public void init(CmsDbContext dbc,
+			CmsConfigurationManager configurationManager,
+			List successiveDrivers, CmsDriverManager driverManager)
+			throws CmsException {	
+        
+		m_sqlManager = new CmsSqlManager() ;
+
+        m_driverManager = driverManager;
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_ASSIGNED_POOL_1, "JPA"));
+        }
+
+        if ((successiveDrivers != null) && !successiveDrivers.isEmpty()) {
+            if (LOG.isWarnEnabled()) {
+                LOG.warn(Messages.get().getBundle().key(
+                    Messages.LOG_SUCCESSIVE_DRIVERS_UNSUPPORTED_1,
+                    getClass().getName()));
+            }
+        }
+		
+	}
+	
+	/* 
+	 * @see org.opencms.db.I_CmsHistoryDriver#createPropertyDefinition(org.opencms.db.CmsDbContext, java.lang.String, org.opencms.file.CmsPropertyDefinition.CmsPropertyType)
+	 */
+	public CmsPropertyDefinition createPropertyDefinition(CmsDbContext dbc,
+			String name, CmsPropertyType type) throws CmsDataAccessException {
+		
+
+        try {
+        	
+            CmsDAOHistoryPropertyDef chpd = new CmsDAOHistoryPropertyDef() ;
+            
+            chpd.setPropertyDefId(new CmsUUID().toString()) ;
+            chpd.setPropertyDefName(name) ;
+            chpd.setPropertyDefType(type.getMode()) ;
+            
+            dbc.getEntityManager().persist(chpd) ;
+            
+        } catch (PersistenceException e) {
+            throw new CmsDataAccessException(Messages.get().container(
+                Messages.ERR_JPA_PERSITENCE), e);
+
+        } 
+
+        return readPropertyDefinition(dbc, name);
+	}
+
+	/* 
+	 * @see org.opencms.db.I_CmsHistoryDriver#deleteEntries(org.opencms.db.CmsDbContext, org.opencms.file.history.I_CmsHistoryResource, int, long)
+	 */
+	public int deleteEntries(CmsDbContext dbc,
+			I_CmsHistoryResource resource, int versionsToKeep, long time)
+			throws CmsDataAccessException {
+
+        try {
+            int maxVersion = -1;
+            // get the maximal version number for this resource
+            Query q = m_sqlManager.createQuery(dbc, C_STRUCTURE_HISTORY_MAXVER);
+            q.setParameter(1, resource.getStructureId().toString());
+            try{
+            	maxVersion = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            }catch(NoResultException e){
+            	// nothing to delete
+                internalCleanup(dbc, resource);
+                return 0;
+            }
+            
+            if (time >= 0) {
+                int maxVersionByTime = -1;
+                // get the maximal version to keep for this resource based on the time parameter
+                q = m_sqlManager.createQuery(dbc, C_STRUCTURE_HISTORY_MAXVER_BYTIME) ;
+                q.setParameter(1, resource.getStructureId().toString());
+                q.setParameter(2, time);
+                
+                try{
+                	maxVersionByTime = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+                }catch(NoResultException e){
+                	// do nothing
+                }
+               
+                if (maxVersionByTime > 0) {
+                    if (versionsToKeep < 0) {
+                        versionsToKeep = (maxVersion - maxVersionByTime);
+                    } else {
+                        versionsToKeep = Math.min(versionsToKeep, (maxVersion - maxVersionByTime));
+                    }
+                }
+            }
+
+            if (maxVersion - versionsToKeep <= 0) {
+                // nothing to delete
+                internalCleanup(dbc, resource);
+                return 0;
+            }
+            
+            // get the minimal structure publish tag to keep for this sibling
+            int minStrPublishTagToKeep = -1;
+            q = m_sqlManager.createQuery(dbc, C_HISTORY_READ_MAXTAG_FOR_VERSION);
+            q.setParameter(1, resource.getStructureId().toString());
+            q.setParameter(2, 1 + maxVersion - versionsToKeep);
+            try{
+            	minStrPublishTagToKeep = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            } catch(NoResultException e){
+            	// nothing to delete
+                internalCleanup(dbc, resource);
+                return 0;
+            }
+            
+            if (minStrPublishTagToKeep < 1) {
+                // nothing to delete
+                internalCleanup(dbc, resource);
+                return 0;
+            }
+            minStrPublishTagToKeep++;
+            
+            // delete the properties
+            q = m_sqlManager.createQuery(dbc, C_PROPERTIES_HISTORY_DELETE);
+            q.setParameter(1, resource.getStructureId().toString());
+            q.setParameter(2, minStrPublishTagToKeep);
+            List res = q.getResultList() ;
+            for(CmsDAOHistoryProperties hp:((List<CmsDAOHistoryProperties>)res)){
+            	dbc.getEntityManager().remove(hp) ;
+            }
+
+            // delete the structure entries
+            q = m_sqlManager.createQuery(dbc, C_STRUCTURE_HISTORY_DELETE);
+            q.setParameter(1, resource.getStructureId().toString());
+            q.setParameter(2, minStrPublishTagToKeep);
+            res = q.getResultList() ;
+            int structureVersions = 0;
+            for(CmsDAOHistoryStructure hs:((List<CmsDAOHistoryStructure>) res)){
+            	dbc.getEntityManager().remove(hs) ;
+            	structureVersions++ ;
+            }
+
+            // get the minimal resource publish tag to keep, 
+            // all entries with publish tag less than this will be deleted
+            int minResPublishTagToKeep = -1;
+            q = m_sqlManager.createQuery(dbc, C_HISTORY_READ_MIN_USED_TAG);
+            q.setParameter(1, resource.getResourceId().toString());
+            
+            try{
+            	minResPublishTagToKeep = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            } catch(NoResultException e){
+            	internalCleanup(dbc, resource);
+                return structureVersions;
+            }
+
+            // delete the resource entries
+            q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_DELETE);
+            q.setParameter(1, resource.getResourceId().toString());
+            q.setParameter(2, minResPublishTagToKeep);
+            int resourceVersions = 0;
+            res = q.getResultList() ;
+            for(CmsDAOHistoryResources hr:((List<CmsDAOHistoryResources>) res) ){
+            	dbc.getEntityManager().remove(hr) ;
+            	resourceVersions++ ;
+            }
+
+            // delete the content entries
+            q = m_sqlManager.createQuery(dbc, C_CONTENT_HISTORY_DELETE);
+            q.setParameter(1, resource.getResourceId().toString());
+            q.setParameter(2, minResPublishTagToKeep);
+            res = q.getResultList();
+            for(CmsDAOContents c:((List<CmsDAOContents>) res)){
+            	dbc.getEntityManager().remove(c) ;
+            }
+
+            internalCleanup(dbc, resource);
+            
+            return Math.max(structureVersions, resourceVersions);
+        } catch (PersistenceException e) {
+            throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE), e);
+        }
+	}
+
+	/* 
+	 * @see org.opencms.db.I_CmsHistoryDriver#deletePropertyDefinition(org.opencms.db.CmsDbContext, org.opencms.file.CmsPropertyDefinition)
+	 */
+	public void deletePropertyDefinition(CmsDbContext dbc,
+			CmsPropertyDefinition metadef) throws CmsDataAccessException {
+		
+		try {
+            if ((internalCountProperties(dbc, metadef, CmsProject.ONLINE_PROJECT_ID) != 0)
+                || (internalCountProperties(dbc, metadef, CmsUUID.getOpenCmsUUID()) != 0)) { // HACK: to get an offline project
+
+                throw new CmsDbConsistencyException(Messages.get().container(
+                    Messages.ERR_ERROR_DELETING_PROPERTYDEF_1,
+                    metadef.getName()));
+            }
+
+            // delete the historical property definition
+            Query q = m_sqlManager.createQuery(dbc, C_PROPERTYDEF_DELETE_HISTORY);
+            q.setParameter(1, metadef.getId().toString());
+            List<CmsDAOHistoryPropertyDef> res = q.getResultList() ;
+            for(CmsDAOHistoryPropertyDef hpd:res){
+            	dbc.getEntityManager().remove(hpd) ;
+            }
+        } catch (PersistenceException e) {
+            throw new CmsDataAccessException(Messages.get().container(
+                Messages.ERR_GENERIC_SQL_1,
+                Messages.ERR_JPA_PERSITENCE), e);
+        }
+	}
+
+	/* 
+	 * @see org.opencms.db.I_CmsHistoryDriver#destroy()
+	 */
+	public void destroy() throws Throwable {
+		m_sqlManager = null;
+        m_driverManager = null;
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_SHUTDOWN_DRIVER_1, getClass().getName()));
+        }
+	}
+
+	/* 
+	 * @see org.opencms.db.I_CmsHistoryDriver#getAllDeletedEntries(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+	 */
+	public List getAllDeletedEntries(CmsDbContext dbc, CmsUUID parentId)
+			throws CmsDataAccessException {
+
+		Query q = null ;
+        List entries = new ArrayList();
+        try {
+            // get all not-deleted historical entries that may come in question
+            q = m_sqlManager.createQuery(dbc, C_STRUCTURE_HISTORY_READ_DELETED);
+            List<Object[]> res = q.getResultList();
+            for (Object[] obj:res) {
+                CmsUUID structureId = new CmsUUID((String) obj[0]);
+                int version = CmsDataTypeUtil.numberToInt((Integer) obj[1]);
+                entries.add(readResource(dbc, structureId, version));
+            }
+        } catch (PersistenceException e) {
+            throw new CmsDataAccessException(Messages.get().container(
+                Messages.ERR_JPA_PERSITENCE,
+                e), e);
+        }
+        
+        return internalFilterParentId(parentId, entries);
+	}
+
+	/* 
+	 * @see org.opencms.db.I_CmsHistoryDriver#getSqlManager()
+	 */
+	 public org.opencms.db.CmsSqlManager getSqlManager() {
+		
+		return (org.opencms.db.CmsSqlManager) m_sqlManager ;
+	}
+
+	/* 
+	 * @see org.opencms.db.I_CmsHistoryDriver#initSqlManager(java.lang.String)
+	 */
+	@Override
+	public org.opencms.db.CmsSqlManager initSqlManager(String classname) {
+		
+		return (org.opencms.db.CmsSqlManager) m_sqlManager;
+	}
+
+	/*
+	 * @see org.opencms.db.I_CmsHistoryDriver#readAllAvailableVersions(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+	 */
+	
+	public List readAllAvailableVersions(CmsDbContext dbc, CmsUUID structureId)
+			throws CmsDataAccessException {
+		
+        List result = new ArrayList();
+        List<CmsDAOHistoryResources> lResources ;
+        Query q = null ;
+        try {
+            // get all direct versions (where the structure entry has been written)
+            // sorted from the NEWEST to the OLDEST version (publish tag descendant)
+            List historyResources = new ArrayList();
+            q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_READ_ALL_VERSIONS);
+            q.setParameter(1, structureId.toString());
+            List<Object[]> res = q.getResultList() ;
+            for (Object[] o:res) {
+                historyResources.add(internalCreateResource(o));
+            }
+            res = null ;
+
+            if (!historyResources.isEmpty()) {
+                // look for newer versions
+                // this is the NEWEST version, with the HIGHEST publish tag
+                I_CmsHistoryResource histRes = (I_CmsHistoryResource)historyResources.get(0);
+
+                // look for later resource entries
+                
+                q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_READ_NEW_VERSIONS);
+                q.setParameter(1, histRes.getResourceId().toString());
+                q.setParameter(2, histRes.getPublishTag());
+                lResources = q.getResultList();
+
+                I_CmsHistoryResource lastHistRes = histRes;
+                // these are sorted from the oldest to the newest version (publish tag ascendent)
+                for (CmsDAOHistoryResources hr:lResources) {
+                    int resVersion = hr.getResourceVersion() ;
+                    if (resVersion == lastHistRes.getResourceVersion()) {
+                        // skip not interesting versions
+                        continue;
+                    }
+                    I_CmsHistoryResource newHistRes = internalMergeResource(histRes, hr, 0);
+                    // add interesting versions, in the right order
+                    result.add(0, newHistRes);
+                    lastHistRes = newHistRes;
+                }
+            }
+            // iterate from the NEWEST to the OLDEST versions (publish tag descendant)
+            for (int i = 0; i < historyResources.size(); i++) {
+                I_CmsHistoryResource histRes = (I_CmsHistoryResource)historyResources.get(i);
+                result.add(histRes);
+                if (i < historyResources.size() - 1) {
+                    // this is one older direct version than histRes (histRes.getPublishTag() > histRes2.getPublishTag())
+                    I_CmsHistoryResource histRes2 = (I_CmsHistoryResource)historyResources.get(i + 1);
+
+                    // look for resource changes in between of the direct versions in ascendent order                    
+                    q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_READ_BTW_VERSIONS);
+                    q.setParameter(1, histRes.getResourceId().toString());
+                    q.setParameter(2, histRes2.getPublishTag()); // lower limit
+                    q.setParameter(3, histRes.getPublishTag()); // upper limit
+                    lResources = q.getResultList();
+
+                    int pos = result.size();
+                    I_CmsHistoryResource lastHistRes = histRes2;
+                    for (CmsDAOHistoryResources hr:lResources) {
+                        int resVersion = hr.getResourceVersion() ;
+                        if (resVersion == lastHistRes.getResourceVersion()) {
+                            // skip not interesting versions
+                            continue;
+                        }
+                        I_CmsHistoryResource newHistRes = internalMergeResource(histRes2, hr, 0);
+                        // add interesting versions, in the right order
+                        result.add(pos, newHistRes);
+                        lastHistRes = newHistRes;
+                    }
+                    lResources = null ;
+                }
+            }
+            if (!result.isEmpty()) {
+                // get the oldest version
+                I_CmsHistoryResource histRes = (I_CmsHistoryResource)result.get(result.size() - 1);
+
+                if (histRes.getVersion() > 1) {
+                    // look for older resource versions, in descendant order
+                    q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_READ_OLD_VERSIONS);
+                    q.setParameter(1, histRes.getResourceId().toString());
+                    q.setParameter(2, histRes.getPublishTag());
+                    lResources = q.getResultList() ;
+
+                    int offset = (histRes.getStructureVersion() > 0 ? 1 : 0);
+
+                    I_CmsHistoryResource lastHistRes = histRes;
+                    for (CmsDAOHistoryResources hr:lResources) {
+                        I_CmsHistoryResource newHistRes = internalMergeResource(histRes, hr, offset);
+                        if (newHistRes.getResourceVersion() != lastHistRes.getResourceVersion()) {
+                            // only add interesting versions
+                            if (offset == 1) {
+                                result.add(lastHistRes);
+                            } else {
+                                result.add(newHistRes);
+                            }
+                        }
+                        lastHistRes = newHistRes;
+                    }
+                    // add the last one if there is one
+                    if ((offset == 1) && (lastHistRes != histRes)) {
+                        result.add(lastHistRes);
+                    }
+                }
+            } else {
+                // new resources have no history entries (despite they could be computed for siblings)
+                /*
+                // look for older resource versions, and merge with online or offline entry
+                */
+            }
+        } catch (PersistenceException e) {
+            throw new CmsDataAccessException(Messages.get().container(
+                Messages.ERR_JPA_PERSITENCE,
+                e), e);
+        } 
+        return result;
+	}
+
+	/*
+	 * @see org.opencms.db.I_CmsHistoryDriver#readContent(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, int)
+	 */
+	public byte[] readContent(CmsDbContext dbc, CmsUUID resourceId,
+			int publishTag) throws CmsDataAccessException {
+		
+        byte[] content = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_HISTORY_READ_CONTENT);
+            q.setParameter(1, resourceId.toString());
+            q.setParameter(2, publishTag);
+            q.setParameter(3, publishTag);
+
+            try{
+            	content = ((CmsDAOContents) q.getSingleResult()).getFileContent() ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+            throw new CmsDataAccessException(Messages.get().container(
+                Messages.ERR_JPA_PERSITENCE,
+                e), e);
+        } 
+        return content;
+	}
+
+	/*
+	 * @see org.opencms.db.I_CmsHistoryDriver#readDeletedResources(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, org.opencms.util.CmsUUID)
+	 */
+	public List readDeletedResources(CmsDbContext dbc, CmsUUID structureId,
+			CmsUUID userId) throws CmsDataAccessException {
+		
+        List<Object[]> res = null;
+        List result = new ArrayList();
+        Query q = null ;
+
+        try {
+            if (userId == null) {
+                q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_READ_DELETED);
+            } else {
+                q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_READ_DELETED_RESTRICTED);
+            }
+            q.setParameter(1, structureId.toString());
+            if (userId != null) {
+            	q.setParameter(2, userId.toString());
+            }
+            res = q.getResultList();
+            for (Object[] o:res) {
+                I_CmsHistoryResource histRes = internalCreateResource(o);
+                if (m_driverManager.getVfsDriver().validateStructureIdExists(
+                    dbc,
+                    dbc.currentProject().getUuid(),
+                    histRes.getStructureId())) {
+                    // only add resources that are really deleted
+                    continue;
+                }
+                result.add(histRes);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        if (!result.isEmpty() || (dbc.getRequestContext().getAttribute("ATTR_RESOURCE_NAME") == null)) {
+            return result;
+        }
+        try {
+            if (userId == null) {
+                q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_READ_DELETED_NAME);
+            } else {
+                q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_READ_DELETED_NAME_RESTRICTED);
+            }
+            String path = dbc.getRequestContext().getAttribute("ATTR_RESOURCE_NAME").toString();
+            q.setParameter(1, path + '%');
+            q.setParameter(2, path);
+            if (userId != null) {
+            	q.setParameter(3, userId.toString());
+            }
+            res = (List<Object[]>) q.getResultList();
+            for (Object[] o:res) {
+                I_CmsHistoryResource histRes = internalCreateResource(o);
+                if (m_driverManager.getVfsDriver().validateStructureIdExists(
+                    dbc,
+                    dbc.currentProject().getUuid(),
+                    histRes.getStructureId())) {
+                    // only add resources that are really deleted
+                    continue;
+                }
+                result.add(histRes);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        return result;
+	}
+
+	/**
+     * @see org.opencms.db.I_CmsHistoryDriver#readFile(CmsDbContext, CmsUUID, int)
+     * @deprecated
+     */
+    public I_CmsHistoryResource readFile(CmsDbContext dbc, CmsUUID structureId, int tagId)
+    throws CmsDataAccessException {
+
+        I_CmsHistoryResource file = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_FILES_READ_HISTORY_BYID);
+            q.setParameter(1, structureId.toString());
+            q.setParameter(2, tagId);
+            Object[] res = (Object[]) q.getSingleResult() ;
+            file = internalCreateResource(res);
+        } catch(NoResultException e){
+        	throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                    Messages.ERR_HISTORY_FILE_NOT_FOUND_1,
+                    structureId));
+        }
+          catch (PersistenceException e) {
+        	  throw new CmsDataAccessException(Messages.get().container(
+                      Messages.ERR_JPA_PERSITENCE,
+                      e), e);
+        } 
+
+        ((CmsFile)file).setContents(readContent(dbc, file.getResourceId(), file.getPublishTag()));
+        return file;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readLastVersion(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public int readLastVersion(CmsDbContext dbc, CmsUUID structureId) throws CmsDataAccessException {
+
+        int lastVersion = 0;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_STRUCTURE_HISTORY_MAXVER);
+            q.setParameter(1, structureId.toString());
+            try {
+                lastVersion = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult());
+            } catch(NoResultException e) {
+                // do nothing
+            } catch(NullPointerException e){
+            	lastVersion = 0 ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return lastVersion;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readMaxPublishTag(CmsDbContext, CmsUUID)
+     */
+    public int readMaxPublishTag(CmsDbContext dbc, CmsUUID resourceId) throws CmsDataAccessException {
+
+        int result = 0;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_RESOURCES_READ_MAX_PUBLISH_TAG);
+            q.setParameter(1, resourceId.toString());
+            try{
+            	result = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return result;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readNextPublishTag(org.opencms.db.CmsDbContext)
+     */
+    public int readNextPublishTag(CmsDbContext dbc) {
+
+        int projectPublishTag = 1;
+        int resourcePublishTag = 1;
+        Query q ;
+        
+        try {
+            // get the max publish tag from project history 
+            q  = m_sqlManager.createQuery(dbc, C_PROJECTS_HISTORY_MAXTAG);
+            try{
+            	projectPublishTag = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) +1 ; 
+            } catch(NoResultException e){
+            	// do nothing
+            }
+
+        } catch (PersistenceException e) {
+            LOG.error(Messages.get().container(Messages.ERR_JPA_PERSITENCE, e), e);
+        } 
+
+        try {
+            // get the max publish tag from resource history 
+            q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_MAXTAG);
+            try{
+            	resourcePublishTag = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) + 1 ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+            LOG.error(Messages.get().container(Messages.ERR_JPA_PERSITENCE, e), e);
+        } 
+
+     // keep the biggest 
+        if (resourcePublishTag > projectPublishTag) {
+            projectPublishTag = resourcePublishTag;
+        }
+
+        try {
+            // get the max publish tag from contents 
+            q = m_sqlManager.createQuery(dbc, C_CONTENT_PUBLISH_MAXTAG);
+            try{
+            	resourcePublishTag = CmsDataTypeUtil.numberToInt((Number)q.getSingleResult()) + 1 ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+
+        } 
+        // return the biggest 
+        if (resourcePublishTag > projectPublishTag) {
+            projectPublishTag = resourcePublishTag;
+        }
+
+        return projectPublishTag;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readPrincipal(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public CmsHistoryPrincipal readPrincipal(CmsDbContext dbc, CmsUUID principalId) throws CmsDataAccessException {
+
+        CmsHistoryPrincipal historyPrincipal = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_HISTORY_PRINCIPAL_READ);
+            q.setParameter(1, principalId.toString());
+            try{
+            	CmsDAOHistoryPrincipals hp = (CmsDAOHistoryPrincipals) q.getSingleResult() ;
+            	String userName = hp.getPrincipalName() ;
+            	String ou = CmsOrganizationalUnit.removeLeadingSeparator(hp.getPrincipalOu());
+            	historyPrincipal = new CmsHistoryPrincipal(
+                        principalId,
+                        ou + userName,
+                        hp.getPrincipalDescription(),
+                        hp.getPrincipalEmail(),
+                        hp.getPrincipalType(),
+                        new CmsUUID(hp.getPrincipalUserDeleted()),
+                        hp.getPrincipalDateDeleted());
+            } catch(NoResultException e){
+            	throw new CmsDbEntryNotFoundException(Messages.get().container(
+                        Messages.ERR_HISTORY_PRINCIPAL_NOT_FOUND_1,
+                        principalId));
+            }   
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+        
+        return historyPrincipal;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readProject(org.opencms.db.CmsDbContext, CmsUUID)
+     */
+    public CmsHistoryProject readProject(CmsDbContext dbc, CmsUUID projectId) throws CmsDataAccessException {
+
+        CmsHistoryProject project = null;
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_HISTORY_READ_BYID);
+
+            q.setParameter(1, projectId.toString());
+            try{
+            	CmsDAOHistoryProjects hp = (CmsDAOHistoryProjects) q.getSingleResult();
+            	int tag = hp.getPublishTag() ;
+            	List projectresources = readProjectResources(dbc, tag);
+            	project = internalCreateProject(hp, projectresources);
+            } catch(NoResultException e){
+            	throw new CmsDbEntryNotFoundException(Messages.get().container(
+                        Messages.ERR_NO_HISTORY_PROJECT_WITH_ID_1,
+                        projectId));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        return project;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readProject(org.opencms.db.CmsDbContext, int)
+     */
+    public CmsHistoryProject readProject(CmsDbContext dbc, int publishTag) throws CmsDataAccessException {
+
+        CmsHistoryProject project = null;
+        
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_HISTORY_READ);
+
+            q.setParameter(1, publishTag);
+            try{
+            	CmsDAOHistoryProjects hp = (CmsDAOHistoryProjects) q.getSingleResult() ;
+            	List projectresources = readProjectResources(dbc, publishTag);
+            	project = internalCreateProject(hp, projectresources);
+            } catch(NoResultException e){
+            	throw new CmsDbEntryNotFoundException(Messages.get().container(
+                        Messages.ERR_NO_HISTORY_PROJECT_WITH_TAG_ID_1,
+                        new Integer(publishTag)));
+            }
+            
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+        
+        return project;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readProjectResources(org.opencms.db.CmsDbContext, int)
+     */
+    public List readProjectResources(CmsDbContext dbc, int publishTag) throws CmsDataAccessException {
+
+        List projectResources = new ArrayList();
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTRESOURCES_HISTORY_READ);
+            q.setParameter(1, publishTag);
+            List<String> res = q.getResultList() ;
+            for (String s:res) {
+                projectResources.add(s);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return projectResources;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readProjects(org.opencms.db.CmsDbContext)
+     */
+    public List readProjects(CmsDbContext dbc) throws CmsDataAccessException {
+
+        List projects = new ArrayList();
+        
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_HISTORY_READ_ALL);
+            List<CmsDAOHistoryProjects> res = q.getResultList() ;
+
+            // this is not really efficient
+            // but it is overriden in all db specific implementations, including mysql
+            int i = 0;
+            int max = 300;
+
+            for(CmsDAOHistoryProjects hp:res) {
+            	if(i == max){
+            		break ;
+            	}
+                List resources = readProjectResources(dbc, hp.getPublishTag());
+                projects.add(internalCreateProject(hp, resources));
+                i++;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return (projects);
+    }
+
+    /** 
+     * @see org.opencms.db.I_CmsHistoryDriver#readProperties(org.opencms.db.CmsDbContext, org.opencms.file.history.I_CmsHistoryResource)
+     */
+    public List readProperties(CmsDbContext dbc, I_CmsHistoryResource resource) throws CmsDataAccessException {
+
+        Map propertyMap = new HashMap();
+
+        try {
+            // get the latest properties for this sibling
+            int pubTag = -1;
+            Query q = m_sqlManager.createQuery(dbc, C_PROPERTIES_HISTORY_READ_PUBTAG);
+            q.setParameter(1, resource.getStructureId().toString());
+            q.setParameter(2, resource.getPublishTag());
+            try{
+            	pubTag = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+            
+            if (pubTag > 0) {
+                // add the siblings props
+                q = m_sqlManager.createQuery(dbc, C_PROPERTIES_HISTORY_READALL_STR);
+                q.setParameter(1, resource.getStructureId().toString());
+                q.setParameter(2, pubTag);
+
+                List<Object[]> res = q.getResultList() ;
+                for (Object[] o:res) {
+                    String propertyKey = (String) o[0] ;
+                    String propertyValue = (String) o[1];
+                    int mappingType = CmsDataTypeUtil.numberToInt((Number) o[2]);
+
+                    internalAddToPropMap(propertyMap, resource, propertyKey, propertyValue, mappingType);
+                }
+            }
+
+            if (pubTag != resource.getPublishTag()) {
+                // check if there were newer shared properties modifications
+                q = m_sqlManager.createQuery(dbc, C_PROPERTIES_HISTORY_READALL_RES);
+                q.setParameter(1, resource.getStructureId().toString());
+                q.setParameter(2, resource.getPublishTag());
+                List<Object[]> res = q.getResultList();
+
+                for (Object[] o:res) {
+                    String propertyKey = (String) o[0];
+                    String propertyValue = (String) o[1];
+                    int mappingType = CmsDataTypeUtil.numberToInt((Number) o[2]);
+
+                    internalAddToPropMap(propertyMap, resource, propertyKey, propertyValue, mappingType);
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+
+        return new ArrayList(propertyMap.values());
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readPropertyDefinition(org.opencms.db.CmsDbContext, java.lang.String)
+     */
+    public CmsPropertyDefinition readPropertyDefinition(CmsDbContext dbc, String name) throws CmsDataAccessException {
+
+        CmsPropertyDefinition propDef = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROPERTYDEF_READ_HISTORY);
+            q.setParameter(1, name);
+            try{
+            	CmsDAOHistoryPropertyDef hpd = (CmsDAOHistoryPropertyDef) q.getSingleResult() ;
+            	propDef = new CmsPropertyDefinition(
+                        new CmsUUID(hpd.getPropertyDefId()),
+                        hpd.getPropertyDefName(),
+                        CmsPropertyDefinition.CmsPropertyType.valueOf(hpd.getPropertyDefType()));
+            } catch(NoResultException e){
+            	throw new CmsDbEntryNotFoundException(Messages.get().container(
+                        Messages.ERR_NO_PROPERTYDEF_WITH_NAME_1,
+                        name));
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+
+        return propDef;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readPublishTag(org.opencms.db.CmsDbContext, long)
+     */
+    public int readPublishTag(CmsDbContext dbc, long maxdate) throws CmsDataAccessException {
+
+        int maxVersion = 0;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_HISTORY_READ_TAG_FOR_DATE);
+            q.setParameter(1, maxdate);
+            try{
+            	maxVersion = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        return maxVersion;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#writePrincipal(CmsDbContext, org.opencms.security.I_CmsPrincipal)
+     */
+    public void writePrincipal(CmsDbContext dbc, I_CmsPrincipal principal) throws CmsDataAccessException {
+
+        try {
+            // check if the principal was already saved
+            readPrincipal(dbc, principal.getId());
+            return;
+        } catch (CmsDbEntryNotFoundException e) {
+            // ok
+        }
+        try {
+        	CmsDAOHistoryPrincipals hp = new CmsDAOHistoryPrincipals() ;
+        	hp.setPrincipalId(principal.getId().toString()) ;
+        	hp.setPrincipalName(principal.getSimpleName()) ;
+        	String desc = principal.getDescription();
+            desc = CmsStringUtil.isEmptyOrWhitespaceOnly(desc) ? "-" : desc;
+            hp.setPrincipalDescription(desc) ;
+            hp.setPrincipalOu(CmsOrganizationalUnit.SEPARATOR + principal.getOuFqn()) ;
+            if (principal instanceof CmsUser) {
+                String email = ((CmsUser)principal).getEmail();
+                email = CmsStringUtil.isEmptyOrWhitespaceOnly(email) ? "-" : email;
+                hp.setPrincipalEmail(email) ;
+                hp.setPrincipalType(I_CmsPrincipal.PRINCIPAL_USER) ;
+            } else {
+            	hp.setPrincipalEmail("-") ;
+            	hp.setPrincipalType(I_CmsPrincipal.PRINCIPAL_GROUP) ;
+            }
+        	hp.setPrincipalUserDeleted(dbc.currentUser().getId().toString()) ;
+        	hp.setPrincipalDateDeleted(System.currentTimeMillis()) ;
+        	dbc.getEntityManager().persist(hp) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#writeProject(org.opencms.db.CmsDbContext, int, long)
+     */
+    public void writeProject(CmsDbContext dbc, int publishTag, long publishDate) throws CmsDataAccessException {
+
+        CmsProject currentProject = dbc.currentProject();
+        CmsUser currentUser = dbc.currentUser();
+
+        List projectresources = m_driverManager.getProjectDriver().readProjectResources(dbc, currentProject);
+
+        // write historical project to the database
+        try {
+        	CmsDAOHistoryProjects hp = new CmsDAOHistoryProjects() ;
+        	
+        	hp.setPublishTag(publishTag) ;
+        	hp.setProjectId(currentProject.getUuid().toString()) ;
+        	hp.setProjectName(currentProject.getSimpleName()) ;
+        	hp.setProjectPublishDate(publishDate) ;
+        	hp.setProjectPublishedBy(currentUser.getId().toString()) ;
+        	hp.setUserId(currentProject.getOwnerId().toString()) ;
+        	hp.setGroupId(currentProject.getGroupId().toString()) ;
+        	hp.setManagerGroupId(currentProject.getManagerGroupId().toString()) ;
+        	hp.setProjectDescription(currentProject.getDescription()) ;
+        	hp.setDateCreated(currentProject.getDateCreated()) ;
+        	hp.setProjectType(currentProject.getType().getMode()) ;
+        	hp.setProjectOu(CmsOrganizationalUnit.SEPARATOR + currentProject.getOuFqn()) ;
+        	
+            dbc.getEntityManager().persist(hp) ;
+
+            // now write the projectresources
+            CmsDAOHistoryProjectResources hpr ;
+            Iterator i = projectresources.iterator();
+            while (i.hasNext()) {
+            	hpr = new CmsDAOHistoryProjectResources() ;
+            	
+            	hpr.setPublishTag(publishTag) ;
+            	hpr.setProjectId(currentProject.getUuid().toString()) ;
+            	hpr.setResourcePath((String)i.next()) ;
+            	
+            	dbc.getEntityManager().persist(hpr) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#writeProperties(org.opencms.db.CmsDbContext, org.opencms.file.CmsResource, java.util.List, int)
+     */
+    public void writeProperties(CmsDbContext dbc, CmsResource resource, List properties, int publishTag)
+    throws CmsDataAccessException {
+
+    	CmsDAOHistoryProperties hp ;
+    	
+        try {
+            Iterator dummy = properties.iterator();
+            while (dummy.hasNext()) {
+                CmsProperty property = (CmsProperty)dummy.next();
+                CmsPropertyDefinition propDef = null;
+                try {
+                    propDef = readPropertyDefinition(dbc, property.getName());
+                } catch (CmsDbEntryNotFoundException e) {
+                    // create if missing
+                    propDef = createPropertyDefinition(dbc, property.getName(), CmsPropertyDefinition.TYPE_NORMAL);
+                }
+
+                for (int i = 0; i < 2; i++) {
+                    int mappingType;
+                    String value;
+                    CmsUUID id;
+                    if (i == 0) {
+                        // write the structure value on the first cycle
+                        value = property.getStructureValue();
+                        mappingType = CmsProperty.STRUCTURE_RECORD_MAPPING;
+                        id = resource.getStructureId();
+                        if (CmsStringUtil.isEmpty(value)) {
+                            continue;
+                        }
+                    } else {
+                        // write the resource value on the second cycle
+                        value = property.getResourceValue();
+                        mappingType = CmsProperty.RESOURCE_RECORD_MAPPING;
+                        id = resource.getResourceId();
+                        if (CmsStringUtil.isEmpty(value)) {
+                            break;
+                        }
+                    }
+
+                    hp = new CmsDAOHistoryProperties() ;
+                    
+                    hp.setStructureId(resource.getStructureId().toString()) ;
+                    hp.setPropertyDefId(propDef.getId().toString()) ;
+                    hp.setPropertyMappingId(id.toString()) ;
+                    hp.setPropertyMappingType(mappingType) ;
+                    hp.setPropertyValue(m_sqlManager.validateEmpty(value)) ;
+                    hp.setPublishTag(publishTag) ;
+                    
+                    dbc.getEntityManager().persist(hp) ;
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#writeResource(org.opencms.db.CmsDbContext, org.opencms.file.CmsResource, java.util.List, int)
+     */
+    public void writeResource(CmsDbContext dbc, CmsResource resource, List properties, int publishTag)
+    throws CmsDataAccessException {
+
+        try {
+            int sibCount = resource.getSiblingCount();
+
+            boolean valResource = internalValidateResource(dbc, resource, publishTag);
+
+            // if deleted
+            if (resource.getState().isDeleted()) {
+                // if it is a file
+                if (resource instanceof CmsFile) {
+                    if (!valResource) {
+                        if (sibCount < 2) {
+                            // copy from offline content to content tables
+                            // so that the history contains the last state of the file
+                            m_driverManager.getVfsDriver().createOnlineContent(
+                                dbc,
+                                resource.getResourceId(),
+                                ((CmsFile)resource).getContents(),
+                                publishTag,
+                                false,
+                                true);
+                        } else {
+                            // put the content definitively in the history if no sibling is left
+                            m_driverManager.getVfsDriver().createOnlineContent(
+                                dbc,
+                                resource.getResourceId(),
+                                ((CmsFile)resource).getContents(),
+                                publishTag,
+                                true,
+                                false);
+                        }
+                    }
+                }
+
+                // update version numbers
+                m_driverManager.getVfsDriver().publishVersions(dbc, resource, !valResource);
+            }
+
+            // read the version numbers
+            Map versions = m_driverManager.getVfsDriver().readVersions(
+                dbc,
+                CmsProject.ONLINE_PROJECT_ID,
+                resource.getResourceId(),
+                resource.getStructureId());
+            int structureVersion = CmsDataTypeUtil.numberToInt((Integer)versions.get("structure"));
+            int resourceVersion = CmsDataTypeUtil.numberToInt((Integer)versions.get("resource"));
+
+            if (!valResource) {
+                // write the resource
+            	CmsDAOHistoryResources hs = new CmsDAOHistoryResources() ;
+            	
+            	hs.setResourceId(resource.getResourceId().toString()) ;
+            	hs.setResourceType(resource.getTypeId()) ;
+            	hs.setResourceFlags(resource.getFlags()) ;
+            	hs.setDateCreated(resource.getDateCreated()) ;
+            	hs.setUserCreated(resource.getUserCreated().toString()) ;
+            	hs.setDateLastModified(resource.getDateLastModified()) ;
+            	hs.setUserLastModified(resource.getUserLastModified().toString()) ;
+            	hs.setResourceState(resource.getState().getState()) ;
+            	hs.setResourceSize(resource.getLength()) ;
+            	hs.setDateContent(resource.getDateContent()) ;
+            	hs.setProjectLastModified(dbc.currentProject().getUuid().toString()) ;
+            	hs.setSiblingCount(resource.getSiblingCount()) ;
+            	hs.setResourceVersion(resourceVersion) ;
+            	hs.setPublishTag(publishTag) ;
+            	
+                dbc.getEntityManager().persist(hs) ;
+            }
+            CmsUUID parentId = CmsUUID.getNullUUID();
+            CmsFolder parent = m_driverManager.getVfsDriver().readParentFolder(
+                dbc,
+                CmsProject.ONLINE_PROJECT_ID,
+                resource.getStructureId());
+            if (parent != null) {
+                parentId = parent.getStructureId();
+            }
+            // write the structure
+            CmsDAOHistoryStructure hstr = new CmsDAOHistoryStructure() ;
+            
+            hstr.setStructureId(resource.getStructureId().toString()) ;
+            hstr.setResourceId(resource.getResourceId().toString()) ;
+            hstr.setResourcePath(resource.getRootPath()) ;
+            hstr.setStructureState(resource.getState().getState()) ;
+            hstr.setDateReleased(resource.getDateReleased()) ;
+            hstr.setDateExpired(resource.getDateExpired()) ;
+            hstr.setStructureVersion(structureVersion) ;
+            hstr.setParentId(parentId.toString()) ;
+            hstr.setPublishTag(publishTag) ;
+            hstr.setVersion(resource.getVersion()) ;
+            
+            dbc.getEntityManager().persist(hstr) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+
+        writeProperties(dbc, resource, properties, publishTag);
+    }
+
+	/**
+     * Deletes all historical entries of subresources of a folder without any historical netry left.<p>
+     * 
+     * @param dbc the current database context
+     * @param resource the resource to check
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected void internalCleanup(CmsDbContext dbc, I_CmsHistoryResource resource) throws CmsDataAccessException {
+
+        boolean isFolder = resource.getRootPath().endsWith("/");
+        List subResources = new ArrayList();
+        // if the resource is a folder
+        if (isFolder) {
+            // and if no versions left
+            if (readLastVersion(dbc, resource.getStructureId()) == 0) {
+                // get all direct subresources                    
+
+                try {
+                    Query q = m_sqlManager.createQuery(dbc, C_STRUCTURE_HISTORY_READ_SUBRESOURCES);
+                    q.setParameter(1, resource.getStructureId().toString());
+                    List<Object[]> res =  q.getResultList();
+                    for(Object[] obj:res) {
+                        CmsUUID structureId = new CmsUUID( (String) obj[0]);
+                        int version = CmsDataTypeUtil.numberToInt((Integer) obj[1]);
+                        subResources.add(readResource(dbc, structureId, version));
+                    }
+                } catch (PersistenceException e) {
+                    throw new CmsDbSqlException(Messages.get().container(
+                        Messages.ERR_GENERIC_SQL_1,
+                        Messages.ERR_JPA_PERSITENCE), e);
+                }
+            }
+        }
+
+        // delete all subresource versions
+        Iterator it = subResources.iterator();
+        while (it.hasNext()) {
+            I_CmsHistoryResource histResource = (I_CmsHistoryResource)it.next();
+            deleteEntries(dbc, histResource, 0, -1);
+        }
+    }
+	
+    /**
+     * Filters all resources in the subtree of the folder identified by the given id.<p>
+     * 
+     * @param parentId the id of the folder to filter
+     * @param resources the resources to filter
+     * 
+     * @return the filtered list of resource
+     */
+    protected List internalFilterParentId(CmsUUID parentId, List resources) {
+
+        List result = new ArrayList();
+
+        // filter the parent id
+        Set ids = new HashSet();
+        ids.add(parentId);
+
+        boolean modified = true;
+        while (modified) {
+            modified = false;
+            Iterator it = resources.iterator();
+            while (it.hasNext()) {
+                I_CmsHistoryResource resource = (I_CmsHistoryResource)it.next();
+                if (ids.contains(resource.getParentId())) {
+                    ids.add(resource.getStructureId());
+                    result.add(resource);
+                    modified = true;
+                    it.remove();
+                }
+            }
+        }
+        return result;
+    }
+    
+    /**
+     * Creates a valid {@link I_CmsHistoryResource} instance from a JDBC ResultSet.<p>
+     * 
+     * @param res the JDBC result set
+     * 
+     * @return the new historical resource instance
+     * 
+     */
+    protected I_CmsHistoryResource internalCreateResource(Object[] res) {
+    	
+    	CmsDAOHistoryStructure hs = (CmsDAOHistoryStructure) res[0] ;
+    	CmsDAOHistoryResources hr = (CmsDAOHistoryResources) res[1] ;
+    	String lockedInProject = (String) res[2] ;
+    	
+
+        int resourceVersion = hr.getResourceVersion() ;
+        int structureVersion = hs.getStructureVersion() ;
+        int tagId = hr.getPublishTag() ;
+        CmsUUID structureId = new CmsUUID(hs.getStructureId());
+        CmsUUID resourceId = new CmsUUID(hr.getResourceId());
+        String resourcePath = hs.getResourcePath() ;
+        int resourceType = hr.getResourceType() ;
+        int resourceFlags = hr.getResourceFlags() ;
+        CmsUUID projectLastModified = new CmsUUID(hr.getProjectLastModified());
+        int state = Math.max(
+        	hr.getResourceState(),
+        	hs.getStructureState()) ;
+        long dateCreated = hr.getDateCreated() ;
+        long dateLastModified = hr.getDateLastModified() ;
+        long dateReleased = hs.getDateReleased() ;
+        long dateExpired = hs.getDateExpired() ;
+        int resourceSize = hr.getResourceSize() ;
+        CmsUUID userLastModified = new CmsUUID( hr.getUserLastModified());
+        CmsUUID userCreated = new CmsUUID(hr.getUserCreated());
+        CmsUUID parentId = new CmsUUID(hs.getParentId());
+        long dateContent = hr.getDateContent() ;
+
+        boolean isFolder = resourcePath.endsWith("/");
+        if (isFolder) {
+            return new CmsHistoryFolder(
+                tagId,
+                structureId,
+                resourceId,
+                resourcePath,
+                resourceType,
+                resourceFlags,
+                projectLastModified,
+                CmsResourceState.valueOf(state),
+                dateCreated,
+                userCreated,
+                dateLastModified,
+                userLastModified,
+                dateReleased,
+                dateExpired,
+                resourceVersion + structureVersion,
+                parentId,
+                resourceVersion,
+                structureVersion);
+        } else {
+            return new CmsHistoryFile(
+                tagId,
+                structureId,
+                resourceId,
+                resourcePath,
+                resourceType,
+                resourceFlags,
+                projectLastModified,
+                CmsResourceState.valueOf(state),
+                dateCreated,
+                userCreated,
+                dateLastModified,
+                userLastModified,
+                dateReleased,
+                dateExpired,
+                resourceSize,
+                dateContent,
+                resourceVersion + structureVersion,
+                parentId,
+                null,
+                resourceVersion,
+                structureVersion);
+        }
+    }
+    
+    /**
+     * Merges an historical entry for a sibling, based on the structure data from the given historical resource
+     * and result set for the resource entry.<p>
+     * 
+     * @param histRes the original historical entry
+     * @param hr the CmsDAOHistoryResources instance of the resource entry
+     * @param versionOffset the offset for the structure version
+     * 
+     * @return a merged historical entry for the sibling
+     * 
+     */
+    protected I_CmsHistoryResource internalMergeResource(I_CmsHistoryResource histRes, CmsDAOHistoryResources hr, int versionOffset) {
+
+        int resourceVersion = hr.getResourceVersion();
+        int structureVersion = histRes.getStructureVersion() - versionOffset;
+        int tagId = hr.getPublishTag() ;
+        CmsUUID structureId = histRes.getStructureId();
+        CmsUUID resourceId = new CmsUUID(hr.getResourceId());
+        int resourceType = hr.getResourceType();
+        int resourceFlags = hr.getResourceFlags();
+        CmsUUID projectLastModified = new CmsUUID(hr.getProjectLastModified()) ;
+        int state = histRes.getState().getState(); // may be we have to compute something here?
+        long dateCreated = hr.getDateCreated();
+        long dateLastModified = hr.getDateLastModified() ;
+        long dateReleased = histRes.getDateReleased();
+        long dateExpired = histRes.getDateExpired();
+        int resourceSize = hr.getResourceSize() ;
+        CmsUUID userLastModified = new CmsUUID(hr.getUserLastModified());
+        CmsUUID userCreated = new CmsUUID(hr.getUserCreated());
+        // here we could use the path/parent id for the sibling where the modification really occurred
+        String resourcePath = histRes.getRootPath();
+        CmsUUID parentId = histRes.getParentId();
+        long dateContent = hr.getDateContent();
+
+        if (histRes.isFolder()) {
+            return new CmsHistoryFolder(
+                tagId,
+                structureId,
+                resourceId,
+                resourcePath,
+                resourceType,
+                resourceFlags,
+                projectLastModified,
+                CmsResourceState.valueOf(state),
+                dateCreated,
+                userCreated,
+                dateLastModified,
+                userLastModified,
+                dateReleased,
+                dateExpired,
+                resourceVersion + structureVersion,
+                parentId,
+                resourceVersion,
+                structureVersion);
+        } else {
+            return new CmsHistoryFile(
+                tagId,
+                structureId,
+                resourceId,
+                resourcePath,
+                resourceType,
+                resourceFlags,
+                projectLastModified,
+                CmsResourceState.valueOf(state),
+                dateCreated,
+                userCreated,
+                dateLastModified,
+                userLastModified,
+                dateReleased,
+                dateExpired,
+                resourceSize,
+                dateContent,
+                resourceVersion + structureVersion,
+                parentId,
+                null,
+                resourceVersion,
+                structureVersion);
+        }
+    }
+    
+    /**
+     * Returns the amount of properties for a propertydefinition.<p>
+     * 
+     * @param dbc the current database context
+     * @param metadef the propertydefinition to test
+     * @param projectId the ID of the current project
+     * 
+     * @return the amount of properties for a propertydefinition
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected int internalCountProperties(CmsDbContext dbc, CmsPropertyDefinition metadef, CmsUUID projectId)
+    throws CmsDataAccessException {
+
+        int returnValue;
+        try {
+            // create statement
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_PROPERTIES_READALL_COUNT);
+            q.setParameter(1, metadef.getId().toString());
+            try{
+            	returnValue = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            } catch(NoResultException e){
+            	throw new CmsDbConsistencyException(Messages.get().container(
+                        Messages.ERR_NO_PROPERTIES_FOR_PROPERTYDEF_1,
+                        metadef.getName()));
+            }
+            
+        } catch (PersistenceException e) {
+            throw new CmsDataAccessException(Messages.get().container(
+                Messages.ERR_JPA_PERSITENCE,
+                e), e);
+        } 
+        return returnValue;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#readResource(CmsDbContext, CmsUUID, int)
+     */
+    public I_CmsHistoryResource readResource(CmsDbContext dbc, CmsUUID structureId, int version)
+    throws CmsDataAccessException {
+
+        I_CmsHistoryResource resource = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_RESOURCES_HISTORY_READ_VERSION);
+            q.setParameter(1, structureId.toString());
+            q.setParameter(2, version);
+            try{
+            	resource = internalCreateResource((Object[]) q.getSingleResult());
+            } catch(NoResultException e){
+            	throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                        Messages.ERR_HISTORY_FILE_NOT_FOUND_1,
+                        structureId));
+            }
+            
+        } catch (PersistenceException e) {
+            throw new CmsDbSqlException(Messages.get().container(
+                Messages.ERR_JPA_PERSITENCE,
+                e), e);
+        } 
+        return resource;
+    }
+    
+    /**
+     * Creates a historical project from the given result set and resources.<p>
+     * @param hp the CmsDAOHistoryProjects instance
+     * @param resources the historical resources
+     * 
+     * @return the historical project
+     *  
+     * @throws PersistenceException if something goes wrong
+     */
+    protected CmsHistoryProject internalCreateProject(CmsDAOHistoryProjects hp, List resources) throws PersistenceException {
+
+        String ou = CmsOrganizationalUnit.removeLeadingSeparator(hp.getProjectOu());
+        CmsUUID publishedById = new CmsUUID(hp.getProjectPublishedBy());
+        CmsUUID userId = new CmsUUID(hp.getUserId());
+        return new CmsHistoryProject(
+            hp.getPublishTag(),
+            new CmsUUID(hp.getProjectId()),
+            ou + hp.getProjectName(),
+            hp.getProjectDescription(),
+            userId,
+            new CmsUUID(hp.getGroupId()),
+            new CmsUUID(hp.getManagerGroupId()),
+            hp.getDateCreated(),
+            CmsProject.CmsProjectType.valueOf(hp.getProjectType()),
+            hp.getProjectPublishDate(),
+            publishedById,
+            resources);
+    }
+    
+    /**
+     * Updates the property map for the given resource with the given property data.<p>
+     * 
+     * @param propertyMap the map to update
+     * @param resource the resource the properties belong to
+     * @param propertyKey the property key
+     * @param propertyValue the property value
+     * @param mappingType the mapping type
+     * 
+     * @throws CmsDbConsistencyException if the mapping type is wrong
+     */
+    protected void internalAddToPropMap(
+        Map propertyMap,
+        I_CmsHistoryResource resource,
+        String propertyKey,
+        String propertyValue,
+        int mappingType) throws CmsDbConsistencyException {
+
+        CmsProperty property = (CmsProperty)propertyMap.get(propertyKey);
+        if (property != null) {
+            // there exists already a property for this key in the result
+            switch (mappingType) {
+                case CmsProperty.STRUCTURE_RECORD_MAPPING:
+                    // this property value is mapped to a structure record
+                    property.setStructureValue(propertyValue);
+                    break;
+                case CmsProperty.RESOURCE_RECORD_MAPPING:
+                    // this property value is mapped to a resource record
+                    property.setResourceValue(propertyValue);
+                    break;
+                default:
+                    throw new CmsDbConsistencyException(Messages.get().container(
+                        Messages.ERR_UNKNOWN_PROPERTY_VALUE_MAPPING_3,
+                        resource.getRootPath(),
+                        new Integer(mappingType),
+                        propertyKey));
+            }
+        } else {
+            // there doesn't exist a property for this key yet
+            property = new CmsProperty();
+            property.setName(propertyKey);
+
+            switch (mappingType) {
+                case CmsProperty.STRUCTURE_RECORD_MAPPING:
+                    // this property value is mapped to a structure record
+                    property.setStructureValue(propertyValue);
+                    property.setResourceValue(null);
+                    break;
+                case CmsProperty.RESOURCE_RECORD_MAPPING:
+                    // this property value is mapped to a resource record
+                    property.setStructureValue(null);
+                    property.setResourceValue(propertyValue);
+                    break;
+                default:
+                    throw new CmsDbConsistencyException(Messages.get().container(
+                        Messages.ERR_UNKNOWN_PROPERTY_VALUE_MAPPING_3,
+                        resource.getRootPath(),
+                        new Integer(mappingType),
+                        propertyKey));
+            }
+            propertyMap.put(propertyKey, property);
+        }
+    }
+    
+    /**
+     * Tests if a history resource does exist.<p>
+     * 
+     * @param dbc the current database context
+     * @param resource the resource to test
+     * @param publishTag the publish tag of the resource to test
+     * 
+     * @return <code>true</code> if the resource already exists, <code>false</code> otherwise
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected boolean internalValidateResource(CmsDbContext dbc, CmsResource resource, int publishTag)
+    throws CmsDataAccessException {
+
+        boolean exists = false;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_HISTORY_EXISTS_RESOURCE);
+            q.setParameter(1, resource.getResourceId().toString());
+            q.setParameter(2, publishTag);
+            try{
+            	Object res = q.getSingleResult() ;
+            	exists = true ;
+            } catch(NoResultException e){
+            	//do nothing
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDbSqlException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+        
+        return exists;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsHistoryDriver#getAllNotDeletedEntries(CmsDbContext, CmsUUID)
+     */
+    public List getAllNotDeletedEntries(CmsDbContext dbc, CmsUUID parentId) throws CmsDataAccessException {
+
+        List entries = new ArrayList();
+        try {
+            // get all not-deleted historical entries that may come in question
+            Query q = m_sqlManager.createQuery(dbc, C_STRUCTURE_HISTORY_READ_NOTDELETED);
+            List<Object[]> res = q.getResultList() ;
+            for (Object[] o:res) {
+                CmsUUID structureId = new CmsUUID((String) o[0]);
+                int version = CmsDataTypeUtil.numberToInt((Number) o[1]) ;
+                entries.add(readResource(dbc, structureId, version));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDbSqlException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+        
+        return internalFilterParentId(parentId, entries);
+    }
+}
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/CmsProjectDriver.java trunk/src/org/opencms/db/jpa/CmsProjectDriver.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/CmsProjectDriver.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/CmsProjectDriver.java	2008-09-02 11:14:29.183884150 +0300
@@ -0,0 +1,2831 @@
+/*
+ *
+ * This work is derivate of generic SQL driver and it's part of 
+ * OpenCms - the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceException;
+import javax.persistence.Query;
+
+import org.apache.commons.logging.Log;
+import org.opencms.configuration.CmsConfigurationManager;
+import org.opencms.db.CmsDbContext;
+import org.opencms.db.CmsDbEntryNotFoundException;
+import org.opencms.db.CmsDbIoException;
+import org.opencms.db.CmsDriverManager;
+import org.opencms.db.CmsPublishList;
+import org.opencms.db.CmsPublishedResource;
+import org.opencms.db.CmsResourceState;
+import org.opencms.db.I_CmsDriver;
+import org.opencms.db.I_CmsProjectDriver;
+import org.opencms.db.jpa.persistence.CmsDAOOfflineResources;
+import org.opencms.db.jpa.persistence.CmsDAOProjectResources;
+import org.opencms.db.jpa.persistence.CmsDAOProjects;
+import org.opencms.db.jpa.persistence.CmsDAOPublishHistory;
+import org.opencms.db.jpa.persistence.CmsDAOPublishJobs;
+import org.opencms.db.jpa.persistence.CmsDAOResourceLocks;
+import org.opencms.db.jpa.persistence.CmsDAOStaticExportLinks;
+import org.opencms.db.jpa.persistence.CmsDAOProjectResources.CmsDAOProjectResourcesPK;
+import org.opencms.file.CmsDataAccessException;
+import org.opencms.file.CmsFile;
+import org.opencms.file.CmsFolder;
+import org.opencms.file.CmsGroup;
+import org.opencms.file.CmsProject;
+import org.opencms.file.CmsProperty;
+import org.opencms.file.CmsResource;
+import org.opencms.file.CmsResourceFilter;
+import org.opencms.file.CmsUser;
+import org.opencms.file.CmsVfsResourceAlreadyExistsException;
+import org.opencms.file.CmsVfsResourceNotFoundException;
+import org.opencms.file.history.CmsHistoryFile;
+import org.opencms.file.types.CmsResourceTypeFolder;
+import org.opencms.i18n.CmsMessageContainer;
+import org.opencms.lock.CmsLock;
+import org.opencms.lock.CmsLockType;
+import org.opencms.main.CmsEvent;
+import org.opencms.main.CmsException;
+import org.opencms.main.CmsLog;
+import org.opencms.main.I_CmsEventListener;
+import org.opencms.main.OpenCms;
+import org.opencms.publish.CmsPublishJobInfoBean;
+import org.opencms.relations.CmsRelationFilter;
+import org.opencms.report.I_CmsReport;
+import org.opencms.security.CmsOrganizationalUnit;
+import org.opencms.security.I_CmsPrincipal;
+import org.opencms.staticexport.CmsStaticExportManager;
+import org.opencms.util.CmsDataTypeUtil;
+import org.opencms.util.CmsStringUtil;
+import org.opencms.util.CmsUUID;
+
+/**
+ * @author gosho
+ *
+ */
+public class CmsProjectDriver implements I_CmsDriver, I_CmsProjectDriver {
+
+	/** The log object for this class. */
+    private static final Log LOG = CmsLog.getLog(org.opencms.db.jpa.CmsProjectDriver.class);
+
+    /** The driver manager. */
+    protected CmsDriverManager m_driverManager;
+
+    /** The SQL manager. */
+    protected CmsSqlManager m_sqlManager;
+    
+    private static final String C_STATICEXPORT_DELETE_ALL_PUBLISHED_LINKS = "C_STATICEXPORT_DELETE_ALL_PUBLISHED_LINKS" ;
+    
+    private static final String C_PROJECTRESOURCES_DELETEALL_1 = "C_PROJECTRESOURCES_DELETEALL_1" ;
+    
+    private static final String C_DELETE_PUBLISH_HISTORY = "C_DELETE_PUBLISH_HISTORY" ;
+    
+    private static final String C_RESOURCES_DELETE_PUBLISH_HISTORY_ENTRY = "C_RESOURCES_DELETE_PUBLISH_HISTORY_ENTRY" ;
+    
+    private static final String C_PUBLISHJOB_DELETE = "C_PUBLISHJOB_DELETE" ;
+    
+    private static final String C_PUBLISHJOB_DELETE_PUBLISHLIST = "C_PUBLISHJOB_DELETE_PUBLISHLIST" ;
+    
+    private static final String C_STATICEXPORT_DELETE_PUBLISHED_LINKS = "C_STATICEXPORT_DELETE_PUBLISHED_LINKS" ;
+    
+    private static final String C_RESOURCE_LOCKS_READALL = "C_RESOURCE_LOCKS_READALL" ;
+    
+    private static final String C_PROJECTS_READ_1 = "C_PROJECTS_READ_1" ;
+    
+    private static final String C_PROJECTS_READ_BYNAME_2 = "C_PROJECTS_READ_BYNAME_2" ;
+    
+    private static final String C_PROJECTRESOURCES_READ_2 = "C_PROJECTRESOURCES_READ_2" ;
+    
+    private static final String C_PROJECTRESOURCES_READ_BY_ID_1 = "C_PROJECTRESOURCES_READ_BY_ID_1" ;
+    
+    private static final String C_PROJECTS_READ_BYOU_1 = "C_PROJECTS_READ_BYOU_1" ;
+    
+    private static final String C_PROJECTS_READ_BYGROUP_2 = "C_PROJECTS_READ_BYGROUP_2" ;
+    
+    private static final String C_PROJECTS_READ_BYMANAGER_1 = "C_PROJECTS_READ_BYMANAGER_1" ;
+    
+    private static final String C_PROJECTS_READ_BYUSER_1 = "C_PROJECTS_READ_BYUSER_1" ;
+    
+    private static final String C_SELECT_PUBLISHED_RESOURCES = "C_SELECT_PUBLISHED_RESOURCES" ;
+    
+    private static final String C_PUBLISHJOB_READ_JOB = "C_PUBLISHJOB_READ_JOB" ;
+    
+    private static final String C_PUBLISHJOB_READ_JOBS_IN_TIMERANGE = "C_PUBLISHJOB_READ_JOBS_IN_TIMERANGE" ;
+    
+    private static final String C_PUBLISHJOB_READ_PUBLISHLIST = "C_PUBLISHJOB_READ_PUBLISHLIST" ;
+    
+    private static final String C_PUBLISHJOB_READ_REPORT = "C_PUBLISHJOB_READ_REPORT" ;
+    
+    private static final String C_STATICEXPORT_READ_PUBLISHED_LINK_PARAMETERS = "C_STATICEXPORT_READ_PUBLISHED_LINK_PARAMETERS" ;
+    
+    private static final String C_STATICEXPORT_READ_ALL_PUBLISHED_LINKS = "C_STATICEXPORT_READ_ALL_PUBLISHED_LINKS" ;
+    
+    private static final String C_RESOURCES_UNMARK = "C_RESOURCES_UNMARK" ;
+    
+    private static final String C_RESOURCE_LOCKS_DELETEALL = "C_RESOURCE_LOCKS_DELETEALL" ;
+    
+    private static final String C_PROJECTS_WRITE_6 = "C_PROJECTS_WRITE_6" ;
+    
+    private static final String C_STATICEXPORT_READ_PUBLISHED_RESOURCES = "C_STATICEXPORT_READ_PUBLISHED_RESOURCES" ;
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#createProject(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.file.CmsUser, org.opencms.file.CmsGroup, org.opencms.file.CmsGroup, java.lang.String, java.lang.String, int, CmsProject.CmsProjectType)
+     */
+    public CmsProject createProject(
+        CmsDbContext dbc,
+        CmsUUID id,
+        CmsUser owner,
+        CmsGroup group,
+        CmsGroup managergroup,
+        String projectFqn,
+        String description,
+        int flags,
+        CmsProject.CmsProjectType type) throws CmsDataAccessException {
+
+        CmsProject project = null;
+
+        if ((description == null) || (description.length() < 1)) {
+            description = " ";
+        }
+
+        try {
+            CmsDAOProjects p = new CmsDAOProjects() ;
+            
+            p.setProjectId(id.toString()) ;
+            p.setUserId(owner.getId().toString()) ;
+            p.setGroupId(group.getId().toString()) ;
+            p.setManagerGroupId(managergroup.getId().toString()) ;
+            p.setProjectName(CmsOrganizationalUnit.getSimpleName(projectFqn)) ;
+            p.setProjectDescription(description) ;
+            p.setProjectFlags(flags) ;
+            p.setProjectType(type.getMode()) ;
+            p.setProjectOu(CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(projectFqn)) ;
+
+            synchronized (this) {
+                long createTime = System.currentTimeMillis();
+                p.setDateCreated(createTime) ;
+                dbc.getEntityManager().persist(p) ;
+                try {
+                    // this is an ugly hack, but for MySQL (and maybe other DBs as well)
+                    // there is a UNIQUE INDEX constraint on the project name+createTime
+                    // so theoretically if 2 projects with the same name are created very fast, this
+                    // SQL restraint would be violated if we don't wait here
+                    Thread.sleep(50);
+                } catch (InterruptedException e) {
+                    // continue
+                }
+                project = new CmsProject(
+                    id,
+                    projectFqn,
+                    description,
+                    owner.getId(),
+                    group.getId(),
+                    managergroup.getId(),
+                    flags,
+                    createTime,
+                    type);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+
+        return project;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#createProjectResource(org.opencms.db.CmsDbContext, CmsUUID, java.lang.String)
+     */
+    public void createProjectResource(CmsDbContext dbc, CmsUUID projectId, String resourcePath)
+    throws CmsDataAccessException {
+
+        // do not create entries for online-project
+        boolean projectResourceExists = false;
+        try {
+            readProjectResource(dbc, projectId, resourcePath);
+            projectResourceExists = true;
+        } catch (CmsVfsResourceNotFoundException e) {
+            // resource does not exist yet, everything is okay 
+            projectResourceExists = false;
+        }
+
+        if (projectResourceExists) {
+            throw new CmsVfsResourceAlreadyExistsException(Messages.get().container(
+                Messages.ERR_RESOURCE_WITH_NAME_ALREADY_EXISTS_1,
+                dbc.removeSiteRoot(resourcePath)));
+        }
+
+        try {
+        	CmsDAOProjectResources pr = new CmsDAOProjectResources() ;
+        	
+        	pr.setProjectId(projectId.toString()) ;
+        	pr.setResourcePath(resourcePath) ;
+        	
+        	dbc.getEntityManager().persist(pr) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#createPublishJob(org.opencms.db.CmsDbContext, org.opencms.publish.CmsPublishJobInfoBean)
+     */
+    public void createPublishJob(CmsDbContext dbc, CmsPublishJobInfoBean publishJob) throws CmsDataAccessException {
+
+        try {
+            CmsPublishJobInfoBean currentJob = readPublishJob(dbc, publishJob.getPublishHistoryId());
+            LOG.error("wanted to write: " + publishJob);
+            LOG.error("already on db: " + currentJob);
+            return;
+        } catch (CmsDbEntryNotFoundException e) {
+            // ok, this is the expected behavior
+        }
+        try {
+        	CmsDAOPublishJobs pj = new CmsDAOPublishJobs() ;
+        	
+        	pj.setHistoryId(publishJob.getPublishHistoryId().toString()) ;
+        	pj.setProjectId(publishJob.getProjectId().toString()) ;
+        	pj.setProjectName(publishJob.getProjectName()) ;
+        	pj.setUserId(publishJob.getUserId().toString()) ;
+        	pj.setPublishLocale(publishJob.getLocale().toString()) ;
+        	pj.setPublishFlags(publishJob.getFlags()) ;
+        	pj.setResourceCount(publishJob.getSize()) ;
+        	pj.setEnqueueTime(publishJob.getEnqueueTime()) ;
+        	pj.setStartTime(publishJob.getStartTime()) ;
+        	pj.setFinishTime(publishJob.getFinishTime()) ;
+        	byte[] publishList = internalSerializePublishList(publishJob.getPublishList());
+        	pj.setPublishList(publishList) ;
+        	
+        	dbc.getEntityManager().persist(pj) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } catch (IOException e) {
+            throw new CmsDbIoException(Messages.get().container(
+                    Messages.ERR_SERIALIZING_PUBLISHLIST_1,
+                    publishJob.getPublishHistoryId().toString()), e);
+        } 
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#deleteAllStaticExportPublishedResources(org.opencms.db.CmsDbContext, int)
+     */
+    public void deleteAllStaticExportPublishedResources(CmsDbContext dbc, int linkType) throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_STATICEXPORT_DELETE_ALL_PUBLISHED_LINKS);
+            q.setParameter(1, linkType);
+            List<CmsDAOStaticExportLinks> res = q.getResultList() ;
+            for(CmsDAOStaticExportLinks sel:res){
+            	dbc.getEntityManager().remove(sel) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#deleteProject(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject)
+     */
+    public void deleteProject(CmsDbContext dbc, CmsProject project) throws CmsDataAccessException {
+
+        // delete the resources from project_resources
+        deleteProjectResources(dbc, project);
+
+        // remove the project id form all resources within their project
+        unmarkProjectResources(dbc, project);
+
+        // finally delete the project     
+        try {
+            EntityManager em = dbc.getEntityManager() ;
+            CmsDAOProjects p = em.find(CmsDAOProjects.class, project.getUuid().toString()) ;
+            if(p != null){
+            	em.remove(p) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#deleteProjectResource(org.opencms.db.CmsDbContext, CmsUUID, java.lang.String)
+     */
+    public void deleteProjectResource(CmsDbContext dbc, CmsUUID projectId, String resourceName)
+    throws CmsDataAccessException {
+
+        try {
+        	EntityManager em = dbc.getEntityManager() ;
+        	CmsDAOProjectResourcesPK pk = new CmsDAOProjectResourcesPK() ;
+        	pk.m_projectId = projectId.toString() ;
+        	pk.m_resourcePath = resourceName ;
+        	CmsDAOProjectResources pr = em.find(CmsDAOProjectResources.class, pk) ;
+        	if(pr != null){
+        		em.remove(pr) ;
+        	}
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#deleteProjectResources(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject)
+     */
+    public void deleteProjectResources(CmsDbContext dbc, CmsProject project) throws CmsDataAccessException {
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTRESOURCES_DELETEALL_1);
+            q.setParameter(1, project.getUuid().toString());
+            List<CmsDAOProjectResources> res = q.getResultList() ;
+            for(CmsDAOProjectResources pr:res){
+            	dbc.getEntityManager().remove(pr) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#deletePublishHistory(org.opencms.db.CmsDbContext, CmsUUID, int)
+     */
+    public void deletePublishHistory(CmsDbContext dbc, CmsUUID projectId, int maxpublishTag)
+    throws CmsDataAccessException {
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_DELETE_PUBLISH_HISTORY);
+            q.setParameter(1, maxpublishTag);
+            List<CmsDAOPublishHistory> res = q.getResultList();
+            for(CmsDAOPublishHistory ph:res){
+            	dbc.getEntityManager().remove(ph) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#deletePublishHistoryEntry(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, org.opencms.db.CmsPublishedResource)
+     */
+    public void deletePublishHistoryEntry(
+        CmsDbContext dbc,
+        CmsUUID publishHistoryId,
+        CmsPublishedResource publishedResource) throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_RESOURCES_DELETE_PUBLISH_HISTORY_ENTRY);
+            q.setParameter(1, publishHistoryId.toString());
+            q.setParameter(2, publishedResource.getPublishTag());
+            q.setParameter(3, publishedResource.getStructureId().toString());
+            q.setParameter(4, publishedResource.getRootPath());
+            List<CmsDAOPublishHistory> res = q.getResultList();
+            for(CmsDAOPublishHistory ph:res){
+            	dbc.getEntityManager().remove(ph) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#deletePublishJob(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public void deletePublishJob(CmsDbContext dbc, CmsUUID publishHistoryId) throws CmsDataAccessException {
+
+    	try {
+    		EntityManager em = dbc.getEntityManager() ;
+    		CmsDAOPublishJobs pj = em.find(CmsDAOPublishJobs.class, publishHistoryId.toString()) ;
+    		if(pj != null){
+    			em.remove(pj) ;
+    		}
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#deletePublishList(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public void deletePublishList(CmsDbContext dbc, CmsUUID publishHistoryId) throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PUBLISHJOB_DELETE_PUBLISHLIST);
+            q.setParameter(1, publishHistoryId.toString());
+            List<CmsDAOPublishJobs> res = q.getResultList() ;
+            
+            for(CmsDAOPublishJobs pj:res){
+            	pj.setPublishList(null) ;
+            }         
+            
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#deleteStaticExportPublishedResource(org.opencms.db.CmsDbContext, java.lang.String, int, java.lang.String)
+     */
+    public void deleteStaticExportPublishedResource(
+        CmsDbContext dbc,
+        String resourceName,
+        int linkType,
+        String linkParameter) throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_STATICEXPORT_DELETE_PUBLISHED_LINKS);
+            q.setParameter(1, resourceName);
+            q.setParameter(2, linkType);
+            q.setParameter(3, linkParameter);
+            List<CmsDAOStaticExportLinks> res = q.getResultList() ;
+            for(CmsDAOStaticExportLinks sel:res){
+            	dbc.getEntityManager().remove(sel) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#destroy()
+     */
+    public void destroy() throws Throwable {
+
+        m_sqlManager = null;
+        m_driverManager = null;
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_SHUTDOWN_DRIVER_1, getClass().getName()));
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#fillDefaults(org.opencms.db.CmsDbContext)
+     */
+    public void fillDefaults(CmsDbContext dbc) throws CmsDataAccessException {
+
+        try {
+            if (readProject(dbc, CmsProject.ONLINE_PROJECT_ID) != null) {
+                // online-project exists - no need of filling defaults
+                return;
+            }
+        } catch (CmsDataAccessException exc) {
+            // ignore the exception - the project was not readable so fill in the defaults
+        }
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_FILL_DEFAULTS_0));
+        }
+
+        String adminUser = OpenCms.getDefaultUsers().getUserAdmin();
+        CmsUser admin = m_driverManager.readUser(dbc, adminUser);
+
+        String administratorsGroup = OpenCms.getDefaultUsers().getGroupAdministrators();
+        CmsGroup administrators = m_driverManager.readGroup(dbc, administratorsGroup);
+
+        String usersGroup = OpenCms.getDefaultUsers().getGroupUsers();
+        CmsGroup users = m_driverManager.readGroup(dbc, usersGroup);
+
+        String projectmanagersGroup = OpenCms.getDefaultUsers().getGroupProjectmanagers();
+        CmsGroup projectmanager = m_driverManager.readGroup(dbc, projectmanagersGroup);
+
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        // online project stuff
+        ////////////////////////////////////////////////////////////////////////////////////////////        
+
+        // create the online project
+        CmsProject onlineProject = createProject(
+            dbc,
+            CmsProject.ONLINE_PROJECT_ID,
+            admin,
+            users,
+            projectmanager,
+            CmsProject.ONLINE_PROJECT_NAME,
+            "The Online project",
+            I_CmsPrincipal.FLAG_ENABLED,
+            CmsProject.PROJECT_TYPE_NORMAL);
+
+        // create the root-folder for the online project
+        CmsFolder rootFolder = new CmsFolder(
+            new CmsUUID(),
+            new CmsUUID(),
+            "/",
+            CmsResourceTypeFolder.RESOURCE_TYPE_ID,
+            0,
+            onlineProject.getUuid(),
+            CmsResource.STATE_CHANGED,
+            0,
+            admin.getId(),
+            0,
+            admin.getId(),
+            CmsResource.DATE_RELEASED_DEFAULT,
+            CmsResource.DATE_EXPIRED_DEFAULT,
+            0);
+
+        m_driverManager.getVfsDriver().createResource(dbc, onlineProject.getUuid(), rootFolder, null);
+
+        // important: must access through driver manager to ensure proper cascading
+        m_driverManager.getProjectDriver().createProjectResource(dbc, onlineProject.getUuid(), rootFolder.getRootPath());
+
+        // create the system-folder for the online project
+        CmsFolder systemFolder = new CmsFolder(
+            new CmsUUID(),
+            new CmsUUID(),
+            "/system",
+            CmsResourceTypeFolder.RESOURCE_TYPE_ID,
+            0,
+            onlineProject.getUuid(),
+            CmsResource.STATE_CHANGED,
+            0,
+            admin.getId(),
+            0,
+            admin.getId(),
+            CmsResource.DATE_RELEASED_DEFAULT,
+            CmsResource.DATE_EXPIRED_DEFAULT,
+            0);
+
+        m_driverManager.getVfsDriver().createResource(dbc, onlineProject.getUuid(), systemFolder, null);
+
+        ////////////////////////////////////////////////////////////////////////////////////////////
+        // setup project stuff
+        ////////////////////////////////////////////////////////////////////////////////////////////
+
+        // important: must access through driver manager to ensure proper cascading        
+        CmsProject setupProject = m_driverManager.getProjectDriver().createProject(
+            dbc,
+            CmsUUID.getConstantUUID(SETUP_PROJECT_NAME),
+            admin,
+            administrators,
+            administrators,
+            SETUP_PROJECT_NAME,
+            "The Project for the initial import",
+            I_CmsPrincipal.FLAG_ENABLED,
+            CmsProject.PROJECT_TYPE_TEMPORARY);
+
+        rootFolder.setState(CmsResource.STATE_CHANGED);
+        // create the root-folder for the offline project       
+        CmsResource offlineRootFolder = m_driverManager.getVfsDriver().createResource(
+            dbc,
+            setupProject.getUuid(),
+            rootFolder,
+            null);
+
+        offlineRootFolder.setState(CmsResource.STATE_UNCHANGED);
+
+        m_driverManager.getVfsDriver().writeResource(
+            dbc,
+            setupProject.getUuid(),
+            offlineRootFolder,
+            CmsDriverManager.NOTHING_CHANGED);
+
+        // important: must access through driver manager to ensure proper cascading        
+        m_driverManager.getProjectDriver().createProjectResource(
+            dbc,
+            setupProject.getUuid(),
+            offlineRootFolder.getRootPath());
+
+        systemFolder.setState(CmsResource.STATE_CHANGED);
+        // create the system-folder for the offline project       
+        CmsResource offlineSystemFolder = m_driverManager.getVfsDriver().createResource(
+            dbc,
+            setupProject.getUuid(),
+            systemFolder,
+            null);
+
+        offlineSystemFolder.setState(CmsResource.STATE_UNCHANGED);
+
+        m_driverManager.getVfsDriver().writeResource(
+            dbc,
+            setupProject.getUuid(),
+            offlineSystemFolder,
+            CmsDriverManager.NOTHING_CHANGED);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#getSqlManager()
+     */
+    public CmsSqlManager getSqlManager() {
+
+        return m_sqlManager;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsDriver#init(org.opencms.db.CmsDbContext, org.opencms.configuration.CmsConfigurationManager, java.util.List, org.opencms.db.CmsDriverManager)
+     */
+    public void init(
+        CmsDbContext dbc,
+        CmsConfigurationManager configurationManager,
+        List successiveDrivers,
+        CmsDriverManager driverManager) {
+
+        Map configuration = configurationManager.getConfiguration();
+        String poolUrl = configuration.get("db.project.pool").toString();
+        String classname = configuration.get("db.project.sqlmanager").toString();
+        m_sqlManager = (CmsSqlManager) this.initSqlManager(classname);
+
+        m_driverManager = driverManager;
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_ASSIGNED_POOL_1, poolUrl));
+        }
+
+        if ((successiveDrivers != null) && !successiveDrivers.isEmpty()) {
+            if (LOG.isWarnEnabled()) {
+                LOG.warn(Messages.get().getBundle().key(
+                    Messages.LOG_SUCCESSIVE_DRIVERS_UNSUPPORTED_1,
+                    getClass().getName()));
+            }
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#initSqlManager(String)
+     */
+    public org.opencms.db.CmsSqlManager initSqlManager(String classname) {
+
+        return (org.opencms.db.CmsSqlManager) CmsSqlManager.getInstance(classname);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#publishDeletedFolder(org.opencms.db.CmsDbContext, org.opencms.report.I_CmsReport, int, int, org.opencms.file.CmsProject, org.opencms.file.CmsFolder, org.opencms.util.CmsUUID, int)
+     */
+    public void publishDeletedFolder(
+        CmsDbContext dbc,
+        I_CmsReport report,
+        int m,
+        int n,
+        CmsProject onlineProject,
+        CmsFolder currentFolder,
+        CmsUUID publishHistoryId,
+        int publishTag) throws CmsDataAccessException {
+
+        try {
+            report.print(org.opencms.report.Messages.get().container(
+                org.opencms.report.Messages.RPT_SUCCESSION_2,
+                String.valueOf(m),
+                String.valueOf(n)), I_CmsReport.FORMAT_NOTE);
+            report.print(Messages.get().container(Messages.RPT_DELETE_FOLDER_0), I_CmsReport.FORMAT_NOTE);
+            report.print(org.opencms.report.Messages.get().container(
+                org.opencms.report.Messages.RPT_ARGUMENT_1,
+                dbc.removeSiteRoot(currentFolder.getRootPath())));
+            report.print(org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_DOTS_0));
+
+            CmsResourceState folderState = fixMovedResource(
+                dbc,
+                onlineProject,
+                currentFolder,
+                publishHistoryId,
+                publishTag);
+
+            // read the folder online
+            CmsFolder onlineFolder = m_driverManager.readFolder(dbc, currentFolder.getRootPath(), CmsResourceFilter.ALL);
+
+            // write history before deleting
+            internalWriteHistory(dbc, currentFolder, folderState, null, publishHistoryId, publishTag);
+
+            try {
+                // delete the properties online and offline
+                m_driverManager.getVfsDriver().deletePropertyObjects(
+                    dbc,
+                    onlineProject.getUuid(),
+                    onlineFolder,
+                    CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES);
+                m_driverManager.getVfsDriver().deletePropertyObjects(
+                    dbc,
+                    dbc.currentProject().getUuid(),
+                    currentFolder,
+                    CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES);
+            } catch (CmsDataAccessException e) {
+                if (LOG.isErrorEnabled()) {
+                    LOG.error(Messages.get().getBundle().key(
+                        Messages.LOG_DELETING_PROPERTIES_1,
+                        currentFolder.getRootPath()), e);
+                }
+                throw e;
+            }
+
+            try {
+                // remove the folder online and offline
+                m_driverManager.getVfsDriver().removeFolder(dbc, dbc.currentProject(), currentFolder);
+                m_driverManager.getVfsDriver().removeFolder(dbc, onlineProject, currentFolder);
+            } catch (CmsDataAccessException e) {
+                if (LOG.isErrorEnabled()) {
+                    LOG.error(Messages.get().getBundle().key(
+                        Messages.LOG_REMOVING_RESOURCE_1,
+                        currentFolder.getRootPath()), e);
+                }
+                throw e;
+            }
+
+            try {
+                // remove the ACL online and offline
+                m_driverManager.getUserDriver().removeAccessControlEntries(
+                    dbc,
+                    onlineProject,
+                    onlineFolder.getResourceId());
+                m_driverManager.getUserDriver().removeAccessControlEntries(
+                    dbc,
+                    dbc.currentProject(),
+                    currentFolder.getResourceId());
+            } catch (CmsDataAccessException e) {
+                if (LOG.isErrorEnabled()) {
+                    LOG.error(
+                        Messages.get().getBundle().key(Messages.LOG_REMOVING_ACL_1, currentFolder.getRootPath()),
+                        e);
+                }
+                throw e;
+            }
+
+            try {
+                m_driverManager.getVfsDriver().deleteRelations(
+                    dbc,
+                    onlineProject.getUuid(),
+                    onlineFolder,
+                    CmsRelationFilter.TARGETS);
+                m_driverManager.getVfsDriver().deleteRelations(
+                    dbc,
+                    dbc.currentProject().getUuid(),
+                    currentFolder,
+                    CmsRelationFilter.TARGETS);
+            } catch (CmsDataAccessException e) {
+                if (LOG.isErrorEnabled()) {
+                    LOG.error(Messages.get().getBundle().key(
+                        Messages.LOG_REMOVING_RELATIONS_1,
+                        currentFolder.getRootPath()), e);
+                }
+                throw e;
+            }
+
+            report.println(
+                org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_OK_0),
+                I_CmsReport.FORMAT_OK);
+
+            if (LOG.isDebugEnabled()) {
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug(Messages.get().getBundle().key(
+                        Messages.LOG_DEL_FOLDER_3,
+                        currentFolder.getRootPath(),
+                        String.valueOf(m),
+                        String.valueOf(n)));
+                }
+            }
+        } finally {
+            // notify the app. that the published folder and it's properties have been modified offline
+            OpenCms.fireCmsEvent(new CmsEvent(
+                I_CmsEventListener.EVENT_RESOURCE_AND_PROPERTIES_MODIFIED,
+                Collections.singletonMap("resource", currentFolder)));
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#publishFile(org.opencms.db.CmsDbContext, org.opencms.report.I_CmsReport, int, int, org.opencms.file.CmsProject, org.opencms.file.CmsResource, java.util.Set, org.opencms.util.CmsUUID, int)
+     */
+    public void publishFile(
+        CmsDbContext dbc,
+        I_CmsReport report,
+        int m,
+        int n,
+        CmsProject onlineProject,
+        CmsResource offlineResource,
+        Set publishedContentIds,
+        CmsUUID publishHistoryId,
+        int publishTag) throws CmsDataAccessException {
+
+        /*
+         * Never use onlineResource.getState() here!
+         * Only use offlineResource.getState() to determine the state of an offline resource!
+         * 
+         * In case a resource has siblings, after a sibling was published the structure
+         * and resource states are reset to UNCHANGED -> the state of the corresponding
+         * onlineResource is still NEW, DELETED or CHANGED. 
+         * Thus, using onlineResource.getState() will inevitably result in unpublished resources!
+         */
+
+        try {
+            report.print(org.opencms.report.Messages.get().container(
+                org.opencms.report.Messages.RPT_SUCCESSION_2,
+                String.valueOf(m),
+                String.valueOf(n)), I_CmsReport.FORMAT_NOTE);
+
+            if (offlineResource.getState().isDeleted()) {
+                report.print(Messages.get().container(Messages.RPT_DELETE_FILE_0), I_CmsReport.FORMAT_NOTE);
+                report.print(org.opencms.report.Messages.get().container(
+                    org.opencms.report.Messages.RPT_ARGUMENT_1,
+                    dbc.removeSiteRoot(offlineResource.getRootPath())));
+                report.print(org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_DOTS_0));
+
+                publishDeletedFile(dbc, onlineProject, offlineResource, publishHistoryId, publishTag);
+
+                dbc.pop();
+                // delete old historical entries
+                m_driverManager.getHistoryDriver().deleteEntries(
+                    dbc,
+                    new CmsHistoryFile(offlineResource),
+                    OpenCms.getSystemInfo().getHistoryVersionsAfterDeletion(),
+                    -1);
+
+                report.println(
+                    org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_OK_0),
+                    I_CmsReport.FORMAT_OK);
+
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug(Messages.get().getBundle().key(
+                        Messages.LOG_DEL_FILE_3,
+                        String.valueOf(m),
+                        String.valueOf(n),
+                        offlineResource.getRootPath()));
+                }
+
+            } else if (offlineResource.getState().isChanged()) {
+                report.print(Messages.get().container(Messages.RPT_PUBLISH_FILE_0), I_CmsReport.FORMAT_NOTE);
+                report.print(org.opencms.report.Messages.get().container(
+                    org.opencms.report.Messages.RPT_ARGUMENT_1,
+                    dbc.removeSiteRoot(offlineResource.getRootPath())));
+                report.print(org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_DOTS_0));
+
+                publishChangedFile(
+                    dbc,
+                    onlineProject,
+                    offlineResource,
+                    publishedContentIds,
+                    publishHistoryId,
+                    publishTag);
+
+                dbc.pop();
+                // delete old historical entries
+                m_driverManager.getHistoryDriver().deleteEntries(
+                    dbc,
+                    new CmsHistoryFile(offlineResource),
+                    OpenCms.getSystemInfo().getHistoryVersions(),
+                    -1);
+
+                report.println(
+                    org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_OK_0),
+                    I_CmsReport.FORMAT_OK);
+
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug(Messages.get().getBundle().key(
+                        Messages.LOG_PUBLISHING_FILE_3,
+                        offlineResource.getRootPath(),
+                        String.valueOf(m),
+                        String.valueOf(n)));
+                }
+            } else if (offlineResource.getState().isNew()) {
+                report.print(Messages.get().container(Messages.RPT_PUBLISH_FILE_0), I_CmsReport.FORMAT_NOTE);
+                report.print(org.opencms.report.Messages.get().container(
+                    org.opencms.report.Messages.RPT_ARGUMENT_1,
+                    dbc.removeSiteRoot(offlineResource.getRootPath())));
+                report.print(org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_DOTS_0));
+
+                publishNewFile(dbc, onlineProject, offlineResource, publishedContentIds, publishHistoryId, publishTag);
+
+                dbc.pop();
+                // delete old historical entries
+                m_driverManager.getHistoryDriver().deleteEntries(
+                    dbc,
+                    new CmsHistoryFile(offlineResource),
+                    OpenCms.getSystemInfo().getHistoryVersions(),
+                    -1);
+
+                report.println(
+                    org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_OK_0),
+                    I_CmsReport.FORMAT_OK);
+
+                if (LOG.isDebugEnabled()) {
+                    if (LOG.isDebugEnabled()) {
+                        LOG.debug(Messages.get().getBundle().key(
+                            Messages.LOG_PUBLISHING_FILE_3,
+                            offlineResource.getRootPath(),
+                            String.valueOf(m),
+                            String.valueOf(n)));
+                    }
+                }
+            } else {
+                // state == unchanged !!?? something went really wrong
+                report.print(Messages.get().container(Messages.RPT_PUBLISH_FILE_0), I_CmsReport.FORMAT_NOTE);
+                report.print(org.opencms.report.Messages.get().container(
+                    org.opencms.report.Messages.RPT_ARGUMENT_1,
+                    dbc.removeSiteRoot(offlineResource.getRootPath())));
+                report.print(org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_DOTS_0));
+                report.println(
+                    org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_FAILED_0),
+                    I_CmsReport.FORMAT_ERROR);
+
+                if (LOG.isErrorEnabled()) {
+                    // the whole resource is printed out here
+                    LOG.error(Messages.get().getBundle().key(
+                        Messages.LOG_PUBLISHING_FILE_3,
+                        String.valueOf(m),
+                        String.valueOf(n),
+                        offlineResource));
+                }
+            }
+        } catch (CmsException e) {
+            throw new CmsDataAccessException(e.getMessageContainer(), e);
+        } finally {
+            // notify the app. that the published file and it's properties have been modified offline
+            OpenCms.fireCmsEvent(new CmsEvent(
+                I_CmsEventListener.EVENT_RESOURCE_AND_PROPERTIES_MODIFIED,
+                Collections.singletonMap("resource", offlineResource)));
+        }
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#publishFileContent(CmsDbContext, CmsProject, CmsProject, CmsResource, Set, boolean, int)
+     */
+    public CmsFile publishFileContent(
+        CmsDbContext dbc,
+        CmsProject offlineProject,
+        CmsProject onlineProject,
+        CmsResource offlineResource,
+        Set publishedResourceIds,
+        boolean needToUpdateContent,
+        int publishTag) throws CmsDataAccessException {
+
+        CmsFile newFile = null;
+        try {
+            // read the file content offline
+            CmsUUID projectId = dbc.getProjectId();
+            dbc.setProjectId(CmsUUID.getNullUUID());
+            byte[] offlineContent = m_driverManager.getVfsDriver().readContent(
+                dbc,
+                offlineProject.getUuid(),
+                offlineResource.getResourceId());
+            CmsFile offlineFile = new CmsFile(offlineResource);
+            offlineFile.setContents(offlineContent);
+            dbc.setProjectId(projectId);
+
+            // create the file online              
+            newFile = (CmsFile)offlineFile.clone();
+            newFile.setState(CmsResource.STATE_UNCHANGED);
+
+            boolean createSibling = true;
+            // check if we are facing with a create new sibling operation
+            if (!offlineFile.getState().isNew()) {
+                createSibling = false;
+            } else {
+                // check if the resource entry already exists
+                if (!m_driverManager.getVfsDriver().validateResourceIdExists(
+                    dbc,
+                    onlineProject.getUuid(),
+                    offlineFile.getResourceId())) {
+                    // we are creating a normal resource and not a sibling
+                    createSibling = false;
+                }
+            }
+
+            // only update the content if it was not updated before
+            boolean alreadyPublished = publishedResourceIds.contains(offlineResource.getResourceId());
+            needToUpdateContent &= !alreadyPublished;
+
+            if (createSibling) {
+                if (!alreadyPublished) {
+                    // create the file online, the first time a sibling is published also the resource entry has to be actualized
+                    m_driverManager.getVfsDriver().createResource(dbc, onlineProject.getUuid(), newFile, null);
+                } else {
+                    // create the sibling online
+                    m_driverManager.getVfsDriver().createSibling(dbc, onlineProject, offlineResource);
+                }
+                newFile = new CmsFile(offlineResource);
+                newFile.setContents(offlineContent);
+            } else {
+                // update the online/offline structure and resource records of the file
+                m_driverManager.getVfsDriver().publishResource(dbc, onlineProject, newFile, offlineFile);
+            }
+            // update version numbers
+            m_driverManager.getVfsDriver().publishVersions(dbc, offlineResource, !alreadyPublished);
+
+            // create/update the content
+            m_driverManager.getVfsDriver().createOnlineContent(
+                dbc,
+                offlineFile.getResourceId(),
+                offlineFile.getContents(),
+                publishTag,
+                true,
+                needToUpdateContent);
+
+            // mark the resource as written to avoid that the same content is written for each sibling instance
+            publishedResourceIds.add(offlineResource.getResourceId());
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(
+                    Messages.LOG_PUBLISHING_FILE_CONTENT_1,
+                    offlineResource.toString()), e);
+            }
+            throw e;
+        }
+        return newFile;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#publishFolder(org.opencms.db.CmsDbContext, org.opencms.report.I_CmsReport, int, int, org.opencms.file.CmsProject, org.opencms.file.CmsFolder, org.opencms.util.CmsUUID, int)
+     */
+    public void publishFolder(
+        CmsDbContext dbc,
+        I_CmsReport report,
+        int m,
+        int n,
+        CmsProject onlineProject,
+        CmsFolder offlineFolder,
+        CmsUUID publishHistoryId,
+        int publishTag) throws CmsDataAccessException {
+
+        try {
+            report.print(org.opencms.report.Messages.get().container(
+                org.opencms.report.Messages.RPT_SUCCESSION_2,
+                String.valueOf(m),
+                String.valueOf(n)), I_CmsReport.FORMAT_NOTE);
+            report.print(Messages.get().container(Messages.RPT_PUBLISH_FOLDER_0), I_CmsReport.FORMAT_NOTE);
+            report.print(org.opencms.report.Messages.get().container(
+                org.opencms.report.Messages.RPT_ARGUMENT_1,
+                dbc.removeSiteRoot(offlineFolder.getRootPath())));
+            report.print(org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_DOTS_0));
+
+            CmsResourceState resourceState = fixMovedResource(
+                dbc,
+                onlineProject,
+                offlineFolder,
+                publishHistoryId,
+                publishTag);
+
+            CmsResource onlineFolder = null;
+            if (offlineFolder.getState().isNew()) {
+                try {
+                    // create the folder online
+                    CmsResource newFolder = (CmsFolder)offlineFolder.clone();
+                    newFolder.setState(CmsResource.STATE_UNCHANGED);
+
+                    onlineFolder = m_driverManager.getVfsDriver().createResource(
+                        dbc,
+                        onlineProject.getUuid(),
+                        newFolder,
+                        null);
+                    m_driverManager.getVfsDriver().publishResource(dbc, onlineProject, onlineFolder, offlineFolder);
+                    // update version numbers
+                    m_driverManager.getVfsDriver().publishVersions(dbc, offlineFolder, true);
+                } catch (CmsVfsResourceAlreadyExistsException e) {
+                    if (!offlineFolder.getRootPath().equals("/")
+                        && !offlineFolder.getRootPath().equals("/system/")
+                        && LOG.isWarnEnabled()) {
+                        LOG.warn(Messages.get().getBundle().key(
+                            Messages.LOG_WARN_FOLDER_WRONG_STATE_CN_1,
+                            offlineFolder.getRootPath()));
+                    }
+                    try {
+                        onlineFolder = m_driverManager.getVfsDriver().readFolder(
+                            dbc,
+                            onlineProject.getUuid(),
+                            offlineFolder.getRootPath());
+                        m_driverManager.getVfsDriver().publishResource(dbc, onlineProject, onlineFolder, offlineFolder);
+                        // update version numbers
+                        m_driverManager.getVfsDriver().publishVersions(dbc, offlineFolder, true);
+                    } catch (CmsDataAccessException e1) {
+                        if (LOG.isErrorEnabled()) {
+                            LOG.error(Messages.get().getBundle().key(
+                                Messages.LOG_READING_RESOURCE_1,
+                                offlineFolder.getRootPath()), e);
+                        }
+                        throw e1;
+                    }
+                } catch (CmsDataAccessException e) {
+                    if (LOG.isErrorEnabled()) {
+                        LOG.error(Messages.get().getBundle().key(
+                            Messages.LOG_PUBLISHING_RESOURCE_1,
+                            offlineFolder.getRootPath()), e);
+                    }
+                    throw e;
+                }
+            } else if (offlineFolder.getState().isChanged()) {
+                try {
+                    // read the folder online
+                    onlineFolder = m_driverManager.getVfsDriver().readFolder(
+                        dbc,
+                        onlineProject.getUuid(),
+                        offlineFolder.getStructureId());
+                } catch (CmsVfsResourceNotFoundException e) {
+                    if (LOG.isWarnEnabled()) {
+                        LOG.warn(Messages.get().getBundle().key(
+                            Messages.LOG_WARN_FOLDER_WRONG_STATE_NC_1,
+                            offlineFolder.getRootPath()));
+                    }
+                    try {
+                        onlineFolder = m_driverManager.getVfsDriver().createResource(
+                            dbc,
+                            onlineProject.getUuid(),
+                            offlineFolder,
+                            null);
+                        internalResetResourceState(dbc, onlineFolder);
+                    } catch (CmsDataAccessException e1) {
+                        if (LOG.isErrorEnabled()) {
+                            LOG.error(Messages.get().getBundle().key(
+                                Messages.LOG_PUBLISHING_RESOURCE_1,
+                                offlineFolder.getRootPath()), e);
+                        }
+                        throw e1;
+                    }
+                }
+
+                try {
+                    // update the folder online
+                    m_driverManager.getVfsDriver().publishResource(dbc, onlineProject, onlineFolder, offlineFolder);
+                    // update version numbers
+                    m_driverManager.getVfsDriver().publishVersions(dbc, offlineFolder, true);
+                } catch (CmsDataAccessException e) {
+                    if (LOG.isErrorEnabled()) {
+                        LOG.error(Messages.get().getBundle().key(
+                            Messages.LOG_PUBLISHING_RESOURCE_1,
+                            offlineFolder.getRootPath()), e);
+                    }
+                    throw e;
+                }
+            }
+
+            if (onlineFolder != null) {
+                try {
+                    // write the ACL online
+                    m_driverManager.getUserDriver().publishAccessControlEntries(
+                        dbc,
+                        dbc.currentProject(),
+                        onlineProject,
+                        offlineFolder.getResourceId(),
+                        onlineFolder.getResourceId());
+                } catch (CmsDataAccessException e) {
+                    if (LOG.isErrorEnabled()) {
+                        LOG.error(Messages.get().getBundle().key(
+                            Messages.LOG_PUBLISHING_ACL_1,
+                            offlineFolder.getRootPath()), e);
+                    }
+                    throw e;
+                }
+            }
+
+            List offlineProperties = null;
+            try {
+                // write the properties online
+                m_driverManager.getVfsDriver().deletePropertyObjects(
+                    dbc,
+                    onlineProject.getUuid(),
+                    onlineFolder,
+                    CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES);
+                offlineProperties = m_driverManager.getVfsDriver().readPropertyObjects(
+                    dbc,
+                    dbc.currentProject(),
+                    offlineFolder);
+                CmsProperty.setAutoCreatePropertyDefinitions(offlineProperties, true);
+                m_driverManager.getVfsDriver().writePropertyObjects(dbc, onlineProject, onlineFolder, offlineProperties);
+            } catch (CmsDataAccessException e) {
+                if (LOG.isErrorEnabled()) {
+                    LOG.error(Messages.get().getBundle().key(
+                        Messages.LOG_PUBLISHING_PROPERTIES_1,
+                        offlineFolder.getRootPath()), e);
+                }
+                throw e;
+            }
+
+            internalWriteHistory(dbc, offlineFolder, resourceState, offlineProperties, publishHistoryId, publishTag);
+
+            m_driverManager.getVfsDriver().updateRelations(dbc, onlineProject, offlineFolder);
+
+            report.println(
+                org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_OK_0),
+                I_CmsReport.FORMAT_OK);
+
+            if (LOG.isDebugEnabled()) {
+                LOG.debug(Messages.get().getBundle().key(
+                    Messages.LOG_PUBLISHING_FOLDER_3,
+                    String.valueOf(m),
+                    String.valueOf(n),
+                    offlineFolder.getRootPath()));
+            }
+        } finally {
+            // notify the app. that the published folder and it's properties have been modified offline
+            OpenCms.fireCmsEvent(new CmsEvent(
+                I_CmsEventListener.EVENT_RESOURCE_AND_PROPERTIES_MODIFIED,
+                Collections.singletonMap("resource", offlineFolder)));
+        }
+    }
+ 
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#publishProject(org.opencms.db.CmsDbContext, org.opencms.report.I_CmsReport, org.opencms.file.CmsProject, org.opencms.db.CmsPublishList, int)
+     */
+    public void publishProject(
+        CmsDbContext dbc,
+        I_CmsReport report,
+        CmsProject onlineProject,
+        CmsPublishList publishList,
+        int publishTag) throws CmsException {
+
+        int publishedFolderCount = 0;
+        int deletedFolderCount = 0;
+        int publishedFileCount = 0;
+        Set publishedContentIds = new HashSet();
+
+        try {
+
+            ////////////////////////////////////////////////////////////////////////////////////////
+            // write the historical project entry
+
+            if (OpenCms.getSystemInfo().isHistoryEnabled()) {
+                try {
+                    // write an entry in the publish project log
+                    m_driverManager.getHistoryDriver().writeProject(dbc, publishTag, System.currentTimeMillis());
+                    dbc.pop();
+                } catch (Throwable t) {
+                    dbc.report(report, Messages.get().container(
+                        Messages.ERR_WRITING_HISTORY_OF_PROJECT_1,
+                        dbc.currentProject().getName()), t);
+                }
+            }
+
+            ///////////////////////////////////////////////////////////////////////////////////////
+            // publish new/changed folders
+
+            if (LOG.isDebugEnabled()) {
+                LOG.debug(Messages.get().getBundle().key(
+                    Messages.LOG_START_PUBLISHING_PROJECT_2,
+                    dbc.currentProject().getName(),
+                    dbc.currentUser().getName()));
+            }
+
+            publishedFolderCount = 0;
+            int foldersSize = publishList.getFolderList().size();
+            if (foldersSize > 0) {
+                report.println(
+                    Messages.get().container(Messages.RPT_PUBLISH_FOLDERS_BEGIN_0),
+                    I_CmsReport.FORMAT_HEADLINE);
+            }
+
+            Iterator itFolders = publishList.getFolderList().iterator();
+            while (itFolders.hasNext()) {
+                CmsResource currentFolder = (CmsResource)itFolders.next();
+                try {
+                    if (currentFolder.getState().isNew() || currentFolder.getState().isChanged()) {
+                        // bounce the current publish task through all project drivers
+                        m_driverManager.getProjectDriver().publishFolder(
+                            dbc,
+                            report,
+                            ++publishedFolderCount,
+                            foldersSize,
+                            onlineProject,
+                            new CmsFolder(currentFolder),
+                            publishList.getPublishHistoryId(),
+                            publishTag);
+
+                        dbc.pop();
+                        // delete old historical entries
+                        m_driverManager.getHistoryDriver().deleteEntries(
+                            dbc,
+                            new CmsHistoryFile(currentFolder),
+                            OpenCms.getSystemInfo().getHistoryVersions(),
+                            -1);
+
+                        // reset the resource state to UNCHANGED and the last-modified-in-project-ID to 0
+                        internalResetResourceState(dbc, currentFolder);
+
+                        m_driverManager.unlockResource(dbc, currentFolder, true, true);
+                    } else {
+                        // state == unchanged !!?? something went really wrong
+                        report.print(Messages.get().container(Messages.RPT_PUBLISH_FOLDER_0), I_CmsReport.FORMAT_NOTE);
+                        report.print(org.opencms.report.Messages.get().container(
+                            org.opencms.report.Messages.RPT_ARGUMENT_1,
+                            dbc.removeSiteRoot(currentFolder.getRootPath())));
+                        report.print(org.opencms.report.Messages.get().container(org.opencms.report.Messages.RPT_DOTS_0));
+                        report.println(org.opencms.report.Messages.get().container(
+                            org.opencms.report.Messages.RPT_FAILED_0), I_CmsReport.FORMAT_ERROR);
+
+                        if (LOG.isErrorEnabled()) {
+                            // the whole resource is printed out here
+                            LOG.error(Messages.get().getBundle().key(
+                                Messages.LOG_PUBLISHING_FILE_3,
+                                String.valueOf(++publishedFolderCount),
+                                String.valueOf(foldersSize),
+                                currentFolder));
+                        }
+                    }
+
+                    dbc.pop();
+                } catch (Throwable t) {
+                    dbc.report(report, Messages.get().container(
+                        Messages.ERR_ERROR_PUBLISHING_FOLDER_1,
+                        currentFolder.getRootPath()), t);
+                }
+            }
+
+            if (foldersSize > 0) {
+                report.println(
+                    Messages.get().container(Messages.RPT_PUBLISH_FOLDERS_END_0),
+                    I_CmsReport.FORMAT_HEADLINE);
+            }
+
+            ///////////////////////////////////////////////////////////////////////////////////////
+            // publish changed/new/deleted files
+
+            publishedFileCount = 0;
+            int filesSize = publishList.getFileList().size();
+
+            if (filesSize > 0) {
+                report.println(
+                    Messages.get().container(Messages.RPT_PUBLISH_FILES_BEGIN_0),
+                    I_CmsReport.FORMAT_HEADLINE);
+            }
+
+            Iterator itFiles = publishList.getFileList().iterator();
+            while (itFiles.hasNext()) {
+                CmsResource currentResource = (CmsResource)itFiles.next();
+                try {
+                    // bounce the current publish task through all project drivers
+                    m_driverManager.getProjectDriver().publishFile(
+                        dbc,
+                        report,
+                        ++publishedFileCount,
+                        filesSize,
+                        onlineProject,
+                        currentResource,
+                        publishedContentIds,
+                        publishList.getPublishHistoryId(),
+                        publishTag);
+
+                    if (!currentResource.getState().isDeleted()) {
+                        // reset the resource state to UNCHANGED and the last-modified-in-project-ID to 0
+                        internalResetResourceState(dbc, currentResource);
+                    }
+
+                    m_driverManager.unlockResource(dbc, currentResource, true, true);
+
+                    dbc.pop();
+                } catch (Throwable t) {
+                    dbc.report(report, Messages.get().container(
+                        Messages.ERR_ERROR_PUBLISHING_FILE_1,
+                        currentResource.getRootPath()), t);
+                }
+            }
+
+            if (filesSize > 0) {
+                report.println(Messages.get().container(Messages.RPT_PUBLISH_FILES_END_0), I_CmsReport.FORMAT_HEADLINE);
+            }
+
+            ////////////////////////////////////////////////////////////////////////////////////////
+
+            // publish deleted folders
+            List deletedFolders = publishList.getDeletedFolderList();
+            if (deletedFolders.isEmpty()) {
+                return;
+            }
+
+            deletedFolderCount = 0;
+            int deletedFoldersSize = deletedFolders.size();
+            if (deletedFoldersSize > 0) {
+                report.println(
+                    Messages.get().container(Messages.RPT_DELETE_FOLDERS_BEGIN_0),
+                    I_CmsReport.FORMAT_HEADLINE);
+            }
+
+            Iterator itDeletedFolders = deletedFolders.iterator();
+            while (itDeletedFolders.hasNext()) {
+                CmsResource currentFolder = (CmsResource)itDeletedFolders.next();
+
+                try {
+                    // bounce the current publish task through all project drivers
+                    m_driverManager.getProjectDriver().publishDeletedFolder(
+                        dbc,
+                        report,
+                        ++deletedFolderCount,
+                        deletedFoldersSize,
+                        onlineProject,
+                        new CmsFolder(currentFolder),
+                        publishList.getPublishHistoryId(),
+                        publishTag);
+
+                    dbc.pop();
+                    // delete old historical entries
+                    m_driverManager.getHistoryDriver().deleteEntries(
+                        dbc,
+                        new CmsHistoryFile(currentFolder),
+                        OpenCms.getSystemInfo().getHistoryVersionsAfterDeletion(),
+                        -1);
+
+                    m_driverManager.unlockResource(dbc, currentFolder, true, true);
+
+                    dbc.pop();
+                } catch (Throwable t) {
+                    dbc.report(report, Messages.get().container(
+                        Messages.ERR_ERROR_PUBLISHING_DELETED_FOLDER_1,
+                        currentFolder.getRootPath()), t);
+                }
+            }
+
+            if (deletedFoldersSize > 0) {
+                report.println(Messages.get().container(Messages.RPT_DELETE_FOLDERS_END_0), I_CmsReport.FORMAT_HEADLINE);
+            }
+        } catch (OutOfMemoryError o) {
+            // clear all caches to reclaim memory
+            OpenCms.fireCmsEvent(new CmsEvent(I_CmsEventListener.EVENT_CLEAR_CACHES, Collections.EMPTY_MAP));
+
+            CmsMessageContainer message = Messages.get().container(Messages.ERR_OUT_OF_MEMORY_0);
+            if (LOG.isErrorEnabled()) {
+                LOG.error(message.key(), o);
+            }
+            throw new CmsDataAccessException(message, o);
+        } finally {
+            // reset vfs driver internal info after publishing
+            m_driverManager.getVfsDriver().publishVersions(dbc, null, false);
+            Object[] msgArgs = new Object[] {
+                String.valueOf(publishedFileCount),
+                String.valueOf(publishedFolderCount),
+                String.valueOf(deletedFolderCount),
+                report.formatRuntime()};
+            CmsMessageContainer message = Messages.get().container(Messages.RPT_PUBLISH_STAT_4, msgArgs);
+            if (LOG.isInfoEnabled()) {
+                LOG.info(message.key());
+            }
+            report.println(message);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readLocks(org.opencms.db.CmsDbContext)
+     */
+    public List readLocks(CmsDbContext dbc) throws CmsDataAccessException {
+
+        List locks = new ArrayList(256);
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_RESOURCE_LOCKS_READALL);
+            List<CmsDAOResourceLocks> res = q.getResultList();
+            for (CmsDAOResourceLocks rl:res) {
+                String resourcePath = rl.getResourcePath();
+                CmsUUID userId = new CmsUUID(rl.getUserId());
+                CmsUUID projectId = new CmsUUID(rl.getProjectId());
+                int lockType = rl.getLockType();
+                CmsProject project;
+                try {
+                    project = readProject(dbc, projectId);
+                } catch (CmsDataAccessException dae) {
+                    // the project does not longer exist, ignore this lock (should usually not happen)
+                    project = null;
+                }
+                if (project != null) {
+                    CmsLock lock = new CmsLock(resourcePath, userId, project, CmsLockType.valueOf(lockType));
+                    locks.add(lock);
+                }
+            }
+            if (LOG.isDebugEnabled()) {
+                LOG.debug(Messages.get().getBundle().key(Messages.LOG_DBG_READ_LOCKS_1, new Integer(locks.size())));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+        
+        return locks;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readProject(org.opencms.db.CmsDbContext, CmsUUID)
+     */
+    public CmsProject readProject(CmsDbContext dbc, CmsUUID id) throws CmsDataAccessException {
+
+        CmsProject project = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_READ_1);
+
+            q.setParameter(1, id.toString());
+            try{
+            	CmsDAOProjects p = (CmsDAOProjects) q.getSingleResult() ;
+            	project = internalCreateProject(p);
+            } catch(NoResultException e){
+            	throw new CmsDbEntryNotFoundException(Messages.get().container(
+                        Messages.ERR_NO_PROJECT_WITH_ID_1,
+                        String.valueOf(id)));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return project;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readProject(org.opencms.db.CmsDbContext, java.lang.String)
+     */
+    public CmsProject readProject(CmsDbContext dbc, String projectFqn) throws CmsDataAccessException {
+
+        CmsProject project = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_READ_BYNAME_2);
+
+            q.setParameter(1, CmsOrganizationalUnit.getSimpleName(projectFqn));
+            q.setParameter(2, CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(projectFqn));
+            
+            try{
+            	CmsDAOProjects p = (CmsDAOProjects) q.getSingleResult() ;
+            	project = internalCreateProject(p);
+            } catch(NoResultException e){
+            	throw new CmsDbEntryNotFoundException(Messages.get().container(
+                        Messages.ERR_NO_PROJECT_WITH_NAME_1,
+                        projectFqn));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return project;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readProjectResource(org.opencms.db.CmsDbContext, CmsUUID, java.lang.String)
+     */
+    public String readProjectResource(CmsDbContext dbc, CmsUUID projectId, String resourcePath)
+    throws CmsDataAccessException {
+
+        String resName = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTRESOURCES_READ_2);
+
+            // select resource from the database
+            q.setParameter(1, projectId.toString());
+            q.setParameter(2, resourcePath);
+            
+            try{
+            	resName = (String) q.getSingleResult() ;
+            } catch(NoResultException e){
+            	throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                        Messages.ERR_NO_PROJECTRESOURCE_1,
+                        resourcePath));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return resName;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readProjectResources(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject)
+     */
+    public List readProjectResources(CmsDbContext dbc, CmsProject project) throws CmsDataAccessException {
+
+        List result = new ArrayList();
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTRESOURCES_READ_BY_ID_1);
+            q.setParameter(1, project.getUuid().toString());
+            List<String> res = q.getResultList();
+
+            for (String r:res) {
+                result.add(r);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return result;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readProjects(org.opencms.db.CmsDbContext, String)
+     */
+    public List readProjects(CmsDbContext dbc, String ouFqn) throws CmsDataAccessException {
+
+        List projects = new ArrayList();
+
+        try {
+            // create the statement
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_READ_BYOU_1);
+
+            q.setParameter(1, CmsOrganizationalUnit.SEPARATOR + ouFqn + "%");
+            List<CmsDAOProjects> res = q.getResultList() ;
+
+            for (CmsDAOProjects p:res) {
+                projects.add(internalCreateProject(p));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return (projects);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readProjectsForGroup(org.opencms.db.CmsDbContext, org.opencms.file.CmsGroup)
+     */
+    public List readProjectsForGroup(CmsDbContext dbc, CmsGroup group) throws CmsDataAccessException {
+
+        List projects = new ArrayList();
+
+        try {
+            // create the statement
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_READ_BYGROUP_2);
+
+            q.setParameter(1, group.getId().toString());
+            q.setParameter(2, group.getId().toString());
+            List<CmsDAOProjects> res = q.getResultList() ;
+
+            for (CmsDAOProjects p:res) {
+                projects.add(internalCreateProject(p));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+        
+        return (projects);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readProjectsForManagerGroup(org.opencms.db.CmsDbContext, org.opencms.file.CmsGroup)
+     */
+    public List readProjectsForManagerGroup(CmsDbContext dbc, CmsGroup group) throws CmsDataAccessException {
+
+        List projects = new ArrayList();
+
+        try {
+            // create the statement
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_READ_BYMANAGER_1);
+
+            q.setParameter(1, group.getId().toString());
+            List<CmsDAOProjects> res = q.getResultList() ;
+
+            for (CmsDAOProjects p:res) {
+                projects.add(internalCreateProject(p));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+
+        return (projects);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readProjectsForUser(org.opencms.db.CmsDbContext, org.opencms.file.CmsUser)
+     */
+    public List readProjectsForUser(CmsDbContext dbc, CmsUser user) throws CmsDataAccessException {
+
+        List projects = new ArrayList();
+
+        try {
+            // create the statement
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_READ_BYUSER_1);
+
+            q.setParameter(1, user.getId().toString());
+            List<CmsDAOProjects> res = q.getResultList() ;
+
+            for (CmsDAOProjects p:res) {
+                projects.add(internalCreateProject(p));
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return (projects);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readPublishedResources(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public List readPublishedResources(CmsDbContext dbc, CmsUUID publishHistoryId) throws CmsDataAccessException {
+
+        List publishedResources = new ArrayList();
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_SELECT_PUBLISHED_RESOURCES);
+            q.setParameter(1, publishHistoryId.toString());
+            List<CmsDAOPublishHistory> res = q.getResultList() ;
+
+            for (CmsDAOPublishHistory ph:res) {
+                CmsUUID structureId = new CmsUUID(ph.getStructureId());
+                CmsUUID resourceId = new CmsUUID(ph.getResourceId());
+                String rootPath = ph.getResourcePath();
+                int resourceState = ph.getResourceState();
+                int resourceType = ph.getResourceType();
+                int siblingCount = ph.getSiblingCount();
+                int publishTag = ph.getPublishTag();
+
+                // compose the resource state
+                CmsResourceState state;
+                if (resourceState == CmsPublishedResource.STATE_MOVED_SOURCE.getState()) {
+                    state = CmsPublishedResource.STATE_MOVED_SOURCE;
+                } else if (resourceState == CmsPublishedResource.STATE_MOVED_DESTINATION.getState()) {
+                    state = CmsPublishedResource.STATE_MOVED_DESTINATION;
+                } else {
+                    state = CmsResourceState.valueOf(resourceState);
+                }
+
+                publishedResources.add(new CmsPublishedResource(
+                    structureId,
+                    resourceId,
+                    publishTag,
+                    rootPath,
+                    resourceType,
+                    structureId.isNullUUID() ? false : CmsFolder.isFolderType(resourceType),
+                    state,
+                    siblingCount));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return publishedResources;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readPublishJob(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public CmsPublishJobInfoBean readPublishJob(CmsDbContext dbc, CmsUUID publishHistoryId)
+    throws CmsDataAccessException {
+
+        CmsPublishJobInfoBean result = null;
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PUBLISHJOB_READ_JOB);
+            q.setParameter(1, publishHistoryId.toString());
+            try{
+            	CmsDAOPublishJobs pj = (CmsDAOPublishJobs) q.getSingleResult() ;
+            	result = createPublishJobInfoBean(pj);
+            } catch(NoResultException e){
+            	throw new CmsDbEntryNotFoundException(Messages.get().container(
+                        Messages.ERR_READ_PUBLISH_JOB_1,
+                        publishHistoryId.toString()));
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+
+        return result;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readPublishJobs(org.opencms.db.CmsDbContext, long, long)
+     */
+    public List readPublishJobs(CmsDbContext dbc, long startTime, long endTime) throws CmsDataAccessException {
+
+        List result = null;
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PUBLISHJOB_READ_JOBS_IN_TIMERANGE);
+            q.setParameter(1, startTime);
+            q.setParameter(2, endTime);
+            List<CmsDAOPublishJobs> res = q.getResultList();
+
+            result = new ArrayList();
+            for (CmsDAOPublishJobs pj:res) {
+                result.add(createPublishJobInfoBean(pj));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return result;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readPublishList(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public CmsPublishList readPublishList(CmsDbContext dbc, CmsUUID publishHistoryId) throws CmsDataAccessException {
+
+        CmsPublishList publishList = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PUBLISHJOB_READ_PUBLISHLIST);
+            q.setParameter(1, publishHistoryId.toString());
+            try{
+            	CmsDAOPublishJobs pj = (CmsDAOPublishJobs) q.getSingleResult() ;;
+                publishList = internalDeserializePublishList(pj.getPublishList());
+            } catch(NoResultException e){
+            	throw new CmsDataAccessException(Messages.get().container(
+                        Messages.ERR_READ_PUBLISH_JOB_1,
+                        publishHistoryId.toString()));
+            }
+            
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } catch (Exception e) {
+            throw new CmsDataAccessException(Messages.get().container(
+                Messages.ERR_PUBLISHLIST_DESERIALIZATION_FAILED_1,
+                publishHistoryId), e);
+        } 
+
+        return publishList;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readPublishReportContents(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public byte[] readPublishReportContents(CmsDbContext dbc, CmsUUID publishHistoryId) throws CmsDataAccessException {
+
+        byte[] bytes = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PUBLISHJOB_READ_REPORT);
+            q.setParameter(1, publishHistoryId.toString());
+            try{
+            	CmsDAOPublishJobs pj = (CmsDAOPublishJobs) q.getSingleResult() ;
+            	bytes = pj.getPublishReport() ;
+            } catch(NoResultException e){
+            	throw new CmsDataAccessException(Messages.get().container(
+                        Messages.ERR_READ_PUBLISH_JOB_1,
+                        publishHistoryId.toString()));
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+
+        return bytes;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readStaticExportPublishedResourceParameters(org.opencms.db.CmsDbContext, java.lang.String)
+     */
+    public String readStaticExportPublishedResourceParameters(CmsDbContext dbc, String rfsName)
+    throws CmsDataAccessException {
+
+        String returnValue = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_STATICEXPORT_READ_PUBLISHED_LINK_PARAMETERS);
+            q.setParameter(1, rfsName);
+            try{
+            	returnValue = (String) q.getSingleResult() ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+            
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return returnValue;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#readStaticExportResources(org.opencms.db.CmsDbContext, int, long)
+     */
+    public List readStaticExportResources(CmsDbContext dbc, int parameterResources, long timestamp)
+    throws CmsDataAccessException {
+
+        List returnValue = new ArrayList();
+
+        if (parameterResources == CmsStaticExportManager.EXPORT_LINK_WITHOUT_PARAMETER) {
+            timestamp = 0;
+        }
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_STATICEXPORT_READ_ALL_PUBLISHED_LINKS);
+            q.setParameter(1, parameterResources);
+            q.setParameter(2, timestamp);
+            List<String> res = q.getResultList() ;
+            // add all resourcenames to the list of return values
+            for (String path:res) {
+                returnValue.add(path);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+
+        return returnValue;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#unmarkProjectResources(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject)
+     */
+    public void unmarkProjectResources(CmsDbContext dbc, CmsProject project) throws CmsDataAccessException {
+
+        // finally remove the project id form all resources 
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_RESOURCES_UNMARK);
+            // create the statement
+            q.setParameter(1, project.getUuid().toString());
+            List<CmsDAOOfflineResources> res = q.getResultList();
+            
+            for(CmsDAOOfflineResources r:res){
+            	r.setProjectLastModified("00000000-0000-0000-0000-000000000000") ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#writeLocks(org.opencms.db.CmsDbContext, java.util.List)
+     */
+    public void writeLocks(CmsDbContext dbc, List locks) throws CmsDataAccessException {
+
+    	CmsDAOResourceLocks rl ;
+    	
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_RESOURCE_LOCKS_DELETEALL);
+            List<CmsDAOResourceLocks> res = q.getResultList() ;
+            int deleted = 0 ;
+            for(CmsDAOResourceLocks r:res){
+            	dbc.getEntityManager().remove(r) ;
+            	deleted++ ;
+            }
+            if (LOG.isDebugEnabled()) {
+                LOG.debug(Messages.get().getBundle().key(Messages.LOG_DBG_CLEAR_LOCKS_1, new Integer(deleted)));
+            }
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("SQL :" + "Inserting rows in the CMS_RESOURCE_LOCKS table.");
+            }
+            Iterator i = locks.iterator();
+            int count = 0;
+            while (i.hasNext()) {
+                CmsLock lock = (CmsLock)i.next();
+                // only persist locks that should be written to the DB
+                CmsLock sysLock = lock.getSystemLock();
+                if (sysLock.isPersistent()) {
+                    // persist system lock
+                	
+                	rl = new CmsDAOResourceLocks() ;
+                	
+                	rl.setResourcePath(sysLock.getResourceName()) ;
+                	rl.setUserId(sysLock.getUserId().toString()) ;
+                	rl.setProjectId(sysLock.getProjectId().toString()) ;
+                	rl.setLockType(sysLock.getType().hashCode()) ;
+                	
+                	dbc.getEntityManager().persist(rl) ;
+                    count++;
+                }
+                CmsLock editLock = lock.getEditionLock();
+                if (editLock.isPersistent()) {
+                    // persist edition lock
+                	rl = new CmsDAOResourceLocks() ;
+                	
+                	rl.setResourcePath(editLock.getResourceName()) ;
+                	rl.setUserId(editLock.getUserId().toString()) ;
+                	rl.setProjectId(editLock.getProjectId().toString()) ;
+                	rl.setLockType(editLock.getType().hashCode()) ;
+                	
+                	dbc.getEntityManager().persist(rl) ;
+                    count++;
+                }
+            }
+            if (LOG.isDebugEnabled()) {
+                LOG.debug(Messages.get().getBundle().key(Messages.LOG_DBG_WRITE_LOCKS_1, new Integer(count)));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#writeProject(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject)
+     */
+    public void writeProject(CmsDbContext dbc, CmsProject project) throws CmsDataAccessException {
+
+        if (CmsStringUtil.isEmptyOrWhitespaceOnly(project.getDescription())) {
+            project.setDescription(" ");
+        }
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_PROJECTS_WRITE_6);
+            q.setParameter(1, project.getUuid().toString());
+            List<CmsDAOProjects> res = q.getResultList();
+            
+            for(CmsDAOProjects pr:res){
+            	pr.setProjectDescription(project.getDescription()) ;
+            	pr.setGroupId(project.getGroupId().toString()) ;
+            	pr.setManagerGroupId(project.getManagerGroupId().toString()) ;
+            	pr.setProjectFlags(project.getFlags()) ;
+            	pr.setProjectType(project.getType().getMode()) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#writePublishHistory(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, org.opencms.db.CmsPublishedResource)
+     */
+    public void writePublishHistory(CmsDbContext dbc, CmsUUID publishId, CmsPublishedResource resource)
+    throws CmsDataAccessException {
+    	
+        try {
+        	CmsDAOPublishHistory ph = new CmsDAOPublishHistory() ;
+        	ph.setPublishTag(resource.getPublishTag()) ;
+        	ph.setStructureId(resource.getStructureId().toString()) ;
+        	ph.setResourceId(resource.getResourceId().toString()) ;
+        	ph.setResourcePath(resource.getRootPath()) ;
+        	ph.setResourceState(resource.getMovedState().getState()) ;
+        	ph.setResourceType(resource.getType()) ;
+        	ph.setHistoryId(publishId.toString()) ;
+        	ph.setSiblingCount(resource.getSiblingCount()) ;
+        	
+        	dbc.getEntityManager().persist(ph) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#writePublishJob(org.opencms.db.CmsDbContext, org.opencms.publish.CmsPublishJobInfoBean)
+     */
+    public void writePublishJob(CmsDbContext dbc, CmsPublishJobInfoBean publishJob) throws CmsDataAccessException {
+
+        try {
+        	CmsDAOPublishJobs pj = dbc.getEntityManager().find(CmsDAOPublishJobs.class, publishJob.getPublishHistoryId().toString()) ;
+        	if( pj != null ){
+        		pj.setProjectId(publishJob.getProjectId().toString()) ;
+        		pj.setProjectName(publishJob.getProjectName()) ;
+        		pj.setUserId(publishJob.getUserId().toString()) ;
+        		pj.setPublishLocale(publishJob.getLocale().toString()) ;
+        		pj.setPublishFlags(publishJob.getFlags()) ;
+        		pj.setResourceCount(publishJob.getSize()) ;
+        		pj.setEnqueueTime(publishJob.getEnqueueTime()) ;
+        		pj.setStartTime(publishJob.getStartTime()) ;
+        		pj.setFinishTime(publishJob.getFinishTime()) ;
+        	}
+            
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#writePublishReport(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, byte[])
+     */
+    public void writePublishReport(CmsDbContext dbc, CmsUUID publishId, byte[] content) throws CmsDataAccessException {
+
+        try {
+        	CmsDAOPublishJobs pj = dbc.getEntityManager().find(CmsDAOPublishJobs.class, publishId.toString()) ;
+        	if(pj != null){
+        		pj.setPublishReport(content) ;
+        	}
+        	
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsProjectDriver#writeStaticExportPublishedResource(org.opencms.db.CmsDbContext, java.lang.String, int, java.lang.String, long)
+     */
+    public void writeStaticExportPublishedResource(
+        CmsDbContext dbc,
+        String resourceName,
+        int linkType,
+        String linkParameter,
+        long timestamp) throws CmsDataAccessException {
+
+        int returnValue = 0;
+        // first check if a record with this resource name does already exist
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_STATICEXPORT_READ_PUBLISHED_RESOURCES);
+            q.setParameter(1, resourceName);
+            try{
+            	returnValue = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        // there was no entry found, so add it to the database
+        if (returnValue == 0) {
+            try {
+            	CmsDAOStaticExportLinks sel = new CmsDAOStaticExportLinks() ;
+            	
+            	sel.setLinkId(new CmsUUID().toString()) ;
+            	sel.setLinkRfsPath(resourceName) ;
+            	sel.setLinkType(linkType) ;
+            	sel.setLinkParameter(linkParameter) ;
+            	sel.setLinkTimestamp(timestamp) ;
+            	
+            	dbc.getEntityManager().persist(sel) ;
+            } catch (PersistenceException e) {
+            	throw new CmsDataAccessException(Messages.get().container(
+                        Messages.ERR_JPA_PERSITENCE,
+                        e), e);
+            }
+        }
+    }
+    
+    /**
+     * Creates a <code>CmsPublishJobInfoBean</code> from a result set.<p>
+     * 
+     * @param res the result set 
+     * @return an initialized <code>CmsPublishJobInfoBean</code>
+     */
+    protected CmsPublishJobInfoBean createPublishJobInfoBean(CmsDAOPublishJobs pj) {
+
+        return new CmsPublishJobInfoBean(
+            new CmsUUID(pj.getHistoryId()),
+            new CmsUUID(pj.getProjectId()),
+            pj.getProjectName(),
+            new CmsUUID(pj.getUserId()),
+            pj.getPublishLocale(),
+            pj.getPublishFlags(),
+            pj.getResourceCount(),
+            pj.getEnqueueTime(),
+            pj.getStartTime(),
+            pj.getFinishTime());
+    }
+    
+    /**
+     * Checks if the given resource (by id) is available in the online project,
+     * if there exists a resource with a different path (a moved file), then the 
+     * online entry is moved to the right (new) location before publishing.<p>
+     * 
+     * @param dbc the db context
+     * @param onlineProject the online project
+     * @param offlineResource the offline resource to check
+     * @param publishHistoryId the publish history id
+     * @param publishTag the publish tag
+     * 
+     * @return <code>true</code> if the resource has actually been moved
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected CmsResourceState fixMovedResource(
+        CmsDbContext dbc,
+        CmsProject onlineProject,
+        CmsResource offlineResource,
+        CmsUUID publishHistoryId,
+        int publishTag) throws CmsDataAccessException {
+
+        CmsResource onlineResource;
+        // check if the resource has been moved since last publishing
+        try {
+            onlineResource = m_driverManager.getVfsDriver().readResource(
+                dbc,
+                onlineProject.getUuid(),
+                offlineResource.getStructureId(),
+                true);
+            if (onlineResource.getRootPath().equals(offlineResource.getRootPath())) {
+                // resource changed, not moved 
+                return offlineResource.getState();
+            }
+        } catch (CmsVfsResourceNotFoundException e) {
+            // ok, resource new, not moved
+            return offlineResource.getState();
+        }
+
+        // move the online resource to the new position
+        m_driverManager.getVfsDriver().moveResource(
+            dbc,
+            onlineProject.getUuid(),
+            onlineResource,
+            offlineResource.getRootPath());
+
+        try {
+            // write the resource to the publish history
+            m_driverManager.getProjectDriver().writePublishHistory(
+                dbc,
+                publishHistoryId,
+                new CmsPublishedResource(onlineResource, publishTag, CmsPublishedResource.STATE_MOVED_SOURCE));
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(
+                    Messages.LOG_WRITING_PUBLISHING_HISTORY_1,
+                    onlineResource.getRootPath()), e);
+            }
+            throw e;
+        }
+        return offlineResource.getState().isDeleted() ? CmsResource.STATE_DELETED
+        : CmsPublishedResource.STATE_MOVED_DESTINATION;
+    }
+    
+    /**
+     * Creates a new project from the current row of the given result set.<p>
+     * 
+     * @param res the result set
+     * 
+     * @return the new project
+     * 
+     * @throws SQLException is something goes wrong
+     */
+    protected CmsProject internalCreateProject(CmsDAOProjects p) {
+
+        String ou = CmsOrganizationalUnit.removeLeadingSeparator(p.getProjectOu());
+        return new CmsProject(
+            new CmsUUID(p.getProjectId()),
+            ou + p.getProjectName(),
+            p.getProjectDescription(),
+            new CmsUUID(p.getUserId()),
+            new CmsUUID(p.getGroupId()),
+            new CmsUUID(p.getManagerGroupId()),
+            p.getProjectFlags(),
+            p.getDateCreated(),
+            CmsProject.CmsProjectType.valueOf(p.getProjectType()));
+    }
+    
+    /**
+     * Builds a publish list from serialized data.<p>
+     * 
+     * @param bytes the byte array containing the serailized data for the publish list
+     * @return the initialized publish list
+     * 
+     * @throws IOException if deserialization fails
+     * @throws ClassNotFoundException if deserialization fails
+     */
+    protected CmsPublishList internalDeserializePublishList(byte[] bytes) throws IOException, ClassNotFoundException {
+
+        ByteArrayInputStream bin = new ByteArrayInputStream(bytes);
+        ObjectInputStream oin = new ObjectInputStream(bin);
+        return (CmsPublishList)oin.readObject();
+    }
+    
+    /**
+     * Resets the state to UNCHANGED for a specified resource.<p>
+     * 
+     * @param dbc the current database context
+     * @param resource the Cms resource
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected void internalResetResourceState(CmsDbContext dbc, CmsResource resource) throws CmsDataAccessException {
+
+        try {
+            // reset the resource state
+            resource.setState(CmsResource.STATE_UNCHANGED);
+            m_driverManager.getVfsDriver().writeResourceState(
+                dbc,
+                dbc.currentProject(),
+                resource,
+                CmsDriverManager.UPDATE_ALL,
+                true);
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(
+                    Messages.LOG_ERROR_RESETTING_RESOURCE_STATE_1,
+                    resource.getRootPath()), e);
+            }
+            throw e;
+        }
+    }
+    
+    /**
+     * Serialize publish list to write it as byte array to the database.<p>
+     * 
+     * @param publishList the publish list
+     * @return byte array containing the publish list data
+     * @throws IOException if something goes wrong
+     */
+    protected byte[] internalSerializePublishList(CmsPublishList publishList) throws IOException {
+
+        // serialize the publish list
+        ByteArrayOutputStream bout = new ByteArrayOutputStream();
+        ObjectOutputStream oout = new ObjectOutputStream(bout);
+        oout.writeObject(publishList);
+        oout.close();
+        return bout.toByteArray();
+    }
+    
+    /**
+     * Writes the needed history entries.<p>
+     * 
+     * @param dbc the current database context
+     * @param resource the offline resource
+     * @param state the state to store in the publish history entry
+     * @param properties the offline properties
+     * @param publishHistoryId the current publish process id
+     * @param publishTag the current publish process tag
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected void internalWriteHistory(
+        CmsDbContext dbc,
+        CmsResource resource,
+        CmsResourceState state,
+        List properties,
+        CmsUUID publishHistoryId,
+        int publishTag) throws CmsDataAccessException {
+
+        try {
+            if (OpenCms.getSystemInfo().isHistoryEnabled()) {
+                // write the resource to the historical archive
+                if (properties == null) {
+                    properties = m_driverManager.getVfsDriver().readPropertyObjects(dbc, dbc.currentProject(), resource);
+                }
+                m_driverManager.getHistoryDriver().writeResource(dbc, resource, properties, publishTag);
+            }
+            // write the resource to the publish history
+            m_driverManager.getProjectDriver().writePublishHistory(
+                dbc,
+                publishHistoryId,
+                new CmsPublishedResource(resource, publishTag, state));
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(
+                    Messages.LOG_WRITING_PUBLISHING_HISTORY_1,
+                    resource.getRootPath()), e);
+            }
+            throw e;
+        }
+    }
+    
+    /**
+     * Publishes a changed file.<p>
+     * 
+     * @param dbc the current database context
+     * @param onlineProject the online project
+     * @param offlineResource the resource to publish
+     * @param publishedResourceIds contains the UUIDs of already published content records
+     * @param publishHistoryId the publish history id
+     * @param publishTag the publish tag
+     * 
+     * @throws CmsDataAccessException is something goes wrong
+     */
+    protected void publishChangedFile(
+        CmsDbContext dbc,
+        CmsProject onlineProject,
+        CmsResource offlineResource,
+        Set publishedResourceIds,
+        CmsUUID publishHistoryId,
+        int publishTag) throws CmsDataAccessException {
+
+        CmsResourceState resourceState = fixMovedResource(
+            dbc,
+            onlineProject,
+            offlineResource,
+            publishHistoryId,
+            publishTag);
+
+        CmsResource onlineResource;
+        try {
+            // read the file header online                   
+            onlineResource = m_driverManager.getVfsDriver().readResource(
+                dbc,
+                onlineProject.getUuid(),
+                offlineResource.getStructureId(),
+                false);
+
+            // reset the labeled link flag before writing the online file
+            int flags = offlineResource.getFlags();
+            flags &= ~CmsResource.FLAG_LABELED;
+            offlineResource.setFlags(flags);
+
+            // delete the properties online
+            m_driverManager.getVfsDriver().deletePropertyObjects(
+                dbc,
+                onlineProject.getUuid(),
+                onlineResource,
+                CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES);
+
+            // if the offline file has a resource ID different from the online file
+            // (probably because a deleted file was replaced by a new file with the
+            // same name), the properties mapped to the "old" resource ID have to be
+            // deleted also offline. if this is the case, the online and offline structure
+            // ID's do match, but the resource ID's are different. structure IDs are reused
+            // to prevent orphan structure records in the online project.
+            if (!onlineResource.getResourceId().equals(offlineResource.getResourceId())) {
+                List offlineProperties = m_driverManager.getVfsDriver().readPropertyObjects(
+                    dbc,
+                    dbc.currentProject(),
+                    onlineResource);
+                if (offlineProperties.size() > 0) {
+                    for (int i = 0; i < offlineProperties.size(); i++) {
+                        CmsProperty property = (CmsProperty)offlineProperties.get(i);
+                        property.setStructureValue(null);
+                        property.setResourceValue(CmsProperty.DELETE_VALUE);
+                    }
+                    m_driverManager.getVfsDriver().writePropertyObjects(
+                        dbc,
+                        dbc.currentProject(),
+                        onlineResource,
+                        offlineProperties);
+                }
+            }
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(
+                    Messages.get().getBundle().key(Messages.LOG_DELETING_PROPERTIES_1, offlineResource.toString()),
+                    e);
+            }
+            throw e;
+        }
+
+        CmsFile newFile;
+        try {
+            boolean needToUpdateContent = (onlineResource.getDateContent() < offlineResource.getDateContent());
+            // publish the file content
+            newFile = m_driverManager.getProjectDriver().publishFileContent(
+                dbc,
+                dbc.currentProject(),
+                onlineProject,
+                offlineResource,
+                publishedResourceIds,
+                needToUpdateContent,
+                publishTag);
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(
+                    Messages.LOG_PUBLISHING_RESOURCE_1,
+                    offlineResource.getRootPath()), e);
+            }
+            throw e;
+        }
+
+        List offlineProperties;
+        try {
+            // write the properties online
+            offlineProperties = m_driverManager.getVfsDriver().readPropertyObjects(
+                dbc,
+                dbc.currentProject(),
+                offlineResource);
+            CmsProperty.setAutoCreatePropertyDefinitions(offlineProperties, true);
+            m_driverManager.getVfsDriver().writePropertyObjects(dbc, onlineProject, newFile, offlineProperties);
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(
+                    Messages.get().getBundle().key(Messages.LOG_PUBLISHING_PROPERTIES_1, newFile.getRootPath()),
+                    e);
+            }
+            throw e;
+        }
+
+        try {
+            // write the ACL online
+            m_driverManager.getUserDriver().publishAccessControlEntries(
+                dbc,
+                dbc.currentProject(),
+                onlineProject,
+                newFile.getResourceId(),
+                onlineResource.getResourceId());
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(Messages.LOG_PUBLISHING_ACL_1, newFile.getRootPath()), e);
+            }
+            throw e;
+        }
+
+        CmsFile offlineFile = new CmsFile(offlineResource);
+        offlineFile.setContents(newFile.getContents());
+        internalWriteHistory(dbc, offlineFile, resourceState, offlineProperties, publishHistoryId, publishTag);
+
+        m_driverManager.getVfsDriver().updateRelations(dbc, onlineProject, offlineResource);
+    }
+    
+    /**
+     * Publishes a deleted file.<p>
+     * 
+     * @param dbc the current database context
+     * @param onlineProject the online project
+     * @param offlineResource the resource to publish
+     * @param publishHistoryId the publish history id
+     * @param publishTag the publish tag
+     * 
+     * @throws CmsDataAccessException is something goes wrong
+     */
+    protected void publishDeletedFile(
+        CmsDbContext dbc,
+        CmsProject onlineProject,
+        CmsResource offlineResource,
+        CmsUUID publishHistoryId,
+        int publishTag) throws CmsDataAccessException {
+
+        CmsResourceState resourceState = fixMovedResource(
+            dbc,
+            onlineProject,
+            offlineResource,
+            publishHistoryId,
+            publishTag);
+
+        CmsResource onlineResource;
+        try {
+            // read the file header online
+            onlineResource = m_driverManager.getVfsDriver().readResource(
+                dbc,
+                onlineProject.getUuid(),
+                offlineResource.getStructureId(),
+                true);
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(
+                    Messages.get().getBundle().key(Messages.LOG_READING_RESOURCE_1, offlineResource.getRootPath()),
+                    e);
+            }
+            throw e;
+        }
+
+        if (offlineResource.isLabeled() && !m_driverManager.labelResource(dbc, offlineResource, null, 2)) {
+            // update the resource flags to "unlabeled" of the siblings of the offline resource
+            int flags = offlineResource.getFlags();
+            flags &= ~CmsResource.FLAG_LABELED;
+            offlineResource.setFlags(flags);
+        }
+
+        // write history before deleting
+        CmsFile offlineFile = new CmsFile(offlineResource);
+        offlineFile.setContents(m_driverManager.getVfsDriver().readContent(
+            dbc,
+            dbc.currentProject().getUuid(),
+            offlineFile.getResourceId()));
+        internalWriteHistory(dbc, offlineFile, resourceState, null, publishHistoryId, publishTag);
+
+        int propertyDeleteOption = -1;
+        try {
+            // delete the properties online and offline
+            if (offlineResource.getSiblingCount() > 1) {
+                // there are other siblings- delete only structure property values and keep the resource property values
+                propertyDeleteOption = CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_VALUES;
+            } else {
+                // there are no other siblings- delete both the structure and resource property values
+                propertyDeleteOption = CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES;
+            }
+
+            m_driverManager.getVfsDriver().deletePropertyObjects(
+                dbc,
+                onlineProject.getUuid(),
+                onlineResource,
+                propertyDeleteOption);
+            m_driverManager.getVfsDriver().deletePropertyObjects(
+                dbc,
+                dbc.currentProject().getUuid(),
+                offlineResource,
+                propertyDeleteOption);
+
+            // if the offline file has a resource ID different from the online file
+            // (probably because a (deleted) file was replaced by a new file with the
+            // same name), the properties with the "old" resource ID have to be
+            // deleted also offline
+            if (!onlineResource.getResourceId().equals(offlineResource.getResourceId())) {
+                m_driverManager.getVfsDriver().deletePropertyObjects(
+                    dbc,
+                    dbc.currentProject().getUuid(),
+                    onlineResource,
+                    CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES);
+            }
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(
+                    Messages.LOG_DELETING_PROPERTIES_1,
+                    offlineResource.getRootPath()), e);
+            }
+            throw e;
+        }
+
+        try {
+            // remove the file online and offline
+            m_driverManager.getVfsDriver().removeFile(dbc, dbc.currentProject().getUuid(), offlineResource);
+            m_driverManager.getVfsDriver().removeFile(dbc, onlineProject.getUuid(), onlineResource);
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(
+                    Messages.LOG_REMOVING_RESOURCE_1,
+                    offlineResource.getRootPath()), e);
+            }
+            throw e;
+        }
+
+        // delete the ACL online and offline
+        try {
+            if (onlineResource.getSiblingCount() == 1) {
+                // only if no siblings left
+                m_driverManager.getUserDriver().removeAccessControlEntries(
+                    dbc,
+                    onlineProject,
+                    onlineResource.getResourceId());
+            }
+            if (offlineResource.getSiblingCount() == 1) {
+                // only if no siblings left
+                m_driverManager.getUserDriver().removeAccessControlEntries(
+                    dbc,
+                    dbc.currentProject(),
+                    offlineResource.getResourceId());
+            }
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(Messages.LOG_REMOVING_ACL_1, offlineResource.toString()), e);
+            }
+            throw e;
+        }
+
+        try {
+            // delete relations online and offline
+            m_driverManager.getVfsDriver().deleteRelations(
+                dbc,
+                onlineProject.getUuid(),
+                offlineResource,
+                CmsRelationFilter.TARGETS);
+            m_driverManager.getVfsDriver().deleteRelations(
+                dbc,
+                dbc.currentProject().getUuid(),
+                offlineResource,
+                CmsRelationFilter.TARGETS);
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(
+                    Messages.get().getBundle().key(Messages.LOG_REMOVING_RELATIONS_1, offlineResource.toString()),
+                    e);
+            }
+            throw e;
+        }
+    }
+    
+    /**
+     * Publishes a new file.<p>
+     * 
+     * @param dbc the current database context
+     * @param onlineProject the online project
+     * @param offlineResource the resource to publish
+     * @param publishedContentIds contains the UUIDs of already published content records
+     * @param publishHistoryId the publish history id
+     * @param publishTag the publish tag
+     * 
+     * @throws CmsDataAccessException is something goes wrong
+     */
+    protected void publishNewFile(
+        CmsDbContext dbc,
+        CmsProject onlineProject,
+        CmsResource offlineResource,
+        Set publishedContentIds,
+        CmsUUID publishHistoryId,
+        int publishTag) throws CmsDataAccessException {
+
+        CmsResourceState resourceState = fixMovedResource(
+            dbc,
+            onlineProject,
+            offlineResource,
+            publishHistoryId,
+            publishTag);
+
+        CmsFile newFile;
+        try {
+            // reset the labeled link flag before writing the online file
+            int flags = offlineResource.getFlags();
+            flags &= ~CmsResource.FLAG_LABELED;
+            offlineResource.setFlags(flags);
+
+            // publish the file content
+            newFile = m_driverManager.getProjectDriver().publishFileContent(
+                dbc,
+                dbc.currentProject(),
+                onlineProject,
+                offlineResource,
+                publishedContentIds,
+                true,
+                publishTag);
+        } catch (CmsVfsResourceAlreadyExistsException e) {
+            try {
+                // remove the existing file and ensure that it's content is written 
+                // in any case by removing it's resource ID from the set of published resource IDs
+                m_driverManager.getVfsDriver().removeFile(dbc, onlineProject.getUuid(), offlineResource);
+                publishedContentIds.remove(offlineResource.getResourceId());
+                newFile = m_driverManager.getProjectDriver().publishFileContent(
+                    dbc,
+                    dbc.currentProject(),
+                    onlineProject,
+                    offlineResource,
+                    publishedContentIds,
+                    true,
+                    publishTag);
+            } catch (CmsDataAccessException e1) {
+                if (LOG.isErrorEnabled()) {
+                    LOG.error(Messages.get().getBundle().key(
+                        Messages.LOG_PUBLISHING_RESOURCE_1,
+                        offlineResource.getRootPath()), e);
+                }
+                throw e1;
+            }
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(
+                    Messages.LOG_PUBLISHING_RESOURCE_1,
+                    offlineResource.getRootPath()), e);
+            }
+            throw e;
+        }
+
+        List offlineProperties;
+        try {
+            // write the properties online
+            offlineProperties = m_driverManager.getVfsDriver().readPropertyObjects(
+                dbc,
+                dbc.currentProject(),
+                offlineResource);
+            CmsProperty.setAutoCreatePropertyDefinitions(offlineProperties, true);
+            m_driverManager.getVfsDriver().writePropertyObjects(dbc, onlineProject, newFile, offlineProperties);
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(
+                    Messages.get().getBundle().key(Messages.LOG_PUBLISHING_PROPERTIES_1, newFile.getRootPath()),
+                    e);
+            }
+
+            throw e;
+        }
+
+        try {
+            // write the ACL online
+            m_driverManager.getUserDriver().publishAccessControlEntries(
+                dbc,
+                dbc.currentProject(),
+                onlineProject,
+                offlineResource.getResourceId(),
+                newFile.getResourceId());
+        } catch (CmsDataAccessException e) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(Messages.LOG_PUBLISHING_ACL_1, newFile.getRootPath()), e);
+            }
+            throw e;
+        }
+
+        CmsFile offlineFile = new CmsFile(offlineResource);
+        offlineFile.setContents(newFile.getContents());
+        internalWriteHistory(dbc, offlineFile, resourceState, offlineProperties, publishHistoryId, publishTag);
+
+        m_driverManager.getVfsDriver().updateRelations(dbc, onlineProject, offlineResource);
+    }
+}
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/CmsSqlManager.java trunk/src/org/opencms/db/jpa/CmsSqlManager.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/CmsSqlManager.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/CmsSqlManager.java	2008-09-02 11:14:29.187884133 +0300
@@ -0,0 +1,525 @@
+/*
+ *
+ * This work is derivate of generic SQL driver and it's part of 
+ * OpenCms - the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa;
+
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Persistence;
+import javax.persistence.EntityManagerFactory ;
+import javax.persistence.Query;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.pool.ObjectPool;
+import org.apache.commons.pool.impl.StackObjectPool;
+import org.opencms.configuration.CmsConfigurationManager;
+import org.opencms.configuration.CmsPersistenceUnitConfigurator;
+import org.opencms.db.CmsDbContext;
+import org.opencms.file.CmsProject;
+import org.opencms.main.CmsLog;
+import org.opencms.main.CmsRuntimeException;
+import org.opencms.util.CmsStringUtil;
+import org.opencms.util.CmsUUID;
+
+/**
+ * @author gosho
+ *
+ */
+public class CmsSqlManager extends org.opencms.db.CmsSqlManager {
+
+	/** The persistence unit name in the persistence.xml file for OpenCms'es persistence classes. */
+	public static final String JPA_PERSISTENCE_UNIT="OpenCmsJPAPool" ;
+	
+	/** A pattern being replaced in JPQL queries to generate JPQL queries to access online/offline tables. */
+    protected static final String QUERY_PROJECT_SEARCH_PATTERN = "${PROJECT}";
+    
+    /** String which indicates project parameter in the queries*/
+    protected static final String QUERY_PROJECT_STRING = "PROJECT" ;
+    
+    /** The value to be replaced with for online project */
+    private static final String OFFLINE_PROJECT = "Offline" ;
+    
+    /** The value to be replaced with for online project */
+    private static final String ONLINE_PROJECT = "Online" ;
+    
+	/** The filename/path of the JPQL query properties. */
+    private static final String QUERY_PROPERTIES = "org/opencms/db/jpa/query.properties";
+    
+    /** The log object for this class. */
+    private static final Log LOG = CmsLog.getLog(CmsSqlManager.class);
+    
+    /** Contains JPQL placeholder for query parameters. Currently it's question mark.*/
+    private static final String JPQL_PARAMETER_PLACEHOLDER = "?" ;
+    
+    /** Number of characters for JPQL parameter's placeholder. */
+    private static final int JPQL_PARAMETER_PLACEHOLDER_LENGTH = JPQL_PARAMETER_PLACEHOLDER.length() ;
+    
+    /** Property name for pool size configuration*/
+    public static final String JPA_POOL_SIZE_PROPERTY_NAME = "opencms.jpa.EntityManagerPoolSize" ;
+    
+    /** Default pool size for EntityManager instances*/
+    public static int DEFAULT_EM_POOL_SIZE = 300 ;
+    
+	/** The hashtable with all factories. You may have additional factories for OpenCms modules. */
+	private static Hashtable<String, EntityManagerFactory> m_factoryTable ;
+	
+	/** EntityManager factory for OpenCms application */
+	private static EntityManagerFactory m_persistenceFactory ;
+	
+	/** A map to cache queries with replaced search patterns. */
+    protected Hashtable m_cachedQueries;
+    
+    /** A map holding all JPQL queries. */
+    protected Hashtable m_queries;
+    
+    protected Hashtable< String, String> m_QueriesWithParameters ;
+    
+    /** Poll of EntityManager instances for OpenCms*/
+    protected static ObjectPool m_openCmsEmPool ;
+    
+    /** Poll size of EntityManager instances for OpenCms*/
+    protected static int m_openCmsEmPoolSize ;
+	
+    
+    /** Returns the pool size of EntityManagers for OpnCms core.
+	 * @return the m_openCmsEmPoolSize
+	 */
+	public static int getOpenCmsEmPoolSize() {
+		return m_openCmsEmPoolSize;
+	}
+
+	/**
+	 * Sets the pool size of EntityManagers for OpnCms core.
+	 * @param cmsEmPoolSize the m_openCmsEmPoolSize to set
+	 */
+	public static void setOpenCmsEmPoolSize(int cmsEmPoolSize) {
+		m_openCmsEmPoolSize = cmsEmPoolSize;
+	}
+
+	/** Contains the state of initialization of the static part of the class.*/
+    private static boolean m_isInitialized = false ;
+    
+	/**
+	 * The constructor.
+	 */
+	public CmsSqlManager() {
+
+		if(!m_isInitialized){
+			init() ;
+		}
+		m_cachedQueries = new Hashtable();
+        m_queries = new Hashtable();
+        m_QueriesWithParameters = new Hashtable<String, String>() ;
+        loadQueryProperties(QUERY_PROPERTIES);
+    }
+	
+	/*
+	 * Initialize the static part of the class.
+	 */
+	public static void init(){
+		m_isInitialized = true ;
+		m_factoryTable = new Hashtable<String, EntityManagerFactory>() ;
+		m_persistenceFactory =
+			Persistence.createEntityManagerFactory(JPA_PERSISTENCE_UNIT, System.getProperties()) ;
+		m_factoryTable.put(JPA_PERSISTENCE_UNIT, m_persistenceFactory) ;
+		m_openCmsEmPool = new StackObjectPool(
+				new PoolEntityManagerFactory(m_persistenceFactory),
+				m_openCmsEmPoolSize,
+				0) ;
+	}
+	
+	/*
+	 * Close all instances of EntityManagerFactory.
+	 */
+	public static void destroy(){
+		try{
+			m_openCmsEmPool.close() ;
+		} catch(Exception e){
+			
+		}
+		Set<String> s = m_factoryTable.keySet() ;
+		EntityManagerFactory emf ;
+		for(String f:s){
+			emf = m_factoryTable.get(f) ;
+			if(emf != null){
+				emf.close() ;
+				m_factoryTable.remove(f) ;
+			}
+		}
+		m_isInitialized = false ;
+	}
+	
+	/**
+     * Replaces the project search pattern in JPQL queries by the pattern _ONLINE_ or _OFFLINE_ depending on the 
+     * specified project ID.<p> 
+     * 
+     * @param projectId the ID of the current project
+     * @param query the JPQL query
+     * @return String the JPQL query with the table key search pattern replaced
+     */
+    protected static String replaceProjectPattern(CmsUUID projectId, String query) {
+
+        // make the statement project dependent
+        String replacePattern = ((projectId == null) || projectId.equals(CmsProject.ONLINE_PROJECT_ID)) ? ONLINE_PROJECT
+        : OFFLINE_PROJECT;
+        return CmsStringUtil.substitute(query, QUERY_PROJECT_SEARCH_PATTERN, replacePattern);
+    }
+	
+    /**
+     * Loads a Java properties hash containing JPQL queries.<p>
+     * 
+     * @param propertyFilename the package/filename of the properties hash
+     */
+    protected void loadQueryProperties(String propertyFilename) {
+
+        Properties properties = new Properties();
+
+        try {
+            properties.load(getClass().getClassLoader().getResourceAsStream(propertyFilename));
+            m_queries.putAll(properties);
+            replaceQuerySearchPatterns();
+        } catch (Throwable t) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(
+                    Messages.get().getBundle().key(Messages.LOG_LOAD_QUERY_PROP_FILE_FAILED_1, propertyFilename),
+                    t);
+            }
+
+            properties = null;
+        }
+    }
+    
+    /**
+     * Replaces patterns ${XXX} by another property value, if XXX is a property key with a value.<p>
+     */
+    protected void replaceQuerySearchPatterns() {
+
+        String currentKey = null;
+        String currentValue = null;
+        int startIndex = 0;
+        int endIndex = 0;
+        int lastIndex = 0;
+
+        Iterator allKeys = m_queries.keySet().iterator();
+        while (allKeys.hasNext()) {
+            currentKey = (String)allKeys.next();
+            currentValue = (String)m_queries.get(currentKey);
+            startIndex = 0;
+            endIndex = 0;
+            lastIndex = 0;
+
+            while ((startIndex = currentValue.indexOf("${", lastIndex)) != -1) {
+                endIndex = currentValue.indexOf('}', startIndex);
+                if ((endIndex != -1) && !currentValue.startsWith(QUERY_PROJECT_SEARCH_PATTERN, startIndex - 1)) {
+
+                    String replaceKey = currentValue.substring(startIndex + 2, endIndex);
+                    String searchPattern = currentValue.substring(startIndex, endIndex + 1);
+                    String replacePattern = this.readQuery(replaceKey);
+
+                    if (replacePattern != null) {
+                        currentValue = CmsStringUtil.substitute(currentValue, searchPattern, replacePattern);
+                    }
+                }
+
+                lastIndex = endIndex + 2;
+            }
+            m_queries.put(currentKey, currentValue);
+        }
+    }
+    
+    /**
+     * Returns a Query for a EntityManagerContext specified by the key of a JPQL query.<p>
+     * 
+     * @param emc EntityManagerContext
+     * @param queryKey the key of the JPQL query
+     * @return Query a new Query containing the pre-compiled JPQL statement 
+     */
+    public Query createQuery(CmsDbContext dbc, String queryKey) {
+    	dbc.getEntityManager().flush() ;
+        String rawJpql = readQuery(CmsUUID.getNullUUID(), queryKey);
+        return dbc.getEntityManager().createQuery(prepareQueryParameters(rawJpql));
+    }
+    
+    /**
+     * Returns a PreparedStatement for a JDBC connection specified by the key of a JPQL query
+     * and the CmsProject.<p>
+     * 
+     * @param con the JDBC connection
+     * @param project the specified CmsProject
+     * @param queryKey the key of the JPQL query
+     * 
+     * @return PreparedStatement a new PreparedStatement containing the pre-compiled JPQL statement 
+     * 
+     */
+    public Query createQuery(CmsDbContext dbc, CmsProject project, String queryKey){
+
+        return createQuery(dbc, project.getUuid(), queryKey);
+    }
+    
+    /**
+     * Returns a Query for a EntityManagerContext specified by the key of a JPQL query
+     * and the project-ID.<p>
+     * 
+     * @param emc the EntityManagerContext
+     * @param projectId the ID of the specified CmsProject
+     * @param queryKey the key of the JPQL query
+     * 
+     * @return PreparedStatement a new PreparedStatement containing the pre-compiled JPQL statement 
+     * 
+     */
+    public Query createQuery(CmsDbContext dbc, CmsUUID projectId, String queryKey){
+    	dbc.getEntityManager().flush() ;
+        String rawJpql = readQuery(projectId, queryKey);
+        return dbc.getEntityManager().createQuery(prepareQueryParameters(rawJpql));
+    }
+    
+    public Query createQueryFromJPQL(CmsDbContext dbc, String query){
+    	dbc.getEntityManager().flush() ;
+    	return dbc.getEntityManager().createQuery(prepareQueryParameters(query)) ;
+    }
+    
+    /**
+     * Searches for the JPQL query with the specified key and project-ID.<p>
+     * 
+     * For projectIds &ne; 0, the pattern {@link #QUERY_PROJECT_SEARCH_PATTERN} in table names of queries is 
+     * replaced with "Online" or "Offline" to choose the right database 
+     * tables for JPQL queries that are project dependent!
+     * 
+     * @param projectId the ID of the specified CmsProject
+     * @param queryKey the key of the JPQL query
+     * @return the the JPQL query in this property list with the specified key
+     */
+    public String readQuery(CmsUUID projectId, String queryKey) {
+
+        String key;
+        if ((projectId != null) && !projectId.isNullUUID()) {
+            // id 0 is special, please see below
+            StringBuffer buffer = new StringBuffer(128);
+            buffer.append(queryKey);
+            if (projectId.equals(CmsProject.ONLINE_PROJECT_ID)) {
+                buffer.append(ONLINE_PROJECT);
+            } else {
+                buffer.append(OFFLINE_PROJECT);
+            }
+            key = buffer.toString();
+        } else {
+            key = queryKey;
+        }
+
+        // look up the query in the cache
+        String query = (String)m_cachedQueries.get(key);
+
+        if (query == null) {
+            // the query has not been cached yet
+            // get the JPQL statement from the properties hash
+            query = readQuery(queryKey);
+
+            if (query == null) {
+                throw new CmsRuntimeException(Messages.get().container(Messages.ERR_QUERY_NOT_FOUND_1, queryKey));
+            }
+
+            // replace control chars.
+            query = CmsStringUtil.substitute(query, "\t", " ");
+            query = CmsStringUtil.substitute(query, "\n", " ");
+
+            if ((projectId != null) && !projectId.isNullUUID()) {
+                // a project ID = 0 is an internal indicator that a project-independent 
+                // query was requested - further regex operations are not required then
+                query = CmsSqlManager.replaceProjectPattern(projectId, query);
+            }
+            // to minimize costs, all statements with replaced expressions are cached in a map
+            m_cachedQueries.put(key, query);
+        }
+
+        return query;
+    }
+    
+    /**
+     * Searches for the JPQL query with the specified key.<p>
+     * 
+     * @param queryKey the JPQL query key
+     * @return the the JPQL query in this property list with the specified key
+     */
+    public String readQuery(String queryKey) {
+
+        String value = (String)m_queries.get(queryKey);
+        if (value == null && 
+        		(!QUERY_PROJECT_STRING.equalsIgnoreCase(queryKey))) {
+            if (LOG.isErrorEnabled()) {
+                LOG.error(Messages.get().getBundle().key(Messages.LOG_QUERY_NOT_FOUND_1, queryKey));
+            }
+        }
+        return value;
+    }
+    
+	/**
+	 * Returns EntityManagerFactory for given unit name. If the factory does not already exists
+	 * it creates one.
+	 * 
+	 * @param unitName - the unit name in the persistence.xml file
+	 * @return EntityManagerFactory for given unit name
+	 */
+	public static EntityManagerFactory getFactory(String unitName){
+		EntityManagerFactory factory = m_factoryTable.get(unitName) ;
+		if(factory == null){
+			factory = Persistence.createEntityManagerFactory(unitName, System.getProperties()) ;
+			m_factoryTable.put(unitName, factory) ;
+		}
+		
+		return factory ;
+	}
+	
+	/**
+	 * Creates EntityManager from OpenCms's factory
+	 * 
+	 * @return EntityManager created from OpenCms's factory
+	 */
+	public static EntityManager getEntityManager(){
+		EntityManager em = null ;
+		try{
+			em = (EntityManager) m_openCmsEmPool.borrowObject() ;
+		} catch(Exception e){
+			LOG.error(e) ;
+		}
+		
+		return em ;
+	}
+	
+	/*
+	 * Returns EntityManager instance from OpenCms, back to pool.
+	 * 
+	 * @param em - instance which returns back to pool of
+	 * OpenCmsJPAPool persistence context.
+	 */
+	
+	public static void returnEntityManager(EntityManager em){
+		try{
+			m_openCmsEmPool.returnObject(em) ;
+		} catch(Exception e){
+			LOG.error(e) ;
+		}
+	}
+	
+	/**
+	 * Create EntityManager instance for given unit name. If factory
+	 * for this unit is not already created it creates it.
+	 * 
+	 * @param unitName - the unit name in the persistence.xml file
+	 * @return EntityManager instance for given unit name
+	 */
+	public static EntityManager createEntityManager(String unitName){
+		EntityManager em = null ;
+		EntityManagerFactory factory = getFactory(unitName) ;
+		
+		if(factory != null){
+			em = factory.createEntityManager() ;
+		}
+		return em ;
+	}
+	
+	/**
+     * Replaces null or empty Strings with a String with one space character <code>" "</code>.<p>
+     * 
+     * @param value the string to validate
+     * @return the validate string or a String with one space character if the validated string is null or empty
+     */
+    public String validateEmpty(String value) {
+
+        if (CmsStringUtil.isNotEmpty(value)) {
+            return value;
+        }
+
+        return " ";
+    }
+    
+    /**
+     * Set numbers for parameters of giving JPQL query
+     * @param query - the query
+     * @return query with numbered parameter's placeholders
+     */
+    private String prepareQueryParameters(String query){
+    	String jpqlQuery = m_QueriesWithParameters.get(query) ;
+    	
+    	if(jpqlQuery != null ){
+    		return jpqlQuery ;
+    	}
+    	
+		StringBuilder builder = new StringBuilder(query) ;
+		int startPosition = 0 ;
+		int currPosition = 0 ;
+		int counter = 0 ;
+		
+		while( ( currPosition = builder.indexOf(JPQL_PARAMETER_PLACEHOLDER, startPosition)) != -1){
+			builder.insert(currPosition + JPQL_PARAMETER_PLACEHOLDER_LENGTH, ++counter) ;
+			startPosition = currPosition + JPQL_PARAMETER_PLACEHOLDER_LENGTH + (counter<10?1:2) ; // assumes we have not more than 99 parameters per query :)
+		}
+		
+		jpqlQuery = builder.toString() ;
+		m_QueriesWithParameters.put(query, jpqlQuery) ;
+		return jpqlQuery ;
+	}
+    
+    /**
+     * Creates a new instance of a SQL manager.<p>
+     * 
+     * @param classname the classname of the SQL manager
+     * 
+     * @return a new instance of the SQL manager
+     */
+    public static CmsSqlManager getInstance(String classname) {
+
+        CmsSqlManager sqlManager;
+
+        try {
+            sqlManager = new CmsSqlManager();
+        } catch (Throwable t) {
+            LOG.error(Messages.get().getBundle().key(Messages.LOG_SQL_MANAGER_INIT_FAILED_1, classname), t);
+            sqlManager = null;
+        }
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DRIVER_SQL_MANAGER_1, classname));
+        }
+
+        return sqlManager;
+
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#initSqlManager(String)
+     */
+    public CmsSqlManager initSqlManager(String classname) {
+
+        return new CmsSqlManager();
+    }
+    
+}
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/CmsUserDriver.java trunk/src/org/opencms/db/jpa/CmsUserDriver.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/CmsUserDriver.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/CmsUserDriver.java	2008-09-02 11:14:29.187884133 +0300
@@ -0,0 +1,2451 @@
+/*
+ *
+ * This work is derivate of generic SQL driver and it's part of 
+ * OpenCms - the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa;
+
+import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceException;
+import javax.persistence.Query;
+
+import org.apache.commons.collections.ExtendedProperties;
+import org.apache.commons.logging.Log;
+import org.opencms.configuration.CmsConfigurationManager;
+import org.opencms.db.CmsDbContext;
+import org.opencms.db.CmsDbEntryAlreadyExistsException;
+import org.opencms.db.CmsDbEntryNotFoundException;
+import org.opencms.db.CmsDbIoException;
+import org.opencms.db.CmsDriverManager;
+import org.opencms.db.CmsUserSettings;
+import org.opencms.db.I_CmsDriver;
+import org.opencms.db.I_CmsProjectDriver;
+import org.opencms.db.I_CmsUserDriver;
+import org.opencms.db.jpa.CmsSqlManager;
+import org.opencms.db.jpa.persistence.CmsDAOGroups;
+import org.opencms.db.jpa.persistence.CmsDAOGroupUsers;
+import org.opencms.db.jpa.persistence.CmsDAOOfflineAccessControl;
+import org.opencms.db.jpa.persistence.CmsDAOOnlineAccessControl;
+import org.opencms.db.jpa.persistence.I_CmsDAOAccessControl;
+import org.opencms.db.jpa.persistence.CmsDAOUserData;
+import org.opencms.db.jpa.persistence.CmsDAOUsers;
+import org.opencms.db.jpa.persistence.CmsDAOGroupUsers.CmsDAOGroupUsersPK;
+import org.opencms.file.CmsDataAccessException;
+import org.opencms.file.CmsFolder;
+import org.opencms.file.CmsGroup;
+import org.opencms.file.CmsProject;
+import org.opencms.file.CmsProperty;
+import org.opencms.file.CmsPropertyDefinition;
+import org.opencms.file.CmsResource;
+import org.opencms.file.CmsResourceFilter;
+import org.opencms.file.CmsUser;
+import org.opencms.file.CmsVfsResourceNotFoundException;
+import org.opencms.file.types.CmsResourceTypeFolder;
+import org.opencms.i18n.CmsEncoder;
+import org.opencms.i18n.CmsLocaleManager;
+import org.opencms.i18n.CmsMessageContainer;
+import org.opencms.main.CmsEvent;
+import org.opencms.main.CmsException;
+import org.opencms.main.CmsInitException;
+import org.opencms.main.CmsLog;
+import org.opencms.main.I_CmsEventListener;
+import org.opencms.main.OpenCms;
+import org.opencms.relations.CmsRelation;
+import org.opencms.relations.CmsRelationFilter;
+import org.opencms.relations.CmsRelationType;
+import org.opencms.security.CmsAccessControlEntry;
+import org.opencms.security.CmsOrganizationalUnit;
+import org.opencms.security.CmsPasswordEncryptionException;
+import org.opencms.security.CmsRole;
+import org.opencms.security.I_CmsPrincipal;
+import org.opencms.util.CmsDataTypeUtil;
+import org.opencms.util.CmsMacroResolver;
+import org.opencms.util.CmsStringUtil;
+import org.opencms.util.CmsUUID;
+
+/**
+ * @author gosho
+ *
+ */
+public class CmsUserDriver implements I_CmsDriver, I_CmsUserDriver {
+
+	/** The log object for this class. */
+    private static final Log LOG = CmsLog.getLog(org.opencms.db.jpa.CmsUserDriver.class);
+
+    /** The name of the offline project. */
+    private static final String OFFLINE_PROJECT_NAME = "Offline";
+
+    /** The root path for organizational units. */
+    public static final String ORGUNIT_BASE_FOLDER = "/system/orgunits/";
+
+    /** Property for the organizational unit description. */
+    private static final String ORGUNIT_PROPERTY_DESCRIPTION = CmsPropertyDefinition.PROPERTY_DESCRIPTION;
+
+    /** Property for the organizational unit default project id. */
+    private static final String ORGUNIT_PROPERTY_PROJECTID = CmsPropertyDefinition.PROPERTY_KEYWORDS;
+
+    /** A digest to encrypt the passwords. */
+    protected MessageDigest m_digest;
+
+    /** The algorithm used to encode passwords. */
+    protected String m_digestAlgorithm;
+
+    /** The file.encoding to code passwords after encryption with digest. */
+    protected String m_digestFileEncoding;
+
+    /** The driver manager. */
+    protected CmsDriverManager m_driverManager;
+
+    /** The SQL manager. */
+    protected CmsSqlManager m_sqlManager;
+    
+    private static final String C_GROUPS_DELETE_GROUP_2 = "C_GROUPS_DELETE_GROUP_2" ;
+    
+    private static final String C_USERS_DELETE_2 = "C_USERS_DELETE_2" ;
+    
+    private static final String C_GROUPS_CHECK_BY_NAME_2 = "C_GROUPS_CHECK_BY_NAME_2" ;
+    
+    private static final String C_USERS_CHECK_BY_NAME_2 = "C_USERS_CHECK_BY_NAME_2" ;
+    
+    private static final String C_GROUPS_GET_GROUPS_0 = "C_GROUPS_GET_GROUPS_0" ; 
+    
+    private static final String C_USERS_GET_WEBUSERS_FOR_ORGUNIT_1 = "C_USERS_GET_WEBUSERS_FOR_ORGUNIT_1" ;
+    
+    private static final String C_USERS_GET_USERS_FOR_ORGUNIT_1 = "C_USERS_GET_USERS_FOR_ORGUNIT_1" ;
+    
+    private static final String C_ACCESS_READ_ENTRIES_1 = "C_ACCESS_READ_ENTRIES_1" ;
+    
+    private static final String C_ACCESS_READ_ENTRY_2 = "C_ACCESS_READ_ENTRY_2" ;
+    
+    private static final String C_GROUPS_GET_CHILD_1 = "C_GROUPS_GET_CHILD_1" ;
+    
+    private static final String C_GROUPS_READ_BY_NAME_2 = "C_GROUPS_READ_BY_NAME_2" ;
+    
+    private static final String C_GROUPS_GET_GROUPS_OF_USER_1 = "C_GROUPS_GET_GROUPS_OF_USER_1" ;
+    
+    private static final String C_USERS_READ_BY_NAME_2 = "C_USERS_READ_BY_NAME_2" ;
+    
+    private static final String C_USERS_READ_WITH_PWD_3 = "C_USERS_READ_WITH_PWD_3" ;
+    
+    private static final String C_USERDATA_READ_1 = "C_USERDATA_READ_1" ;
+    
+    private static final String C_GROUPS_GET_USERS_OF_GROUP_2 = "C_GROUPS_GET_USERS_OF_GROUP_2" ;
+    
+    private static final String C_GROUPS_GET_ALL_USERS_OF_GROUP_2 = "C_GROUPS_GET_ALL_USERS_OF_GROUP_2" ;
+    
+    private static final String C_ACCESS_REMOVE_ALL_1 = "C_ACCESS_REMOVE_ALL_1" ;
+    
+    private static final String C_ACCESS_REMOVE_ALL_FOR_PRINCIPAL_1 = "C_ACCESS_REMOVE_ALL_FOR_PRINCIPAL_1" ;
+    
+    private static final String C_ACCESS_REMOVE_2 = "C_ACCESS_REMOVE_2" ;
+    
+    private static final String C_USERS_SET_ORGUNIT_2 = "C_USERS_SET_ORGUNIT_2" ;
+    
+    private static final String C_ACCESS_UPDATE_5 = "C_ACCESS_UPDATE_5" ;
+    
+    private static final String C_GROUPS_WRITE_GROUP_4 = "C_GROUPS_WRITE_GROUP_4" ;
+    
+    private static final String C_USERS_SET_PWD_3 = "C_USERS_SET_PWD_3" ;
+    
+    private static final String C_USERS_WRITE_6 = "C_USERS_WRITE_6" ;
+    
+    private static final String C_GROUPS_GROUP_OU_EQUALS_1 = "C_GROUPS_GROUP_OU_EQUALS_1" ;
+    
+    private static final String C_GROUPS_GROUP_OU_LIKE_1 = "C_GROUPS_GROUP_OU_LIKE_1" ;
+    
+    private static final String C_GROUPS_SELECT_GROUPS_1 = "C_GROUPS_SELECT_GROUPS_1" ;
+    
+    private static final String C_GROUPS_SELECT_ROLES_1 = "C_GROUPS_SELECT_ROLES_1" ;
+    
+    private static final String C_GROUPS_ORDER_0 = "C_GROUPS_ORDER_0" ;
+    
+    private static final String C_GROUPS_USER_IN_GROUP_2 = "C_GROUPS_USER_IN_GROUP_2" ;
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#addResourceToOrganizationalUnit(org.opencms.db.CmsDbContext, org.opencms.security.CmsOrganizationalUnit, org.opencms.file.CmsResource)
+     */
+    public void addResourceToOrganizationalUnit(CmsDbContext dbc, CmsOrganizationalUnit orgUnit, CmsResource resource)
+    throws CmsDataAccessException {
+
+        try {
+            // check if the resource is a folder
+            if (resource.isFile()) {
+                throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_ORGUNIT_RESOURCE_IS_NOT_FOLDER_2,
+                    orgUnit.getName(),
+                    dbc.removeSiteRoot(resource.getRootPath())));
+            }
+
+            // read the resource representing the organizational unit
+            CmsResource ouResource = m_driverManager.readResource(dbc, orgUnit.getId(), CmsResourceFilter.ALL);
+
+            // get the associated resources
+            List vfsPaths = new ArrayList(internalResourcesForOrgUnit(dbc, ouResource));
+
+            // check resource scope for non root ous
+            if (orgUnit.getParentFqn() != null) {
+                // get the parent ou
+                CmsOrganizationalUnit parentOu = m_driverManager.readOrganizationalUnit(dbc, orgUnit.getParentFqn());
+                // validate
+                internalValidateResourceForOrgUnit(dbc, parentOu, resource.getRootPath());
+            } else {
+                // allow to set the first resource
+                if (!vfsPaths.isEmpty()) {
+                    throw new CmsDataAccessException(org.opencms.security.Messages.get().container(
+                        org.opencms.security.Messages.ERR_ORGUNIT_ROOT_EDITION_0));
+                }
+            }
+
+            // add the new resource
+            CmsRelation relation = new CmsRelation(ouResource, resource, CmsRelationType.OU_RESOURCE);
+            m_driverManager.getVfsDriver().createRelation(dbc, dbc.currentProject().getUuid(), relation);
+            m_driverManager.getVfsDriver().createRelation(dbc, CmsProject.ONLINE_PROJECT_ID, relation);
+
+            try {
+                // be sure the project was not deleted
+                CmsProject project = m_driverManager.readProject(dbc, orgUnit.getProjectId());
+                // maintain the default project synchronized
+                m_driverManager.getProjectDriver().createProjectResource(
+                    dbc,
+                    orgUnit.getProjectId(),
+                    resource.getRootPath());
+
+                OpenCms.fireCmsEvent(I_CmsEventListener.EVENT_PROJECT_MODIFIED, Collections.singletonMap(
+                    "project",
+                    project));
+            } catch (CmsDbEntryNotFoundException e) {
+                // ignore
+            }
+        } catch (CmsException e) {
+            throw new CmsDataAccessException(e.getMessageContainer(), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#createAccessControlEntry(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.util.CmsUUID, org.opencms.util.CmsUUID, int, int, int)
+     */
+    public void createAccessControlEntry(
+        CmsDbContext dbc,
+        CmsProject project,
+        CmsUUID resource,
+        CmsUUID principal,
+        int allowed,
+        int denied,
+        int flags) throws CmsDataAccessException {
+
+        try {
+        	I_CmsDAOAccessControl pac = 
+        		CmsProject.isOnlineProject(project.getUuid())?
+        				new CmsDAOOnlineAccessControl() 
+        			  : new CmsDAOOfflineAccessControl() ;
+        				
+        	pac.setResourceId(resource.toString()) ;
+        	pac.setPrincipalId(principal.toString()) ;
+        	pac.setAccessAllowed(allowed) ;
+        	pac.setAccessDenied(denied) ;
+        	pac.setAccessFlags(flags) ;
+        	
+        	dbc.getEntityManager().persist(pac) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#createGroup(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, java.lang.String, java.lang.String, int, java.lang.String)
+     */
+    public CmsGroup createGroup(
+        CmsDbContext dbc,
+        CmsUUID groupId,
+        String groupFqn,
+        String description,
+        int flags,
+        String parentGroupFqn) throws CmsDataAccessException {
+
+        CmsUUID parentId = CmsUUID.getNullUUID();
+        CmsGroup group = null;
+
+        if (existsGroup(dbc, groupFqn)) {
+            CmsMessageContainer message = Messages.get().container(
+                Messages.ERR_GROUP_WITH_NAME_ALREADY_EXISTS_1,
+                groupFqn);
+            if (LOG.isErrorEnabled()) {
+                LOG.error(message.key());
+            }
+            throw new CmsDbEntryAlreadyExistsException(message);
+        }
+
+        try {
+            // get the id of the parent group if necessary
+            if (CmsStringUtil.isNotEmpty(parentGroupFqn)) {
+                parentId = readGroup(dbc, parentGroupFqn).getId();
+            }
+
+            CmsDAOGroups g = new CmsDAOGroups() ;
+            
+            g.setGroupId(groupId.toString()) ;
+            g.setParentGroupId(parentId.toString()) ;
+            g.setGroupName(CmsOrganizationalUnit.getSimpleName(groupFqn)) ;
+            g.setGroupDescription(m_sqlManager.validateEmpty(description)) ;
+            g.setGroupFlags(flags) ;
+            g.setGroupOu(CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(groupFqn)) ;
+            
+            dbc.getEntityManager().persist(g) ;
+
+            group = new CmsGroup(groupId, parentId, groupFqn, description, flags);
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+
+        return group;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#createOrganizationalUnit(org.opencms.db.CmsDbContext, java.lang.String, java.lang.String, int, org.opencms.security.CmsOrganizationalUnit, String)
+     */
+    public CmsOrganizationalUnit createOrganizationalUnit(
+        CmsDbContext dbc,
+        String name,
+        String description,
+        int flags,
+        CmsOrganizationalUnit parent,
+        String associatedResource) throws CmsDataAccessException {
+
+        // check the parent
+        if ((parent == null) && !name.equals("")) {
+            throw new CmsDataAccessException(org.opencms.db.Messages.get().container(
+                org.opencms.db.Messages.ERR_PARENT_ORGUNIT_NULL_0));
+        }
+        try {
+            // get the parent ou folder
+            CmsResource parentFolder = internalOrgUnitFolder(dbc, parent);
+
+            CmsResource resource = null;
+            // only normal OUs have to have at least one resource
+            if (((flags & CmsOrganizationalUnit.FLAG_WEBUSERS) == 0) || (associatedResource != null)) {
+                // check that the associated resource exists and if is a folder
+                resource = m_driverManager.readFolder(dbc, associatedResource, CmsResourceFilter.ALL);
+            }
+
+            String ouPath = ORGUNIT_BASE_FOLDER;
+            // validate resource
+            if ((parentFolder != null) && (resource != null)) {
+                internalValidateResourceForOrgUnit(
+                    dbc,
+                    internalCreateOrgUnitFromResource(dbc, parentFolder),
+                    resource.getRootPath());
+            }
+            if (parentFolder != null) {
+                ouPath = parentFolder.getRootPath();
+                if (!ouPath.endsWith("/")) {
+                    ouPath += "/";
+                }
+            }
+            // create the resource
+            CmsResource ouFolder = internalCreateResourceForOrgUnit(dbc, ouPath + name, flags);
+
+            // write description property
+            internalWriteOrgUnitProperty(
+                dbc,
+                ouFolder,
+                new CmsProperty(ORGUNIT_PROPERTY_DESCRIPTION, description, null));
+
+            // create the ou object
+            CmsOrganizationalUnit ou = internalCreateOrgUnitFromResource(dbc, ouFolder);
+
+            if ((ou.getParentFqn() != null)) {
+                // if not the root ou, create default roles & groups
+                // for the root ou, are created in #fillDefaults
+                Locale locale = dbc.getRequestContext().getLocale();
+                if (locale == null) {
+                    locale = CmsLocaleManager.getDefaultLocale();
+                }
+                // create default groups
+                internalCreateDefaultGroups(dbc, ou.getName(), ou.getDisplayName(locale), ou.hasFlagWebuser());
+                if (!ou.hasFlagWebuser()) {
+                    // create default project
+                    CmsProject project = m_driverManager.createProject(
+                        dbc,
+                        ou.getName() + OFFLINE_PROJECT_NAME,
+                        "",
+                        ou.getName() + OpenCms.getDefaultUsers().getGroupUsers(),
+                        ou.getName() + OpenCms.getDefaultUsers().getGroupUsers(),
+                        CmsProject.PROJECT_TYPE_NORMAL);
+
+                    // write project id property
+                    internalWriteOrgUnitProperty(dbc, ouFolder, new CmsProperty(
+                        ORGUNIT_PROPERTY_PROJECTID,
+                        project.getUuid().toString(),
+                        null));
+                } else {
+                    // write project id property
+                    internalWriteOrgUnitProperty(dbc, ouFolder, new CmsProperty(
+                        ORGUNIT_PROPERTY_PROJECTID,
+                        CmsUUID.getNullUUID().toString(),
+                        null));
+                }
+            } else {
+                // write project id property
+                internalWriteOrgUnitProperty(dbc, ouFolder, new CmsProperty(
+                    ORGUNIT_PROPERTY_PROJECTID,
+                    CmsUUID.getNullUUID().toString(),
+                    null));
+            }
+            // reread the ou, to actualize the project id
+            ou = internalCreateOrgUnitFromResource(dbc, ouFolder);
+            if (resource != null) {
+                // add the given resource
+                m_driverManager.addResourceToOrgUnit(dbc, ou, resource);
+            }
+            OpenCms.fireCmsEvent(I_CmsEventListener.EVENT_CLEAR_ONLINE_CACHES, null);
+            // return the new created ou
+            return ou;
+        } catch (CmsException e) {
+            throw new CmsDataAccessException(e.getMessageContainer(), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#createRootOrganizationalUnit(org.opencms.db.CmsDbContext)
+     */
+    public void createRootOrganizationalUnit(CmsDbContext dbc) {
+
+        try {
+            readOrganizationalUnit(dbc, "");
+        } catch (CmsException e) {
+            try {
+                CmsProject onlineProject = dbc.currentProject();
+                CmsProject setupProject = onlineProject;
+                // get the right offline project
+                try {
+                    // this if setting up OpenCms
+                    setupProject = m_driverManager.readProject(
+                        dbc,
+                        I_CmsProjectDriver.SETUP_PROJECT_NAME);
+                } catch (CmsException exc) {
+                    // this if updating OpenCms
+                    try {
+                        setupProject = m_driverManager.readProject(dbc, "Offline");
+                    } catch (CmsException exc2) {
+                        // there is nothing to do, if no offline project found
+                    }
+                }
+                dbc.getRequestContext().setCurrentProject(setupProject);
+                try {
+                    createOrganizationalUnit(dbc, "", CmsMacroResolver.localizedKeyMacro(
+                        Messages.GUI_ORGUNIT_ROOT_DESCRIPTION_0,
+                        null), 0, null, "/");
+                } finally {
+                    dbc.getRequestContext().setCurrentProject(onlineProject);
+                }
+                if (CmsLog.INIT.isInfoEnabled()) {
+                    CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_ROOT_ORGUNIT_DEFAULTS_INITIALIZED_0));
+                }
+            } catch (CmsException exc) {
+                if (CmsLog.INIT.isErrorEnabled()) {
+                    CmsLog.INIT.error(
+                        Messages.get().getBundle().key(Messages.INIT_ROOT_ORGUNIT_INITIALIZATION_FAILED_0),
+                        exc);
+                }
+                throw new CmsInitException(Messages.get().container(Messages.ERR_INITIALIZING_USER_DRIVER_0), exc);
+            }
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#createUser(CmsDbContext, CmsUUID, String, String, String, String, String, long, int, long, Map)
+     */
+    public CmsUser createUser(
+        CmsDbContext dbc,
+        CmsUUID id,
+        String userFqn,
+        String password,
+        String firstname,
+        String lastname,
+        String email,
+        long lastlogin,
+        int flags,
+        long dateCreated,
+        Map additionalInfos) throws CmsDataAccessException {
+
+        if (existsUser(dbc, userFqn)) {
+            CmsMessageContainer message = Messages.get().container(
+                Messages.ERR_USER_WITH_NAME_ALREADY_EXISTS_1,
+                userFqn);
+            if (LOG.isErrorEnabled()) {
+                LOG.error(message.key());
+            }
+            throw new CmsDbEntryAlreadyExistsException(message);
+        }
+
+        try {
+            CmsDAOUsers u = new CmsDAOUsers() ;
+            
+            u.setUserId(id.toString()) ;
+            u.setUserName(CmsOrganizationalUnit.getSimpleName(userFqn)) ;
+            u.setUserPassword(password) ;
+            u.setUserFirstName(m_sqlManager.validateEmpty(firstname)) ;
+            u.setUserLastName(m_sqlManager.validateEmpty(lastname)) ;
+            u.setUserEmail(m_sqlManager.validateEmpty(email)) ;
+            u.setUserLastLogin(lastlogin) ;
+            u.setUserFlags(flags) ;
+            u.setUserOu(CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(userFqn)) ;
+            u.setUserDateCreated((dateCreated == 0 ? System.currentTimeMillis() : dateCreated)) ;
+            
+            dbc.getEntityManager().persist(u) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } 
+        
+        internalWriteUserInfos(dbc, id, additionalInfos);
+
+        return readUser(dbc, id);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#createUserInGroup(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public void createUserInGroup(CmsDbContext dbc, CmsUUID userId, CmsUUID groupId) throws CmsDataAccessException {
+
+        // check if user is already in group
+        if (!internalValidateUserInGroup(dbc, userId, groupId)) {
+            // if not, add this user to the group
+            try {
+            	CmsDAOGroupUsers gu = new CmsDAOGroupUsers() ;
+            	
+            	gu.setGroupId(groupId.toString()) ;
+            	gu.setUserId(userId.toString()) ;
+            	// flag field is not used yet
+            	gu.setGroupUserFlags(0) ;
+            	
+                dbc.getEntityManager().persist(gu) ;
+            } catch (PersistenceException e) {
+            	throw new CmsDataAccessException(Messages.get().container(
+                        Messages.ERR_JPA_PERSITENCE,
+                        e), e);
+            }
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#deleteAccessControlEntries(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.util.CmsUUID)
+     * 
+     * @deprecated use {@link #removeAccessControlEntries(CmsDbContext, CmsProject, CmsUUID)} instead
+     */
+    public void deleteAccessControlEntries(CmsDbContext dbc, CmsProject project, CmsUUID resource)
+    throws CmsDataAccessException {
+
+        removeAccessControlEntries(dbc, project, resource);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#deleteGroup(org.opencms.db.CmsDbContext, java.lang.String)
+     */
+    public void deleteGroup(CmsDbContext dbc, String groupFqn) throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_GROUPS_DELETE_GROUP_2);
+
+            q.setParameter(1, CmsOrganizationalUnit.getSimpleName(groupFqn));
+            q.setParameter(2, CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(groupFqn));
+            List<CmsDAOGroups> res = q.getResultList();
+            for(CmsDAOGroups g:res){
+            	dbc.getEntityManager().remove(g) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#deleteOrganizationalUnit(org.opencms.db.CmsDbContext, org.opencms.security.CmsOrganizationalUnit)
+     */
+    public void deleteOrganizationalUnit(CmsDbContext dbc, CmsOrganizationalUnit organizationalUnit)
+    throws CmsDataAccessException {
+
+        try {
+            CmsResource resource = m_driverManager.readResource(
+                dbc,
+                organizationalUnit.getId(),
+                CmsResourceFilter.DEFAULT);
+            internalDeleteOrgUnitResource(dbc, resource);
+            if (organizationalUnit.getProjectId() != null) {
+                try {
+                    // maintain the default project synchronized
+                    m_driverManager.deleteProject(dbc, m_driverManager.readProject(
+                        dbc,
+                        organizationalUnit.getProjectId()));
+                } catch (CmsDbEntryNotFoundException e) {
+                    // ignore
+                }
+            }
+        } catch (CmsException e) {
+            throw new CmsDataAccessException(e.getMessageContainer(), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#deleteUser(org.opencms.db.CmsDbContext, java.lang.String)
+     */
+    public void deleteUser(CmsDbContext dbc, String userFqn) throws CmsDataAccessException {
+
+        CmsUser user = readUser(dbc, userFqn);
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_USERS_DELETE_2);
+
+            q.setParameter(1, CmsOrganizationalUnit.getSimpleName(userFqn));
+            q.setParameter(2, CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(userFqn));
+            List<CmsDAOUsers> res = q.getResultList();
+            for(CmsDAOUsers u:res){
+            	dbc.getEntityManager().remove(u) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        // delete the additional infos
+        deleteUserInfos(dbc, user.getId());
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#deleteUserInfos(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public void deleteUserInfos(CmsDbContext dbc, CmsUUID userId) throws CmsDataAccessException {
+
+        try {
+        	Query q = m_sqlManager.createQuery(dbc, C_USERDATA_READ_1);
+
+            q.setParameter(1, userId.toString());
+            List<CmsDAOUserData> res = q.getResultList() ;
+            EntityManager em = dbc.getEntityManager() ;
+            for(CmsDAOUserData ud:res){
+            	em.remove(ud) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#deleteUserInGroup(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public void deleteUserInGroup(CmsDbContext dbc, CmsUUID userId, CmsUUID groupId) throws CmsDataAccessException {
+
+        try {
+        	EntityManager em = dbc.getEntityManager() ;
+        	CmsDAOGroupUsersPK pk = new CmsDAOGroupUsersPK() ;
+        	pk.m_groupId = groupId.toString() ;
+        	pk.m_userId = userId.toString() ;
+        	CmsDAOGroupUsers gu = em.find(CmsDAOGroupUsers.class, pk) ;
+        	if(gu != null){
+        		em.remove(gu) ;
+        	}
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#destroy()
+     */
+    public void destroy() throws Throwable {
+
+        m_sqlManager = null;
+        m_driverManager = null;
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_SHUTDOWN_DRIVER_1, getClass().getName()));
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#existsGroup(org.opencms.db.CmsDbContext, java.lang.String)
+     */
+    public boolean existsGroup(CmsDbContext dbc, String groupFqn) throws CmsDataAccessException {
+
+        boolean result = false;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_GROUPS_CHECK_BY_NAME_2);
+
+            q.setParameter(1, CmsOrganizationalUnit.getSimpleName(groupFqn));
+            q.setParameter(2, CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(groupFqn));
+            int count = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            if(count > 0){
+            	result = true ;
+            }
+            
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return result;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#existsUser(org.opencms.db.CmsDbContext, java.lang.String)
+     */
+    public boolean existsUser(CmsDbContext dbc, String userFqn) throws CmsDataAccessException {
+
+        boolean result = false;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_USERS_CHECK_BY_NAME_2);
+            q.setParameter(1, CmsOrganizationalUnit.getSimpleName(userFqn));
+            q.setParameter(2, CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(userFqn));
+            
+            int count = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            
+            if(count > 0){
+            	result = true ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return result;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#fillDefaults(org.opencms.db.CmsDbContext)
+     */
+    public void fillDefaults(CmsDbContext dbc) throws CmsInitException {
+
+        try {
+            internalCreateDefaultGroups(dbc, "", "", false);
+        } catch (CmsException e) {
+            if (CmsLog.INIT.isErrorEnabled()) {
+                CmsLog.INIT.error(Messages.get().getBundle().key(Messages.INIT_DEFAULT_USERS_CREATION_FAILED_0), e);
+            }
+            throw new CmsInitException(Messages.get().container(Messages.ERR_INITIALIZING_USER_DRIVER_0), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#getGroups(org.opencms.db.CmsDbContext, org.opencms.security.CmsOrganizationalUnit, boolean, boolean)
+     */
+    public List getGroups(CmsDbContext dbc, CmsOrganizationalUnit orgUnit, boolean includeSubOus, boolean readRoles)
+    throws CmsDataAccessException {
+
+        // compose the query
+        String sqlQuery = createRoleQuery(C_GROUPS_GET_GROUPS_0, includeSubOus, readRoles);
+        // adjust parameter to use with LIKE
+        String ouFqn = CmsOrganizationalUnit.SEPARATOR + orgUnit.getName();
+        if (includeSubOus) {
+            ouFqn += "%";
+        }
+
+        // execute it
+        List groups = new ArrayList();
+
+        try {
+            // create query
+            Query q = m_sqlManager.createQueryFromJPQL(dbc, sqlQuery);
+
+            q.setParameter(1, ouFqn);
+            q.setParameter(2, I_CmsPrincipal.FLAG_GROUP_ROLE);
+
+            List<CmsDAOGroups> res = q.getResultList() ;
+
+            // create new Cms group objects
+            for (CmsDAOGroups g:res) {
+                groups.add(internalCreateGroup(g));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return groups;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#getOrganizationalUnits(org.opencms.db.CmsDbContext, org.opencms.security.CmsOrganizationalUnit, boolean)
+     */
+    public List getOrganizationalUnits(CmsDbContext dbc, CmsOrganizationalUnit parent, boolean includeChildren)
+    throws CmsDataAccessException {
+
+        List orgUnits = new ArrayList();
+        try {
+            CmsResource parentFolder = internalOrgUnitFolder(dbc, parent);
+            Iterator itResources = m_driverManager.readResources(
+                dbc,
+                parentFolder,
+                CmsResourceFilter.DEFAULT,
+                includeChildren).iterator();
+            while (itResources.hasNext()) {
+                CmsResource resource = (CmsResource)itResources.next();
+                orgUnits.add(internalCreateOrgUnitFromResource(dbc, resource));
+            }
+        } catch (CmsException e) {
+            throw new CmsDataAccessException(e.getMessageContainer(), e);
+        }
+        return orgUnits;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#getResourcesForOrganizationalUnit(org.opencms.db.CmsDbContext, org.opencms.security.CmsOrganizationalUnit)
+     */
+    public List getResourcesForOrganizationalUnit(CmsDbContext dbc, CmsOrganizationalUnit orgUnit)
+    throws CmsDataAccessException {
+
+        List result = new ArrayList();
+        try {
+            CmsResource ouResource = m_driverManager.readResource(dbc, orgUnit.getId(), CmsResourceFilter.ALL);
+            Iterator itPaths = internalResourcesForOrgUnit(dbc, ouResource).iterator();
+            while (itPaths.hasNext()) {
+                String path = (String)itPaths.next();
+                try {
+                    result.add(m_driverManager.readResource(dbc, path, CmsResourceFilter.ALL));
+                } catch (CmsVfsResourceNotFoundException e) {
+                    LOG.error(e.getLocalizedMessage(), e);
+                }
+            }
+        } catch (CmsException e) {
+            throw new CmsDataAccessException(e.getMessageContainer(), e);
+        }
+        return result;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#getSqlManager()
+     */
+    public CmsSqlManager getSqlManager() {
+
+        return m_sqlManager;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#getUsers(org.opencms.db.CmsDbContext, org.opencms.security.CmsOrganizationalUnit, boolean)
+     */
+    public List getUsers(CmsDbContext dbc, CmsOrganizationalUnit orgUnit, boolean recursive)
+    throws CmsDataAccessException {
+
+        List users = new ArrayList();
+
+        try {
+        	Query q ;
+            // create statement
+            if (orgUnit.hasFlagWebuser()) {
+                q = m_sqlManager.createQuery(dbc, C_USERS_GET_WEBUSERS_FOR_ORGUNIT_1);
+            } else {
+                q = m_sqlManager.createQuery(dbc, C_USERS_GET_USERS_FOR_ORGUNIT_1);
+            }
+
+            String param = CmsOrganizationalUnit.SEPARATOR + orgUnit.getName();
+            if (recursive) {
+                param += "%";
+            }
+            q.setParameter(1, param);
+            List<CmsDAOUsers> res = q.getResultList() ;
+            // create new Cms group objects
+            for (CmsDAOUsers u:res) {
+                users.add(internalCreateUser(dbc, u));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return users;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsDriver#init(org.opencms.db.CmsDbContext, org.opencms.configuration.CmsConfigurationManager, java.util.List, org.opencms.db.CmsDriverManager)
+     */
+    public void init(
+        CmsDbContext dbc,
+        CmsConfigurationManager configurationManager,
+        List successiveDrivers,
+        CmsDriverManager driverManager) {
+
+        Map configuration = configurationManager.getConfiguration();
+
+        ExtendedProperties config;
+        if (configuration instanceof ExtendedProperties) {
+            config = (ExtendedProperties)configuration;
+        } else {
+            config = new ExtendedProperties();
+            config.putAll(configuration);
+        }
+
+        String poolUrl = config.get("db.user.pool").toString();
+        String classname = config.get("db.user.sqlmanager").toString();
+        m_sqlManager = (CmsSqlManager) this.initSqlManager(classname);
+
+        m_driverManager = driverManager;
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_ASSIGNED_POOL_1, poolUrl));
+        }
+
+        m_digestAlgorithm = config.getString(CmsDriverManager.CONFIGURATION_DB + ".user.digest.type", "MD5");
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DIGEST_ALGORITHM_1, m_digestAlgorithm));
+        }
+
+        m_digestFileEncoding = config.getString(
+            CmsDriverManager.CONFIGURATION_DB + ".user.digest.encoding",
+            CmsEncoder.ENCODING_UTF_8);
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DIGEST_ENCODING_1, m_digestFileEncoding));
+        }
+
+        // create the digest
+        try {
+            m_digest = MessageDigest.getInstance(m_digestAlgorithm);
+            if (CmsLog.INIT.isInfoEnabled()) {
+                CmsLog.INIT.info(Messages.get().getBundle().key(
+                    Messages.INIT_DIGEST_ENC_3,
+                    m_digest.getAlgorithm(),
+                    m_digest.getProvider().getName(),
+                    String.valueOf(m_digest.getProvider().getVersion())));
+            }
+        } catch (NoSuchAlgorithmException e) {
+            if (CmsLog.INIT.isInfoEnabled()) {
+                CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_SET_DIGEST_ERROR_0), e);
+            }
+        }
+
+        if ((successiveDrivers != null) && !successiveDrivers.isEmpty()) {
+            if (LOG.isWarnEnabled()) {
+                LOG.warn(Messages.get().getBundle().key(
+                    Messages.LOG_SUCCESSIVE_DRIVERS_UNSUPPORTED_1,
+                    getClass().getName()));
+            }
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#initSqlManager(String)
+     */
+    public org.opencms.db.CmsSqlManager initSqlManager(String classname) {
+
+        return CmsSqlManager.getInstance(classname);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#publishAccessControlEntries(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsProject, org.opencms.util.CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public void publishAccessControlEntries(
+        CmsDbContext dbc,
+        CmsProject offlineProject,
+        CmsProject onlineProject,
+        CmsUUID offlineId,
+        CmsUUID onlineId) throws CmsDataAccessException {
+
+        // at first, we remove all access contries of this resource in the online project
+        m_driverManager.getUserDriver().removeAccessControlEntries(dbc, onlineProject, onlineId);
+
+        // then, we copy the access control entries from the offline project into the online project
+        try {
+            CmsUUID dbcProjectId = dbc.getProjectId();
+            dbc.setProjectId(CmsUUID.getNullUUID());
+
+            Query q = m_sqlManager.createQuery(dbc, offlineProject, C_ACCESS_READ_ENTRIES_1);
+
+            q.setParameter(1, offlineId.toString());
+
+            dbc.setProjectId(dbcProjectId);
+
+            List<I_CmsDAOAccessControl> res = q.getResultList() ;
+            for (I_CmsDAOAccessControl ac:res) {
+                CmsAccessControlEntry ace = internalCreateAce(ac, onlineId);
+                m_driverManager.getUserDriver().writeAccessControlEntry(dbc, onlineProject, ace);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readAccessControlEntries(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.util.CmsUUID, boolean)
+     */
+    public List readAccessControlEntries(CmsDbContext dbc, CmsProject project, CmsUUID resource, boolean inheritedOnly)
+    throws CmsDataAccessException {
+
+        List aceList = new ArrayList();
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project, C_ACCESS_READ_ENTRIES_1);
+
+            String resId = resource.toString();
+            q.setParameter(1, resId);
+
+            List<I_CmsDAOAccessControl> res = q.getResultList() ;
+
+            // create new CmsAccessControlEntry and add to list
+            for (I_CmsDAOAccessControl ac:res) {
+                CmsAccessControlEntry ace = internalCreateAce(ac);
+                if (inheritedOnly && !ace.isInheriting()) {
+                    continue;
+                }
+                if (inheritedOnly && ace.isInheriting()) {
+                    ace.setFlags(CmsAccessControlEntry.ACCESS_FLAGS_INHERITED);
+                }
+                aceList.add(ace);
+            }
+            return aceList;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+        
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readAccessControlEntry(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.util.CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public CmsAccessControlEntry readAccessControlEntry(
+        CmsDbContext dbc,
+        CmsProject project,
+        CmsUUID resource,
+        CmsUUID principal) throws CmsDataAccessException {
+
+        CmsAccessControlEntry ace = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project, C_ACCESS_READ_ENTRY_2);
+
+            q.setParameter(1, resource.toString());
+            q.setParameter(2, principal.toString());
+
+            try{
+            	I_CmsDAOAccessControl ac = (I_CmsDAOAccessControl) q.getSingleResult() ;
+            	ace = internalCreateAce(ac);
+            } catch(NoResultException e){
+            	throw new CmsDbEntryNotFoundException(Messages.get().container(
+                        Messages.ERR_NO_ACE_FOUND_2,
+                        resource,
+                        principal));
+            }
+
+            return ace;
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readChildGroups(org.opencms.db.CmsDbContext, java.lang.String)
+     */
+    public List readChildGroups(CmsDbContext dbc, String parentGroupFqn) throws CmsDataAccessException {
+
+        List children = new ArrayList();
+
+        try {
+            // get parent group
+            CmsGroup parent = m_driverManager.getUserDriver().readGroup(dbc, parentGroupFqn);
+            // parent group exists, so get all children
+            if (parent != null) {
+                // create statement
+                Query q = m_sqlManager.createQuery(dbc, C_GROUPS_GET_CHILD_1);
+                q.setParameter(1, parent.getId().toString());
+                List<CmsDAOGroups> res = q.getResultList() ;
+                // create new Cms group objects
+                for (CmsDAOGroups g:res) {
+                    children.add(internalCreateGroup(g));
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return children;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readGroup(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public CmsGroup readGroup(CmsDbContext dbc, CmsUUID groupId) throws CmsDataAccessException {
+
+        CmsGroup group = null;
+
+        try {
+            CmsDAOGroups g = dbc.getEntityManager().find(CmsDAOGroups.class, groupId.toString()) ;
+
+            if(g != null){
+            	group = internalCreateGroup(g);
+            }
+            else{
+            	CmsMessageContainer message = Messages.get().container(Messages.ERR_NO_GROUP_WITH_ID_1, groupId);
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug(message.key());
+                }
+                throw new CmsDbEntryNotFoundException(message);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return group;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readGroup(org.opencms.db.CmsDbContext, java.lang.String)
+     */
+    public CmsGroup readGroup(CmsDbContext dbc, String groupFqn) throws CmsDataAccessException {
+
+        CmsGroup group = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_GROUPS_READ_BY_NAME_2);
+
+            // read the group from the database
+            q.setParameter(1, CmsOrganizationalUnit.getSimpleName(groupFqn));
+            q.setParameter(2, CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(groupFqn));
+            
+            try{
+            	CmsDAOGroups g = (CmsDAOGroups) q.getSingleResult() ;
+            	group = internalCreateGroup(g);
+            } catch(NoResultException e){
+            	CmsMessageContainer message = org.opencms.db.Messages.get().container(
+                        org.opencms.db.Messages.ERR_UNKNOWN_GROUP_1,
+                        groupFqn);
+                if (LOG.isDebugEnabled()) {
+                	LOG.debug(message.key(), new Exception());
+                }
+                throw new CmsDbEntryNotFoundException(message);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return group;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readGroupsOfUser(CmsDbContext, CmsUUID, String, boolean, String, boolean)
+     */
+    public List readGroupsOfUser(
+        CmsDbContext dbc,
+        CmsUUID userId,
+        String ouFqn,
+        boolean includeChildOus,
+        String remoteAddress,
+        boolean readRoles) throws CmsDataAccessException {
+
+        // compose the query
+        String sqlQuery = createRoleQuery(C_GROUPS_GET_GROUPS_OF_USER_1, includeChildOus, readRoles);
+        // adjust parameter to use with LIKE
+        String ouFqnParam = CmsOrganizationalUnit.SEPARATOR + ouFqn;
+        if (includeChildOus) {
+            ouFqnParam += "%";
+        }
+
+        // execute it
+        List groups = new ArrayList();
+
+        try {
+            Query q = m_sqlManager.createQueryFromJPQL(dbc, sqlQuery);
+
+            //  get all all groups of the user
+            q.setParameter(1, userId.toString());
+            q.setParameter(2, ouFqnParam);
+            q.setParameter(3, I_CmsPrincipal.FLAG_GROUP_ROLE);
+
+            List<Object[]> res = q.getResultList() ;
+
+            for (Object[] o:res) {
+                groups.add(internalCreateGroup(((CmsDAOGroups) o[0])));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return groups;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readOrganizationalUnit(org.opencms.db.CmsDbContext, String)
+     */
+    public CmsOrganizationalUnit readOrganizationalUnit(CmsDbContext dbc, String ouFqn) throws CmsDataAccessException {
+
+        try {
+            CmsResource resource = m_driverManager.readResource(
+                dbc,
+                ORGUNIT_BASE_FOLDER + ouFqn,
+                CmsResourceFilter.DEFAULT);
+            return internalCreateOrgUnitFromResource(dbc, resource);
+        } catch (CmsVfsResourceNotFoundException e) {
+            throw new CmsDbEntryNotFoundException(Messages.get().container(Messages.ERR_READ_ORGUNIT_1, ouFqn), e);
+        } catch (CmsException e) {
+            throw new CmsDataAccessException(e.getMessageContainer(), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readUser(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public CmsUser readUser(CmsDbContext dbc, CmsUUID id) throws CmsDataAccessException {
+
+        CmsUser user = null;
+
+        try {
+        	CmsDAOUsers u = dbc.getEntityManager().find(CmsDAOUsers.class, id.toString()) ;
+        	if(u != null){
+        		user = internalCreateUser(dbc, u);
+        	}
+        	else{
+        		CmsMessageContainer message = Messages.get().container(Messages.ERR_NO_USER_WITH_ID_1, id);
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug(message.key());
+                }
+                throw new CmsDbEntryNotFoundException(message);
+        	}
+
+            return user;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readUser(org.opencms.db.CmsDbContext, java.lang.String)
+     */
+    public CmsUser readUser(CmsDbContext dbc, String userFqn) throws CmsDataAccessException {
+
+        CmsUser user = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_USERS_READ_BY_NAME_2);
+            q.setParameter(1, CmsOrganizationalUnit.getSimpleName(userFqn));
+            q.setParameter(2, CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(userFqn));
+
+            try{
+            	CmsDAOUsers u = (CmsDAOUsers) q.getSingleResult() ;
+            	user = internalCreateUser(dbc, u);
+            } catch(NoResultException e){
+            	CmsMessageContainer message = org.opencms.db.Messages.get().container(
+                        org.opencms.db.Messages.ERR_UNKNOWN_USER_1,
+                        userFqn);
+                if (LOG.isDebugEnabled()) {
+                	LOG.debug(message.key());
+                }
+                throw new CmsDbEntryNotFoundException(message);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return user;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readUser(org.opencms.db.CmsDbContext, java.lang.String, java.lang.String, String)
+     */
+    public CmsUser readUser(CmsDbContext dbc, String userFqn, String password, String remoteAddress)
+    throws CmsDataAccessException, CmsPasswordEncryptionException {
+
+        CmsUser user = null;
+        
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_USERS_READ_WITH_PWD_3);
+            q.setParameter(1, CmsOrganizationalUnit.getSimpleName(userFqn));
+            q.setParameter(2, CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(userFqn));
+            q.setParameter(3, OpenCms.getPasswordHandler().digest(password));
+            
+            try{
+            	CmsDAOUsers u = (CmsDAOUsers) q.getSingleResult() ;
+            	user = internalCreateUser(dbc, u);
+            } catch(NoResultException e){
+            	CmsMessageContainer message = org.opencms.db.Messages.get().container(
+                        org.opencms.db.Messages.ERR_UNKNOWN_USER_1,
+                        userFqn);
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug(message.key());
+                }
+                throw new CmsDbEntryNotFoundException(message);
+            }
+            
+            return user;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readUserInfos(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID)
+     */
+    public Map readUserInfos(CmsDbContext dbc, CmsUUID userId) throws CmsDataAccessException {
+
+        Map infos = new HashMap();
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_USERDATA_READ_1);
+
+            q.setParameter(1, userId.toString());
+            List<CmsDAOUserData> res = q.getResultList() ;
+            // read the infos
+            for (CmsDAOUserData ud:res) {
+                String key = ud.getDataKey();
+                String type = ud.getDataType();
+                byte[] value = ud.getDataValue();
+                // deserialize
+                Object data = null;
+                try {
+                    data = CmsDataTypeUtil.dataDeserialize(value, type);
+                } catch (IOException e) {
+                    LOG.error(
+                        Messages.get().container(Messages.ERR_READING_ADDITIONAL_INFO_1, userId.toString()).key(),
+                        e);
+                } catch (ClassNotFoundException e) {
+                    LOG.error(
+                        Messages.get().container(Messages.ERR_READING_ADDITIONAL_INFO_1, userId.toString()).key(),
+                        e);
+                } catch(NullPointerException e){
+                	// continue
+                }
+                if ((key != null) && (data != null)) {
+                    infos.put(key, data);
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return infos;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#readUsersOfGroup(CmsDbContext, String, boolean)
+     */
+    public List readUsersOfGroup(CmsDbContext dbc, String groupFqn, boolean includeOtherOuUsers)
+    throws CmsDataAccessException {
+
+        String sqlQuery = C_GROUPS_GET_USERS_OF_GROUP_2 ;
+        if (includeOtherOuUsers) {
+            sqlQuery = C_GROUPS_GET_ALL_USERS_OF_GROUP_2 ;
+        }
+
+        List users = new ArrayList();
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, sqlQuery);
+            q.setParameter(1, CmsOrganizationalUnit.getSimpleName(groupFqn));
+            q.setParameter(2, CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(groupFqn));
+
+            List<CmsDAOUsers> res = q.getResultList() ;
+
+            for (CmsDAOUsers u:res) {
+                users.add(internalCreateUser(dbc, u));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return users;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#removeAccessControlEntries(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.util.CmsUUID)
+     */
+    public void removeAccessControlEntries(CmsDbContext dbc, CmsProject project, CmsUUID resource)
+    throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project, C_ACCESS_REMOVE_ALL_1);
+            q.setParameter(1, resource.toString());
+            List<I_CmsDAOAccessControl> res = q.getResultList() ;
+            for(I_CmsDAOAccessControl ac:res){
+            	dbc.getEntityManager().remove(ac) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#removeAccessControlEntriesForPrincipal(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsProject, org.opencms.util.CmsUUID)
+     */
+    public void removeAccessControlEntriesForPrincipal(
+        CmsDbContext dbc,
+        CmsProject project,
+        CmsProject onlineProject,
+        CmsUUID principal) throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project, C_ACCESS_REMOVE_ALL_FOR_PRINCIPAL_1);
+            q.setParameter(1, principal.toString());
+            List<I_CmsDAOAccessControl> res = q.getResultList();
+            for(I_CmsDAOAccessControl ac:res){
+            	dbc.getEntityManager().remove(ac) ;
+            }
+            
+            q = m_sqlManager.createQuery(dbc, onlineProject, C_ACCESS_REMOVE_ALL_FOR_PRINCIPAL_1);
+            q.setParameter(1, principal.toString()) ;
+            res = q.getResultList();
+            for(I_CmsDAOAccessControl ac:res){
+            	dbc.getEntityManager().remove(ac) ;
+            }
+            
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#removeAccessControlEntry(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.util.CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public void removeAccessControlEntry(CmsDbContext dbc, CmsProject project, CmsUUID resource, CmsUUID principal)
+    throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project, C_ACCESS_REMOVE_2);
+
+            q.setParameter(1, resource.toString());
+            q.setParameter(2, principal.toString());
+            List<I_CmsDAOAccessControl> res = q.getResultList();
+            for(I_CmsDAOAccessControl ac:res){
+            	dbc.getEntityManager().remove(ac) ;
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#removeResourceFromOrganizationalUnit(org.opencms.db.CmsDbContext, org.opencms.security.CmsOrganizationalUnit, CmsResource)
+     */
+    public void removeResourceFromOrganizationalUnit(
+        CmsDbContext dbc,
+        CmsOrganizationalUnit orgUnit,
+        CmsResource resource) throws CmsDataAccessException {
+
+        // check for root ou
+        if (orgUnit.getParentFqn() == null) {
+            throw new CmsDataAccessException(org.opencms.security.Messages.get().container(
+                org.opencms.security.Messages.ERR_ORGUNIT_ROOT_EDITION_0));
+        }
+
+        try {
+            // read the representing resource
+            CmsResource ouResource = m_driverManager.readResource(dbc, orgUnit.getId(), CmsResourceFilter.ALL);
+
+            // get the associated resources
+            List vfsPaths = new ArrayList(internalResourcesForOrgUnit(dbc, ouResource));
+
+            // check if associated
+            if (!vfsPaths.contains(resource.getRootPath())) {
+                throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_ORGUNIT_DOESNOT_CONTAINS_RESOURCE_2,
+                    orgUnit.getName(),
+                    dbc.removeSiteRoot(resource.getRootPath())));
+            }
+            if ((vfsPaths.size() == 1) && !orgUnit.hasFlagWebuser()) {
+                // normal ous have to have at least one resource 
+                throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_ORGUNIT_REMOVE_LAST_RESOURCE_2,
+                    orgUnit.getName(),
+                    dbc.removeSiteRoot(resource.getRootPath())));
+            }
+
+            // remove the resource
+            CmsRelationFilter filter = CmsRelationFilter.TARGETS.filterPath(resource.getRootPath());
+            m_driverManager.getVfsDriver().deleteRelations(dbc, dbc.currentProject().getUuid(), ouResource, filter);
+            m_driverManager.getVfsDriver().deleteRelations(dbc, CmsProject.ONLINE_PROJECT_ID, ouResource, filter);
+
+            try {
+                // be sure the project was not deleted
+                CmsProject project = m_driverManager.readProject(dbc, orgUnit.getProjectId());
+                // maintain the default project synchronized
+                m_driverManager.getProjectDriver().deleteProjectResource(
+                    dbc,
+                    orgUnit.getProjectId(),
+                    resource.getRootPath());
+
+                OpenCms.fireCmsEvent(I_CmsEventListener.EVENT_PROJECT_MODIFIED, Collections.singletonMap(
+                    "project",
+                    project));
+            } catch (CmsDbEntryNotFoundException e) {
+                // ignore
+            }
+        } catch (CmsException e) {
+            throw new CmsDataAccessException(e.getMessageContainer(), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#setUsersOrganizationalUnit(org.opencms.db.CmsDbContext, org.opencms.security.CmsOrganizationalUnit, org.opencms.file.CmsUser)
+     */
+    public void setUsersOrganizationalUnit(CmsDbContext dbc, CmsOrganizationalUnit orgUnit, CmsUser user)
+    throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_USERS_SET_ORGUNIT_2);
+
+            q.setParameter(1, user.getId().toString());
+
+            List<CmsDAOUsers> res = q.getResultList();
+            
+            for(CmsDAOUsers u:res){
+            	u.setUserOu((orgUnit == null ? null : CmsOrganizationalUnit.SEPARATOR + orgUnit.getName())) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#writeAccessControlEntry(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.security.CmsAccessControlEntry)
+     */
+    public void writeAccessControlEntry(CmsDbContext dbc, CmsProject project, CmsAccessControlEntry acEntry)
+    throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project, C_ACCESS_READ_ENTRY_2);
+
+            q.setParameter(1, acEntry.getResource().toString());
+            q.setParameter(2, acEntry.getPrincipal().toString());
+            
+            try{
+            	I_CmsDAOAccessControl ac = (I_CmsDAOAccessControl) q.getSingleResult() ;
+            	
+            	// otherwise update the already existing entry
+                q = m_sqlManager.createQuery(dbc, project, C_ACCESS_UPDATE_5);
+
+                q.setParameter(1, acEntry.getResource().toString());
+                q.setParameter(2, acEntry.getPrincipal().toString());
+
+                List<I_CmsDAOAccessControl> res = q.getResultList();
+                
+                for(I_CmsDAOAccessControl a:res){
+                	a.setAccessAllowed(acEntry.getAllowedPermissions()) ;
+                	a.setAccessDenied(acEntry.getDeniedPermissions()) ;
+                	a.setAccessFlags(acEntry.getFlags()) ;
+                }
+            } catch (NoResultException e) {
+            	m_driverManager.getUserDriver().createAccessControlEntry(
+                        dbc,
+                        project,
+                        acEntry.getResource(),
+                        acEntry.getPrincipal(),
+                        acEntry.getAllowedPermissions(),
+                        acEntry.getDeniedPermissions(),
+                        acEntry.getFlags());
+                return;
+			}
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#writeGroup(org.opencms.db.CmsDbContext, org.opencms.file.CmsGroup)
+     */
+    public void writeGroup(CmsDbContext dbc, CmsGroup group) throws CmsDataAccessException {
+
+        if (group != null) {
+            try {
+                Query q = m_sqlManager.createQuery(dbc, C_GROUPS_WRITE_GROUP_4);
+
+                q.setParameter(1, group.getId().toString());
+                List<CmsDAOGroups> res = q.getResultList();
+                
+                for(CmsDAOGroups g:res){
+                	g.setGroupDescription(m_sqlManager.validateEmpty(group.getDescription())) ;
+                	g.setGroupFlags(group.getFlags()) ;
+                	g.setParentGroupId(group.getParentId().toString()) ;
+                }
+
+            } catch (PersistenceException e) {
+            	throw new CmsDataAccessException(Messages.get().container(
+                        Messages.ERR_JPA_PERSITENCE,
+                        e), e);
+            }
+        } else {
+            throw new CmsDbEntryNotFoundException(org.opencms.db.Messages.get().container(
+                org.opencms.db.Messages.ERR_UNKNOWN_GROUP_1,
+                "null"));
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#writeOrganizationalUnit(org.opencms.db.CmsDbContext, org.opencms.security.CmsOrganizationalUnit)
+     */
+    public void writeOrganizationalUnit(CmsDbContext dbc, CmsOrganizationalUnit organizationalUnit)
+    throws CmsDataAccessException {
+
+        try {
+            CmsResource resource = m_driverManager.readResource(
+                dbc,
+                organizationalUnit.getId(),
+                CmsResourceFilter.DEFAULT);
+
+            // write the properties
+            internalWriteOrgUnitProperty(dbc, resource, new CmsProperty(
+                ORGUNIT_PROPERTY_DESCRIPTION,
+                organizationalUnit.getDescription(),
+                null));
+
+            // update the resource flags
+            resource.setFlags(organizationalUnit.getFlags() | CmsResource.FLAG_INTERNAL);
+            m_driverManager.writeResource(dbc, resource);
+            resource.setState(CmsResource.STATE_UNCHANGED);
+            m_driverManager.getVfsDriver().writeResource(
+                dbc,
+                dbc.currentProject().getUuid(),
+                resource,
+                CmsDriverManager.NOTHING_CHANGED);
+
+            if (!dbc.currentProject().isOnlineProject()) {
+                // online persistence
+                CmsProject onlineProject = m_driverManager.readProject(dbc, CmsProject.ONLINE_PROJECT_ID);
+                resource.setState(CmsResource.STATE_UNCHANGED);
+                m_driverManager.getVfsDriver().writeResource(
+                    dbc,
+                    onlineProject.getUuid(),
+                    resource,
+                    CmsDriverManager.NOTHING_CHANGED);
+            }
+
+            OpenCms.fireCmsEvent(I_CmsEventListener.EVENT_CLEAR_ONLINE_CACHES, null);
+        } catch (CmsException e) {
+            throw new CmsDataAccessException(e.getMessageContainer(), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#writePassword(org.opencms.db.CmsDbContext, java.lang.String, java.lang.String, java.lang.String)
+     */
+    public void writePassword(CmsDbContext dbc, String userFqn, String oldPassword, String newPassword)
+    throws CmsDataAccessException, CmsPasswordEncryptionException {
+
+        // check if the old password is valid
+        if (oldPassword != null) {
+            readUser(dbc, userFqn, oldPassword, "");
+        }
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_USERS_SET_PWD_3);
+            q.setParameter(1, CmsOrganizationalUnit.getSimpleName(userFqn));
+            q.setParameter(2, CmsOrganizationalUnit.SEPARATOR + CmsOrganizationalUnit.getParentFqn(userFqn));
+            List<CmsDAOUsers> res = q.getResultList();
+            
+            for(CmsDAOUsers u:res){
+            	u.setUserPassword(OpenCms.getPasswordHandler().digest(newPassword)) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#writeUser(org.opencms.db.CmsDbContext, org.opencms.file.CmsUser)
+     */
+    public void writeUser(CmsDbContext dbc, CmsUser user) throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_USERS_WRITE_6);
+            // write data to database
+            q.setParameter(1, user.getId().toString());
+            List<CmsDAOUsers> res = q.getResultList();
+            
+            for(CmsDAOUsers u:res){
+            	u.setUserFirstName(m_sqlManager.validateEmpty(user.getFirstname())) ;
+            	u.setUserLastName(m_sqlManager.validateEmpty(user.getLastname())) ;
+            	u.setUserEmail(m_sqlManager.validateEmpty(user.getEmail())) ;
+            	u.setUserLastLogin(user.getLastlogin()) ;
+            	u.setUserFlags(user.getFlags()) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        internalWriteUserInfos(dbc, user.getId(), user.getAdditionalInfo());
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsUserDriver#writeUserInfo(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, java.lang.String, java.lang.Object)
+     */
+    public void writeUserInfo(CmsDbContext dbc, CmsUUID userId, String key, Object value) throws CmsDataAccessException {
+
+        try {
+        	CmsDAOUserData ud = new CmsDAOUserData() ;
+        	
+        	ud.setUserId(userId.toString()) ;
+        	ud.setDataKey(key) ;
+        	ud.setDataValue(CmsDataTypeUtil.dataSerialize(value)) ;
+        	ud.setDataType(value.getClass().getName()) ;
+        	
+        	dbc.getEntityManager().persist(ud) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        } catch (IOException e) {
+            throw new CmsDbIoException(Messages.get().container(Messages.ERR_SERIALIZING_USER_DATA_1, userId), e);
+        }
+    }
+    
+    /**
+     * Returns a sql query to select groups.<p>
+     * 
+     * @param mainQuery the main select sql query
+     * @param includeSubOus if groups in sub-ous should be included in the selection
+     * @param readRoles if groups or roles whould be selected
+     * 
+     * @return a sql query to select groups
+     */
+    protected String createRoleQuery(String mainQuery, boolean includeSubOus, boolean readRoles) {
+
+        String sqlQuery = m_sqlManager.readQuery(mainQuery);
+        sqlQuery += " ";
+        if (includeSubOus) {
+            sqlQuery += m_sqlManager.readQuery(C_GROUPS_GROUP_OU_LIKE_1);
+        } else {
+            sqlQuery += m_sqlManager.readQuery(C_GROUPS_GROUP_OU_EQUALS_1);
+        }
+        sqlQuery += AND_CONDITION;
+        if (readRoles) {
+            sqlQuery += m_sqlManager.readQuery(C_GROUPS_SELECT_ROLES_1);
+        } else {
+            sqlQuery += m_sqlManager.readQuery(C_GROUPS_SELECT_GROUPS_1);
+        }
+        sqlQuery += " ";
+        sqlQuery += m_sqlManager.readQuery(C_GROUPS_ORDER_0);
+        return sqlQuery;
+    }
+    
+    /**
+     * Internal helper method to create an access control entry from a database record.<p>
+     * 
+     * @param res resultset of the current query
+     * 
+     * @return a new {@link CmsAccessControlEntry} initialized with the values from the current database record 
+     */
+    protected CmsAccessControlEntry internalCreateAce(I_CmsDAOAccessControl ac) {
+
+        return internalCreateAce(ac, new CmsUUID(ac.getResourceId()));
+    }
+    
+    /**
+     * Internal helper method to create an access control entry from a database record.<p>
+     * 
+     * @param res resultset of the current query
+     * @param newId the id of the new access control entry
+     * 
+     * @return a new {@link CmsAccessControlEntry} initialized with the values from the current database record
+     */
+    protected CmsAccessControlEntry internalCreateAce(I_CmsDAOAccessControl ac, CmsUUID newId) {
+
+        return new CmsAccessControlEntry(
+            newId,
+            new CmsUUID(ac.getPrincipalId()),
+            ac.getAccessAllowed(),
+            ac.getAccessDenied(),
+            ac.getAccessFlags());
+    }
+    
+    /**
+     * Creates the default groups and user for the given organizational unit.<p>
+     * 
+     * @param dbc the database context
+     * @param ouFqn the fully qualified name of the organizational unit to create the principals for
+     * @param ouDescription the description of the given organizational unit
+     * @param webuser the webuser ou flag
+     * 
+     * @throws CmsException if something goes wrong 
+     */
+    protected void internalCreateDefaultGroups(CmsDbContext dbc, String ouFqn, String ouDescription, boolean webuser)
+    throws CmsException {
+
+        // create roles
+        String rootAdminRole = CmsRole.ROOT_ADMIN.getGroupName();
+        try {
+            // only do something if really needed
+            if ((CmsOrganizationalUnit.getParentFqn(ouFqn) != null)
+                || ((CmsOrganizationalUnit.getParentFqn(ouFqn) == null) && !existsGroup(dbc, rootAdminRole))) {
+                // create the roles in the given ou
+                Iterator itRoles = CmsRole.getSystemRoles().iterator();
+                while (itRoles.hasNext()) {
+                    CmsRole role = (CmsRole)itRoles.next();
+                    if (webuser && (role != CmsRole.ACCOUNT_MANAGER)) {
+                        // if webuser ou and not account manager role
+                        continue;
+                    }
+                    if (role.isOrganizationalUnitIndependent() && (CmsOrganizationalUnit.getParentFqn(ouFqn) != null)) {
+                        // if role is ou independent and not in the root ou
+                        continue;
+                    }
+                    String groupName = ouFqn + role.getGroupName();
+                    int flags = I_CmsPrincipal.FLAG_ENABLED | I_CmsPrincipal.FLAG_GROUP_ROLE;
+                    if ((role == CmsRole.WORKPLACE_USER) || (role == CmsRole.PROJECT_MANAGER)) {
+                        flags |= I_CmsPrincipal.FLAG_GROUP_PROJECT_USER;
+                    }
+                    if (role == CmsRole.PROJECT_MANAGER) {
+                        flags |= I_CmsPrincipal.FLAG_GROUP_PROJECT_MANAGER;
+                    }
+                    createGroup(dbc, CmsUUID.getConstantUUID(groupName), groupName, "A system role group", flags, null);
+
+                }
+                if ((CmsOrganizationalUnit.getParentFqn(ouFqn) == null) && CmsLog.INIT.isInfoEnabled()) {
+                    CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_SYSTEM_ROLES_CREATED_0));
+                }
+            }
+        } catch (CmsException e) {
+            if ((CmsOrganizationalUnit.getParentFqn(ouFqn) == null) && CmsLog.INIT.isErrorEnabled()) {
+                CmsLog.INIT.error(Messages.get().getBundle().key(Messages.INIT_SYSTEM_ROLES_CREATION_FAILED_0), e);
+            }
+            throw new CmsInitException(Messages.get().container(Messages.ERR_INITIALIZING_USER_DRIVER_0), e);
+        }
+
+        if (webuser) {
+            // no default groups for webuser ou
+            return;
+        }
+
+        // create groups
+        String administratorsGroup = ouFqn + OpenCms.getDefaultUsers().getGroupAdministrators();
+        String guestGroup = ouFqn + OpenCms.getDefaultUsers().getGroupGuests();
+        String usersGroup = ouFqn + OpenCms.getDefaultUsers().getGroupUsers();
+        String projectmanagersGroup = ouFqn + OpenCms.getDefaultUsers().getGroupProjectmanagers();
+        String guestUser = ouFqn + OpenCms.getDefaultUsers().getUserGuest();
+        String adminUser = ouFqn + OpenCms.getDefaultUsers().getUserAdmin();
+        String exportUser = ouFqn + OpenCms.getDefaultUsers().getUserExport();
+        String deleteUser = ouFqn + OpenCms.getDefaultUsers().getUserDeletedResource();
+
+        if (existsGroup(dbc, administratorsGroup)) {
+            if (CmsOrganizationalUnit.getParentFqn(ouFqn) == null) {
+                // check the flags of existing groups, for compatibility checks
+                internalUpdateRoleGroup(dbc, administratorsGroup, CmsRole.ROOT_ADMIN);
+                internalUpdateRoleGroup(dbc, usersGroup, CmsRole.WORKPLACE_USER.forOrgUnit(ouFqn));
+                internalUpdateRoleGroup(dbc, projectmanagersGroup, CmsRole.PROJECT_MANAGER.forOrgUnit(ouFqn));
+            }
+            return;
+        }
+        String parentOu = CmsOrganizationalUnit.getParentFqn(ouFqn);
+        String parentGroup = null;
+        if (parentOu != null) {
+            parentGroup = parentOu + OpenCms.getDefaultUsers().getGroupUsers();
+        }
+        String groupDescription = (CmsStringUtil.isNotEmptyOrWhitespaceOnly(ouDescription) ? CmsMacroResolver.localizedKeyMacro(
+            Messages.GUI_DEFAULTGROUP_OU_USERS_DESCRIPTION_1,
+            new String[] {ouDescription})
+        : CmsMacroResolver.localizedKeyMacro(Messages.GUI_DEFAULTGROUP_ROOT_USERS_DESCRIPTION_0, null));
+        createGroup(dbc, CmsUUID.getConstantUUID(usersGroup), usersGroup, groupDescription, I_CmsPrincipal.FLAG_ENABLED
+            | I_CmsPrincipal.FLAG_GROUP_PROJECT_USER
+            | CmsRole.WORKPLACE_USER.getVirtualGroupFlags(), parentGroup);
+
+        if (parentOu != null) {
+            // default users/groups(except the users group) are only for the root ou
+            return;
+        }
+
+        CmsGroup guests = createGroup(
+            dbc,
+            CmsUUID.getConstantUUID(guestGroup),
+            guestGroup,
+            CmsMacroResolver.localizedKeyMacro(Messages.GUI_DEFAULTGROUP_ROOT_GUESTS_DESCRIPTION_0, null),
+            I_CmsPrincipal.FLAG_ENABLED,
+            null);
+
+        int flags = CmsRole.ROOT_ADMIN.getVirtualGroupFlags();
+        createGroup(
+            dbc,
+            CmsUUID.getConstantUUID(administratorsGroup),
+            administratorsGroup,
+            CmsMacroResolver.localizedKeyMacro(Messages.GUI_DEFAULTGROUP_ROOT_ADMINS_DESCRIPTION_0, null),
+            I_CmsPrincipal.FLAG_ENABLED | I_CmsPrincipal.FLAG_GROUP_PROJECT_MANAGER | flags,
+            null);
+
+        parentGroup = ouFqn + OpenCms.getDefaultUsers().getGroupUsers();
+        createGroup(
+            dbc,
+            CmsUUID.getConstantUUID(projectmanagersGroup),
+            projectmanagersGroup,
+            CmsMacroResolver.localizedKeyMacro(Messages.GUI_DEFAULTGROUP_ROOT_PROJMANS_DESCRIPTION_0, null),
+            I_CmsPrincipal.FLAG_ENABLED
+                | I_CmsPrincipal.FLAG_GROUP_PROJECT_MANAGER
+                | I_CmsPrincipal.FLAG_GROUP_PROJECT_USER
+                | CmsRole.PROJECT_MANAGER.getVirtualGroupFlags(),
+            parentGroup);
+
+        CmsUser guest = createUser(
+            dbc,
+            CmsUUID.getConstantUUID(guestUser),
+            guestUser,
+            OpenCms.getPasswordHandler().digest(""),
+            " ",
+            " ",
+            " ",
+            0,
+            I_CmsPrincipal.FLAG_ENABLED,
+            0,
+            Collections.singletonMap(CmsUserSettings.ADDITIONAL_INFO_DESCRIPTION, CmsMacroResolver.localizedKeyMacro(
+                Messages.GUI_DEFAULTUSER_ROOT_GUEST_DESCRIPTION_0,
+                null)));
+        createUserInGroup(dbc, guest.getId(), guests.getId());
+
+        CmsUser admin = createUser(
+            dbc,
+            CmsUUID.getConstantUUID(adminUser),
+            adminUser,
+            OpenCms.getPasswordHandler().digest("admin"),
+            " ",
+            " ",
+            " ",
+            0,
+            I_CmsPrincipal.FLAG_ENABLED,
+            0,
+            Collections.singletonMap(CmsUserSettings.ADDITIONAL_INFO_DESCRIPTION, CmsMacroResolver.localizedKeyMacro(
+                Messages.GUI_DEFAULTUSER_ROOT_ADMIN_DESCRIPTION_0,
+                null)));
+        createUserInGroup(dbc, admin.getId(), CmsUUID.getConstantUUID(CmsRole.ROOT_ADMIN.getGroupName()));
+        createUserInGroup(dbc, admin.getId(), CmsUUID.getConstantUUID(administratorsGroup));
+
+        if (!OpenCms.getDefaultUsers().getUserExport().equals(OpenCms.getDefaultUsers().getUserAdmin())
+            && !OpenCms.getDefaultUsers().getUserExport().equals(OpenCms.getDefaultUsers().getUserGuest())) {
+
+            CmsUser export = createUser(
+                dbc,
+                CmsUUID.getConstantUUID(exportUser),
+                exportUser,
+                OpenCms.getPasswordHandler().digest((new CmsUUID()).toString()),
+                " ",
+                " ",
+                " ",
+                0,
+                I_CmsPrincipal.FLAG_ENABLED,
+                0,
+                Collections.singletonMap(
+                    CmsUserSettings.ADDITIONAL_INFO_DESCRIPTION,
+                    CmsMacroResolver.localizedKeyMacro(Messages.GUI_DEFAULTUSER_ROOT_EXPORT_DESCRIPTION_0, null)));
+            createUserInGroup(dbc, export.getId(), guests.getId());
+        }
+
+        if (!OpenCms.getDefaultUsers().getUserDeletedResource().equals(OpenCms.getDefaultUsers().getUserAdmin())
+            && !OpenCms.getDefaultUsers().getUserDeletedResource().equals(OpenCms.getDefaultUsers().getUserGuest())
+            && !OpenCms.getDefaultUsers().getUserDeletedResource().equals(OpenCms.getDefaultUsers().getUserExport())) {
+
+            createUser(
+                dbc,
+                CmsUUID.getConstantUUID(deleteUser),
+                deleteUser,
+                OpenCms.getPasswordHandler().digest((new CmsUUID()).toString()),
+                " ",
+                " ",
+                " ",
+                0,
+                I_CmsPrincipal.FLAG_ENABLED,
+                0,
+                Collections.singletonMap(
+                    CmsUserSettings.ADDITIONAL_INFO_DESCRIPTION,
+                    CmsMacroResolver.localizedKeyMacro(Messages.GUI_DEFAULTUSER_ROOT_DELETED_DESCRIPTION_0, null)));
+        }
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_DEFAULT_USERS_CREATED_0));
+        }
+    }
+    
+    /**
+     * Semi-constructor to create a {@link CmsGroup} instance from a JDBC result set.
+     * 
+     * @param res the JDBC ResultSet
+     * @return CmsGroup the new CmsGroup object
+     */
+    protected CmsGroup internalCreateGroup(CmsDAOGroups g) {
+
+        String ou = CmsOrganizationalUnit.removeLeadingSeparator(g.getGroupOu());
+        String description = g.getGroupDescription();
+        return new CmsGroup(
+            new CmsUUID(g.getGroupId()),
+            new CmsUUID(g.getParentGroupId()),
+            ou + g.getGroupName(),
+            description,
+            g.getGroupFlags());
+    }
+    
+    /**
+     * Returns the organizational unit represented by the given resource.<p>
+     * 
+     * @param dbc the current db context
+     * @param resource the resource that represents an organizational unit
+     * 
+     * @return the organizational unit represented by the given resource
+     * 
+     * @throws CmsException if something goes wrong
+     */
+    protected CmsOrganizationalUnit internalCreateOrgUnitFromResource(CmsDbContext dbc, CmsResource resource)
+    throws CmsException {
+
+        if (!resource.getRootPath().startsWith(ORGUNIT_BASE_FOLDER)) {
+            throw new CmsDataAccessException(Messages.get().container(
+                Messages.ERR_READ_ORGUNIT_1,
+                resource.getRootPath()));
+        }
+        // get the data
+        String name = resource.getRootPath().substring(ORGUNIT_BASE_FOLDER.length());
+        if ((name.length() > 0) && !name.endsWith(CmsOrganizationalUnit.SEPARATOR)) {
+            name += CmsOrganizationalUnit.SEPARATOR;
+        }
+        String description = m_driverManager.readPropertyObject(dbc, resource, ORGUNIT_PROPERTY_DESCRIPTION, false).getStructureValue();
+        int flags = (resource.getFlags() & ~CmsResource.FLAG_INTERNAL); // remove the internal flag
+        String projectId = m_driverManager.readPropertyObject(dbc, resource, ORGUNIT_PROPERTY_PROJECTID, false).getStructureValue();
+        // create the object
+        return new CmsOrganizationalUnit(resource.getStructureId(), name, description, flags, (projectId == null ? null
+        : new CmsUUID(projectId)));
+    }
+    
+    /**
+     * Creates a folder with the given path an properties, offline AND online.<p>
+     * 
+     * @param dbc the current database context
+     * @param path the path to create the folder
+     * @param flags the resource flags
+     * 
+     * @return the new created offline folder
+     * 
+     * @throws CmsException if something goes wrong
+     */
+    protected CmsResource internalCreateResourceForOrgUnit(CmsDbContext dbc, String path, int flags)
+    throws CmsException {
+
+        // create the offline folder 
+        CmsResource resource = new CmsFolder(
+            new CmsUUID(),
+            new CmsUUID(),
+            path,
+            CmsResourceTypeFolder.RESOURCE_TYPE_ID,
+            (CmsResource.FLAG_INTERNAL | flags),
+            dbc.currentProject().getUuid(),
+            CmsResource.STATE_NEW,
+            0,
+            dbc.currentUser().getId(),
+            0,
+            dbc.currentUser().getId(),
+            CmsResource.DATE_RELEASED_DEFAULT,
+            CmsResource.DATE_EXPIRED_DEFAULT,
+            0);
+
+        CmsUUID projectId = dbc.getProjectId().isNullUUID() ? dbc.currentProject().getUuid() : dbc.getProjectId();
+
+        m_driverManager.getVfsDriver().createResource(dbc, projectId, resource, null);
+        resource.setState(CmsResource.STATE_UNCHANGED);
+        m_driverManager.getVfsDriver().writeResource(dbc, projectId, resource, CmsDriverManager.NOTHING_CHANGED);
+
+        if (!dbc.currentProject().isOnlineProject() && dbc.getProjectId().isNullUUID()) {
+            // online persistence
+            CmsProject onlineProject = m_driverManager.readProject(dbc, CmsProject.ONLINE_PROJECT_ID);
+            m_driverManager.getVfsDriver().createResource(dbc, onlineProject.getUuid(), resource, null);
+        }
+
+        // clear the internal caches
+        OpenCms.getMemoryMonitor().clearAccessControlListCache();
+        OpenCms.getMemoryMonitor().flushProperties();
+        OpenCms.getMemoryMonitor().flushPropertyLists();
+
+        // fire an event that a new resource has been created
+        OpenCms.fireCmsEvent(new CmsEvent(I_CmsEventListener.EVENT_RESOURCE_CREATED, Collections.singletonMap(
+            "resource",
+            resource)));
+
+        return resource;
+    }
+    
+    /**
+     * Semi-constructor to create a {@link CmsUser} instance from a JDBC result set.<p>
+     * 
+     * @param dbc the current database context
+     * @param res the JDBC ResultSet
+     * 
+     * @return the new CmsUser object
+     * 
+     * @throws CmsDataAccessException if there is an error in deserializing the user info
+     */
+    protected CmsUser internalCreateUser(CmsDbContext dbc, CmsDAOUsers u) throws CmsDataAccessException {
+
+        String userName = u.getUserName() ;
+        String ou = CmsOrganizationalUnit.removeLeadingSeparator(u.getUserOu());
+        CmsUUID userId = new CmsUUID(u.getUserId());
+        Map info = readUserInfos(dbc, userId);
+        return new CmsUser(
+            userId,
+            ou + userName,
+            u.getUserPassword(),
+            u.getUserFirstName(),
+            u.getUserLastName(),
+            u.getUserEmail(),
+            u.getUserLastLogin(),
+            u.getUserFlags(),
+            u.getUserDateCreated(),
+            info);
+    }
+    
+    /**
+     * Deletes a resource representing a organizational unit, offline AND online.<p>
+     * 
+     * @param dbc the current database context
+     * @param resource the resource to delete
+     * 
+     * @throws CmsException if something goes wrong
+     */
+    protected void internalDeleteOrgUnitResource(CmsDbContext dbc, CmsResource resource) throws CmsException {
+
+        CmsRelationFilter filter = CmsRelationFilter.TARGETS;
+
+        // first the online version
+        if (!dbc.currentProject().isOnlineProject()) {
+            // online persistence
+            CmsProject project = dbc.currentProject();
+            dbc.getRequestContext().setCurrentProject(m_driverManager.readProject(dbc, CmsProject.ONLINE_PROJECT_ID));
+
+            try {
+                // delete properties
+                m_driverManager.getVfsDriver().deletePropertyObjects(
+                    dbc,
+                    CmsProject.ONLINE_PROJECT_ID,
+                    resource,
+                    CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES);
+
+                // remove the online folder only if it is really deleted offline
+                m_driverManager.getVfsDriver().removeFolder(dbc, dbc.currentProject(), resource);
+
+                // remove ACL
+                m_driverManager.getUserDriver().removeAccessControlEntries(
+                    dbc,
+                    dbc.currentProject(),
+                    resource.getResourceId());
+
+                // delete relations
+                m_driverManager.getVfsDriver().deleteRelations(
+                    dbc,
+                    dbc.getRequestContext().currentProject().getUuid(),
+                    resource,
+                    filter);
+            } finally {
+                dbc.getRequestContext().setCurrentProject(project);
+            }
+        }
+        // delete properties
+        m_driverManager.getVfsDriver().deletePropertyObjects(
+            dbc,
+            CmsProject.ONLINE_PROJECT_ID,
+            resource,
+            CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES);
+
+        // remove the online folder only if it is really deleted offline
+        m_driverManager.getVfsDriver().removeFolder(dbc, dbc.currentProject(), resource);
+
+        // remove ACL
+        m_driverManager.getUserDriver().removeAccessControlEntries(dbc, dbc.currentProject(), resource.getResourceId());
+
+        // delete relations
+        m_driverManager.getVfsDriver().deleteRelations(
+            dbc,
+            dbc.getRequestContext().currentProject().getUuid(),
+            resource,
+            filter);
+
+        // flush all relevant caches
+        OpenCms.getMemoryMonitor().clearAccessControlListCache();
+        OpenCms.getMemoryMonitor().flushProperties();
+        OpenCms.getMemoryMonitor().flushPropertyLists();
+        OpenCms.getMemoryMonitor().flushProjectResources();
+
+        // fire events
+        OpenCms.fireCmsEvent(new CmsEvent(I_CmsEventListener.EVENT_RESOURCE_DELETED, Collections.singletonMap(
+            "resources",
+            Collections.singletonList(resource))));
+        OpenCms.fireCmsEvent(new CmsEvent(
+            I_CmsEventListener.EVENT_RESOURCE_AND_PROPERTIES_MODIFIED,
+            Collections.singletonMap("resource", resource)));
+    }
+    
+    /**
+     * Returns the folder for the given organizational units, or the base folder if <code>null</code>.<p>
+     * 
+     * The base folder will be created if it does not exist.<p> 
+     * 
+     * @param dbc the current db context
+     * @param orgUnit the organizational unit to get the folder for
+     * 
+     * @return the base folder for organizational units
+     *  
+     * @throws CmsException if something goes wrong
+     */
+    protected CmsResource internalOrgUnitFolder(CmsDbContext dbc, CmsOrganizationalUnit orgUnit) throws CmsException {
+
+        if (orgUnit != null) {
+            return m_driverManager.readResource(dbc, orgUnit.getId(), CmsResourceFilter.DEFAULT);
+        } else {
+            return null;
+        }
+    }
+    
+    /**
+     * Returns the list of root paths associated to the organizational unit represented by the given resource.<p>
+     * 
+     * @param dbc the current db context
+     * @param ouResource the resource that represents the organizational unit to get the resources for
+     * 
+     * @return the list of associated resource names
+     * 
+     * @throws CmsException if something goes wrong
+     */
+    protected List internalResourcesForOrgUnit(CmsDbContext dbc, CmsResource ouResource) throws CmsException {
+
+        List relations = m_driverManager.getRelationsForResource(dbc, ouResource, CmsRelationFilter.TARGETS);
+        List paths = new ArrayList();
+        Iterator it = relations.iterator();
+        while (it.hasNext()) {
+            CmsRelation relation = (CmsRelation)it.next();
+            paths.add(relation.getTargetPath());
+        }
+        return paths;
+    }
+    
+    /**
+     * Updates a group to a virtual group.<p>
+     * 
+     * @param dbc the database context
+     * @param groupName the name of the group to update
+     * @param role the role for this group
+     * 
+     * @throws CmsDataAccessException if something goes wrong 
+     */
+    protected void internalUpdateRoleGroup(CmsDbContext dbc, String groupName, CmsRole role)
+    throws CmsDataAccessException {
+
+        CmsGroup group = readGroup(dbc, groupName);
+        if ((CmsRole.valueOf(group) == null) || !CmsRole.valueOf(group).equals(role)) {
+            CmsGroup roleGroup = readGroup(dbc, role.getGroupName());
+            // copy all users from the group to the role
+            Iterator it = readUsersOfGroup(dbc, groupName, false).iterator();
+            while (it.hasNext()) {
+                CmsUser user = (CmsUser)it.next();
+                createUserInGroup(dbc, user.getId(), roleGroup.getId());
+            }
+            // set the right flags
+            group.setFlags(role.getVirtualGroupFlags());
+        }
+    }
+    
+    /**
+     * Validates the given root path to be in the scope of the resources of the given organizational unit.<p>
+     * 
+     * @param dbc the current db context
+     * @param orgUnit the organizational unit
+     * @param rootPath the root path to check
+     * 
+     * @throws CmsException if something goes wrong
+     */
+    protected void internalValidateResourceForOrgUnit(CmsDbContext dbc, CmsOrganizationalUnit orgUnit, String rootPath)
+    throws CmsException {
+
+        CmsResource parentResource = m_driverManager.readResource(dbc, orgUnit.getId(), CmsResourceFilter.ALL);
+        // assume not in scope
+        boolean found = false;
+        // iterate parent paths
+        Iterator itParentPaths = internalResourcesForOrgUnit(dbc, parentResource).iterator();
+        // until the given resource is found in scope
+        while (!found && itParentPaths.hasNext()) {
+            String parentPath = (String)itParentPaths.next();
+            // check the scope
+            if (rootPath.startsWith(parentPath)) {
+                found = true;
+            }
+        }
+        // if not in scope throw exception
+        if (!found) {
+            throw new CmsException(Messages.get().container(
+                Messages.ERR_PATH_NOT_IN_PARENT_ORGUNIT_SCOPE_2,
+                orgUnit.getName(),
+                dbc.removeSiteRoot(rootPath)));
+        }
+    }
+    
+    /**
+     * Checks if a user is member of a group.<p>
+     * 
+     * @param dbc the database context
+     * @param userId the id of the user to check
+     * @param groupId the id of the group to check
+     *
+     * @return true if user is member of group
+     * 
+     * @throws CmsDataAccessException if operation was not succesful
+     */
+    protected boolean internalValidateUserInGroup(CmsDbContext dbc, CmsUUID userId, CmsUUID groupId)
+    throws CmsDataAccessException {
+
+        boolean userInGroup = false;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, C_GROUPS_USER_IN_GROUP_2);
+
+            q.setParameter(1, groupId.toString());
+            q.setParameter(2, userId.toString());
+            try{
+            	CmsDAOGroupUsers gu = (CmsDAOGroupUsers) q.getSingleResult() ;
+            	userInGroup = true;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return userInGroup;
+    }
+    
+    /**
+     * Writes a property for an organizational unit resource, online AND offline.<p>
+     * 
+     * @param dbc the current database context
+     * @param resource the resource representing the organizational unit
+     * @param property the property to write
+     * 
+     * @throws CmsException if something goes wrong
+     */
+    protected void internalWriteOrgUnitProperty(CmsDbContext dbc, CmsResource resource, CmsProperty property)
+    throws CmsException {
+
+        // write the property
+        m_driverManager.writePropertyObject(dbc, resource, property);
+        resource.setState(CmsResource.STATE_UNCHANGED);
+        m_driverManager.getVfsDriver().writeResource(
+            dbc,
+            dbc.currentProject().getUuid(),
+            resource,
+            CmsDriverManager.NOTHING_CHANGED);
+
+        // online persistence
+        CmsProject project = dbc.currentProject();
+        dbc.getRequestContext().setCurrentProject(m_driverManager.readProject(dbc, CmsProject.ONLINE_PROJECT_ID));
+        try {
+            m_driverManager.writePropertyObject(dbc, resource, property); // assume the resource is identical in both projects
+            resource.setState(CmsResource.STATE_UNCHANGED);
+            m_driverManager.getVfsDriver().writeResource(
+                dbc,
+                dbc.currentProject().getUuid(),
+                resource,
+                CmsDriverManager.NOTHING_CHANGED);
+        } finally {
+            dbc.getRequestContext().setCurrentProject(project);
+        }
+    }
+    
+    /**
+     * Updates the user additional information map.<p>
+     * 
+     * @param dbc the current database context
+     * @param userId the id of the user to update
+     * @param additionalInfo the info to write
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected void internalWriteUserInfos(CmsDbContext dbc, CmsUUID userId, Map additionalInfo)
+    throws CmsDataAccessException {
+
+        deleteUserInfos(dbc, userId);
+        
+        if (additionalInfo == null) {
+            return;
+        }
+        Iterator itEntries = additionalInfo.entrySet().iterator();
+        while (itEntries.hasNext()) {
+            Map.Entry entry = (Map.Entry)itEntries.next();
+            if ((entry.getKey() != null) && (entry.getValue() != null)) {
+                writeUserInfo(dbc, userId, (String)entry.getKey(), entry.getValue());
+            }
+        }
+    }
+}
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/CmsVfsDriver.java trunk/src/org/opencms/db/jpa/CmsVfsDriver.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/CmsVfsDriver.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/CmsVfsDriver.java	2008-09-02 11:14:29.187884133 +0300
@@ -0,0 +1,3861 @@
+/*
+ *
+ * This work is derivate of generic SQL driver and it's part of 
+ * OpenCms - the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa;
+
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceException;
+import javax.persistence.Query;
+
+import org.apache.commons.logging.Log;
+import org.opencms.configuration.CmsConfigurationManager;
+import org.opencms.db.CmsDbConsistencyException;
+import org.opencms.db.CmsDbContext;
+import org.opencms.db.CmsDbEntryNotFoundException;
+import org.opencms.db.CmsDriverManager;
+import org.opencms.db.CmsResourceState;
+import org.opencms.db.CmsVfsOnlineResourceAlreadyExistsException;
+import org.opencms.db.I_CmsDriver;
+import org.opencms.db.I_CmsVfsDriver;
+import org.opencms.db.jpa.CmsSqlManager;
+import org.opencms.db.jpa.persistence.CmsDAOContents;
+import org.opencms.db.jpa.persistence.CmsDAOOfflineContents;
+import org.opencms.db.jpa.persistence.CmsDAOOfflineProperties;
+import org.opencms.db.jpa.persistence.CmsDAOOfflinePropertyDef;
+import org.opencms.db.jpa.persistence.CmsDAOOfflineResourceRelations;
+import org.opencms.db.jpa.persistence.CmsDAOOfflineResources;
+import org.opencms.db.jpa.persistence.CmsDAOOfflineStructure;
+import org.opencms.db.jpa.persistence.CmsDAOOnlineProperties;
+import org.opencms.db.jpa.persistence.CmsDAOOnlinePropertyDef;
+import org.opencms.db.jpa.persistence.CmsDAOOnlineResourceRelations;
+import org.opencms.db.jpa.persistence.CmsDAOOnlineResources;
+import org.opencms.db.jpa.persistence.CmsDAOOnlineStructure;
+import org.opencms.db.jpa.persistence.I_CmsDAOProperties;
+import org.opencms.db.jpa.persistence.I_CmsDAOPropertyDef;
+import org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations;
+import org.opencms.db.jpa.persistence.I_CmsDAOResources;
+import org.opencms.db.jpa.persistence.I_CmsDAOStructure;
+import org.opencms.file.CmsDataAccessException;
+import org.opencms.file.CmsFile;
+import org.opencms.file.CmsFolder;
+import org.opencms.file.CmsProject;
+import org.opencms.file.CmsProperty;
+import org.opencms.file.CmsPropertyDefinition;
+import org.opencms.file.CmsResource;
+import org.opencms.file.CmsResourceFilter;
+import org.opencms.file.CmsVfsException;
+import org.opencms.file.CmsVfsResourceAlreadyExistsException;
+import org.opencms.file.CmsVfsResourceNotFoundException;
+import org.opencms.file.history.I_CmsHistoryResource;
+import org.opencms.file.types.CmsResourceTypeJsp;
+import org.opencms.main.CmsEvent;
+import org.opencms.main.CmsException;
+import org.opencms.main.CmsLog;
+import org.opencms.main.I_CmsEventListener;
+import org.opencms.main.OpenCms;
+import org.opencms.relations.CmsRelation;
+import org.opencms.relations.CmsRelationFilter;
+import org.opencms.relations.CmsRelationType;
+import org.opencms.security.CmsPermissionSet;
+import org.opencms.util.CmsDataTypeUtil;
+import org.opencms.util.CmsFileUtil;
+import org.opencms.util.CmsStringUtil;
+import org.opencms.util.CmsUUID;
+
+/**
+ * @author gosho
+ *
+ */
+public class CmsVfsDriver implements I_CmsDriver, I_CmsVfsDriver{
+	
+	/** The log object for this class. */
+    private static final Log LOG = CmsLog.getLog(org.opencms.db.jpa.CmsVfsDriver.class);
+
+    /** The driver manager. */
+    protected CmsDriverManager m_driverManager;
+
+    /** 
+     * This field is temporarily used to compute the versions during publishing.<p>
+     * 
+     * @see #publishVersions(CmsDbContext, CmsResource, boolean) 
+     */
+    protected List m_resOp = new ArrayList();
+
+    /** The sql manager. */
+    protected CmsSqlManager m_sqlManager;
+	
+    private static final String C_RESOURCES_COUNT_SIBLINGS = "C_RESOURCES_COUNT_SIBLINGS" ;
+    
+    private static final String C_ONLINE_CONTENTS_HISTORY = "C_ONLINE_CONTENTS_HISTORY" ;
+    
+    private static final String C_HISTORY_CONTENTS_UPDATE = "C_HISTORY_CONTENTS_UPDATE" ;
+    
+    private static final String C_RESOURCES_UPDATE_RESOURCES = "C_RESOURCES_UPDATE_RESOURCES" ;
+    
+    private static final String C_RESOURCES_UPDATE_SIBLING_COUNT = "C_RESOURCES_UPDATE_SIBLING_COUNT" ;
+    
+    private static final String C_RESOURCES_UPDATE_FLAGS = "C_RESOURCES_UPDATE_FLAGS" ;
+    
+    private static final String C_RESOURCES_UPDATE_RESOURCE_PROJECT = "C_RESOURCES_UPDATE_RESOURCE_PROJECT" ;
+    
+    private static final String C_PROPERTYDEF_DELETE = "C_PROPERTYDEF_DELETE" ;
+    
+    private static final String C_PROPERTIES_DELETE_ALL_STRUCTURE_AND_RESOURCE_VALUES = "C_PROPERTIES_DELETE_ALL_STRUCTURE_AND_RESOURCE_VALUES" ;
+    
+    private static final String C_PROPERTIES_DELETE_ALL_VALUES_FOR_MAPPING_TYPE = "C_PROPERTIES_DELETE_ALL_VALUES_FOR_MAPPING_TYPE" ;
+    
+    private static final String C_DELETE_RELATIONS = "C_DELETE_RELATIONS" ;
+    
+    private static final String C_RESOURCES_MOVE = "C_RESOURCES_MOVE" ;
+    
+    private static final String C_RESOURCES_UPDATE_STRUCTURE_VERSION = "C_RESOURCES_UPDATE_STRUCTURE_VERSION" ;
+    
+    private static final String C_RESOURCES_UPDATE_STRUCTURE = "C_RESOURCES_UPDATE_STRUCTURE" ;
+    
+    private static final String C_RESOURCES_UPDATE_RESOURCE_VERSION = "C_RESOURCES_UPDATE_RESOURCE_VERSION" ;
+    
+    private static final String C_RESOURCES_GET_SUBRESOURCES_GET_FOLDERS = "C_RESOURCES_GET_SUBRESOURCES_GET_FOLDERS" ;
+    
+    private static final String C_RESOURCES_GET_SUBRESOURCES_GET_FILES = "C_RESOURCES_GET_SUBRESOURCES_GET_FILES" ;
+    
+    private static final String C_RESOURCES_GET_SUBRESOURCES = "C_RESOURCES_GET_SUBRESOURCES" ;
+    
+    private static final String C_ONLINE_FILES_CONTENT = "C_ONLINE_FILES_CONTENT" ;
+    
+    private static final String C_RESOURCES_READBYID = "C_RESOURCES_READBYID" ;
+    
+    private static final String C_RESOURCES_READ = "C_RESOURCES_READ" ;
+    
+    private static final String C_RESOURCES_READ_PARENT_BY_ID = "C_RESOURCES_READ_PARENT_BY_ID" ;
+    
+    private static final String C_PROPERTYDEF_READ = "C_PROPERTYDEF_READ" ;
+    
+    private static final String C_PROPERTYDEF_READALL = "C_PROPERTYDEF_READALL" ;
+    
+    private static final String C_PROPERTIES_READ = "C_PROPERTIES_READ" ;
+    
+    private static final String C_PROPERTIES_READALL = "C_PROPERTIES_READALL" ;
+    
+    private static final String C_READ_RELATIONS = "C_READ_RELATIONS" ;
+    
+    private static final String C_RESOURCES_GET_RESOURCE_IN_PROJECT_WITH_STATE = "C_RESOURCES_GET_RESOURCE_IN_PROJECT_WITH_STATE" ;
+    
+    private static final String C_RESOURCES_GET_RESOURCE_IN_PROJECT_WITHOUT_STATE = "C_RESOURCES_GET_RESOURCE_IN_PROJECT_WITHOUT_STATE" ;
+    
+    private static final String C_RESOURCES_GET_RESOURCE_IN_PROJECT_IGNORE_STATE = "C_RESOURCES_GET_RESOURCE_IN_PROJECT_IGNORE_STATE" ;
+    
+    private static final String C_SELECT_RESOURCES_FOR_PRINCIPAL_ACE = "C_SELECT_RESOURCES_FOR_PRINCIPAL_ACE" ;
+    
+    private static final String C_SELECT_RESOURCES_FOR_PRINCIPAL_ATTR1 = "C_SELECT_RESOURCES_FOR_PRINCIPAL_ATTR1" ;
+    
+    private static final String C_SELECT_RESOURCES_FOR_PRINCIPAL_ATTR2 = "C_SELECT_RESOURCES_FOR_PRINCIPAL_ATTR2" ;
+    
+    private static final String C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF1 = "C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF1" ;
+    
+    private static final String C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF2 = "C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF2" ;
+    
+    private static final String C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF_VALUE1 = "C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF_VALUE1" ;
+    
+    private static final String C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF_VALUE2 = "C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF_VALUE2" ;
+    
+    private static final String C_RESOURCES_READ_TREE = "C_RESOURCES_READ_TREE" ;
+    
+    private static final String C_RESOURCES_ORDER_BY_PATH = "C_RESOURCES_ORDER_BY_PATH" ;
+    
+    private static final String C_SELECT_VFS_SIBLINGS = "C_SELECT_VFS_SIBLINGS" ;
+    
+    private static final String C_SELECT_NONDELETED_VFS_SIBLINGS = "C_SELECT_NONDELETED_VFS_SIBLINGS" ;
+    
+    private static final String C_RESOURCES_READ_VERSION_RES = "C_RESOURCES_READ_VERSION_RES" ;
+    
+    private static final String C_RESOURCES_READ_VERSION_STR = "C_RESOURCES_READ_VERSION_STR" ;
+    
+    private static final String C_STRUCTURE_DELETE_BY_STRUCTUREID = "C_STRUCTURE_DELETE_BY_STRUCTUREID" ;
+    
+    private static final String C_RESOURCES_DELETE_BY_RESOURCEID = "C_RESOURCES_DELETE_BY_RESOURCEID" ;
+    
+    private static final String C_RESOURCE_REPLACE = "C_RESOURCE_REPLACE" ;
+    
+    private static final String C_RESOURCES_TRANSFER_RESOURCE = "C_RESOURCES_TRANSFER_RESOURCE" ;
+    
+    private static final String C_RESOURCES_READ_RESOURCE_STATE = "C_RESOURCES_READ_RESOURCE_STATE" ;
+    
+    private static final String C_RESOURCES_SELECT_STRUCTURE_ID = "C_RESOURCES_SELECT_STRUCTURE_ID" ;
+    
+    private static final String C_OFFLINE_CONTENTS_UPDATE = "C_OFFLINE_CONTENTS_UPDATE" ;
+    
+    private static final String C_RESOURCES_UPDATE_PROJECT_LASTMODIFIED = "C_RESOURCES_UPDATE_PROJECT_LASTMODIFIED" ;
+    
+    private static final String C_PROPERTIES_UPDATE = "C_PROPERTIES_UPDATE" ;
+    
+    private static final String C_PROPERTIES_DELETE = "C_PROPERTIES_DELETE" ;
+        
+    private static final String C_RESOURCES_UPDATE_RESOURCES_WITHOUT_STATE = "C_RESOURCES_UPDATE_RESOURCES_WITHOUT_STATE" ;
+    
+    private static final String C_RESOURCES_UPDATE_RESOURCE_STATELASTMODIFIED = "C_RESOURCES_UPDATE_RESOURCE_STATELASTMODIFIED" ;
+    
+    private static final String C_RESOURCES_UPDATE_RESOURCE_STATE = "C_RESOURCES_UPDATE_RESOURCE_STATE" ;
+    
+    private static final String C_RESOURCES_UPDATE_STRUCTURE_STATE = "C_RESOURCES_UPDATE_STRUCTURE_STATE" ;
+    
+    private static final String C_RESOURCES_UPDATE_RELEASE_EXPIRED = "C_RESOURCES_UPDATE_RELEASE_EXPIRED" ;
+    
+    private static final String C_RESOURCES_READ_WITH_ACE_1 = "C_RESOURCES_READ_WITH_ACE_1" ;
+    
+    private static final String C_PROPERTIES_READALL_COUNT = "C_PROPERTIES_READALL_COUNT" ;
+    
+    private static final String C_RESOURCES_READ_PARENT_STRUCTURE_ID = "C_RESOURCES_READ_PARENT_STRUCTURE_ID" ;
+    
+    private static final String C_READ_RESOURCE_STATE = "C_READ_RESOURCE_STATE" ;
+    
+    private static final String C_READ_STRUCTURE_STATE = "C_READ_STRUCTURE_STATE" ;
+    
+    private static final String C_MOVE_RELATIONS_SOURCE = "C_MOVE_RELATIONS_SOURCE" ;
+    
+    private static final String C_MOVE_RELATIONS_TARGET = "C_MOVE_RELATIONS_TARGET" ;
+    
+    private static final String C_STRUCTURE_SELECT_BY_DATE_EXPIRED_AFTER = "C_STRUCTURE_SELECT_BY_DATE_EXPIRED_AFTER" ;
+    
+    private static final String C_STRUCTURE_SELECT_BY_DATE_EXPIRED_BEFORE = "C_STRUCTURE_SELECT_BY_DATE_EXPIRED_BEFORE" ;
+    
+    private static final String C_RESOURCES_SELECT_BY_PARENT_UUID = "C_RESOURCES_SELECT_BY_PARENT_UUID" ;
+    
+    private static final String C_RESOURCES_SELECT_BY_PATH_PREFIX = "C_RESOURCES_SELECT_BY_PATH_PREFIX" ;
+    
+    private static final String C_RESOURCES_SELECT_BY_PROJECT_LASTMODIFIED = "C_RESOURCES_SELECT_BY_PROJECT_LASTMODIFIED" ;
+
+    private static final String C_RELATION_FILTER_TARGET_ID = "C_RELATION_FILTER_TARGET_ID" ;
+    
+    private static final String C_RELATION_FILTER_TARGET_PATH = "C_RELATION_FILTER_TARGET_PATH" ;
+    
+    private static final String C_RELATION_FILTER_SOURCE_ID = "C_RELATION_FILTER_SOURCE_ID" ;
+    
+    private static final String C_RELATION_FILTER_SOURCE_PATH = "C_RELATION_FILTER_SOURCE_PATH" ;
+    
+    private static final String C_RELATION_FILTER_TYPE = "C_RELATION_FILTER_TYPE" ;
+    
+    private static final String C_STRUCTURE_SELECT_BY_DATE_RELEASED_AFTER = "C_STRUCTURE_SELECT_BY_DATE_RELEASED_AFTER" ;
+    
+    private static final String C_STRUCTURE_SELECT_BY_DATE_RELEASED_BEFORE = "C_STRUCTURE_SELECT_BY_DATE_RELEASED_BEFORE" ;
+    
+    private static final String C_RESOURCES_SELECT_ONLY_FOLDERS = "C_RESOURCES_SELECT_ONLY_FOLDERS" ;
+    
+    private static final String C_RESOURCES_SELECT_ONLY_FILES = "C_RESOURCES_SELECT_ONLY_FILES" ;
+    
+    private static final String C_RESOURCES_SELECT_BY_RESOURCE_STATE = "C_RESOURCES_SELECT_BY_RESOURCE_STATE" ;
+    
+    private static final String C_RESOURCES_SELECT_BY_DATE_LASTMODIFIED_AFTER = "C_RESOURCES_SELECT_BY_DATE_LASTMODIFIED_AFTER" ;
+    
+    private static final String C_RESOURCES_SELECT_BY_DATE_LASTMODIFIED_BEFORE = "C_RESOURCES_SELECT_BY_DATE_LASTMODIFIED_BEFORE" ;
+    
+    private static final String C_RESOURCES_SELECT_BY_RESOURCE_TYPE = "C_RESOURCES_SELECT_BY_RESOURCE_TYPE" ;
+    
+    private static final String C_RELATIONS_REPAIR_BROKEN = "C_RELATIONS_REPAIR_BROKEN" ;
+    
+    private static final String C_RELATIONS_UPDATE_BROKEN = "C_RELATIONS_UPDATE_BROKEN" ;
+    
+    private static final String C_READ_RESOURCE_OUS = "C_READ_RESOURCE_OUS" ;
+    
+    /**
+     * Counts the number of siblings of a resource.<p>
+     * 
+     * @param dbc the current database context
+     * @param projectId the current project id
+     * @param resourceId the resource id to count the number of siblings from
+     * 
+     * @return number of siblings
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    public int countSiblings(CmsDbContext dbc, CmsUUID projectId, CmsUUID resourceId) throws CmsDataAccessException {
+
+        int count = 0;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_COUNT_SIBLINGS);
+            q.setParameter(1, resourceId.toString());
+            try{
+            	count = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return count;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#createContent(CmsDbContext, CmsUUID, CmsUUID, byte[])
+     */
+    public void createContent(CmsDbContext dbc, CmsUUID projectId, CmsUUID resourceId, byte[] content)
+    throws CmsDataAccessException {
+
+        try {
+        	CmsDAOOfflineContents oc = new CmsDAOOfflineContents() ;
+        	
+        	oc.setResourceId(resourceId.toString()) ;
+        	oc.setFileContent(content) ;
+        	
+        	dbc.getEntityManager().persist(oc) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#createFile(java.sql.ResultSet, CmsUUID, boolean)
+     */
+    public CmsFile createFile(Object[] o, CmsUUID projectId, boolean hasFileContentInResultSet) {
+
+    	I_CmsDAOResources r = (I_CmsDAOResources) o[0] ;
+    	I_CmsDAOStructure s = (I_CmsDAOStructure) o[1] ;
+    	String lockedInProjectParameter = (String) o[2] ;
+    	
+        byte[] content = null;
+
+        CmsUUID resProjectId = null;
+
+        CmsUUID structureId = new CmsUUID(s.getStructureId());
+        CmsUUID resourceId = new CmsUUID(r.getResourceId());
+        String resourcePath = s.getResourcePath();
+        int resourceType = r.getResourceType();
+        int resourceFlags = r.getResourceFlags();
+        int resourceState = r.getResourceState();
+        int structureState = s.getStructureState();
+        long dateCreated = r.getDateCreated() ;
+        long dateLastModified = r.getDateLastModified();
+        long dateReleased = s.getDateReleased();
+        long dateExpired = s.getDateExpired();
+        int resourceSize = r.getResourceSize();
+        CmsUUID userCreated = new CmsUUID(r.getUserCreated());
+        CmsUUID userLastModified = new CmsUUID(r.getUserLastModified());
+        CmsUUID lockedInProject = new CmsUUID(lockedInProjectParameter);
+        int siblingCount = r.getSiblingCount();
+        long dateContent = r.getDateContent();
+        int resourceVersion = r.getResourceVersion();
+        int structureVersion = s.getStructureVersion();
+
+        // in case of folder type ensure, that the root path has a trailing slash
+        if (CmsFolder.isFolderType(resourceType)) {
+            resourcePath = CmsFileUtil.addTrailingSeparator(resourcePath);
+        }
+        if (hasFileContentInResultSet) {
+            //content = m_sqlManager.getBytes(res, m_sqlManager.readQuery("C_RESOURCES_FILE_CONTENT"));
+        	throw new RuntimeException("CCmsVfsDriver: public CmsFile createFile(Object[] o, CmsUUID projectId, boolean hasFileContentInResultSet) throws SQLException ") ; 
+        }
+        resProjectId = lockedInProject;
+        int newState = (structureState > resourceState) ? structureState : resourceState;
+
+        return new CmsFile(
+            structureId,
+            resourceId,
+            resourcePath,
+            resourceType,
+            resourceFlags,
+            resProjectId,
+            CmsResourceState.valueOf(newState),
+            dateCreated,
+            userCreated,
+            dateLastModified,
+            userLastModified,
+            dateReleased,
+            dateExpired,
+            siblingCount,
+            resourceSize,
+            dateContent,
+            resourceVersion + structureVersion,
+            content);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#createFolder(java.sql.ResultSet, CmsUUID, boolean)
+     */
+    public CmsFolder createFolder(Object[] o, CmsUUID projectId, boolean hasProjectIdInResultSet){
+
+    	I_CmsDAOResources r = (I_CmsDAOResources) o[0] ;
+    	I_CmsDAOStructure s = (I_CmsDAOStructure) o[1] ;
+    	String lockedInProjectParameter = (String) o[2] ;
+    	
+        CmsUUID structureId = new CmsUUID(s.getStructureId());
+        CmsUUID resourceId = new CmsUUID(r.getResourceId());
+        String resourcePath = s.getResourcePath();
+        int resourceType = r.getResourceType();
+        int resourceFlags = r.getResourceFlags();
+        int resourceState = r.getResourceState();
+        int structureState = s.getStructureState();
+        long dateCreated = r.getDateCreated();
+        long dateLastModified = r.getDateLastModified();
+        long dateReleased = s.getDateReleased();
+        long dateExpired = s.getDateExpired();
+        CmsUUID userCreated = new CmsUUID(r.getUserCreated());
+        CmsUUID userLastModified = new CmsUUID(r.getUserLastModified());
+        CmsUUID resProjectId = new CmsUUID(lockedInProjectParameter);
+        int resourceVersion = r.getResourceVersion();
+        int structureVersion = s.getStructureVersion();
+        int resourceSize = r.getResourceSize();
+
+        // in case of folder type ensure, that the root path has a trailing slash
+        if (CmsFolder.isFolderSize(resourceSize)) {
+            resourcePath = CmsFileUtil.addTrailingSeparator(resourcePath);
+        }
+
+        int newState = (structureState > resourceState) ? structureState : resourceState;
+
+        return new CmsFolder(
+            structureId,
+            resourceId,
+            resourcePath,
+            resourceType,
+            resourceFlags,
+            resProjectId,
+            CmsResourceState.valueOf(newState),
+            dateCreated,
+            userCreated,
+            dateLastModified,
+            userLastModified,
+            dateReleased,
+            dateExpired,
+            resourceVersion + structureVersion);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#createOnlineContent(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, byte[], int, boolean, boolean)
+     */
+    public void createOnlineContent(
+        CmsDbContext dbc,
+        CmsUUID resourceId,
+        byte[] contents,
+        int publishTag,
+        boolean keepOnline,
+        boolean needToUpdateContent) throws CmsDataAccessException {
+
+        try {
+            if (needToUpdateContent) {
+                // put the online content in the history, only if explicit requested 
+                Query q = m_sqlManager.createQuery(dbc, C_ONLINE_CONTENTS_HISTORY);
+                q.setParameter(1, resourceId.toString());
+                List<CmsDAOContents> res = q.getResultList();
+                for(CmsDAOContents c:res){
+                	c.setOnlineFlag(0) ;
+                }
+
+                // create new online content
+                CmsDAOContents c = new CmsDAOContents() ;
+                
+                c.setResourceId(resourceId.toString()) ;
+                c.setFileContent(contents) ;
+                c.setPublishTagFrom(publishTag) ;
+                c.setPublishTagTo(publishTag) ;
+                c.setOnlineFlag(keepOnline ? 1 : 0) ;
+
+                dbc.getEntityManager().persist(c) ;
+            } else {
+                // update old content entry
+                Query q = m_sqlManager.createQuery(dbc, C_HISTORY_CONTENTS_UPDATE);
+                q.setParameter(1, resourceId.toString());
+                List<CmsDAOContents> res = q.getResultList();
+                for(CmsDAOContents c:res){
+                	c.setPublishTagTo(publishTag) ;
+                }
+
+                if (!keepOnline) {
+                    // put the online content in the history 
+                    q = m_sqlManager.createQuery(dbc, C_ONLINE_CONTENTS_HISTORY);
+                    q.setParameter(1, resourceId.toString());
+                    res = q.getResultList();
+                    for(CmsDAOContents c:res){
+                    	c.setOnlineFlag(0) ;
+                    }
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#createPropertyDefinition(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, java.lang.String, org.opencms.file.CmsPropertyDefinition.CmsPropertyType)
+     */
+    public CmsPropertyDefinition createPropertyDefinition(
+        CmsDbContext dbc,
+        CmsUUID projectId,
+        String name,
+        CmsPropertyDefinition.CmsPropertyType type) throws CmsDataAccessException {
+
+        try {
+        	I_CmsDAOPropertyDef pd = 
+        		CmsProject.isOnlineProject(projectId) ?
+        				new CmsDAOOnlinePropertyDef()
+        			  : new CmsDAOOfflinePropertyDef() ;
+        	
+        	pd.setPropertyDefId(new CmsUUID().toString()) ;
+        	pd.setPropertyDefName(name) ;
+        	pd.setPropertyDefType(type.getMode()) ;
+        	
+        	dbc.getEntityManager().persist(pd) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return readPropertyDefinition(dbc, name, projectId);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#createRelation(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.relations.CmsRelation)
+     */
+    public void createRelation(CmsDbContext dbc, CmsUUID projectId, CmsRelation relation) throws CmsDataAccessException {
+
+        try {
+        	I_CmsDAOResourceRelations rr =
+        		CmsProject.isOnlineProject(projectId) ?
+        				new CmsDAOOnlineResourceRelations()
+        			  : new CmsDAOOfflineResourceRelations() ;
+        				
+        	rr.setRelationSourceId(relation.getSourceId().toString()) ;
+        	rr.setRelationSourcePath(relation.getSourcePath()) ;
+        	rr.setRelationTargetId(relation.getTargetId().toString()) ;
+        	rr.setRelationTargetPath(relation.getTargetPath()) ;
+        	rr.setRelationType(relation.getType().getId()) ;
+        	
+        	dbc.getEntityManager().persist(rr) ;
+
+            if (LOG.isDebugEnabled()) {
+                LOG.debug(Messages.get().getBundle().key(
+                    Messages.LOG_CREATE_RELATION_2,
+                    String.valueOf(projectId),
+                    relation));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#createResource(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.file.CmsResource, byte[])
+     */
+    public CmsResource createResource(CmsDbContext dbc, CmsUUID projectId, CmsResource resource, byte[] content)
+    throws CmsDataAccessException {
+
+        CmsUUID newStructureId = null;
+
+        // check the resource path
+        String resourcePath = CmsFileUtil.removeTrailingSeparator(resource.getRootPath());
+        if (resourcePath.length() > CmsDriverManager.MAX_VFS_RESOURCE_PATH_LENGTH) {
+            throw new CmsDataAccessException(Messages.get().container(
+                Messages.ERR_RESOURCENAME_TOO_LONG_2,
+                resourcePath,
+                new Integer(CmsDriverManager.MAX_VFS_RESOURCE_PATH_LENGTH)));
+        }
+
+        // check if the parent folder of the resource exists and if is not deleted
+        if (!resource.getRootPath().equals("/")) {
+            String parentFolderName = CmsResource.getParentFolder(resource.getRootPath());
+            CmsFolder parentFolder = m_driverManager.getVfsDriver().readFolder(dbc, projectId, parentFolderName);
+            if (parentFolder.getState().isDeleted()) {
+                throw new CmsDbEntryNotFoundException(Messages.get().container(
+                    Messages.ERR_PARENT_FOLDER_DELETED_1,
+                    resource.getRootPath()));
+            }
+        }
+
+        // validate the resource length
+        internalValidateResourceLength(resource);
+
+        // set the resource state and modification dates
+        CmsResourceState newState;
+        long dateModified;
+        long dateCreated;
+        long dateContent = System.currentTimeMillis();
+
+        if (projectId.equals(CmsProject.ONLINE_PROJECT_ID)) {
+            newState = CmsResource.STATE_UNCHANGED;
+            dateCreated = resource.getDateCreated();
+            dateModified = resource.getDateLastModified();
+        } else {
+            newState = CmsResource.STATE_NEW;
+            if (resource.isTouched()) {
+                dateCreated = resource.getDateCreated();
+                dateModified = resource.getDateLastModified();
+            } else {
+                dateCreated = System.currentTimeMillis();
+                dateModified = dateCreated;
+            }
+        }
+
+        // check if the resource already exists
+        newStructureId = resource.getStructureId();
+
+        try {
+            CmsResource existingResource = m_driverManager.getVfsDriver().readResource(
+                dbc,
+                dbc.getProjectId().isNullUUID() ? projectId : dbc.getProjectId(),
+                resourcePath,
+                true);
+            if (existingResource.getState().isDeleted()) {
+                // if an existing resource is deleted, it will be finally removed now.
+                // but we have to reuse its id in order to avoid orphans in the online project
+                newStructureId = existingResource.getStructureId();
+                newState = CmsResource.STATE_CHANGED;
+
+                // remove the existing file and it's properties
+                List modifiedResources = m_driverManager.getVfsDriver().readSiblings(
+                    dbc,
+                    projectId,
+                    existingResource,
+                    false);
+                int propertyDeleteOption = (existingResource.getSiblingCount() > 1) ? CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_VALUES
+                : CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES;
+                deletePropertyObjects(dbc, projectId, existingResource, propertyDeleteOption);
+                removeFile(dbc, projectId, existingResource);
+
+                OpenCms.fireCmsEvent(new CmsEvent(
+                    I_CmsEventListener.EVENT_RESOURCES_MODIFIED,
+                    Collections.singletonMap("resources", modifiedResources)));
+                OpenCms.fireCmsEvent(new CmsEvent(
+                    I_CmsEventListener.EVENT_RESOURCE_AND_PROPERTIES_MODIFIED,
+                    Collections.singletonMap("resource", existingResource)));
+            } else {
+                // we have a collision: there exists already a resource with the same path/name which cannot be removed
+                throw new CmsVfsResourceAlreadyExistsException(Messages.get().container(
+                    Messages.ERR_RESOURCE_WITH_NAME_ALREADY_EXISTS_1,
+                    dbc.removeSiteRoot(resource.getRootPath())));
+            }
+        } catch (CmsVfsResourceNotFoundException e) {
+            // that's what we want in the best case- anything else should be thrown
+        }
+
+        try {
+            // read the parent id
+            String parentId = internalReadParentId(dbc, projectId, resourcePath);
+
+            // use consistent version numbers if the file is being restored
+            int lastVersion = m_driverManager.getHistoryDriver().readLastVersion(dbc, newStructureId);
+            int newStrVersion = 0;
+            int newResVersion = 0;
+            if (lastVersion > 0) {
+                I_CmsHistoryResource histRes = m_driverManager.getHistoryDriver().readResource(
+                    dbc,
+                    newStructureId,
+                    lastVersion);
+                newStrVersion = histRes.getStructureVersion();
+                newResVersion = histRes.getResourceVersion();
+            }
+
+            // write the structure
+            I_CmsDAOStructure s = 
+            	CmsProject.isOnlineProject(projectId)
+            	? new CmsDAOOnlineStructure()
+                : new CmsDAOOfflineStructure() ;
+            	
+            s.setStructureId(newStructureId.toString()) ;
+            s.setResourceId(resource.getResourceId().toString()) ;
+            s.setResourcePath(resourcePath) ;
+            s.setStructureState(newState.getState()) ;
+            s.setDateReleased(resource.getDateReleased()) ;
+            s.setDateExpired(resource.getDateExpired()) ;
+            s.setParentId(parentId) ;
+            s.setStructureVersion(newStrVersion) ;
+            
+            dbc.getEntityManager().persist(s) ;
+
+            if (!validateResourceIdExists(dbc, projectId, resource.getResourceId())) {
+
+                // create the resource record
+            	I_CmsDAOResources r =
+            		CmsProject.isOnlineProject(projectId)
+            		? new CmsDAOOnlineResources()
+            		: new CmsDAOOfflineResources() ;
+            	r.setResourceId(resource.getResourceId().toString()) ;
+            	r.setResourceType(resource.getTypeId()) ;
+            	r.setResourceFlags(resource.getFlags()) ;
+            	r.setDateCreated(dateCreated) ;
+            	r.setUserCreated(resource.getUserCreated().toString()) ;
+            	r.setDateLastModified(dateModified) ;
+            	r.setUserLastModified(resource.getUserLastModified().toString()) ;
+            	r.setResourceState(newState.getState()) ;
+            	r.setResourceSize(resource.getLength()) ;
+            	r.setDateContent(dateContent) ;
+            	r.setProjectLastModified(projectId.toString()) ;
+            	r.setSiblingCount(1) ;
+            	r.setResourceVersion(newResVersion) ;
+            	
+            	dbc.getEntityManager().persist(r) ;
+
+                if (resource.isFile() && (content != null)) {
+                    // create the file content
+                    createContent(dbc, projectId, resource.getResourceId(), content);
+                }
+            } else {
+                if ((content != null) || !resource.getState().isKeep()) {
+                    CmsUUID projLastMod = projectId;
+                    CmsResourceState state = CmsResource.STATE_CHANGED;
+                    if (projectId.equals(CmsProject.ONLINE_PROJECT_ID)) {
+                        // in case a sibling is being published
+                        projLastMod = resource.getProjectLastModified();
+                        state = CmsResource.STATE_UNCHANGED;
+                    }
+                    // update the resource record only if state has changed or new content is provided
+                    Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_UPDATE_RESOURCES);
+                    
+                    q.setParameter(1, resource.getResourceId().toString());
+                    
+                    List<I_CmsDAOResources> res = q.getResultList();
+                    for(I_CmsDAOResources r:res){
+                    	r.setResourceType(resource.getTypeId()) ;
+                    	r.setResourceFlags(resource.getFlags()) ;
+                    	r.setDateLastModified(dateModified) ;
+                    	r.setUserLastModified(resource.getUserLastModified().toString()) ;
+                    	r.setResourceState(state.getState()) ;
+                    	r.setResourceSize(resource.getLength()) ;
+                    	r.setDateContent(resource.getDateContent()) ;
+                    	r.setProjectLastModified(projLastMod.toString()) ;
+                    	r.setSiblingCount(countSiblings(dbc, projectId, resource.getResourceId())) ;
+                    }
+
+                }
+
+                if (resource.isFile()) {
+                    if (content != null) {
+                        // update the file content
+                        writeContent(dbc, resource.getResourceId(), content);
+                    } else if (resource.getState().isKeep()) {
+                        // special case sibling creation - update the link Count
+                        Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_UPDATE_SIBLING_COUNT);
+                        q.setParameter(1, resource.getResourceId().toString());
+                        List<I_CmsDAOResources> res = q.getResultList();
+                        
+                        for(I_CmsDAOResources r:res){
+                        	r.setSiblingCount(countSiblings(dbc, projectId, resource.getResourceId())) ;
+                        }
+
+                        // update the resource flags
+                        q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_UPDATE_FLAGS);
+                        q.setParameter(1, resource.getResourceId().toString());
+                        List<I_CmsDAOResources> resf = q.getResultList();
+                        
+                        for(I_CmsDAOResources r:resf){
+                        	r.setResourceFlags(resource.getFlags()) ;
+                        }
+                    }
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        repairBrokenRelations(dbc, projectId, resource.getStructureId(), resource.getRootPath());
+        return readResource(dbc, projectId, newStructureId, false);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#createResource(java.sql.ResultSet, CmsUUID)
+     */
+    public CmsResource createResource(Object[] o, CmsUUID projectId) {
+    	I_CmsDAOResources r = (I_CmsDAOResources) o[0] ;
+    	String lockedInProjectParamater = (String) o[2] ;
+    	I_CmsDAOStructure s = (I_CmsDAOStructure) o[1] ;
+
+        CmsUUID structureId = new CmsUUID(s.getStructureId());
+        CmsUUID resourceId = new CmsUUID(r.getResourceId());
+        String resourcePath = s.getResourcePath();
+        int resourceType = r.getResourceType();
+        int resourceFlags = r.getResourceFlags();
+        CmsUUID resourceProjectLastModified = new CmsUUID(r.getProjectLastModified());
+        int resourceState = r.getResourceState();
+        int structureState = s.getStructureState();
+        long dateCreated = r.getDateCreated();
+        long dateLastModified = r.getDateLastModified();
+        long dateReleased = s.getDateReleased();
+        long dateExpired = s.getDateExpired();
+        int resourceSize = r.getResourceSize();
+        boolean isFolder = CmsFolder.isFolderSize(resourceSize);
+        if (isFolder) {
+            // in case of folder type ensure, that the root path has a trailing slash
+            resourcePath = CmsFileUtil.addTrailingSeparator(resourcePath);
+        }
+        long dateContent = isFolder ? -1 : r.getDateContent();
+        CmsUUID userCreated = new CmsUUID(r.getUserCreated());
+        CmsUUID userLastModified = new CmsUUID(r.getUserLastModified());
+        int siblingCount = r.getSiblingCount();
+        int resourceVersion = r.getResourceVersion();
+        int structureVersion = s.getStructureVersion();
+
+        int newState = (structureState > resourceState) ? structureState : resourceState;
+        // if there is a change increase the version number
+        int newVersion = resourceVersion + structureVersion + (newState > 0 ? 1 : 0);
+
+        CmsResource newResource = new CmsResource(
+            structureId,
+            resourceId,
+            resourcePath,
+            resourceType,
+            isFolder,
+            resourceFlags,
+            resourceProjectLastModified,
+            CmsResourceState.valueOf(newState),
+            dateCreated,
+            userCreated,
+            dateLastModified,
+            userLastModified,
+            dateReleased,
+            dateExpired,
+            siblingCount,
+            resourceSize,
+            dateContent,
+            newVersion);
+
+        return newResource;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#createSibling(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsResource)
+     */
+    public void createSibling(CmsDbContext dbc, CmsProject project, CmsResource resource) throws CmsDataAccessException {
+
+        if (!project.getUuid().equals(CmsProject.ONLINE_PROJECT_ID)) {
+            // this method is only intended to be used during publishing
+            return;
+        }
+
+        // check if the resource already exists
+        CmsResource existingSibling = null;
+        CmsUUID newStructureId = resource.getStructureId();
+
+        try {
+            existingSibling = readResource(dbc, project.getUuid(), resource.getRootPath(), true);
+
+            if (existingSibling.getState().isDeleted()) {
+                // if an existing resource is deleted, it will be finally removed now.
+                // but we have to reuse its id in order to avoid orphans in the online project.
+                newStructureId = existingSibling.getStructureId();
+
+                // remove the existing file and it's properties
+                List modifiedResources = readSiblings(dbc, project.getUuid(), existingSibling, false);
+                int propertyDeleteOption = (existingSibling.getSiblingCount() > 1) ? CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_VALUES
+                : CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES;
+                deletePropertyObjects(dbc, project.getUuid(), existingSibling, propertyDeleteOption);
+                removeFile(dbc, project.getUuid(), existingSibling);
+
+                OpenCms.fireCmsEvent(new CmsEvent(
+                    I_CmsEventListener.EVENT_RESOURCES_MODIFIED,
+                    Collections.singletonMap("resources", modifiedResources)));
+                OpenCms.fireCmsEvent(new CmsEvent(
+                    I_CmsEventListener.EVENT_RESOURCE_AND_PROPERTIES_MODIFIED,
+                    Collections.singletonMap("resource", existingSibling)));
+            } else {
+                // we have a collision: there exists already a resource with the same path/name which could not be removed
+                throw new CmsVfsResourceAlreadyExistsException(Messages.get().container(
+                    Messages.ERR_RESOURCE_WITH_NAME_ALREADY_EXISTS_1,
+                    dbc.removeSiteRoot(resource.getRootPath())));
+            }
+        } catch (CmsVfsResourceNotFoundException e) {
+            // that's what we want in the best case- anything else should be thrown
+        }
+
+        // check if a resource with the specified ID already exists
+        if (!validateResourceIdExists(dbc, project.getUuid(), resource.getResourceId())) {
+            throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                Messages.ERR_CREATE_SIBLING_FILE_NOT_FOUND_1,
+                dbc.removeSiteRoot(resource.getRootPath())));
+        }
+
+        // write a new structure referring to the resource
+        try {
+            // use consistent version numbers if the file is being restored
+            int lastVersion = m_driverManager.getHistoryDriver().readLastVersion(dbc, newStructureId);
+            int newStrVersion = 0;
+            if (lastVersion > 0) {
+                I_CmsHistoryResource histRes = m_driverManager.getHistoryDriver().readResource(
+                    dbc,
+                    newStructureId,
+                    lastVersion);
+                newStrVersion = histRes.getStructureVersion();
+            }
+
+            // read the parent id
+            String parentId = internalReadParentId(dbc, project.getUuid(), resource.getRootPath());
+
+            // write the structure
+            I_CmsDAOStructure s =
+            	CmsProject.isOnlineProject(project.getUuid())
+            	? new CmsDAOOnlineStructure()
+            	: new CmsDAOOfflineStructure() ;
+            	
+            s.setStructureId(newStructureId.toString()) ;
+            s.setResourceId(resource.getResourceId().toString()) ;
+            s.setResourcePath(resource.getRootPath()) ;
+            s.setStructureState(CmsResource.STATE_UNCHANGED.getState()) ;
+            s.setDateReleased(resource.getDateReleased()) ;
+            s.setDateExpired(resource.getDateExpired()) ;
+            s.setParentId(parentId) ;
+            s.setStructureVersion(newStrVersion) ;
+            
+            dbc.getEntityManager().persist(s) ;
+
+            // update the link Count
+            Query q = m_sqlManager.createQuery(dbc, project, C_RESOURCES_UPDATE_SIBLING_COUNT);
+            q.setParameter(1, resource.getResourceId().toString());
+            List<I_CmsDAOResources> res = q.getResultList();
+            
+            for(I_CmsDAOResources r:res){
+            	r.setSiblingCount(countSiblings(dbc, project.getUuid(), resource.getResourceId())) ;
+            }
+
+            // update the project last modified and flags
+            q = m_sqlManager.createQuery(dbc, project, C_RESOURCES_UPDATE_RESOURCE_PROJECT);
+            q.setParameter(1, resource.getResourceId().toString());
+            List<I_CmsDAOResources> resr = q.getResultList();
+            
+            for(I_CmsDAOResources r:resr){
+            	r.setResourceFlags(resource.getFlags()) ;
+            	r.setProjectLastModified(resource.getProjectLastModified().toString()) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        repairBrokenRelations(dbc, project.getUuid(), resource.getStructureId(), resource.getRootPath());
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#deletePropertyDefinition(org.opencms.db.CmsDbContext, org.opencms.file.CmsPropertyDefinition)
+     */
+    public void deletePropertyDefinition(CmsDbContext dbc, CmsPropertyDefinition metadef) throws CmsDataAccessException {
+
+        try {
+            if ((internalCountProperties(dbc, metadef, CmsProject.ONLINE_PROJECT_ID) != 0)
+                || (internalCountProperties(dbc, metadef, CmsUUID.getOpenCmsUUID()) != 0)) { // HACK: to get an offline project
+
+                throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_DELETE_USED_PROPERTY_1,
+                    metadef.getName()));
+            }
+            Query q ;
+            for (int i = 0; i < 2; i++) {
+                if (i == 0) {
+                    // delete the offline property definition
+                    q = m_sqlManager.createQuery(dbc, CmsUUID.getOpenCmsUUID(), C_PROPERTYDEF_DELETE); // HACK: to get an offline project
+                } else {
+                    // delete the online property definition
+                    q = m_sqlManager.createQuery(dbc, CmsProject.ONLINE_PROJECT_ID, C_PROPERTYDEF_DELETE);
+                }
+
+                q.setParameter(1, metadef.getId().toString());
+                List<I_CmsDAOPropertyDef> res = q.getResultList();
+                for(I_CmsDAOPropertyDef pd:res){
+                	dbc.getEntityManager().remove(pd) ;
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#deletePropertyObjects(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.file.CmsResource, int)
+     */
+    public void deletePropertyObjects(CmsDbContext dbc, CmsUUID projectId, CmsResource resource, int deleteOption)
+    throws CmsDataAccessException {
+
+        try {
+            Query q ;
+
+            if (deleteOption == CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_AND_RESOURCE_VALUES) {
+                // delete both the structure and resource property values mapped to the specified resource
+                q = m_sqlManager.createQuery(
+                    dbc,
+                    projectId,
+                    C_PROPERTIES_DELETE_ALL_STRUCTURE_AND_RESOURCE_VALUES);
+                q.setParameter(1, resource.getResourceId().toString());
+                q.setParameter(2, CmsProperty.RESOURCE_RECORD_MAPPING);
+                q.setParameter(3, resource.getStructureId().toString());
+                q.setParameter(4, CmsProperty.STRUCTURE_RECORD_MAPPING);
+            } else if (deleteOption == CmsProperty.DELETE_OPTION_DELETE_STRUCTURE_VALUES) {
+                // delete the structure values mapped to the specified resource
+                q = m_sqlManager.createQuery(
+                    dbc,
+                    projectId,
+                    C_PROPERTIES_DELETE_ALL_VALUES_FOR_MAPPING_TYPE);
+                q.setParameter(1, resource.getStructureId().toString());
+                q.setParameter(2, CmsProperty.STRUCTURE_RECORD_MAPPING);
+            } else if (deleteOption == CmsProperty.DELETE_OPTION_DELETE_RESOURCE_VALUES) {
+                // delete the resource property values mapped to the specified resource
+                q = m_sqlManager.createQuery(
+                    dbc,
+                    projectId,
+                    C_PROPERTIES_DELETE_ALL_VALUES_FOR_MAPPING_TYPE);
+                q.setParameter(1, resource.getResourceId().toString());
+                q.setParameter(2, CmsProperty.RESOURCE_RECORD_MAPPING);
+            } else {
+                throw new CmsDataAccessException(Messages.get().container(Messages.ERR_INVALID_DELETE_OPTION_1));
+            }
+
+            List<I_CmsDAOProperties> res = q.getResultList() ;
+            for(I_CmsDAOProperties p:res){
+            	dbc.getEntityManager().remove(p) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#deleteRelations(org.opencms.db.CmsDbContext, CmsUUID, CmsResource, org.opencms.relations.CmsRelationFilter)
+     */
+    public void deleteRelations(CmsDbContext dbc, CmsUUID projectId, CmsResource resource, CmsRelationFilter filter)
+    throws CmsDataAccessException {
+
+        try {
+            if (filter.isSource()) {
+                List params = new ArrayList(7);
+
+                StringBuffer queryBuf = new StringBuffer(256);
+                queryBuf.append(m_sqlManager.readQuery(projectId, C_DELETE_RELATIONS));
+                queryBuf.append(prepareRelationConditions(projectId, filter, resource, params, true));
+
+                Query q = m_sqlManager.createQueryFromJPQL(dbc, queryBuf.toString());
+                for (int i = 0; i < params.size(); i++) {
+                	q.setParameter(i+1, params.get(i)) ;
+                }
+                List<I_CmsDAOResourceRelations> res = q.getResultList() ;
+                for(I_CmsDAOResourceRelations rr:res){
+                	dbc.getEntityManager().remove(rr) ;
+                }
+            }
+            if (filter.isTarget()) {
+                List params = new ArrayList(7);
+
+                StringBuffer queryBuf = new StringBuffer(256);
+                queryBuf.append(m_sqlManager.readQuery(projectId, C_DELETE_RELATIONS));
+                queryBuf.append(prepareRelationConditions(projectId, filter, resource, params, false));
+
+                Query q = m_sqlManager.createQueryFromJPQL(dbc, queryBuf.toString());
+                for (int i = 0; i < params.size(); i++) {
+                	q.setParameter(i+1, params.get(i)) ;
+                }
+                
+                List<I_CmsDAOResourceRelations> res = q.getResultList() ;
+                for(I_CmsDAOResourceRelations rr:res){
+                	dbc.getEntityManager().remove(rr) ;
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        // update broken remaining relations
+        updateBrokenRelations(dbc, projectId, resource.getRootPath());
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#destroy()
+     */
+    public void destroy() throws Throwable {
+
+        m_sqlManager = null;
+        m_driverManager = null;
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_SHUTDOWN_DRIVER_1, getClass().getName()));
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#getSqlManager()
+     */
+    public CmsSqlManager getSqlManager() {
+
+        return m_sqlManager;
+    }
+
+    /**
+     * @see org.opencms.db.I_CmsDriver#init(org.opencms.db.CmsDbContext, org.opencms.configuration.CmsConfigurationManager, java.util.List, org.opencms.db.CmsDriverManager)
+     */
+    public void init(
+        CmsDbContext dbc,
+        CmsConfigurationManager configurationManager,
+        List successiveDrivers,
+        CmsDriverManager driverManager) {
+
+        Map configuration = configurationManager.getConfiguration();
+        String poolUrl = (String)configuration.get("db.vfs.pool");
+        String classname = (String)configuration.get("db.vfs.sqlmanager");
+        m_sqlManager = (CmsSqlManager) this.initSqlManager(classname);
+
+        m_driverManager = driverManager;
+
+        if (CmsLog.INIT.isInfoEnabled()) {
+            CmsLog.INIT.info(Messages.get().getBundle().key(Messages.INIT_ASSIGNED_POOL_1, poolUrl));
+        }
+
+        if ((successiveDrivers != null) && !successiveDrivers.isEmpty()) {
+            if (LOG.isWarnEnabled()) {
+                LOG.warn(Messages.get().getBundle().key(
+                    Messages.LOG_SUCCESSIVE_DRIVERS_UNSUPPORTED_1,
+                    getClass().getName()));
+            }
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#initSqlManager(String)
+     */
+    public org.opencms.db.CmsSqlManager initSqlManager(String classname) {
+
+        return CmsSqlManager.getInstance(classname);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#moveResource(CmsDbContext, CmsUUID, CmsResource, String)
+     */
+    public void moveResource(CmsDbContext dbc, CmsUUID projectId, CmsResource source, String destinationPath)
+    throws CmsDataAccessException {
+
+        if ((dbc.getRequestContext() != null)
+            && (dbc.getRequestContext().getAttribute(REQ_ATTR_CHECK_PERMISSIONS) != null)) {
+            // only check write permissions
+            checkWritePermissionsInFolder(dbc, source);
+            return;
+        }
+
+        // do not allow to move a resource into an as deleted marked folder
+        CmsResourceFilter filter = CmsResourceFilter.IGNORE_EXPIRATION;
+        if (projectId.equals(CmsProject.ONLINE_PROJECT_ID)) {
+            // does not matter online
+            filter = CmsResourceFilter.ALL;
+        }
+
+        // determine destination folder        
+        String destinationFoldername = CmsResource.getParentFolder(destinationPath);
+
+        // read the destination folder (will also check read permissions)
+        CmsFolder destinationFolder = m_driverManager.readFolder(dbc, destinationFoldername, filter);
+
+        if (!projectId.equals(CmsProject.ONLINE_PROJECT_ID)) {
+            // check online resource
+            try {
+                CmsResource onlineResource = m_driverManager.getVfsDriver().readResource(
+                    dbc,
+                    CmsProject.ONLINE_PROJECT_ID,
+                    destinationPath,
+                    true);
+
+                if (!onlineResource.getStructureId().equals(source.getStructureId())) {
+                    // source resource has been moved and it is not the 
+                    // same as the resource that is being trying to move back
+                    CmsResource offlineResource = null;
+                    try {
+                        // read new location in offline project
+                        offlineResource = readResource(
+                            dbc,
+                            dbc.getRequestContext().currentProject().getUuid(),
+                            onlineResource.getStructureId(),
+                            true);
+                    } catch (CmsException e) {
+                        // should never happen
+                        if (LOG.isErrorEnabled()) {
+                            LOG.error(e.getMessage(), e);
+                        }
+                    }
+
+                    throw new CmsVfsOnlineResourceAlreadyExistsException(Messages.get().container(
+                        Messages.ERR_OVERWRITE_MOVED_RESOURCE_3,
+                        dbc.removeSiteRoot(source.getRootPath()),
+                        dbc.removeSiteRoot(destinationPath),
+                        dbc.removeSiteRoot(offlineResource == null ? "__ERROR__" : offlineResource.getRootPath())));
+                }
+            } catch (CmsVfsResourceNotFoundException e) {
+                // ok, no online resource
+            }
+        }
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_MOVE);
+            q.setParameter(1, source.getStructureId().toString());
+            List<I_CmsDAOStructure> res = q.getResultList();
+            
+            for(I_CmsDAOStructure s:res){
+            	s.setResourcePath(CmsFileUtil.removeTrailingSeparator(destinationPath)); // must remove trailing slash
+            	s.setParentId(destinationFolder.getStructureId().toString()) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        moveRelations(dbc, projectId, source.getStructureId(), destinationPath);
+        repairBrokenRelations(dbc, projectId, source.getStructureId(), destinationPath);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#publishResource(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsResource, org.opencms.file.CmsResource)
+     */
+    public void publishResource(
+        CmsDbContext dbc,
+        CmsProject onlineProject,
+        CmsResource onlineResource,
+        CmsResource offlineResource) throws CmsDataAccessException {
+
+        // validate the resource length
+        internalValidateResourceLength(offlineResource);
+        int resourceSize = offlineResource.getLength();
+
+        String resourcePath = CmsFileUtil.removeTrailingSeparator(offlineResource.getRootPath());
+        Query q ;
+
+        try {
+            boolean resourceExists = validateResourceIdExists(
+                dbc,
+                onlineProject.getUuid(),
+                offlineResource.getResourceId());
+            if (resourceExists) {
+                // the resource record exists online already
+                // update the online resource record
+                q = m_sqlManager.createQuery(dbc, onlineProject, C_RESOURCES_UPDATE_RESOURCES);
+                q.setParameter(1, offlineResource.getResourceId().toString());
+                
+                List<I_CmsDAOResources> res = q.getResultList();
+                
+                for(I_CmsDAOResources r:res){
+                	r.setResourceType(offlineResource.getTypeId()) ;
+                	r.setResourceFlags(offlineResource.getFlags()) ;
+                	r.setDateLastModified(offlineResource.getDateLastModified()) ;
+                	r.setUserLastModified(offlineResource.getUserLastModified().toString()) ;
+                	r.setResourceState(CmsResource.STATE_UNCHANGED.getState()) ;
+                	r.setResourceSize(resourceSize) ;
+                	r.setDateContent(offlineResource.getDateContent()) ;
+                	r.setProjectLastModified(offlineResource.getProjectLastModified().toString()) ;
+                	r.setSiblingCount(countSiblings(dbc, onlineProject.getUuid(), onlineResource.getResourceId())) ;
+                }
+            } else {
+                // the resource record does NOT exist online yet
+                // create the resource record online
+            	I_CmsDAOResources r = 
+            		CmsProject.isOnlineProject(onlineProject.getUuid())
+            		? new CmsDAOOnlineResources()
+            		: new CmsDAOOfflineResources() ;
+            		
+            	r.setResourceId(offlineResource.getResourceId().toString()) ;
+            	r.setResourceType(offlineResource.getTypeId()) ;
+            	r.setResourceFlags(offlineResource.getFlags()) ;
+            	r.setDateCreated(offlineResource.getDateCreated()) ;
+            	r.setUserCreated(offlineResource.getUserCreated().toString()) ;
+            	r.setDateLastModified(offlineResource.getDateLastModified()) ;
+            	r.setUserLastModified(offlineResource.getUserLastModified().toString()) ;
+            	r.setResourceState(CmsResource.STATE_UNCHANGED.getState()) ;
+            	r.setResourceSize(resourceSize) ;
+            	r.setDateContent(offlineResource.getDateContent()) ;
+            	r.setProjectLastModified(offlineResource.getProjectLastModified().toString()) ;
+            	r.setSiblingCount(1) ; // initial siblings count
+            	r.setResourceVersion(1) ; // initial resource version
+            	
+            	dbc.getEntityManager().persist(r) ;
+            }
+
+            // read the parent id
+            String parentId = internalReadParentId(dbc, onlineProject.getUuid(), resourcePath);
+
+            if (validateStructureIdExists(dbc, onlineProject.getUuid(), offlineResource.getStructureId())) {
+                // update the online structure record
+                q = m_sqlManager.createQuery(dbc, onlineProject, C_RESOURCES_UPDATE_STRUCTURE);
+                q.setParameter(1, offlineResource.getStructureId().toString());
+                List<I_CmsDAOStructure> res = q.getResultList();
+                
+                for(I_CmsDAOStructure s:res){
+                	s.setResourceId(offlineResource.getResourceId().toString()) ;
+                	s.setResourcePath(resourcePath) ;
+                	s.setStructureState(CmsResource.STATE_UNCHANGED.getState()) ;
+                	s.setDateReleased(offlineResource.getDateReleased()) ;
+                	s.setDateExpired(offlineResource.getDateExpired()) ;
+                	s.setParentId(parentId) ;
+                }
+            } else {
+            	I_CmsDAOStructure s = 
+            		CmsProject.isOnlineProject(onlineProject.getUuid())
+            		? new CmsDAOOnlineStructure()
+            		: new CmsDAOOfflineStructure() ;
+            		
+            	s.setStructureId(offlineResource.getStructureId().toString()) ;
+            	s.setResourceId(offlineResource.getResourceId().toString()) ;
+            	s.setResourcePath(resourcePath) ;
+            	s.setStructureState(CmsResource.STATE_UNCHANGED.getState()) ;
+            	s.setDateReleased(offlineResource.getDateReleased()) ;
+            	s.setDateExpired(offlineResource.getDateExpired()) ;
+            	s.setParentId(parentId) ;
+            	s.setStructureVersion(resourceExists ? 1 : 0); // new resources start with 0, new siblings with 1
+            	
+                dbc.getEntityManager().persist(s) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#publishVersions(org.opencms.db.CmsDbContext, org.opencms.file.CmsResource, boolean)
+     */
+    public void publishVersions(CmsDbContext dbc, CmsResource resource, boolean firstSibling)
+    throws CmsDataAccessException {
+
+        // if resource is null just flush the internal cache
+        if (resource == null) {
+            m_resOp.clear();
+            return;
+        }
+
+        if (!dbc.getProjectId().isNullUUID() || dbc.currentProject().isOnlineProject()) {
+            // this method is supposed to be used only in the offline project
+            return;
+        }
+
+        if (firstSibling) {
+            // reset the resource operation flag
+            m_resOp.remove(resource.getResourceId());
+        }
+
+        boolean resOp = false; // assume structure operation
+
+        CmsResourceState resState = internalReadResourceState(dbc, dbc.currentProject().getUuid(), resource);
+        CmsResourceState strState = internalReadStructureState(dbc, dbc.currentProject().getUuid(), resource);
+
+        if (!resState.isUnchanged()) {
+            if (strState.isDeleted()) {
+                resOp = (resState.isDeleted() || (resource.getSiblingCount() == 1) || (countSiblings(
+                    dbc,
+                    dbc.currentProject().getUuid(),
+                    resource.getResourceId()) == 1));
+            } else {
+                resOp = true;
+            }
+        }
+
+        if (!firstSibling) {
+            if (resOp) {
+                return;
+            }
+            if (m_resOp.contains(resource.getResourceId())) {
+                return;
+            }
+        }
+
+        // read the offline version numbers
+        Map versions = readVersions(
+            dbc,
+            dbc.currentProject().getUuid(),
+            resource.getResourceId(),
+            resource.getStructureId());
+        int strVersion = ((Integer)versions.get("structure")).intValue();
+        int resVersion = ((Integer)versions.get("resource")).intValue();
+
+        if (resOp) {
+            if (resource.getSiblingCount() > 1) {
+                m_resOp.add(resource.getResourceId());
+            }
+            resVersion++;
+        }
+        if (!resOp) {
+            strVersion++;
+        }
+
+        try {
+            if (resOp) {
+                // update the resource version
+                Query q = m_sqlManager.createQuery(
+                    dbc,
+                    CmsProject.ONLINE_PROJECT_ID,
+                    C_RESOURCES_UPDATE_RESOURCE_VERSION);
+                q.setParameter(1, resource.getResourceId().toString());
+                List<I_CmsDAOResources> res = q.getResultList();
+                
+                for(I_CmsDAOResources r:res){
+                	r.setResourceVersion(resVersion) ;
+                }
+            }
+            if (!resOp || strState.isNew()) {
+                // update the structure version
+                Query q = m_sqlManager.createQuery(
+                    dbc,
+                    CmsProject.ONLINE_PROJECT_ID,
+                    C_RESOURCES_UPDATE_STRUCTURE_VERSION);
+                q.setParameter(1, resource.getStructureId().toString());
+                List<I_CmsDAOStructure> res = q.getResultList();
+                
+                for(I_CmsDAOStructure s:res){
+                	s.setStructureVersion(strVersion) ;
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readChildResources(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsResource, boolean, boolean)
+     */
+    public List readChildResources(
+        CmsDbContext dbc,
+        CmsProject currentProject,
+        CmsResource resource,
+        boolean getFolders,
+        boolean getFiles) throws CmsDataAccessException {
+
+        List result = new ArrayList();
+        CmsUUID projectId = currentProject.getUuid();
+
+        String resourceTypeClause;
+        if (getFolders && getFiles) {
+            resourceTypeClause = null;
+        } else if (getFolders) {
+            resourceTypeClause = m_sqlManager.readQuery(projectId, C_RESOURCES_GET_SUBRESOURCES_GET_FOLDERS);
+        } else {
+            resourceTypeClause = m_sqlManager.readQuery(projectId, C_RESOURCES_GET_SUBRESOURCES_GET_FILES);
+        }
+        StringBuffer query = new StringBuffer();
+        query.append(m_sqlManager.readQuery(projectId, C_RESOURCES_GET_SUBRESOURCES));
+        if (resourceTypeClause != null) {
+            query.append(' ');
+            query.append(resourceTypeClause);
+        }
+
+        try {
+            Query q = m_sqlManager.createQueryFromJPQL(dbc, query.toString());
+            q.setParameter(1, resource.getStructureId().toString());
+            List<Object[]> res = q.getResultList();
+            I_CmsDAOResources r ;
+            for (Object[] o:res) {
+            	r = (I_CmsDAOResources) o[0] ;
+                long size = r.getResourceSize();
+                if (CmsFolder.isFolderSize(size)) {
+                    result.add(createFolder(o, projectId, false));
+                } else {
+                    result.add(createFile(o, projectId, false));
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        // sort result in memory, this is to avoid DB dependencies in the result order
+        Collections.sort(result, CmsResource.COMPARE_ROOT_PATH_IGNORE_CASE_FOLDERS_FIRST);
+        return result;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readContent(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public byte[] readContent(CmsDbContext dbc, CmsUUID projectId, CmsUUID resourceId) throws CmsDataAccessException {
+
+        byte[] byteRes = null;
+        boolean resourceExists = false ;
+
+        try {
+            if (projectId.equals(CmsProject.ONLINE_PROJECT_ID)) {
+            	// ONLINE PROJECT
+                Query q = m_sqlManager.createQuery(dbc, projectId, C_ONLINE_FILES_CONTENT);
+                q.setParameter(1, resourceId.toString()) ;
+                try{
+                	byteRes = ((CmsDAOContents) q.getSingleResult()).getFileContent() ;
+                	resourceExists = true ;
+                } catch(NoResultException e){
+                	// do nothing
+                }
+            } else {
+            	// OFFLINE PROJECT
+            	CmsDAOOfflineContents c = dbc.getEntityManager().
+            		find(CmsDAOOfflineContents.class, resourceId) ;
+            	if(c != null){
+            		byteRes = c.getFileContent() ;
+            		resourceExists = true ;
+            	}
+            	
+            }
+
+            if(!resourceExists){
+            	throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                        Messages.ERR_READ_CONTENT_WITH_RESOURCE_ID_2,
+                        resourceId,
+                        Boolean.valueOf(projectId.equals(CmsProject.ONLINE_PROJECT_ID))));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return byteRes;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readFolder(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public CmsFolder readFolder(CmsDbContext dbc, CmsUUID projectId, CmsUUID folderId) throws CmsDataAccessException {
+
+        CmsFolder folder = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_READBYID);
+            q.setParameter(1, folderId.toString());
+            try{
+            	Object[] o = (Object[]) q.getSingleResult() ;
+            	folder = createFolder(o, projectId, true);
+            } catch(NoResultException e){
+            	throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                        Messages.ERR_READ_FOLDER_WITH_ID_1,
+                        folderId));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return folder;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readFolder(org.opencms.db.CmsDbContext, CmsUUID, java.lang.String)
+     */
+    public CmsFolder readFolder(CmsDbContext dbc, CmsUUID projectId, String folderPath) throws CmsDataAccessException {
+
+        CmsFolder folder = null;
+
+        folderPath = CmsFileUtil.removeTrailingSeparator(folderPath);
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_READ);
+
+            q.setParameter(1, folderPath);
+            
+            try{
+            	Object[] o = (Object[]) q.getSingleResult() ;
+            	folder = createFolder(o, projectId, true);
+            } catch(NoResultException e){
+            	throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                        Messages.ERR_READ_FOLDER_1,
+                        dbc.removeSiteRoot(folderPath)));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return folder;
+
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readParentFolder(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public CmsFolder readParentFolder(CmsDbContext dbc, CmsUUID projectId, CmsUUID structureId)
+    throws CmsDataAccessException {
+
+        CmsFolder parent = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_READ_PARENT_BY_ID);
+            q.setParameter(1, structureId.toString());
+
+            try{
+            	Object[] o = (Object[]) q.getSingleResult() ;
+            	parent = new CmsFolder(createResource(o, projectId));
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return parent;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readPropertyDefinition(org.opencms.db.CmsDbContext, java.lang.String, CmsUUID)
+     */
+    public CmsPropertyDefinition readPropertyDefinition(CmsDbContext dbc, String name, CmsUUID projectId)
+    throws CmsDataAccessException {
+
+        CmsPropertyDefinition propDef = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_PROPERTYDEF_READ);
+            q.setParameter(1, name);
+            
+            try{
+            	I_CmsDAOPropertyDef pd = (I_CmsDAOPropertyDef) q.getSingleResult() ;
+            	propDef = new CmsPropertyDefinition(
+                        new CmsUUID(pd.getPropertyDefId()),
+                        pd.getPropertyDefName(),
+                        CmsPropertyDefinition.CmsPropertyType.valueOf(pd.getPropertyDefType()));
+            } catch(NoResultException e){
+            	throw new CmsDbEntryNotFoundException(Messages.get().container(
+                        Messages.ERR_NO_PROPERTYDEF_WITH_NAME_1,
+                        name));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return propDef;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readPropertyDefinitions(org.opencms.db.CmsDbContext, CmsUUID)
+     */
+    public List readPropertyDefinitions(CmsDbContext dbc, CmsUUID projectId) throws CmsDataAccessException {
+
+        ArrayList propertyDefinitions = new ArrayList();
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_PROPERTYDEF_READALL);
+
+            List<I_CmsDAOPropertyDef>res = q.getResultList();
+            for (I_CmsDAOPropertyDef pd:res) {
+                propertyDefinitions.add(new CmsPropertyDefinition(
+                    new CmsUUID(pd.getPropertyDefId()),
+                    pd.getPropertyDefName(),
+                    CmsPropertyDefinition.CmsPropertyType.valueOf(pd.getPropertyDefType())));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return propertyDefinitions;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readPropertyObject(org.opencms.db.CmsDbContext, java.lang.String, org.opencms.file.CmsProject, org.opencms.file.CmsResource)
+     */
+    public CmsProperty readPropertyObject(CmsDbContext dbc, String key, CmsProject project, CmsResource resource)
+    throws CmsDataAccessException {
+
+        String propertyValue = null;
+        int mappingType = -1;
+        CmsProperty property = null;
+        int resultSize = 0;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project.getUuid(), C_PROPERTIES_READ);
+
+            q.setParameter(1, key);
+            q.setParameter(2, resource.getStructureId().toString());
+            q.setParameter(3, resource.getResourceId().toString());
+            List<Object[]> res = q.getResultList() ;
+
+            for (Object[] o:res) {
+                if (resultSize >= 2) {
+                    throw new CmsDbConsistencyException(Messages.get().container(
+                        Messages.ERR_TOO_MANY_PROPERTIES_3,
+                        key,
+                        resource.getRootPath(),
+                        new Integer(resultSize)));
+                }
+
+                if (property == null) {
+                    property = new CmsProperty();
+                    property.setName(key);
+                }
+
+                propertyValue = (String) o[0];
+                mappingType = CmsDataTypeUtil.numberToInt((Number) o[1]) ;
+
+                if (mappingType == CmsProperty.STRUCTURE_RECORD_MAPPING) {
+                    property.setStructureValue(propertyValue);
+                } else if (mappingType == CmsProperty.RESOURCE_RECORD_MAPPING) {
+                    property.setResourceValue(propertyValue);
+                } else {
+                    throw new CmsDbConsistencyException(Messages.get().container(
+                        Messages.ERR_UNKNOWN_PROPERTY_VALUE_MAPPING_3,
+                        resource.getRootPath(),
+                        new Integer(mappingType),
+                        key));
+                }
+
+                resultSize++;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return (property != null) ? property : CmsProperty.getNullProperty();
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readPropertyObjects(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsResource)
+     */
+    public List readPropertyObjects(CmsDbContext dbc, CmsProject project, CmsResource resource)
+    throws CmsDataAccessException {
+
+        int mappingType = -1;
+        Map propertyMap = new HashMap();
+
+        String propertyKey;
+        String propertyValue;
+        CmsProperty property;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project.getUuid(), C_PROPERTIES_READALL);
+            q.setParameter(1, resource.getStructureId().toString());
+            q.setParameter(2, resource.getResourceId().toString());
+            List<Object[]> res = q.getResultList();
+
+            for (Object[] o:res) {
+                propertyKey = null;
+                propertyValue = null;
+                mappingType = -1;
+
+                propertyKey = (String) o[0] ;
+                propertyValue = (String) o[1] ;
+                mappingType = CmsDataTypeUtil.numberToInt((Number) o[2]) ;
+
+                property = (CmsProperty)propertyMap.get(propertyKey);
+                if (property == null) {
+                    // there doesn't exist a property object for this key yet
+                    property = new CmsProperty();
+                    property.setName(propertyKey);
+                    propertyMap.put(propertyKey, property);
+                }
+
+                if (mappingType == CmsProperty.STRUCTURE_RECORD_MAPPING) {
+                    // this property value is mapped to a structure record
+                    property.setStructureValue(propertyValue);
+                } else if (mappingType == CmsProperty.RESOURCE_RECORD_MAPPING) {
+                    // this property value is mapped to a resource record
+                    property.setResourceValue(propertyValue);
+                } else {
+                    throw new CmsDbConsistencyException(Messages.get().container(
+                        Messages.ERR_UNKNOWN_PROPERTY_VALUE_MAPPING_3,
+                        resource.getRootPath(),
+                        new Integer(mappingType),
+                        propertyKey));
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return new ArrayList(propertyMap.values());
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readRelations(org.opencms.db.CmsDbContext, CmsUUID, CmsResource, org.opencms.relations.CmsRelationFilter)
+     */
+    public List readRelations(CmsDbContext dbc, CmsUUID projectId, CmsResource resource, CmsRelationFilter filter)
+    throws CmsDataAccessException {
+
+    	if ((dbc.getRequestContext() != null) && (dbc.getRequestContext().getAttribute(REQ_ATTR_RESOURCE_OUS) != null)) {
+            return getResourceOus(dbc, projectId, resource);
+        }
+    	Set relations = new HashSet();
+
+        try {
+            if (filter.isSource()) {
+                List params = new ArrayList(7);
+
+                StringBuffer queryBuf = new StringBuffer(256);
+                queryBuf.append(m_sqlManager.readQuery(projectId, C_READ_RELATIONS));
+                queryBuf.append(prepareRelationConditions(projectId, filter, resource, params, true));
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug(queryBuf.toString());
+                }
+
+                Query q = m_sqlManager.createQueryFromJPQL(dbc, queryBuf.toString());
+                for (int i = 0; i < params.size(); i++) {
+                	q.setParameter(i+1, params.get(i)) ;
+                }
+                List<I_CmsDAOResourceRelations> res = q.getResultList() ;
+                for (I_CmsDAOResourceRelations rr:res) {
+                    relations.add(internalReadRelation(rr));
+                }
+            }
+
+            if (filter.isTarget()) {
+                List params = new ArrayList(7);
+
+                StringBuffer queryBuf = new StringBuffer(256);
+                queryBuf.append(m_sqlManager.readQuery(projectId, C_READ_RELATIONS));
+                queryBuf.append(prepareRelationConditions(projectId, filter, resource, params, false));
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug(queryBuf.toString());
+                }
+
+                Query q = m_sqlManager.createQueryFromJPQL(dbc, queryBuf.toString());
+                for (int i = 0; i < params.size(); i++) {
+                	q.setParameter(i+1, params.get(i)) ;
+                }
+                List<I_CmsDAOResourceRelations> res = q.getResultList() ;
+                for (I_CmsDAOResourceRelations rr:res) {
+                    relations.add(internalReadRelation(rr));
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        List result = new ArrayList(relations);
+        Collections.sort(result, CmsRelation.COMPARATOR);
+        return result;
+    }
+    
+    /**
+     * Returns all organizational units for the given resource.<p>
+     * 
+     * @param dbc the database context
+     * @param projectId the id of the project
+     * @param resource the resource
+     * 
+     * @return a list of {@link org.opencms.security.CmsOrganizationalUnit} objects
+     * 
+     * @throws CmsDbSqlException if something goes wrong
+     */
+    protected List getResourceOus(CmsDbContext dbc, CmsUUID projectId, CmsResource resource) throws CmsDataAccessException {
+
+        List ous = new ArrayList();
+        String resName = resource.getRootPath();
+        if (resource.isFolder() && !resName.endsWith("/")) {
+            resName += "/";
+        }
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_READ_RESOURCE_OUS);
+            q.setParameter(1, CmsRelationType.OU_RESOURCE.getId());
+            q.setParameter(2, resName);
+            List<I_CmsDAOResourceRelations> res = q.getResultList() ;
+            for(I_CmsDAOResourceRelations rr:res) {
+                CmsRelation rel = internalReadRelation(rr);
+                try {
+                    ous.add(m_driverManager.readOrganizationalUnit(dbc, rel.getSourcePath().substring(
+                        CmsUserDriver.ORGUNIT_BASE_FOLDER.length())));
+                } catch (CmsException e) {
+                    // should never happen
+                    if (LOG.isErrorEnabled()) {
+                        LOG.error(e.getLocalizedMessage(), e);
+                    }
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        return ous;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readResource(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.util.CmsUUID, boolean)
+     */
+    public CmsResource readResource(CmsDbContext dbc, CmsUUID projectId, CmsUUID structureId, boolean includeDeleted)
+    throws CmsDataAccessException {
+
+        CmsResource resource = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_READBYID);
+
+            q.setParameter(1, structureId.toString());
+            
+            try{
+            	Object[] o = (Object[]) q.getSingleResult() ;
+            	resource = createResource(o, projectId);
+            } catch(NoResultException e){
+            	throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                        Messages.ERR_READ_RESOURCE_WITH_ID_1,
+                        structureId));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        // check if this resource is marked as deleted and if we are allowed to return a deleted resource
+        if ((resource != null) && resource.getState().isDeleted() && !includeDeleted) {
+            throw new CmsVfsException(Messages.get().container(
+                Messages.ERR_READ_DELETED_RESOURCE_1,
+                dbc.removeSiteRoot(resource.getRootPath())));
+        }
+
+        return resource;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readResource(org.opencms.db.CmsDbContext, CmsUUID, java.lang.String, boolean)
+     */
+    public CmsResource readResource(CmsDbContext dbc, CmsUUID projectId, String path, boolean includeDeleted)
+    throws CmsDataAccessException {
+
+        CmsResource resource = null;
+
+        // must remove trailing slash
+        path = CmsFileUtil.removeTrailingSeparator(path);
+        boolean endsWithSlash = path.endsWith("/");
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_READ);
+
+            q.setParameter(1, path);
+            
+            try{
+            	Object[] o = (Object[]) q.getSingleResult() ;
+            	resource = createResource(o, projectId);
+            	
+            	// check if the resource is a file, it is not allowed to end with a "/" then
+                if (endsWithSlash && resource.isFile()) {
+                    throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                        Messages.ERR_READ_RESOURCE_1,
+                        dbc.removeSiteRoot(path + "/")));
+                }
+            } catch(NoResultException e){
+            	throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                        Messages.ERR_READ_RESOURCE_1,
+                        dbc.removeSiteRoot(path)));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        // check if this resource is marked as deleted and if we are allowed to return a deleted resource
+        if ((resource != null) && resource.getState().isDeleted() && !includeDeleted) {
+            throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                Messages.ERR_READ_DELETED_RESOURCE_1,
+                dbc.removeSiteRoot(resource.getRootPath())));
+        }
+
+        return resource;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readResources(org.opencms.db.CmsDbContext, CmsUUID, CmsResourceState, int)
+     */
+    public List readResources(CmsDbContext dbc, CmsUUID projectId, CmsResourceState state, int mode)
+    throws CmsDataAccessException {
+
+        List result = new ArrayList();
+        Query q ;
+
+        try {
+            if (mode == CmsDriverManager.READMODE_MATCHSTATE) {
+                q = m_sqlManager.createQuery(
+                    dbc,
+                    projectId,
+                    C_RESOURCES_GET_RESOURCE_IN_PROJECT_WITH_STATE);
+                
+                q.setParameter(1, projectId.toString());
+                q.setParameter(2, state.getState());
+                q.setParameter(3, state.getState());
+                q.setParameter(4, state.getState());
+                q.setParameter(5, state.getState());
+            } else if (mode == CmsDriverManager.READMODE_UNMATCHSTATE) {
+                q = m_sqlManager.createQuery(
+                	dbc, 
+                    projectId,
+                    C_RESOURCES_GET_RESOURCE_IN_PROJECT_WITHOUT_STATE);
+                q.setParameter(1, projectId.toString());
+                q.setParameter(2, state.getState());
+                q.setParameter(3, state.getState());
+            } else {
+                q = m_sqlManager.createQuery(
+                    dbc,
+                    projectId,
+                    C_RESOURCES_GET_RESOURCE_IN_PROJECT_IGNORE_STATE);
+                q.setParameter(1, projectId.toString());
+            }
+
+            List<Object[]> res = q.getResultList();
+            for (Object[] o:res) {
+                CmsResource resource = createResource(o, projectId);
+                result.add(resource);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return result;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readResourcesForPrincipalACE(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.util.CmsUUID)
+     */
+    public List readResourcesForPrincipalACE(CmsDbContext dbc, CmsProject project, CmsUUID principalId)
+    throws CmsDataAccessException {
+
+        CmsResource currentResource = null;
+        List resources = new ArrayList();
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project, C_SELECT_RESOURCES_FOR_PRINCIPAL_ACE);
+
+            q.setParameter(1, principalId.toString());
+            List<Object[]> res = q.getResultList() ;
+
+            for (Object[] o:res) {
+                currentResource = createFile(o, project.getUuid(), false);
+                resources.add(currentResource);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return resources;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readResourcesForPrincipalAttr(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.util.CmsUUID)
+     */
+    public List readResourcesForPrincipalAttr(CmsDbContext dbc, CmsProject project, CmsUUID principalId)
+    throws CmsDataAccessException {
+
+        CmsResource currentResource = null;
+        List resources = new ArrayList();
+
+        try {
+        	// JPQL does not support UNION clause
+        	String[] queries= {C_SELECT_RESOURCES_FOR_PRINCIPAL_ATTR1, C_SELECT_RESOURCES_FOR_PRINCIPAL_ATTR2} ;
+        	String[] parameters = {principalId.toString(), principalId.toString()} ;
+        	Query q ;
+        	
+        	for(int i=0 ; i<queries.length; i++){
+        		q = m_sqlManager.createQuery(dbc, project, queries[i]);
+        		q.setParameter(1, parameters[i]) ;
+        		List<Object[]> res = q.getResultList() ;
+        		for(Object[] o:res){
+        			currentResource = createFile(o, project.getUuid(), false);
+                    resources.add(currentResource);
+        		}
+        	}
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return resources;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readResourcesWithProperty(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.util.CmsUUID, String, String)
+     */
+    public List readResourcesWithProperty(
+        CmsDbContext dbc,
+        CmsUUID projectId,
+        CmsUUID propertyDef,
+        String path,
+        String value) throws CmsDataAccessException {
+
+        List resources = new ArrayList();
+        Query q ;
+        List<Object[]> res = new ArrayList<Object[]>() ;
+        try {
+            if (value == null) {
+            	String[] queries = {C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF1, C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF2} ;
+            	for(int i=0; i< queries.length ; i++){
+            		q = m_sqlManager.createQuery(dbc, projectId, queries[i]) ;
+            		q.setParameter(1,propertyDef.toString());
+            		q.setParameter(2, path + "%");
+            		res.addAll(q.getResultList()) ;
+            	}
+            } else {
+            	String[] queries = {C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF_VALUE1, C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF_VALUE2} ;
+            	String[][] param = { {propertyDef.toString(), path + "%", "%" + value + "%"},
+            						 {propertyDef.toString(), "%" + path + "%", value + "%"} } ;
+            
+            	for(int i=0 ; i < queries.length ; i++ ){
+            		q = m_sqlManager.createQuery(dbc, projectId, queries[i]) ;
+            		for(int b=0 ; b < param[0].length ; b++){
+            			q.setParameter(b+1, param[i][b]) ;
+            		}
+            		res.addAll(q.getResultList()) ;
+            	}
+            }
+
+            for (Object[] o:res) {
+                CmsResource resource = createResource(o, projectId);
+                resources.add(resource);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return resources;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readResourceTree(org.opencms.db.CmsDbContext, CmsUUID, java.lang.String, int, CmsResourceState, long, long, long, long, long, long, int)
+     */
+    public List readResourceTree(
+        CmsDbContext dbc,
+        CmsUUID projectId,
+        String parentPath,
+        int type,
+        CmsResourceState state,
+        long lastModifiedAfter,
+        long lastModifiedBefore,
+        long releasedAfter,
+        long releasedBefore,
+        long expiredAfter,
+        long expiredBefore,
+        int mode) throws CmsDataAccessException {
+
+        List result = new ArrayList();
+
+        StringBuffer conditions = new StringBuffer();
+        List params = new ArrayList(5);
+
+        // prepare the selection criteria
+        prepareProjectCondition(projectId, mode, conditions, params);
+        prepareResourceCondition(projectId, mode, conditions);
+        prepareTypeCondition(projectId, type, mode, conditions, params);
+        prepareTimeRangeCondition(projectId, lastModifiedAfter, lastModifiedBefore, conditions, params);
+        prepareReleasedTimeRangeCondition(projectId, releasedAfter, releasedBefore, conditions, params);
+        prepareExpiredTimeRangeCondition(projectId, expiredAfter, expiredBefore, conditions, params);
+        preparePathCondition(projectId, parentPath, mode, conditions, params);
+        prepareStateCondition(projectId, state, mode, conditions, params);
+
+        // now read matching resources within the subtree 
+
+        try {
+            StringBuffer queryBuf = new StringBuffer(256);
+            queryBuf.append(m_sqlManager.readQuery(projectId, C_RESOURCES_READ_TREE));
+            queryBuf.append(conditions);
+            queryBuf.append(" ");
+            queryBuf.append(m_sqlManager.readQuery(projectId, C_RESOURCES_ORDER_BY_PATH));
+            Query q = m_sqlManager.createQueryFromJPQL(dbc, queryBuf.toString());
+            for (int i = 0; i < params.size(); i++) {
+            	q.setParameter(i+1, params.get(i)) ;
+            }
+
+            List<Object[]> res = q.getResultList() ;
+            for (Object[] o:res) {
+                CmsResource resource = createResource(o, projectId);
+                result.add(resource);
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return result;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readSiblings(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.file.CmsResource, boolean)
+     */
+    public List readSiblings(CmsDbContext dbc, CmsUUID projectId, CmsResource resource, boolean includeDeleted)
+    throws CmsDataAccessException {
+
+        CmsResource currentResource = null;
+        List vfsLinks = new ArrayList();
+        Query q ;
+
+        try {
+            if (includeDeleted) {
+                q = m_sqlManager.createQuery(dbc, projectId, C_SELECT_VFS_SIBLINGS);
+            } else {
+                q = m_sqlManager.createQuery(dbc, projectId, C_SELECT_NONDELETED_VFS_SIBLINGS);
+            }
+
+            q.setParameter(1, resource.getResourceId().toString());
+            List<Object[]> res = q.getResultList() ;
+
+            for (Object[] o:res) {
+                currentResource = createFile(o, projectId, false);
+                vfsLinks.add(currentResource);
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return vfsLinks;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#readVersions(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, org.opencms.util.CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public Map readVersions(CmsDbContext dbc, CmsUUID projectId, CmsUUID resourceId, CmsUUID structureId)
+    throws CmsDataAccessException {
+
+        int structureVersion = -1;
+        int resourceVersion = -1;
+        Query q ;
+
+        try {
+            // read the offline version numbers, first for the resource entry
+            q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_READ_VERSION_RES);
+            q.setParameter(1, resourceId.toString());
+            try{
+            	resourceVersion = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+
+            // then for the structure entry
+            q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_READ_VERSION_STR);
+            q.setParameter(1, structureId.toString());
+            
+            try{
+            	structureVersion = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        Map result = new HashMap();
+        result.put("structure", new Integer(structureVersion));
+        result.put("resource", new Integer(resourceVersion));
+        return result;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#removeFile(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.file.CmsResource)
+     */
+    public void removeFile(CmsDbContext dbc, CmsUUID projectId, CmsResource resource) throws CmsDataAccessException {
+
+        int siblingCount = 0;
+
+        try {
+        	EntityManager em = dbc.getEntityManager() ;
+            // delete the structure record
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_STRUCTURE_DELETE_BY_STRUCTUREID);
+            q.setParameter(1, resource.getStructureId().toString());
+            List res = q.getResultList() ;
+            for(I_CmsDAOStructure ps:((List<I_CmsDAOStructure>) res)){
+            	em.remove(ps) ;
+            }
+
+            // count the references to the resource
+            siblingCount = countSiblings(dbc, projectId, resource.getResourceId());
+
+            if (siblingCount > 0) {
+                // update the link Count
+                q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_UPDATE_SIBLING_COUNT);
+                q.setParameter(1, resource.getResourceId().toString());
+                List<I_CmsDAOResources> ress = q.getResultList();
+                
+                for(I_CmsDAOResources r:ress){
+                	r.setSiblingCount(siblingCount) ;
+                }
+
+                // update the resource flags
+                q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_UPDATE_FLAGS);
+                q.setParameter(1, resource.getResourceId().toString());
+                List<I_CmsDAOResources> resf = q.getResultList();
+                
+                for(I_CmsDAOResources r:resf){
+                	r.setResourceFlags(resource.getFlags()) ;
+                }
+
+            } else {
+                // if not referenced any longer, also delete the resource and the content record
+                q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_DELETE_BY_RESOURCEID);
+                q.setParameter(1, resource.getResourceId().toString());
+                res = q.getResultList();
+                for(I_CmsDAOResources pr:((List<I_CmsDAOResources>)res)){
+                	em.remove(pr) ;
+                }
+
+                // if online we have to keep historical content
+                if (!projectId.equals(CmsProject.ONLINE_PROJECT_ID) || (dbc.getProjectId() != null)) {
+                    // delete content records with this resource id
+                	CmsDAOOfflineContents contents = em.find(CmsDAOOfflineContents.class, resource.getResourceId().toString()) ;
+                	if(contents != null){
+                		em.remove(contents) ;
+                	}
+                } else {
+                    // put the online content in the history 
+                    q = m_sqlManager.createQuery(dbc, C_ONLINE_CONTENTS_HISTORY);
+                    q.setParameter(1, resource.getResourceId().toString());
+                    res = q.getResultList();
+                    for(CmsDAOContents c:((List<CmsDAOContents>)res)){
+                    	c.setOnlineFlag(0) ;
+                    }
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#removeFolder(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsResource)
+     */
+    public void removeFolder(CmsDbContext dbc, CmsProject currentProject, CmsResource resource)
+    throws CmsDataAccessException {
+
+        if ((dbc.getRequestContext() != null)
+            && (dbc.getRequestContext().getAttribute(REQ_ATTR_CHECK_PERMISSIONS) != null)) {
+            // only check write permissions
+            checkWritePermissionsInFolder(dbc, resource);
+            return;
+        }
+
+        // check if the folder has any resources in it
+        Iterator childResources = readChildResources(dbc, currentProject, resource, true, true).iterator();
+
+        CmsUUID projectId = CmsProject.ONLINE_PROJECT_ID;
+        if (currentProject.isOnlineProject()) {
+            projectId = CmsUUID.getOpenCmsUUID(); // HACK: to get an offline project id
+        }
+
+        // collect the names of the resources inside the folder, excluding the moved resources
+        StringBuffer errorResNames = new StringBuffer(128);
+        while (childResources.hasNext()) {
+            CmsResource errorRes = (CmsResource)childResources.next();
+            // if deleting offline, or not moved, or just renamed inside the deleted folder
+            // so, it may remain some orphan online entries for moved resources
+            // which will be fixed during the publishing of the moved resources
+            boolean error = !currentProject.isOnlineProject();
+            if (!error) {
+                try {
+                    String originalPath = m_driverManager.getVfsDriver().readResource(
+                        dbc,
+                        projectId,
+                        errorRes.getRootPath(),
+                        true).getRootPath();
+                    error = originalPath.equals(errorRes.getRootPath())
+                        || originalPath.startsWith(resource.getRootPath());
+                } catch (CmsVfsResourceNotFoundException e) {
+                    // ignore
+                }
+            }
+            if (error) {
+                if (errorResNames.length() != 0) {
+                    errorResNames.append(", ");
+                }
+                errorResNames.append("[" + dbc.removeSiteRoot(errorRes.getRootPath()) + "]");
+            }
+        }
+
+        // the current implementation only deletes empty folders
+        if (CmsStringUtil.isNotEmptyOrWhitespaceOnly(errorResNames.toString())) {
+
+            throw new CmsVfsException(Messages.get().container(
+                Messages.ERR_DELETE_NONEMTY_FOLDER_2,
+                dbc.removeSiteRoot(resource.getRootPath()),
+                errorResNames.toString()));
+        }
+        internalRemoveFolder(dbc, currentProject, resource);
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#replaceResource(org.opencms.db.CmsDbContext, org.opencms.file.CmsResource, byte[], int)
+     */
+    public void replaceResource(CmsDbContext dbc, CmsResource newResource, byte[] resContent, int newResourceType)
+    throws CmsDataAccessException {
+
+        if (resContent == null) {
+            // nothing to do
+            return;
+        }
+
+        try {
+            // write the file content
+            writeContent(dbc, newResource.getResourceId(), resContent);
+
+            // update the resource record
+            Query q = m_sqlManager.createQuery(dbc, dbc.currentProject(), C_RESOURCE_REPLACE);
+            q.setParameter(1, newResource.getResourceId().toString());
+            List<I_CmsDAOResources> res = q.getResultList();
+            
+            for(I_CmsDAOResources r:res){
+            	r.setResourceType(newResourceType) ;
+            	r.setResourceSize(resContent.length) ;
+            	r.setDateContent(System.currentTimeMillis()) ;
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#transferResource(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsResource, org.opencms.util.CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public void transferResource(
+        CmsDbContext dbc,
+        CmsProject project,
+        CmsResource resource,
+        CmsUUID createdUser,
+        CmsUUID lastModifiedUser) throws CmsDataAccessException {
+
+        if (createdUser == null) {
+            createdUser = resource.getUserCreated();
+        }
+        if (lastModifiedUser == null) {
+            lastModifiedUser = resource.getUserLastModified();
+        }
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project, C_RESOURCES_TRANSFER_RESOURCE);
+            q.setParameter(1, resource.getResourceId().toString());
+            List<I_CmsDAOResources> res = q.getResultList();
+            
+            for(I_CmsDAOResources r:res){
+            	r.setUserCreated(createdUser.toString()) ;
+            	r.setUserLastModified(lastModifiedUser.toString()) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#updateRelations(CmsDbContext, CmsProject, CmsResource)
+     */
+    public void updateRelations(CmsDbContext dbc, CmsProject onlineProject, CmsResource offlineResource)
+    throws CmsDataAccessException {
+
+        // delete online relations
+        m_driverManager.getVfsDriver().deleteRelations(
+            dbc,
+            onlineProject.getUuid(),
+            offlineResource,
+            CmsRelationFilter.TARGETS);
+
+        CmsUUID projectId;
+        if (!dbc.getProjectId().isNullUUID()) {
+            projectId = CmsProject.ONLINE_PROJECT_ID;
+        } else {
+            projectId = dbc.currentProject().getUuid();
+        }
+
+        // copy offline to online relations
+        CmsUUID dbcProjectId = dbc.getProjectId();
+        dbc.setProjectId(CmsUUID.getNullUUID());
+        Iterator itRelations = m_driverManager.getVfsDriver().readRelations(
+            dbc,
+            projectId,
+            offlineResource,
+            CmsRelationFilter.TARGETS).iterator();
+        dbc.setProjectId(dbcProjectId);
+        while (itRelations.hasNext()) {
+            m_driverManager.getVfsDriver().createRelation(dbc, onlineProject.getUuid(), (CmsRelation)itRelations.next());
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#validateResourceIdExists(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public boolean validateResourceIdExists(CmsDbContext dbc, CmsUUID projectId, CmsUUID resourceId)
+    throws CmsDataAccessException {
+
+        boolean exists = false;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_READ_RESOURCE_STATE);
+            q.setParameter(1, resourceId.toString());
+
+            try{
+            	int state = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            	exists = true ;
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return exists;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#validateStructureIdExists(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.util.CmsUUID)
+     */
+    public boolean validateStructureIdExists(CmsDbContext dbc, CmsUUID projectId, CmsUUID structureId)
+    throws CmsDataAccessException {
+
+        boolean found = false;
+        int count = 0;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_SELECT_STRUCTURE_ID);
+            q.setParameter(1, structureId.toString());
+            
+            try{
+            	count = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()) ;
+            	found = (count == 1);
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return found;
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#writeContent(org.opencms.db.CmsDbContext, org.opencms.util.CmsUUID, byte[])
+     */
+    public void writeContent(CmsDbContext dbc, CmsUUID resourceId, byte[] content) throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, dbc.currentProject(), C_OFFLINE_CONTENTS_UPDATE);
+            // update the file content in the database.
+            q.setParameter(1, resourceId.toString());
+            List<CmsDAOOfflineContents> res = q.getResultList();
+            
+            for(CmsDAOOfflineContents oc:res){
+            	oc.setFileContent(content) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#writeLastModifiedProjectId(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, CmsUUID, org.opencms.file.CmsResource)
+     */
+    public void writeLastModifiedProjectId(CmsDbContext dbc, CmsProject project, CmsUUID projectId, CmsResource resource)
+    throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, project, C_RESOURCES_UPDATE_PROJECT_LASTMODIFIED);
+            q.setParameter(1, resource.getResourceId().toString());
+            List<I_CmsDAOResources> res = q.getResultList();
+            
+            for(I_CmsDAOResources r:res){
+            	r.setProjectLastModified(projectId.toString()) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#writePropertyObject(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsResource, org.opencms.file.CmsProperty)
+     */
+    public void writePropertyObject(CmsDbContext dbc, CmsProject project, CmsResource resource, CmsProperty property)
+    throws CmsDataAccessException {
+
+        // TODO: check if we need autocreation for link property definition types too
+        CmsPropertyDefinition propertyDefinition = null;
+        try {
+            // read the property definition
+            propertyDefinition = readPropertyDefinition(dbc, property.getName(), project.getUuid());
+        } catch (CmsDbEntryNotFoundException e) {
+            if (property.autoCreatePropertyDefinition()) {
+                propertyDefinition = createPropertyDefinition(
+                    dbc,
+                    project.getUuid(),
+                    property.getName(),
+                    CmsPropertyDefinition.TYPE_NORMAL);
+                try {
+                    readPropertyDefinition(dbc, property.getName(), CmsProject.ONLINE_PROJECT_ID);
+                } catch (CmsDataAccessException e1) {
+                    createPropertyDefinition(
+                        dbc,
+                        CmsProject.ONLINE_PROJECT_ID,
+                        property.getName(),
+                        CmsPropertyDefinition.TYPE_NORMAL);
+                }
+                try {
+                    m_driverManager.getHistoryDriver().readPropertyDefinition(dbc, property.getName());
+                } catch (CmsDataAccessException e1) {
+                    m_driverManager.getHistoryDriver().createPropertyDefinition(
+                        dbc,
+                        property.getName(),
+                        CmsPropertyDefinition.TYPE_NORMAL);
+                }
+            } else {
+                throw new CmsDbEntryNotFoundException(Messages.get().container(
+                    Messages.ERR_NO_PROPERTYDEF_WITH_NAME_1,
+                    property.getName()));
+            }
+        }
+
+        try {
+            // read the existing property to test if we need the 
+            // insert or update query to write a property value
+            CmsProperty existingProperty = readPropertyObject(dbc, propertyDefinition.getName(), project, resource);
+
+            if (existingProperty.isIdentical(property)) {
+                // property already has the identical values set, no write required
+                return;
+            }
+
+            for (int i = 0; i < 2; i++) {
+                int mappingType = -1;
+                String value = null;
+                CmsUUID id = null;
+                boolean existsPropertyValue = false;
+                boolean deletePropertyValue = false;
+
+                // 1) take any required decisions to choose and fill the correct SQL query
+
+                if (i == 0) {
+                    // write/delete the *structure value* on the first cycle
+                    if ((existingProperty.getStructureValue() != null) && property.isDeleteStructureValue()) {
+                        // this property value is marked to be deleted
+                        deletePropertyValue = true;
+                    } else {
+                        value = property.getStructureValue();
+                        if (CmsStringUtil.isEmptyOrWhitespaceOnly(value)) {
+                            // no structure value set or the structure value is an empty string, 
+                            // continue with the resource value
+                            continue;
+                        }
+                    }
+
+                    // set the vars to be written to the database
+                    mappingType = CmsProperty.STRUCTURE_RECORD_MAPPING;
+                    id = resource.getStructureId();
+                    existsPropertyValue = existingProperty.getStructureValue() != null;
+                } else {
+                    // write/delete the *resource value* on the second cycle
+                    if ((existingProperty.getResourceValue() != null) && property.isDeleteResourceValue()) {
+                        // this property value is marked to be deleted
+                        deletePropertyValue = true;
+                    } else {
+                        value = property.getResourceValue();
+                        if (CmsStringUtil.isEmptyOrWhitespaceOnly(value)) {
+                            // no resource value set or the resource value is an empty string,
+                            // break out of the loop
+                            break;
+                        }
+                    }
+
+                    // set the vars to be written to the database
+                    mappingType = CmsProperty.RESOURCE_RECORD_MAPPING;
+                    id = resource.getResourceId();
+                    existsPropertyValue = existingProperty.getResourceValue() != null;
+                }
+
+                // 2) execute the SQL query
+                	Query q ;
+                    if (!deletePropertyValue) {
+                        // insert/update the property value                    
+                        if (existsPropertyValue) {
+                            // {structure|resource} property value already exists- use update statement
+                            q = m_sqlManager.createQuery(dbc, project.getUuid(), C_PROPERTIES_UPDATE);
+                            q.setParameter(1, id.toString());
+                            q.setParameter(2, mappingType);
+                            q.setParameter(3, propertyDefinition.getId().toString());
+                            List<I_CmsDAOProperties> res = q.getResultList() ;
+                            
+                            for(I_CmsDAOProperties p:res){
+                            	p.setPropertyValue(m_sqlManager.validateEmpty(value)) ;
+                            }
+                        } else {
+                            // {structure|resource} property value doesn't exist- use create statement
+                        	I_CmsDAOProperties p = 
+                        		CmsProject.isOnlineProject(project.getUuid())
+                        		? new CmsDAOOnlineProperties() 
+                        		: new CmsDAOOfflineProperties() ;
+                        		
+                        	p.setPropertyId(new CmsUUID().toString()) ;
+                        	p.setPropertyDefId(propertyDefinition.getId().toString()) ;
+                        	p.setPropertyMappingId(id.toString()) ;
+                        	p.setPropertyMappingType(mappingType) ;
+                        	p.setPropertyValue(m_sqlManager.validateEmpty(value)) ;
+                        	
+                            dbc.getEntityManager().persist(p) ;
+                        }
+                    } else {
+                        // {structure|resource} property value marked as deleted- use delete statement
+                        q = m_sqlManager.createQuery(dbc, project.getUuid(), C_PROPERTIES_DELETE);
+                        q.setParameter(1, propertyDefinition.getId().toString());
+                        q.setParameter(2, id.toString());
+                        q.setParameter(3, mappingType);
+                        List<I_CmsDAOProperties> res = q.getResultList() ;
+                        EntityManager em = dbc.getEntityManager() ; 
+                        for(I_CmsDAOProperties pr:res){
+                        	em.remove(pr) ;
+                        }
+                    }
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#writePropertyObjects(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsResource, java.util.List)
+     */
+    public void writePropertyObjects(CmsDbContext dbc, CmsProject project, CmsResource resource, List properties)
+    throws CmsDataAccessException {
+
+        CmsProperty property = null;
+
+        for (int i = 0; i < properties.size(); i++) {
+            property = (CmsProperty)properties.get(i);
+            writePropertyObject(dbc, project, resource, property);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#writeResource(org.opencms.db.CmsDbContext, CmsUUID, org.opencms.file.CmsResource, int)
+     */
+    public void writeResource(CmsDbContext dbc, CmsUUID projectId, CmsResource resource, int changed)
+    throws CmsDataAccessException {
+
+        // validate the resource length
+        internalValidateResourceLength(resource);
+
+        String resourcePath = CmsFileUtil.removeTrailingSeparator(resource.getRootPath());
+
+        // this task is split into two statements because some DBs (e.g. Oracle) doesn't support multi-table updates
+
+        long resourceDateModified;
+
+        if (resource.isTouched()) {
+            resourceDateModified = resource.getDateLastModified();
+        } else {
+            resourceDateModified = System.currentTimeMillis();
+        }
+
+        CmsResourceState structureState = resource.getState();
+        CmsResourceState resourceState = resource.getState();
+        CmsResourceState structureStateOld = internalReadStructureState(dbc, projectId, resource);
+        CmsResourceState resourceStateOld = internalReadResourceState(dbc, projectId, resource);
+        CmsUUID projectLastModified = projectId;
+
+        if (changed == CmsDriverManager.UPDATE_RESOURCE_STATE) {
+            resourceState = resourceStateOld;
+            resourceState = (resourceState.isNew() ? CmsResource.STATE_NEW : CmsResource.STATE_CHANGED);
+            structureState = structureStateOld;
+        } else if (changed == CmsDriverManager.UPDATE_STRUCTURE_STATE) {
+            structureState = structureStateOld;
+            structureState = (structureState.isNew() ? CmsResource.STATE_NEW : CmsResource.STATE_CHANGED);
+        } else if (changed == CmsDriverManager.NOTHING_CHANGED) {
+            projectLastModified = resource.getProjectLastModified();
+        } else {
+            resourceState = resourceStateOld;
+            resourceState = (resourceState.isNew() ? CmsResource.STATE_NEW : CmsResource.STATE_CHANGED);
+            structureState = structureStateOld;
+            structureState = (structureState.isNew() ? CmsResource.STATE_NEW : CmsResource.STATE_CHANGED);
+        }
+
+        try {
+        	Query q ;
+            if (changed != CmsDriverManager.UPDATE_STRUCTURE_STATE) {
+                // if the resource was unchanged
+                q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_UPDATE_RESOURCES);
+                q.setParameter(1, resource.getResourceId().toString());
+                
+                List<I_CmsDAOResources> res = q.getResultList();
+                
+                for(I_CmsDAOResources r:res){
+                	r.setResourceType(resource.getTypeId()) ;
+                	r.setResourceFlags(resource.getFlags()) ;
+                	r.setDateLastModified(resourceDateModified) ;
+                	r.setUserLastModified(resource.getUserLastModified().toString()) ;
+                	r.setResourceState(resourceState.getState()) ;
+                	r.setResourceSize(resource.getLength()) ;
+                	r.setDateContent(resource.getDateContent()) ;
+                	r.setProjectLastModified(projectLastModified.toString()) ;
+                	r.setSiblingCount(countSiblings(dbc, projectId, resource.getResourceId())) ;
+                }
+            } else {
+                q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_UPDATE_RESOURCES_WITHOUT_STATE);
+                q.setParameter(1, resource.getResourceId().toString());
+                List<I_CmsDAOResources> res = q.getResultList();
+                
+                for(I_CmsDAOResources r:res){
+                	r.setResourceType(resource.getTypeId()) ;
+                	r.setResourceFlags(resource.getFlags()) ;
+                	r.setDateLastModified(resourceDateModified) ;
+                	r.setUserLastModified(resource.getUserLastModified().toString()) ;
+                	r.setResourceSize(resource.getLength()) ;
+                	r.setDateContent(resource.getDateContent()) ;
+                	r.setProjectLastModified(projectLastModified.toString()) ;
+                	r.setSiblingCount(countSiblings(dbc, projectId, resource.getResourceId())) ;
+                }
+            }
+
+            // read the parent id
+            String parentId = internalReadParentId(dbc, projectId, resourcePath);
+
+            // update the structure
+            q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_UPDATE_STRUCTURE);
+            q.setParameter(1, resource.getStructureId().toString());
+            List<I_CmsDAOStructure> res = q.getResultList();
+            
+            for(I_CmsDAOStructure s:res){
+            	s.setResourceId(resource.getResourceId().toString()) ;
+            	s.setResourcePath(resourcePath) ;
+            	s.setStructureState(structureState.getState()) ;
+            	s.setDateReleased(resource.getDateReleased()) ;
+            	s.setDateExpired(resource.getDateExpired()) ;
+            	s.setParentId(parentId) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * @see org.opencms.db.I_CmsVfsDriver#writeResourceState(org.opencms.db.CmsDbContext, org.opencms.file.CmsProject, org.opencms.file.CmsResource, int, boolean)
+     */
+    public void writeResourceState(
+        CmsDbContext dbc,
+        CmsProject project,
+        CmsResource resource,
+        int changed,
+        boolean isPublishing) throws CmsDataAccessException {
+
+        if (project.getUuid().equals(CmsProject.ONLINE_PROJECT_ID)) {
+            return;
+        }
+
+        try {
+            Query q ;
+
+            if (changed == CmsDriverManager.UPDATE_RESOURCE_PROJECT) {
+                q = m_sqlManager.createQuery(dbc, project, C_RESOURCES_UPDATE_RESOURCE_PROJECT);
+                q.setParameter(1, resource.getResourceId().toString());
+                List<I_CmsDAOResources> resr = q.getResultList();
+                
+                for(I_CmsDAOResources r:resr){
+                	r.setResourceFlags(resource.getFlags()) ;
+                	r.setProjectLastModified(project.getUuid().toString()) ;
+                }
+            }
+
+            if (changed == CmsDriverManager.UPDATE_RESOURCE) {
+                q = m_sqlManager.createQuery(dbc, project, C_RESOURCES_UPDATE_RESOURCE_STATELASTMODIFIED);
+                q.setParameter(1, resource.getResourceId().toString());
+                List<I_CmsDAOResources> res = q.getResultList();
+                
+                for(I_CmsDAOResources r:res){
+                	r.setResourceState(resource.getState().getState()) ;
+                	r.setDateLastModified(resource.getDateLastModified()) ;
+                	r.setUserLastModified(resource.getUserLastModified().toString()) ;
+                	r.setProjectLastModified(project.getUuid().toString()) ;
+                }
+            }
+
+            if ((changed == CmsDriverManager.UPDATE_RESOURCE_STATE) || (changed == CmsDriverManager.UPDATE_ALL)) {
+                q = m_sqlManager.createQuery(dbc, project, C_RESOURCES_UPDATE_RESOURCE_STATE);
+                q.setParameter(1, resource.getResourceId().toString());
+                List<I_CmsDAOResources> res = q.getResultList();
+                
+                for(I_CmsDAOResources r:res){
+                	r.setResourceState(resource.getState().getState()) ;
+                	r.setProjectLastModified(project.getUuid().toString()) ;
+                }
+            }
+
+            if ((changed == CmsDriverManager.UPDATE_STRUCTURE)
+                || (changed == CmsDriverManager.UPDATE_ALL)
+                || (changed == CmsDriverManager.UPDATE_STRUCTURE_STATE)) {
+                q = m_sqlManager.createQuery(dbc, project, C_RESOURCES_UPDATE_STRUCTURE_STATE);
+                q.setParameter(1, resource.getStructureId().toString());
+                List<I_CmsDAOStructure> res = q.getResultList();
+                
+                for(I_CmsDAOStructure s:res){
+                	s.setStructureState(resource.getState().getState()) ;
+                }
+            }
+
+            if ((changed == CmsDriverManager.UPDATE_STRUCTURE) || (changed == CmsDriverManager.UPDATE_ALL)) {
+                q = m_sqlManager.createQuery(dbc, project, C_RESOURCES_UPDATE_RELEASE_EXPIRED);
+                q.setParameter(1, resource.getStructureId().toString());
+                List<I_CmsDAOStructure> res = q.getResultList();
+                
+                for(I_CmsDAOStructure s:res){
+                	s.setDateReleased(resource.getDateReleased()) ;
+                	s.setDateExpired(resource.getDateExpired()) ;
+                }
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        if (isPublishing) {
+            internalUpdateVersions(dbc, resource);
+        }
+    }
+    
+    /**
+     * Checks that the current user has write permissions for all subresources of the given folder.<p>
+     * 
+     * @param dbc the current database context
+     * @param folder the folder to check
+     * 
+     * @throws CmsDataAccessException if something goes wrong 
+     */
+    protected void checkWritePermissionsInFolder(CmsDbContext dbc, CmsResource folder) throws CmsDataAccessException {
+
+        CmsUUID projectId = dbc.getRequestContext().currentProject().getUuid();
+
+        // first read all subresources with ACEs
+        List resources = new ArrayList();
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_READ_WITH_ACE_1);
+            q.setParameter(1, folder.getRootPath() + "%");
+            
+            List<Object[]> res = q.getResultList() ;
+
+            for (Object[] o:res) {
+                resources.add(createResource(o, projectId));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        // check current user write permission for each of these resources
+        Iterator itResources = resources.iterator();
+        while (itResources.hasNext()) {
+            CmsResource resource = (CmsResource)itResources.next();
+            try {
+                m_driverManager.getSecurityManager().checkPermissions(
+                    dbc.getRequestContext(),
+                    resource,
+                    CmsPermissionSet.ACCESS_WRITE,
+                    false,
+                    CmsResourceFilter.ALL);
+            } catch (CmsException e) {
+                throw new CmsDataAccessException(e.getMessageContainer(), e);
+            }
+        }
+
+        // then check for possible jsp pages without permissions
+        CmsResourceFilter filter = CmsResourceFilter.ALL.addRequireType(CmsResourceTypeJsp.getStaticTypeId());
+        itResources = readResourceTree(
+            dbc,
+            projectId,
+            folder.getRootPath(),
+            filter.getType(),
+            filter.getState(),
+            filter.getModifiedAfter(),
+            filter.getModifiedBefore(),
+            filter.getReleaseAfter(),
+            filter.getReleaseBefore(),
+            filter.getExpireAfter(),
+            filter.getExpireBefore(),
+            CmsDriverManager.READMODE_INCLUDE_TREE).iterator();
+        while (itResources.hasNext()) {
+            CmsResource resource = (CmsResource)itResources.next();
+            try {
+                m_driverManager.getSecurityManager().checkPermissions(
+                    dbc.getRequestContext(),
+                    resource,
+                    CmsPermissionSet.ACCESS_WRITE,
+                    false,
+                    CmsResourceFilter.ALL);
+            } catch (CmsException e) {
+                throw new CmsDataAccessException(e.getMessageContainer(), e);
+            }
+        }
+    }
+    
+    /**
+     * Escapes the database wildcards within the resource path.<p>
+     * 
+     * This method is required to ensure chars in the resource path that have a special 
+     * meaning in SQL (for example "_", which is the "any char" operator) are escaped.<p>
+     * 
+     * It will escape the following chars: 
+     * <ul>
+     * <li>"_" to "|_"</li>
+     * </ul>
+     * 
+     * @param path the resource path
+     * @return the escaped resource path
+     */
+    protected String escapeDbWildcard(String path) {
+
+        return CmsStringUtil.substitute(path, "_", "|_");
+    }
+    
+    /**
+     * Returns the count of properties for a property definition.<p>
+     * 
+     * @param dbc the current database context
+     * @param propertyDefinition the property definition to test
+     * @param projectId the ID of the current project
+     * 
+     * @return the amount of properties for a property definition
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected int internalCountProperties(CmsDbContext dbc, CmsPropertyDefinition propertyDefinition, CmsUUID projectId)
+    throws CmsDataAccessException {
+
+        int count = 0;
+
+        try {
+            // create statement
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_PROPERTIES_READALL_COUNT);
+            q.setParameter(1, propertyDefinition.getId().toString());
+            
+            try{
+            	count = CmsDataTypeUtil.numberToInt((Number) q.getSingleResult());
+            } catch(NoResultException e){
+            	throw new CmsDbConsistencyException(Messages.get().container(
+                        Messages.ERR_COUNTING_PROPERTIES_1,
+                        propertyDefinition.getName()));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return count;
+    }
+    
+    /**
+     * Returns the parent id of the given resource.<p>
+     * 
+     * @param dbc the current database context
+     * @param projectId the current project id 
+     * @param resourcename the resource name to read the parent id for
+     * 
+     * @return  the parent id of the given resource
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected String internalReadParentId(CmsDbContext dbc, CmsUUID projectId, String resourcename)
+    throws CmsDataAccessException {
+
+        if ("/".equalsIgnoreCase(resourcename)) {
+            return CmsUUID.getNullUUID().toString();
+        }
+
+        String parent = CmsResource.getParentFolder(resourcename);
+        parent = CmsFileUtil.removeTrailingSeparator(parent);
+
+        String parentId = null;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RESOURCES_READ_PARENT_STRUCTURE_ID);
+            q.setParameter(1, parent);
+            
+            try{
+            	parentId = (String) q.getSingleResult() ;
+            } catch(NoResultException e){
+                throw new CmsVfsResourceNotFoundException(Messages.get().container(
+                        Messages.ERR_READ_PARENT_ID_1,
+                        dbc.removeSiteRoot(resourcename)));
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+
+        return parentId;
+    }
+    
+    /**
+     * Creates a new {@link CmsRelation} object from the given result set entry.<p>
+     * 
+     * @param res the result set 
+     *  
+     * @return the new {@link CmsRelation} object
+     */
+    protected CmsRelation internalReadRelation(I_CmsDAOResourceRelations rr) {
+
+        CmsUUID sourceId = new CmsUUID(rr.getRelationSourceId());
+        String sourcePath = rr.getRelationSourcePath();
+        CmsUUID targetId = new CmsUUID(rr.getRelationTargetId());
+        String targetPath = rr.getRelationTargetPath();
+        int type = rr.getRelationType();
+        return new CmsRelation(sourceId, sourcePath, targetId, targetPath, CmsRelationType.valueOf(type));
+    }
+    
+    /**
+     * Returns the resource state of the given resource.<p>
+     * 
+     * @param dbc the database context
+     * @param projectId the id of the project
+     * @param resource the resource to read the resource state for
+     * 
+     * @return the resource state of the given resource
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected CmsResourceState internalReadResourceState(CmsDbContext dbc, CmsUUID projectId, CmsResource resource) 
+    	throws CmsDataAccessException {
+
+        CmsResourceState state = CmsResource.STATE_KEEP;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_READ_RESOURCE_STATE);
+            q.setParameter(1, resource.getResourceId().toString());
+            
+            try{
+            	state = CmsResourceState.valueOf(CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()));
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }            
+        
+        return state;
+    }
+    
+    /**
+     * Returns the structure state of the given resource.<p>
+     * 
+     * @param dbc the database context
+     * @param projectId the id of the project
+     * @param resource the resource to read the structure state for
+     * 
+     * @return the structure state of the given resource
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected CmsResourceState internalReadStructureState(CmsDbContext dbc, CmsUUID projectId, CmsResource resource) 
+    	throws CmsDataAccessException {
+
+        CmsResourceState state = CmsResource.STATE_KEEP;
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_READ_STRUCTURE_STATE);
+            q.setParameter(1, resource.getStructureId().toString());
+            
+            try{
+            	state = CmsResourceState.valueOf(CmsDataTypeUtil.numberToInt((Number) q.getSingleResult()));
+            } catch(NoResultException e){
+            	// do nothing
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+        
+        return state;
+    }
+    
+    /**
+     * Removes a resource physically in the database.<p>
+     * 
+     * @param dbc the current database context
+     * @param currentProject the current project
+     * @param resource the folder to remove
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected void internalRemoveFolder(CmsDbContext dbc, CmsProject currentProject, CmsResource resource) 
+    	throws CmsDataAccessException {
+
+        try {
+            // delete the structure record            
+            Query q = m_sqlManager.createQuery(dbc, currentProject, C_STRUCTURE_DELETE_BY_STRUCTUREID);
+            q.setParameter(1, resource.getStructureId().toString());
+            I_CmsDAOStructure s = (I_CmsDAOStructure) q.getSingleResult();
+            dbc.getEntityManager().remove(s) ;
+            
+            // delete the resource record
+            q = m_sqlManager.createQuery(dbc, currentProject, C_RESOURCES_DELETE_BY_RESOURCEID);
+            q.setParameter(1, resource.getResourceId().toString());
+            I_CmsDAOResources r = (I_CmsDAOResources) q.getSingleResult();
+            dbc.getEntityManager().remove(r) ;
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * Updates the offline version numbers.<p>
+     *  
+     * @param dbc the current database context
+     * @param resource the resource to update the version number for
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected void internalUpdateVersions(CmsDbContext dbc, CmsResource resource) 
+    	throws CmsDataAccessException {
+
+        if (dbc.getRequestContext() == null) {
+            // no needed during initialization 
+            return;
+        }
+        if (dbc.currentProject().isOnlineProject()) {
+            // this method is supposed to be used only in the offline project
+            return;
+        }
+
+        // read the online version numbers
+        Map onlineVersions = readVersions(
+            dbc,
+            CmsProject.ONLINE_PROJECT_ID,
+            resource.getResourceId(),
+            resource.getStructureId());
+        int onlineStructureVersion = ((Integer)onlineVersions.get("structure")).intValue();
+        int onlineResourceVersion = ((Integer)onlineVersions.get("resource")).intValue();
+
+        try {
+            // update the resource version
+            Query q = m_sqlManager.createQuery(dbc, dbc.currentProject(), C_RESOURCES_UPDATE_RESOURCE_VERSION);
+            q.setParameter(1, resource.getResourceId().toString());
+            List<I_CmsDAOResources> res = q.getResultList();
+            
+            for(I_CmsDAOResources r:res){
+            	r.setResourceVersion(onlineResourceVersion) ;
+            }
+
+            // update the structure version
+            q = m_sqlManager.createQuery(dbc, dbc.currentProject(), C_RESOURCES_UPDATE_STRUCTURE_VERSION);
+            q.setParameter(1, resource.getStructureId().toString());
+            List<I_CmsDAOStructure> ress = q.getResultList();
+            
+            for(I_CmsDAOStructure s:ress){
+            	s.setStructureVersion(onlineStructureVersion) ;
+            }
+
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * Validates that the length setting of a resource is always correct.<p>
+     * 
+     * Files need to have a resource length of >= 0, while folders require
+     * a resource length of -1.<p>
+     * 
+     * @param resource the resource to check the length for
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected void internalValidateResourceLength(CmsResource resource) 
+    	throws CmsDataAccessException {
+
+        if (resource.isFolder() && (resource.getLength() == -1)) {
+            return;
+        }
+
+        if (resource.isFile() && (resource.getLength() >= 0)) {
+            return;
+        }
+
+        throw new CmsDataAccessException(Messages.get().container(
+            Messages.ERR_INVALID_RESOURCE_LENGTH_2,
+            new Integer(resource.getLength()),
+            resource.getRootPath()));
+    }
+    
+    /**
+     * Moves all relations of a resource to the new path.<p>
+     * 
+     * @param dbc the current database context
+     * @param projectId the id of the project to apply the changes 
+     * @param structureId the structure id of the resource to apply the changes to
+     * @param rootPath the new root path
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected void moveRelations(CmsDbContext dbc, CmsUUID projectId, CmsUUID structureId, String rootPath) 
+    	throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_MOVE_RELATIONS_SOURCE);
+            q.setParameter(1, structureId.toString());
+            List<I_CmsDAOResourceRelations> res = q.getResultList();
+            I_CmsDAOResourceRelations newR ;
+            EntityManager em = dbc.getEntityManager() ;
+            for(I_CmsDAOResourceRelations rr:res){
+            	newR = CmsProject.isOnlineProject(projectId) 
+            		? new CmsDAOOnlineResourceRelations()
+            		: new CmsDAOOfflineResourceRelations() ;
+            		
+            	newR.setRelationSourceId(rr.getRelationSourceId()) ;
+            	newR.setRelationSourcePath(rootPath) ;
+            	newR.setRelationTargetId(rr.getRelationTargetId()) ;
+            	newR.setRelationTargetPath(rr.getRelationTargetPath()) ;
+            	newR.setRelationType(rr.getRelationType()) ;
+            		
+            	em.remove(rr) ;
+            	em.persist(newR) ;
+            }
+
+            q = m_sqlManager.createQuery(dbc, projectId, C_MOVE_RELATIONS_TARGET);
+            q.setParameter(1, structureId.toString());
+            res = q.getResultList();
+            for(I_CmsDAOResourceRelations rr:res){
+            	newR = CmsProject.isOnlineProject(projectId) 
+            		? new CmsDAOOnlineResourceRelations()
+            		: new CmsDAOOfflineResourceRelations() ;
+            		
+            	newR.setRelationSourceId(rr.getRelationSourceId()) ;
+            	newR.setRelationSourcePath(rr.getRelationSourcePath()) ;
+            	newR.setRelationTargetId(rr.getRelationTargetId()) ;
+            	newR.setRelationTargetPath(rootPath) ;
+            	newR.setRelationType(rr.getRelationType()) ;
+            		
+            	em.remove(rr) ;
+            	em.persist(newR) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * Appends the appropriate selection criteria related with the expiration date.<p>
+     * 
+     * @param projectId the id of the project of the resources
+     * @param startTime the start time
+     * @param endTime the end time
+     * @param conditions buffer to append the selection criteria
+     * @param params list to append the selection parameters
+     */
+    protected void prepareExpiredTimeRangeCondition(
+        CmsUUID projectId,
+        long startTime,
+        long endTime,
+        StringBuffer conditions,
+        List params) {
+
+        if (startTime > 0L) {
+            // READ_IGNORE_TIME: if NOT set, add condition to match expired date against startTime
+            conditions.append(BEGIN_INCLUDE_CONDITION);
+            conditions.append(m_sqlManager.readQuery(projectId, C_STRUCTURE_SELECT_BY_DATE_EXPIRED_AFTER));
+            conditions.append(END_CONDITION);
+            params.add(Long.valueOf(startTime));
+        }
+
+        if (endTime > 0L) {
+            // READ_IGNORE_TIME: if NOT set, add condition to match expired date against endTime
+            conditions.append(BEGIN_INCLUDE_CONDITION);
+            conditions.append(m_sqlManager.readQuery(projectId, C_STRUCTURE_SELECT_BY_DATE_EXPIRED_BEFORE));
+            conditions.append(END_CONDITION);
+            params.add(Long.valueOf(endTime));
+        }
+    }
+    
+    /**
+     * Appends the appropriate selection criteria related with the parentPath.<p>
+     * 
+     * @param projectId the id of the project of the resources
+     * @param parent the parent path or UUID (if mode is C_READMODE_EXCLUDE_TREE)
+     * @param mode the selection mode
+     * @param conditions buffer to append the selection criteria
+     * @param params list to append the selection parameters
+     */
+    protected void preparePathCondition(CmsUUID projectId, String parent, int mode, StringBuffer conditions, List params) {
+
+        if (parent == CmsDriverManager.READ_IGNORE_PARENT) {
+            // parent can be ignored
+            return;
+        }
+
+        if ((mode & CmsDriverManager.READMODE_EXCLUDE_TREE) > 0) {
+            // only return immediate children - use UUID optimization            
+            conditions.append(BEGIN_INCLUDE_CONDITION);
+            conditions.append(m_sqlManager.readQuery(projectId, C_RESOURCES_SELECT_BY_PARENT_UUID));
+            conditions.append(END_CONDITION);
+            params.add(parent);
+            return;
+        }
+
+        if ("/".equalsIgnoreCase(parent)) {
+            // if root folder is parent, no additional condition is needed since all resources match anyway
+            return;
+        }
+
+        // add condition to read path subtree        
+        conditions.append(BEGIN_INCLUDE_CONDITION);
+        conditions.append(m_sqlManager.readQuery(projectId, C_RESOURCES_SELECT_BY_PATH_PREFIX));
+        conditions.append(END_CONDITION);
+        params.add(CmsFileUtil.addTrailingSeparator(escapeDbWildcard(parent)) + "%");
+    }
+    
+    /**
+     * Appends the appropriate selection criteria related with the projectId.<p>
+     * 
+     * @param projectId the id of the project of the resources
+     * @param mode the selection mode
+     * @param conditions buffer to append the selection criteria
+     * @param params list to append the selection parameters
+     */
+    protected void prepareProjectCondition(CmsUUID projectId, int mode, StringBuffer conditions, List params) {
+
+        if ((mode & CmsDriverManager.READMODE_INCLUDE_PROJECT) > 0) {
+            // C_READMODE_INCLUDE_PROJECT: add condition to match the PROJECT_ID
+            conditions.append(BEGIN_INCLUDE_CONDITION);
+            conditions.append(m_sqlManager.readQuery(projectId, C_RESOURCES_SELECT_BY_PROJECT_LASTMODIFIED));
+            conditions.append(END_CONDITION);
+            params.add(projectId.toString());
+        }
+    }
+    
+    /**
+     * Build the whole WHERE sql statement part for the given relation filter.<p>
+     * 
+     * @param projectId the current project id
+     * @param filter the filter
+     * @param resource the resource (may be null, if you want to delete all relations for the resource in the filter)
+     * @param params the parameter values (return parameter)
+     * @param checkSource if the query is for the source relations 
+     * 
+     * @return the WHERE sql statement part string
+     */
+    protected String prepareRelationConditions(
+        CmsUUID projectId,
+        CmsRelationFilter filter,
+        CmsResource resource,
+        List params,
+        boolean checkSource) {
+
+        StringBuffer conditions = new StringBuffer(128);
+        params.clear(); // be sure the parameters list is clear
+
+        // source or target filter
+        if (filter.isSource() || filter.isTarget()) {
+            // source or target id filter from resource
+            if (resource != null) {
+                conditions.append(BEGIN_CONDITION);
+                if (filter.isSource() && checkSource) {
+                    if (!filter.isIncludeSubresources()) {
+                        conditions.append(m_sqlManager.readQuery(projectId, C_RELATION_FILTER_TARGET_ID));
+                        params.add(resource.getStructureId().toString());
+                    } else {
+                        conditions.append(m_sqlManager.readQuery(projectId, C_RELATION_FILTER_TARGET_PATH));
+                        params.add(resource.getRootPath() + '%');
+                    }
+                } else if (filter.isTarget() && !checkSource) {
+                    if (!filter.isIncludeSubresources()) {
+                        conditions.append(m_sqlManager.readQuery(projectId, C_RELATION_FILTER_SOURCE_ID));
+                        params.add(resource.getStructureId().toString());
+                    } else {
+                        conditions.append(m_sqlManager.readQuery(projectId, C_RELATION_FILTER_SOURCE_PATH));
+                        params.add(resource.getRootPath() + '%');
+                    }
+                }
+                conditions.append(END_CONDITION);
+            }
+
+            // target or source id filter from filter parameter
+            if (filter.getStructureId() != null) {
+                if (conditions.length() == 0) {
+                    conditions.append(BEGIN_CONDITION);
+                } else {
+                    conditions.append(BEGIN_INCLUDE_CONDITION);
+                }
+
+                if (filter.isSource() && checkSource) {
+                    conditions.append(m_sqlManager.readQuery(projectId, C_RELATION_FILTER_SOURCE_ID));
+                    params.add(filter.getStructureId().toString());
+                } else if (filter.isTarget() && !checkSource) {
+                    conditions.append(m_sqlManager.readQuery(projectId, C_RELATION_FILTER_TARGET_ID));
+                    params.add(filter.getStructureId().toString());
+                }
+                conditions.append(END_CONDITION);
+            }
+
+            // target or source path filter from filter parameter
+            if (CmsStringUtil.isNotEmptyOrWhitespaceOnly(filter.getPath())) {
+                if (conditions.length() == 0) {
+                    conditions.append(BEGIN_CONDITION);
+                } else {
+                    conditions.append(BEGIN_INCLUDE_CONDITION);
+                }
+
+                String queryPath = filter.getPath();
+                if (filter.isIncludeSubresources()) {
+                    queryPath += '%';
+                }
+                if (filter.isSource() && checkSource) {
+                    conditions.append(m_sqlManager.readQuery(projectId, C_RELATION_FILTER_SOURCE_PATH));
+                    params.add(queryPath);
+                } else if (filter.isTarget() && !checkSource) {
+                    conditions.append(m_sqlManager.readQuery(projectId, C_RELATION_FILTER_TARGET_PATH));
+                    params.add(queryPath);
+                }
+                conditions.append(END_CONDITION);
+            }
+        }
+
+        // relation type filter
+        Set types = filter.getTypes();
+        if (!types.isEmpty()) {
+            if (conditions.length() == 0) {
+                conditions.append(BEGIN_CONDITION);
+            } else {
+                conditions.append(BEGIN_INCLUDE_CONDITION);
+            }
+            conditions.append(m_sqlManager.readQuery(projectId, C_RELATION_FILTER_TYPE));
+            conditions.append(BEGIN_CONDITION);
+            Iterator it = types.iterator();
+            while (it.hasNext()) {
+                CmsRelationType type = (CmsRelationType)it.next();
+                conditions.append("?");
+                params.add(Integer.valueOf(type.getId()));
+                if (it.hasNext()) {
+                    conditions.append(", ");
+                }
+            }
+            conditions.append(END_CONDITION);
+            conditions.append(END_CONDITION);
+        }
+        return conditions.toString();
+    }
+    
+    /**
+     * Appends the appropriate selection criteria related with the released date.<p>
+     * 
+     * @param projectId the id of the project
+     * @param startTime the start time
+     * @param endTime the stop time
+     * @param conditions buffer to append the selection criteria
+     * @param params list to append the selection parameters
+     */
+    protected void prepareReleasedTimeRangeCondition(
+        CmsUUID projectId,
+        long startTime,
+        long endTime,
+        StringBuffer conditions,
+        List params) {
+
+        if (startTime > 0L) {
+            // READ_IGNORE_TIME: if NOT set, add condition to match released date against startTime
+            conditions.append(BEGIN_INCLUDE_CONDITION);
+            conditions.append(m_sqlManager.readQuery(projectId, C_STRUCTURE_SELECT_BY_DATE_RELEASED_AFTER));
+            conditions.append(END_CONDITION);
+            params.add(Long.valueOf(startTime));
+        }
+
+        if (endTime > 0L) {
+            // READ_IGNORE_TIME: if NOT set, add condition to match released date against endTime
+            conditions.append(BEGIN_INCLUDE_CONDITION);
+            conditions.append(m_sqlManager.readQuery(projectId, C_STRUCTURE_SELECT_BY_DATE_RELEASED_BEFORE));
+            conditions.append(END_CONDITION);
+            params.add(Long.valueOf(endTime));
+        }
+    }
+    
+    /**
+     * Appends the appropriate selection criteria related with the read mode.<p>
+     * 
+     * @param projectId the id of the project of the resources
+     * @param mode the selection mode
+     * @param conditions buffer to append the selection criteria
+     */
+    protected void prepareResourceCondition(CmsUUID projectId, int mode, StringBuffer conditions) {
+
+        if ((mode & CmsDriverManager.READMODE_ONLY_FOLDERS) > 0) {
+            // C_READMODE_ONLY_FOLDERS: add condition to match only folders
+            conditions.append(BEGIN_INCLUDE_CONDITION);
+            conditions.append(m_sqlManager.readQuery(projectId, C_RESOURCES_SELECT_ONLY_FOLDERS));
+            conditions.append(END_CONDITION);
+        } else if ((mode & CmsDriverManager.READMODE_ONLY_FILES) > 0) {
+            // C_READMODE_ONLY_FILES: add condition to match only files
+            conditions.append(BEGIN_INCLUDE_CONDITION);
+            conditions.append(m_sqlManager.readQuery(projectId, C_RESOURCES_SELECT_ONLY_FILES));
+            conditions.append(END_CONDITION);
+        }
+    }
+    
+    /**
+     * Appends the appropriate selection criteria related with the resource state.<p>
+     * 
+     * @param projectId the id of the project of the resources
+     * @param state the resource state
+     * @param mode the selection mode
+     * @param conditions buffer to append the selection criteria
+     * @param params list to append the selection parameters
+     */
+    protected void prepareStateCondition(
+        CmsUUID projectId,
+        CmsResourceState state,
+        int mode,
+        StringBuffer conditions,
+        List params) {
+
+        if (state != null) {
+            if ((mode & CmsDriverManager.READMODE_EXCLUDE_STATE) > 0) {
+                // C_READ_MODIFIED_STATES: add condition to match against any state but not given state
+                conditions.append(BEGIN_EXCLUDE_CONDITION);
+            } else {
+                // otherwise add condition to match against given state if necessary
+                conditions.append(BEGIN_INCLUDE_CONDITION);
+            }
+            conditions.append(m_sqlManager.readQuery(projectId, C_RESOURCES_SELECT_BY_RESOURCE_STATE));
+            conditions.append(END_CONDITION);
+            params.add(Integer.valueOf(state.getState()));
+            params.add(Integer.valueOf(state.getState()));
+        }
+    }
+    
+    /**
+     * Appends the appropriate selection criteria related with the date of the last modification.<p>
+     * 
+     * @param projectId the id of the project of the resources
+     * @param startTime start of the time range
+     * @param endTime end of the time range
+     * @param conditions buffer to append the selection criteria
+     * @param params list to append the selection parameters
+     */
+    protected void prepareTimeRangeCondition(
+        CmsUUID projectId,
+        long startTime,
+        long endTime,
+        StringBuffer conditions,
+        List params) {
+
+        if (startTime > 0L) {
+            // READ_IGNORE_TIME: if NOT set, add condition to match last modified date against startTime
+            conditions.append(BEGIN_INCLUDE_CONDITION);
+            conditions.append(m_sqlManager.readQuery(projectId, C_RESOURCES_SELECT_BY_DATE_LASTMODIFIED_AFTER));
+            conditions.append(END_CONDITION);
+            params.add(Long.valueOf(startTime));
+        }
+
+        if (endTime > 0L) {
+            // READ_IGNORE_TIME: if NOT set, add condition to match last modified date against endTime
+            conditions.append(BEGIN_INCLUDE_CONDITION);
+            conditions.append(m_sqlManager.readQuery(projectId, C_RESOURCES_SELECT_BY_DATE_LASTMODIFIED_BEFORE));
+            conditions.append(END_CONDITION);
+            params.add(Long.valueOf(endTime));
+        }
+    }
+    
+    /**
+     * Appends the appropriate selection criteria related with the resource type.<p>
+     * 
+     * @param projectId the id of the project of the resources
+     * @param type the resource type
+     * @param mode the selection mode
+     * @param conditions buffer to append the selection criteria
+     * @param params list to append the selection parameters
+     */
+    protected void prepareTypeCondition(CmsUUID projectId, int type, int mode, StringBuffer conditions, List params) {
+
+        if (type != CmsDriverManager.READ_IGNORE_TYPE) {
+            if ((mode & CmsDriverManager.READMODE_EXCLUDE_TYPE) > 0) {
+                // C_READ_FILE_TYPES: add condition to match against any type, but not given type
+                conditions.append(BEGIN_EXCLUDE_CONDITION);
+                conditions.append(m_sqlManager.readQuery(projectId, C_RESOURCES_SELECT_BY_RESOURCE_TYPE));
+                conditions.append(END_CONDITION);
+                params.add(Integer.valueOf(type));
+            } else {
+                //otherwise add condition to match against given type if necessary
+                conditions.append(BEGIN_INCLUDE_CONDITION);
+                conditions.append(m_sqlManager.readQuery(projectId, C_RESOURCES_SELECT_BY_RESOURCE_TYPE));
+                conditions.append(END_CONDITION);
+                params.add(Integer.valueOf(type));
+            }
+        }
+    }
+    
+    /**
+     * Repairs broken links.<p>
+     * 
+     * When a resource is created any relation pointing to it is updated to use the right id.<p>
+     * 
+     * @param dbc the current database context
+     * @param projectId the project id
+     * @param structureId the structure id of the resource that may help to repair broken links
+     * @param rootPath the path of the resource that may help to repair broken links
+     * 
+     * @throws CmsDataAccessException if something goes wrong
+     */
+    protected void repairBrokenRelations(CmsDbContext dbc, CmsUUID projectId, CmsUUID structureId, String rootPath) 
+    	throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RELATIONS_REPAIR_BROKEN);
+            q.setParameter(1, rootPath);
+            List<I_CmsDAOResourceRelations> res = q.getResultList();
+            I_CmsDAOResourceRelations newR ;
+            EntityManager em = dbc.getEntityManager() ;
+            for(I_CmsDAOResourceRelations rr:res){
+            	newR = CmsProject.isOnlineProject(projectId) 
+            		? new CmsDAOOnlineResourceRelations()
+            		: new CmsDAOOfflineResourceRelations() ;
+            		
+            	newR.setRelationSourceId(rr.getRelationSourceId()) ;
+            	newR.setRelationSourcePath(rr.getRelationSourcePath()) ;
+            	newR.setRelationTargetId(structureId.toString()) ;
+            	newR.setRelationTargetPath(rr.getRelationTargetPath()) ;
+            	newR.setRelationType(rr.getRelationType()) ;
+            		
+            	em.remove(rr) ;
+            	em.persist(newR) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    /**
+     * Updates broken links.<p>
+     * 
+     * When a resource is deleted, then the relations pointing to 
+     * the deleted resource are set to the null uuid.<p>
+     * 
+     * @param dbc the current database context
+     * @param projectId the project id
+     * @param rootPath the root path of the resource that has been deleted 
+     * 
+     * @throws CmsDataAccessException if something goes wrong 
+     */
+    protected void updateBrokenRelations(CmsDbContext dbc, CmsUUID projectId, String rootPath) 
+    	throws CmsDataAccessException {
+
+        try {
+            Query q = m_sqlManager.createQuery(dbc, projectId, C_RELATIONS_UPDATE_BROKEN);
+            q.setParameter(1, rootPath);
+            List<I_CmsDAOResourceRelations> res = q.getResultList();
+            I_CmsDAOResourceRelations newR ;
+            EntityManager em = dbc.getEntityManager() ;
+            for(I_CmsDAOResourceRelations rr:res){
+            	newR = CmsProject.isOnlineProject(projectId) 
+            		? new CmsDAOOnlineResourceRelations()
+            		: new CmsDAOOfflineResourceRelations() ;
+            		
+            	newR.setRelationSourceId(rr.getRelationSourceId()) ;
+            	newR.setRelationSourcePath(rr.getRelationSourcePath()) ;
+            	newR.setRelationTargetId("00000000-0000-0000-0000-000000000000") ;
+            	newR.setRelationTargetPath(rr.getRelationTargetPath()) ;
+            	newR.setRelationType(rr.getRelationType()) ;
+            		
+            	em.remove(rr) ;
+            	em.persist(newR) ;
+            }
+        } catch (PersistenceException e) {
+        	throw new CmsDataAccessException(Messages.get().container(
+                    Messages.ERR_JPA_PERSITENCE,
+                    e), e);
+        }
+    }
+    
+    public CmsFile createFile(ResultSet res, CmsUUID projectId) throws SQLException{
+    	LOG.error("This method is not implemented!") ;
+    	return (CmsFile) null ;
+    }
+    
+    public CmsFile createFile(ResultSet res, CmsUUID projectId, boolean hasFileContentInResultSet) throws SQLException{
+    	LOG.error("This method is not implemented!") ;
+    	return (CmsFile) null ;
+    }
+    
+    public CmsFolder createFolder(ResultSet res, CmsUUID projectId, boolean hasProjectIdInResultSet) throws SQLException{
+    	LOG.error("This method is not implemented!") ;
+    	return (CmsFolder) null ;
+    }
+    
+    public CmsResource createResource(ResultSet res, CmsUUID projectId) throws SQLException{
+    	LOG.error("This method is not implemented!") ;
+    	return (CmsResource) null ;
+    }
+}
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/Messages.java trunk/src/org/opencms/db/jpa/Messages.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/Messages.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/Messages.java	2008-09-02 11:14:29.183884150 +0300
@@ -0,0 +1,476 @@
+/*
+ * File   : $Source: /usr/local/cvs/opencms/src/org/opencms/db/generic/Messages.java,v $
+ * Date   : $Date: 2008-02-27 12:05:52 $
+ * Version: $Revision: 1.29 $
+ *
+ * This library is part of OpenCms -
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2002 - 2008 Alkacon Software GmbH (http://www.alkacon.com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about Alkacon Software GmbH, please see the
+ * company website: http://www.alkacon.com
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+package org.opencms.db.jpa;
+
+import org.opencms.i18n.A_CmsMessageBundle;
+import org.opencms.i18n.I_CmsMessageBundle;
+
+/**
+ * Convenience class to access the localized messages of this OpenCms package.<p> 
+ * 
+ * @author Thomas Weckert 
+ * @author Jan Baudisch 
+ * 
+ * @version $Revision: 1.29 $
+ * 
+ * @since 6.0.0 
+ */
+public final class Messages extends A_CmsMessageBundle {
+
+	/** Message constant for key in the resource bundle. */
+    public static final String ERR_JPA_PERSITENCE = "ERR_COUNTING_PROPERTIES_1";
+    
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_COUNTING_PROPERTIES_1 = "ERR_COUNTING_PROPERTIES_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_CREATE_SIBLING_FILE_NOT_FOUND_1 = "ERR_CREATE_SIBLING_FILE_NOT_FOUND_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_DELETE_HISTORY_VERSIONS_1 = "ERR_DELETE_HISTORY_VERSIONS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_DELETE_NONEMTY_FOLDER_2 = "ERR_DELETE_NONEMTY_FOLDER_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_DELETE_USED_PROPERTY_1 = "ERR_DELETE_USED_PROPERTY_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_ERROR_DELETING_PROPERTYDEF_1 = "ERR_ERROR_DELETING_PROPERTYDEF_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_ERROR_PUBLISHING_DELETED_FOLDER_1 = "ERR_ERROR_PUBLISHING_DELETED_FOLDER_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_ERROR_PUBLISHING_FILE_1 = "ERR_ERROR_PUBLISHING_FILE_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_ERROR_PUBLISHING_FOLDER_1 = "ERR_ERROR_PUBLISHING_FOLDER_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_GENERIC_SQL_0 = "ERR_GENERIC_SQL_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_GENERIC_SQL_1 = "ERR_GENERIC_SQL_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_GROUP_WITH_NAME_ALREADY_EXISTS_1 = "ERR_GROUP_WITH_NAME_ALREADY_EXISTS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_HISTORY_FILE_NOT_FOUND_1 = "ERR_HISTORY_FILE_NOT_FOUND_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_HISTORY_PRINCIPAL_NOT_FOUND_1 = "ERR_HISTORY_PRINCIPAL_NOT_FOUND_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_INITIALIZING_USER_DRIVER_0 = "ERR_INITIALIZING_USER_DRIVER_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_INITIALIZING_VFS_DRIVER_0 = "ERR_INITIALIZING_VFS_DRIVER_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_INVALID_DELETE_OPTION_1 = "ERR_INVALID_DELETE_OPTION_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_INVALID_RESOURCE_LENGTH_2 = "ERR_INVALID_RESOURCE_LENGTH_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_JDBC_CONN_INVALID_PROJECT_ID_1 = "ERR_JDBC_CONN_INVALID_PROJECT_ID_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_NO_ACE_FOUND_2 = "ERR_NO_ACE_FOUND_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_NO_GROUP_WITH_ID_1 = "ERR_NO_GROUP_WITH_ID_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_NO_HISTORY_PROJECT_WITH_ID_1 = "ERR_NO_HISTORY_PROJECT_WITH_ID_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_NO_HISTORY_PROJECT_WITH_TAG_ID_1 = "ERR_NO_HISTORY_PROJECT_WITH_TAG_ID_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_NO_PROJECT_WITH_ID_1 = "ERR_NO_PROJECT_WITH_ID_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_NO_PROJECT_WITH_NAME_1 = "ERR_NO_PROJECT_WITH_NAME_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_NO_PROJECTRESOURCE_1 = "ERR_NO_PROJECTRESOURCE_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_NO_PROPERTIES_FOR_PROPERTYDEF_1 = "ERR_NO_PROPERTIES_FOR_PROPERTYDEF_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_NO_PROPERTYDEF_WITH_NAME_1 = "ERR_NO_PROPERTYDEF_WITH_NAME_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_NO_USER_WITH_ID_1 = "ERR_NO_USER_WITH_ID_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_ORGUNIT_ALREADY_CONTAINS_PRINCIPAL_2 = "ERR_ORGUNIT_ALREADY_CONTAINS_PRINCIPAL_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_ORGUNIT_DOESNOT_CONTAINS_PRINCIPAL_2 = "ERR_ORGUNIT_DOESNOT_CONTAINS_PRINCIPAL_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_ORGUNIT_DOESNOT_CONTAINS_RESOURCE_2 = "ERR_ORGUNIT_DOESNOT_CONTAINS_RESOURCE_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_ORGUNIT_REMOVE_LAST_RESOURCE_2 = "ERR_ORGUNIT_REMOVE_LAST_RESOURCE_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_ORGUNIT_RESOURCE_IS_NOT_FOLDER_2 = "ERR_ORGUNIT_RESOURCE_IS_NOT_FOLDER_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_ORGUNIT_WITH_NAME_ALREADY_EXISTS_1 = "ERR_ORGUNIT_WITH_NAME_ALREADY_EXISTS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_OUT_OF_MEMORY_0 = "ERR_OUT_OF_MEMORY_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_OVERWRITE_MOVED_RESOURCE_3 = "ERR_OVERWRITE_MOVED_RESOURCE_3";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_PARENT_FOLDER_DELETED_1 = "ERR_PARENT_FOLDER_DELETED_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_PATH_NOT_IN_PARENT_ORGUNIT_SCOPE_2 = "ERR_PATH_NOT_IN_PARENT_ORGUNIT_SCOPE_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_PUBLISHLIST_DESERIALIZATION_FAILED_1 = "ERR_PUBLISHLIST_DESERIALIZATION_FAILED_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_QUERY_NOT_FOUND_1 = "ERR_QUERY_NOT_FOUND_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_CONTENT_WITH_RESOURCE_ID_2 = "ERR_READ_CONTENT_WITH_RESOURCE_ID_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_DELETED_FILE_1 = "ERR_READ_DELETED_FILE_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_DELETED_RESOURCE_1 = "ERR_READ_DELETED_RESOURCE_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_FOLDER_1 = "ERR_READ_FOLDER_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_FOLDER_WITH_ID_1 = "ERR_READ_FOLDER_WITH_ID_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_ORGUNIT_1 = "ERR_READ_ORGUNIT_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_PARENT_ID_1 = "ERR_READ_PARENT_ID_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_PUBLISH_JOB_1 = "ERR_READ_PUBLISH_JOB_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_RESOURCE_1 = "ERR_READ_RESOURCE_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_RESOURCE_VERSIONS_1 = "ERR_READ_RESOURCE_VERSIONS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READ_RESOURCE_WITH_ID_1 = "ERR_READ_RESOURCE_WITH_ID_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READING_ADDITIONAL_INFO_1 = "ERR_READING_ADDITIONAL_INFO_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READING_USER_0 = "ERR_READING_USER_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_READING_USERS_0 = "ERR_READING_USERS_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_RESOURCE_WITH_NAME_ALREADY_EXISTS_1 = "ERR_RESOURCE_WITH_NAME_ALREADY_EXISTS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_RESOURCE_WITH_NAME_CURRENTLY_CREATED_1 = "ERR_RESOURCE_WITH_NAME_CURRENTLY_CREATED_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_RESOURCENAME_TOO_LONG_2 = "ERR_RESOURCENAME_TOO_LONG_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_SERIALIZING_PUBLISHLIST_1 = "ERR_SERIALIZING_PUBLISHLIST_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_SERIALIZING_USER_DATA_1 = "ERR_SERIALIZING_USER_DATA_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_SIBLING_WITH_NAME_ALREADY_EXISTS_1 = "ERR_SIBLING_WITH_NAME_ALREADY_EXISTS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_TOO_MANY_PROPERTIES_3 = "ERR_TOO_MANY_PROPERTIES_3";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_UNKNOWN_PROPERTY_VALUE_MAPPING_3 = "ERR_UNKNOWN_PROPERTY_VALUE_MAPPING_3";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_USER_WITH_NAME_ALREADY_EXISTS_1 = "ERR_USER_WITH_NAME_ALREADY_EXISTS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_WRITING_HISTORY_OF_PROJECT_1 = "ERR_WRITING_HISTORY_OF_PROJECT_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String ERR_WRITING_TO_OUTPUT_STREAM_1 = "ERR_WRITING_TO_OUTPUT_STREAM_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String GUI_DEFAULTGROUP_OU_USERS_DESCRIPTION_1 = "GUI_DEFAULTGROUP_OU_USERS_DESCRIPTION_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String GUI_DEFAULTGROUP_ROOT_ADMINS_DESCRIPTION_0 = "GUI_DEFAULTGROUP_ROOT_ADMINS_DESCRIPTION_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String GUI_DEFAULTGROUP_ROOT_GUESTS_DESCRIPTION_0 = "GUI_DEFAULTGROUP_ROOT_GUESTS_DESCRIPTION_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String GUI_DEFAULTGROUP_ROOT_PROJMANS_DESCRIPTION_0 = "GUI_DEFAULTGROUP_ROOT_PROJMANS_DESCRIPTION_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String GUI_DEFAULTGROUP_ROOT_USERS_DESCRIPTION_0 = "GUI_DEFAULTGROUP_ROOT_USERS_DESCRIPTION_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String GUI_DEFAULTUSER_ROOT_ADMIN_DESCRIPTION_0 = "GUI_DEFAULTUSER_ROOT_ADMIN_DESCRIPTION_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String GUI_DEFAULTUSER_ROOT_DELETED_DESCRIPTION_0 = "GUI_DEFAULTUSER_ROOT_DELETED_DESCRIPTION_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String GUI_DEFAULTUSER_ROOT_EXPORT_DESCRIPTION_0 = "GUI_DEFAULTUSER_ROOT_EXPORT_DESCRIPTION_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String GUI_DEFAULTUSER_ROOT_GUEST_DESCRIPTION_0 = "GUI_DEFAULTUSER_ROOT_GUEST_DESCRIPTION_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String GUI_ORGUNIT_ROOT_DESCRIPTION_0 = "GUI_ORGUNIT_ROOT_DESCRIPTION_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_ASSIGNED_POOL_1 = "INIT_ASSIGNED_POOL_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_DEFAULT_USERS_CREATED_0 = "INIT_DEFAULT_USERS_CREATED_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_DEFAULT_USERS_CREATION_FAILED_0 = "INIT_DEFAULT_USERS_CREATION_FAILED_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_DIGEST_ALGORITHM_1 = "INIT_DIGEST_ALGORITHM_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_DIGEST_ENC_3 = "INIT_DIGEST_ENC_3";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_DIGEST_ENCODING_1 = "INIT_DIGEST_ENCODING_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_DRIVER_SQL_MANAGER_1 = "INIT_DRIVER_SQL_MANAGER_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_FILL_DEFAULTS_0 = "INIT_FILL_DEFAULTS_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_ROOT_ORGUNIT_DEFAULTS_INITIALIZED_0 = "INIT_ROOT_ORGUNIT_DEFAULTS_INITIALIZED_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_ROOT_ORGUNIT_INITIALIZATION_FAILED_0 = "INIT_ROOT_ORGUNIT_INITIALIZATION_FAILED_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_SET_DIGEST_ERROR_0 = "INIT_SET_DIGEST_ERROR_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_SHUTDOWN_DRIVER_1 = "INIT_SHUTDOWN_DRIVER_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_SYSTEM_FOLDER_INITIALIZATION_FAILED_0 = "INIT_SYSTEM_FOLDER_INITIALIZATION_FAILED_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_SYSTEM_FOLDER_INITIALIZED_0 = "INIT_SYSTEM_FOLDER_INITIALIZED_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_SYSTEM_ROLES_CREATED_0 = "INIT_SYSTEM_ROLES_CREATED_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String INIT_SYSTEM_ROLES_CREATION_FAILED_0 = "INIT_SYSTEM_ROLES_CREATION_FAILED_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_CREATE_RELATION_2 = "LOG_CREATE_RELATION_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_DBG_CLEAR_LOCKS_1 = "LOG_DBG_CLEAR_LOCKS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_DBG_READ_LOCKS_1 = "LOG_DBG_READ_LOCKS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_DBG_WRITE_LOCKS_1 = "LOG_DBG_WRITE_LOCKS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_DEL_FILE_3 = "LOG_DEL_FILE_3";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_DEL_FOLDER_3 = "LOG_DEL_FOLDER_3";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_DELETING_PROPERTIES_1 = "LOG_DELETING_PROPERTIES_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_ERROR_RESETTING_RESOURCE_STATE_1 = "LOG_ERROR_RESETTING_RESOURCE_STATE_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_LOAD_QUERY_PROP_FILE_FAILED_1 = "LOG_LOAD_QUERY_PROP_FILE_FAILED_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_NULL_DB_CONTEXT_0 = "LOG_NULL_DB_CONTEXT_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_PUBLISHING_ACL_1 = "LOG_PUBLISHING_ACL_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_PUBLISHING_FILE_3 = "LOG_PUBLISHING_FILE_3";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_PUBLISHING_FILE_CONTENT_1 = "LOG_PUBLISHING_FILE_CONTENT_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_PUBLISHING_FOLDER_3 = "LOG_PUBLISHING_FOLDER_3";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_PUBLISHING_PROPERTIES_1 = "LOG_PUBLISHING_PROPERTIES_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_PUBLISHING_RESOURCE_1 = "LOG_PUBLISHING_RESOURCE_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_QUERY_NOT_FOUND_1 = "LOG_QUERY_NOT_FOUND_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_READING_RESOURCE_1 = "LOG_READING_RESOURCE_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_REMOVING_ACL_1 = "LOG_REMOVING_ACL_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_REMOVING_RELATIONS_1 = "LOG_REMOVING_RELATIONS_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_REMOVING_RESOURCE_1 = "LOG_REMOVING_RESOURCE_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_SQL_MANAGER_INIT_FAILED_1 = "LOG_SQL_MANAGER_INIT_FAILED_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_START_PUBLISHING_PROJECT_2 = "LOG_START_PUBLISHING_PROJECT_2";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_SUCCESSIVE_DRIVERS_UNSUPPORTED_1 = "LOG_SUCCESSIVE_DRIVERS_UNSUPPORTED_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_WARN_FOLDER_WRONG_STATE_CN_1 = "LOG_WARN_FOLDER_WRONG_STATE_CN_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_WARN_FOLDER_WRONG_STATE_NC_1 = "LOG_WARN_FOLDER_WRONG_STATE_NC_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String LOG_WRITING_PUBLISHING_HISTORY_1 = "LOG_WRITING_PUBLISHING_HISTORY_1";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_DELETE_FILE_0 = "RPT_DELETE_FILE_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_DELETE_FOLDER_0 = "RPT_DELETE_FOLDER_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_DELETE_FOLDERS_BEGIN_0 = "RPT_DELETE_FOLDERS_BEGIN_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_DELETE_FOLDERS_END_0 = "RPT_DELETE_FOLDERS_END_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_PUBLISH_FILE_0 = "RPT_PUBLISH_FILE_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_PUBLISH_FILES_BEGIN_0 = "RPT_PUBLISH_FILES_BEGIN_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_PUBLISH_FILES_END_0 = "RPT_PUBLISH_FILES_END_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_PUBLISH_FOLDER_0 = "RPT_PUBLISH_FOLDER_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_PUBLISH_FOLDERS_BEGIN_0 = "RPT_PUBLISH_FOLDERS_BEGIN_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_PUBLISH_FOLDERS_END_0 = "RPT_PUBLISH_FOLDERS_END_0";
+
+    /** Message constant for key in the resource bundle. */
+    public static final String RPT_PUBLISH_STAT_4 = "RPT_PUBLISH_STAT_4";
+
+    /** Name of the used resource bundle. */
+    private static final String BUNDLE_NAME = "org.opencms.db.jpa.messages";
+
+    /** Static instance member. */
+    private static final I_CmsMessageBundle INSTANCE = new Messages();
+
+    /**
+     * Hides the public constructor for this utility class.<p>
+     */
+    private Messages() {
+
+        // hide the constructor
+    }
+
+    /**
+     * Returns an instance of this localized message accessor.<p>
+     * 
+     * @return an instance of this localized message accessor
+     */
+    public static I_CmsMessageBundle get() {
+
+        return INSTANCE;
+    }
+
+    /**
+     * Returns the bundle name for this OpenCms package.<p>
+     * 
+     * @return the bundle name for this OpenCms package
+     */
+    public String getBundleName() {
+
+        return BUNDLE_NAME;
+    }
+
+}
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/messages.properties trunk/src/org/opencms/db/jpa/messages.properties
--- opencms_7.0.5_src/src/org/opencms/db/jpa/messages.properties	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/messages.properties	2008-09-02 11:14:29.183884150 +0300
@@ -0,0 +1,140 @@
+ERROR_JPA_PERSITENCE						=JPA Layer: Runtime error "{0}".
+ERR_COUNTING_PROPERTIES_1		            =Error counting properties for definition "{0}". 
+ERR_CREATE_SIBLING_FILE_NOT_FOUND_1         =Could not creates a sibling for the resource "{0}". No resource found with the specified ID.
+ERR_DELETE_NONEMTY_FOLDER_2                 =Unable to remove the folder "{0}". The folder contains the files "{1}". 
+ERR_DELETE_USED_PROPERTY_1                  =Unable to remove the property "{0}". It is attached to resources. 
+ERR_ERROR_DELETING_PROPERTYDEF_1	        =Property "{0}" could not be deleted because the property is attached to resources. 
+ERR_ERROR_PUBLISHING_DELETED_FOLDER_1	    =Error publishing deleted folder "{0}". 
+ERR_ERROR_PUBLISHING_FILE_1		            =Error publishing file "{0}". 
+ERR_ERROR_PUBLISHING_FOLDER_1		        =Error publishing folder "{0}". 
+ERR_HISTORY_FILE_NOT_FOUND_1                =Historical file "{0}" was not found. 
+ERR_HISTORY_PRINCIPAL_NOT_FOUND_1			=Historical principal entry for id "{0}" was not found.
+ERR_GENERIC_SQL_0                           =An SQL error occurred.
+ERR_GENERIC_SQL_1                           =An SQL error occurred when executing the following query: {0}. 
+ERR_GROUP_WITH_NAME_ALREADY_EXISTS_1        =Group "{0}" already exists. 
+ERR_INITIALIZING_USER_DRIVER_0		        =Critical error during OpenCms initialization: Unable to initialize the user driver. 
+ERR_INITIALIZING_VFS_DRIVER_0		        =Critical error during OpenCms initialization: Unable to initialize the vfs driver. 
+ERR_INVALID_DELETE_OPTION_1					=Invalid delete option "{0}".
+ERR_INVALID_RESOURCE_LENGTH_2		        =Invalid resource length {0} for resource "{1}". 
+ERR_NO_ACE_FOUND_2			                =Access control entry not found for resource id {0} and principal id {1}.
+ERR_NO_HISTORY_PROJECT_WITH_ID_1	    	=Historical Project with id {0} not found. 
+ERR_NO_HISTORY_PROJECT_WITH_TAG_ID_1	    =Historical Project with publish tag {0} not found.
+ERR_NO_GROUP_WITH_ID_1                      =No group found with ID {0}.
+ERR_NO_PROJECTRESOURCE_1		            =Project resource "{0}" not found.
+ERR_NO_PROJECT_WITH_ID_1		            =Project with ID "{0}" not found.
+ERR_NO_PROJECT_WITH_NAME_1		            =Project with name "{0}" not found.
+ERR_NO_PROPERTIES_FOR_PROPERTYDEF_1	        =No properties found for property definition "{0}".
+ERR_NO_PROPERTYDEF_WITH_NAME_1		        =Property definition with name "{0}" not found.
+ERR_NO_USER_WITH_ID_1                       =No user found with ID {0}.
+ERR_ORGUNIT_ALREADY_CONTAINS_PRINCIPAL_2	=The organizational unit "{0}" already contains principal "{1}".
+ERR_ORGUNIT_DOESNOT_CONTAINS_PRINCIPAL_2	=The organizational unit "{0}" does not contain principal "{1}".
+ERR_ORGUNIT_DOESNOT_CONTAINS_RESOURCE_2		=The organizational unit "{0}" does not contain resource "{1}".
+ERR_ORGUNIT_REMOVE_LAST_RESOURCE_2			=The resource "{1}" can not be removed from the organizational unit "{0}" since it is the last resource that can not be removed.
+ERR_ORGUNIT_RESOURCE_IS_NOT_FOLDER_2		=The resource "{1}" can not be added to the organizational unit "{0}" since only folders can be used.
+ERR_ORGUNIT_WITH_NAME_ALREADY_EXISTS_1		=Organizational Unit "{0}" already exists. 
+ERR_OUT_OF_MEMORY_0			                =An "out of memory" error occurred during publishing.
+ERR_OVERWRITE_MOVED_RESOURCE_3				=Error trying to overwrite a moved resource "{1}" with resource "{0}". You have to publish the moved resource "{2}" first.
+ERR_PATH_NOT_IN_PARENT_ORGUNIT_SCOPE_2		=Error: the resource "{1}" is outside the parent scope of the organizational unit "{0}".
+ERR_PARENT_FOLDER_DELETED_1		            =The parent folder of resource "{0}" has been deleted.
+ERR_PUBLISHLIST_DESERIALIZATION_FAILED_1	=Deserialization of the resource list for publish job "{0}" failed.
+ERR_QUERY_NOT_FOUND_1						=The SQL query "{0}" could not be found.
+ERR_READING_USER_0                          =Error reading user.
+ERR_READING_USERS_0                         =Error reading users.
+ERR_READ_DELETED_FILE_1                     =Failed to read deleted file "{0}", because it is not allowed to read deleted files.
+ERR_READ_DELETED_RESOURCE_1                 =Failed to read deleted resource "{0}", because it is not allowed to read deleted resources.
+ERR_READ_CONTENT_WITH_RESOURCE_ID_2         =Unable to read file contents with resource ID "{0}" (online={1}).
+ERR_READ_FOLDER_1                           =Unable to read folder "{0}".
+ERR_READ_FOLDER_WITH_ID_1                   =Unable to read folder with ID "{0}".
+ERR_READ_ORGUNIT_1							=Unable to read organization unit "{0}".
+ERR_READ_PARENT_ID_1                        =Unable to read parent id of resource "{0}".
+ERR_READ_PUBLISH_JOB_1						=Unable to read publish job with history ID "{0}".
+ERR_READ_RESOURCE_1                         =Unable to read resource "{0}".
+ERR_READ_RESOURCE_VERSIONS_1			    =Unable to read version number of resource "{0}".
+ERR_READ_RESOURCE_WITH_ID_1                 =Unable to read resource with ID "{0}".
+ERR_RESOURCENAME_TOO_LONG_2		            =The resource path "{0}" is too long. The length must be smaller than {1} chars.
+ERR_RESOURCE_WITH_NAME_ALREADY_EXISTS_1     =Could not create resource "{0}" because it already exists.
+ERR_RESOURCE_WITH_NAME_CURRENTLY_CREATED_1  =Could not create resource "{0}" because it already being created concurrently.
+ERR_SERIALIZING_PUBLISHLIST_1				=Error serializing publish list of publish job "{0}".
+ERR_SERIALIZING_USER_DATA_1		            =Error serializing user data of "{0}".
+ERR_SIBLING_WITH_NAME_ALREADY_EXISTS_1      =Could not create sibling because a sibling named "{0}" already exists.
+ERR_TOO_MANY_PROPERTIES_3		            =Values for property "{0}" of resource "{1}" are inconsistent because there are {2} values. A resource may have a maximum of two values for one property. 
+ERR_UNKNOWN_PROPERTY_VALUE_MAPPING_3	    =Resource "{0}" contains an unknown property mapping value "{1}" for property "{2}".
+ERR_USER_WITH_NAME_ALREADY_EXISTS_1         =The user "{0}" already exists.
+ERR_WRITING_HISTORY_OF_PROJECT_1		    =Error writing history of project "{0}".
+ERR_WRITING_TO_OUTPUT_STREAM_1		        =Error writing data to output stream "{0}".
+ERR_JDBC_CONN_INVALID_PROJECT_ID_1          =Unsupported project ID "{0}" to return a JDBC connection.
+ERR_DELETE_HISTORY_VERSIONS_1               =Error deleting history versions of resource "{0}".
+ERR_READING_ADDITIONAL_INFO_1				=Error reading the additional info for user "{0}".
+
+INIT_ASSIGNED_POOL_1			            =. Assigned pool        : {0}
+INIT_DIGEST_ALGORITHM_1			            =. Digest configured    : {0}
+INIT_DIGEST_ENCODING_1			            =. Digest file encoding : {0}
+INIT_FILL_DEFAULTS_0			            =. Database init        : filling default values
+INIT_SHUTDOWN_DRIVER_1			            =. Shutting down        : {0} ... ok!
+INIT_DRIVER_SQL_MANAGER_1                   =. Driver SQL manager   : {0}
+INIT_DIGEST_ENC_3                           =. Using digest encoding: "{0}" from "{1}" version "{2}"
+INIT_SET_DIGEST_ERROR_0                     =. Error setting digest : using clear passwords 
+INIT_SYSTEM_ROLES_CREATED_0    				=. User Driver          : System roles created
+INIT_SYSTEM_ROLES_CREATION_FAILED_0   		=. User Driver          : System roles creation failed
+INIT_DEFAULT_USERS_CREATED_0    			=. User Driver          : Default users created
+INIT_DEFAULT_USERS_CREATION_FAILED_0   		=. User Driver          : Default users creation failed
+INIT_ROOT_ORGUNIT_DEFAULTS_INITIALIZED_0    =. User Driver          : Root organizational unit initialized
+INIT_ROOT_ORGUNIT_INITIALIZATION_FAILED_0   =. User Driver          : Initialization of root organization unit failed
+INIT_SYSTEM_FOLDER_INITIALIZED_0		    =. Vfs Driver           : System folder created
+INIT_SYSTEM_FOLDER_INITIALIZATION_FAILED_0  =. Vfs Driver           : Creation of system folder failed
+              
+LOG_QUERY_NOT_FOUND_1                       =Query "{0}" not found.
+LOG_NULL_DB_CONTEXT_0                       =Null database context used.
+LOG_LOAD_QUERY_PROP_FILE_FAILED_1           =Error loading query property file "{0}".
+LOG_SQL_MANAGER_INIT_FAILED_1               =. SQL manager class "{0}" could not be instantiated.
+LOG_PUBLISHING_ACL_1			            =Error publishing ACL of "{0}".
+LOG_PUBLISHING_FILE_CONTENT_1		        =Error publishing file content of "{0}".
+LOG_PUBLISHING_PROPERTIES_1		            =Error publishing properties of "{0}".
+LOG_PUBLISHING_RESOURCE_1		            =Error publishing resource "{0}".
+LOG_READING_RESOURCE_1			            =Error reading resource "{0}".
+LOG_REMOVING_ACL_1			                =Error removing ACLs of "{0}".
+LOG_REMOVING_RELATIONS_1					=Error removing relations of "{0}".
+LOG_REMOVING_RESOURCE_1			            =Error removing resource "{0}".
+LOG_DELETING_PROPERTIES_1		            =Error deleting properties of "{0}".
+LOG_DEL_FILE_3                              =( {0} / {1} ) Deleting file "{2}".
+LOG_DEL_FOLDER_3                            =( {0} / {1} ) Deleting folder "{2}".
+LOG_PUBLISHING_FILE_3                       =( {0} / {1} ) Publishing file "{2}".
+LOG_PUBLISHING_FOLDER_3                     =( {0} / {1} ) Publishing folder "{2}".
+LOG_START_PUBLISHING_PROJECT_2		        =Starting to publish project "{0}" by user "{1}".
+LOG_SUCCESSIVE_DRIVERS_UNSUPPORTED_1	    ={0} does not support successive drivers.
+LOG_WARN_FOLDER_WRONG_STATE_CN_1			=The resource {0} should have state 'changed' but has state 'new'.
+LOG_WARN_FOLDER_WRONG_STATE_NC_1			=The resource {0} should have state 'new' but has state 'changed'.
+LOG_WRITING_PUBLISHING_HISTORY_1	        =Error writing history/publishing history of "{0}".
+LOG_ERROR_RESETTING_RESOURCE_STATE_1	    =Error resetting resource state of "{0}".
+
+# LOCK PERSISTANCE
+LOG_DBG_CLEAR_LOCKS_1						=Cleared {0} old locks in database.
+LOG_DBG_WRITE_LOCKS_1						=Wrote {0} new locks to database.
+LOG_DBG_READ_LOCKS_1                        =Read {0} locks from database. 
+
+# Relations
+LOG_CREATE_RELATION_2						=Create relation "{1}" in project "{0}".
+
+RPT_DELETE_FILE_0                           =Deleting file
+RPT_DELETE_FOLDER_0                         =Deleting folder
+RPT_DELETE_FOLDERS_BEGIN_0                  =Deleting folders ...
+RPT_DELETE_FOLDERS_END_0                    =... finished deleting folders
+RPT_PUBLISH_FILE_0                          =Publishing file
+RPT_PUBLISH_FILES_BEGIN_0                   =Publishing files ...
+RPT_PUBLISH_FILES_END_0                     =... finished publishing files
+RPT_PUBLISH_FOLDER_0                        =Publishing folder
+RPT_PUBLISH_FOLDERS_BEGIN_0                 =Publishing folders ...
+RPT_PUBLISH_FOLDERS_END_0                   =... finished publishing folders
+RPT_PUBLISH_STAT_4                          =Statistics: published files: {0}, published folders: {1}, deleted folders: {2}, duration: {3}
+
+GUI_ORGUNIT_ROOT_DESCRIPTION_0				=root organizational unit
+
+GUI_DEFAULTGROUP_OU_USERS_DESCRIPTION_1		=users group for {0}
+GUI_DEFAULTGROUP_ROOT_USERS_DESCRIPTION_0	=users group
+GUI_DEFAULTGROUP_ROOT_GUESTS_DESCRIPTION_0	=guests group
+GUI_DEFAULTGROUP_ROOT_ADMINS_DESCRIPTION_0	=administrators group
+GUI_DEFAULTGROUP_ROOT_PROJMANS_DESCRIPTION_0=project managers group
+GUI_DEFAULTUSER_ROOT_GUEST_DESCRIPTION_0	=guest user
+GUI_DEFAULTUSER_ROOT_EXPORT_DESCRIPTION_0	=static export user
+GUI_DEFAULTUSER_ROOT_DELETED_DESCRIPTION_0	=garbage collector user
+GUI_DEFAULTUSER_ROOT_ADMIN_DESCRIPTION_0	=root administrator
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOContents.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOContents.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOContents.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOContents.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,199 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_contents")
+@IdClass(CmsDAOContents.CmsDAOContentsPK.class)
+public class CmsDAOContents {
+	@Basic
+	@Column(name="file_content", nullable=false)
+	private byte[] m_fileContent;
+
+	@Basic
+	@Column(name="online_flag")
+	private int m_onlineFlag;
+
+	@Id
+	@Column(name="publish_tag_from")
+	private int m_publishTagFrom;
+
+	@Basic
+	@Column(name="publish_tag_to")
+	private int m_publishTagTo;
+
+	@Id
+	@Column(name="resource_id", length=36)
+	private String m_resourceId;
+
+
+	public CmsDAOContents() {
+	}
+
+	public CmsDAOContents(int publishTagFrom, String resourceId) {
+		this.m_publishTagFrom = publishTagFrom;
+		this.m_resourceId = resourceId;
+	}
+
+	public byte[] getFileContent() {
+		return m_fileContent;
+	}
+
+	public void setFileContent(byte[] fileContent) {
+		this.m_fileContent = fileContent;
+	}
+
+	public int getOnlineFlag() {
+		return m_onlineFlag;
+	}
+
+	public void setOnlineFlag(int onlineFlag) {
+		this.m_onlineFlag = onlineFlag;
+	}
+
+	public int getPublishTagFrom() {
+		return m_publishTagFrom;
+	}
+
+	public void setPublishTagFrom(int publishTagFrom) {
+		this.m_publishTagFrom = publishTagFrom;
+	}
+
+	public int getPublishTagTo() {
+		return m_publishTagTo;
+	}
+
+	public void setPublishTagTo(int publishTagTo) {
+		this.m_publishTagTo = publishTagTo;
+	}
+
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+
+	public static class CmsDAOContentsPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOContents"); }
+			catch(Exception e) {}
+		}
+	
+		public int m_publishTagFrom;
+		public String m_resourceId;
+	
+		public CmsDAOContentsPK() {
+		}
+	
+		public CmsDAOContentsPK(String str) {
+			fromString(str);
+		}
+	
+		public int getPublishTagFrom() {
+			return m_publishTagFrom;
+		}
+	
+		public void setPublishTagFrom(int publishTagFrom) {
+			this.m_publishTagFrom = publishTagFrom;
+		}
+	
+		public String getResourceId() {
+			return m_resourceId;
+		}
+	
+		public void setResourceId(String resourceId) {
+			this.m_resourceId = resourceId;
+		}
+	
+		public String toString() {
+			return String.valueOf(m_publishTagFrom)
+				+ "::" + m_resourceId;
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + m_publishTagFrom;
+			rs = rs * 37 + ((m_resourceId == null) ? 0 : m_resourceId.hashCode());
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOContentsPK other = (CmsDAOContentsPK) obj;
+			return (m_publishTagFrom == other.m_publishTagFrom)
+				&& ((m_resourceId == null && other.m_resourceId == null)
+				|| (m_resourceId != null && m_resourceId.equals(other.m_resourceId)));
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			m_publishTagFrom = Integer.parseInt(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_resourceId = null;
+			else
+				m_resourceId = str;
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOGroups.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOGroups.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOGroups.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOGroups.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,115 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name="cms_groups", uniqueConstraints=@UniqueConstraint(columnNames={"group_name", "group_ou"}))
+public class CmsDAOGroups {
+	@Basic
+	@Column(name="group_description", nullable=false)
+	private String m_groupDescription;
+
+	@Basic
+	@Column(name="group_flags")
+	private int m_groupFlags;
+
+	@Id
+	@Column(name="group_id", length=36)
+	private String m_groupId;
+
+	@Basic
+	@Column(name="group_name", nullable=false, length=128)
+	private String m_groupName;
+
+	@Basic
+	@Column(name="group_ou", nullable=false, length=128)
+	private String m_groupOu;
+
+	@Basic
+	@Column(name="parent_group_id", nullable=false, length=36)
+	private String m_parentGroupId;
+
+
+	public CmsDAOGroups() {
+	}
+
+	public CmsDAOGroups(String groupId) {
+		this.m_groupId = groupId;
+	}
+
+	public String getGroupDescription() {
+		return m_groupDescription;
+	}
+
+	public void setGroupDescription(String groupDescription) {
+		this.m_groupDescription = groupDescription;
+	}
+
+	public int getGroupFlags() {
+		return m_groupFlags;
+	}
+
+	public void setGroupFlags(int groupFlags) {
+		this.m_groupFlags = groupFlags;
+	}
+
+	public String getGroupId() {
+		return m_groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.m_groupId = groupId;
+	}
+
+	public String getGroupName() {
+		return m_groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.m_groupName = groupName;
+	}
+
+	public String getGroupOu() {
+		return m_groupOu;
+	}
+
+	public void setGroupOu(String groupOu) {
+		this.m_groupOu = groupOu;
+	}
+
+	public String getParentGroupId() {
+		return m_parentGroupId;
+	}
+
+	public void setParentGroupId(String parentGroupId) {
+		this.m_parentGroupId = parentGroupId;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOGroupUsers.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOGroupUsers.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOGroupUsers.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOGroupUsers.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,179 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_groupusers")
+@IdClass(CmsDAOGroupUsers.CmsDAOGroupUsersPK.class)
+public class CmsDAOGroupUsers {
+	@Id
+	@Column(name="group_id", length=36)
+	private String m_groupId;
+
+	@Basic
+	@Column(name="groupuser_flags")
+	private int m_groupUserFlags;
+
+	@Id
+	@Column(name="user_id", length=36)
+	private String m_userId;
+
+
+	public CmsDAOGroupUsers() {
+	}
+
+	public CmsDAOGroupUsers(String groupId, String userId) {
+		this.m_groupId = groupId;
+		this.m_userId = userId;
+	}
+
+	public String getGroupId() {
+		return m_groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.m_groupId = groupId;
+	}
+
+	public int getGroupUserFlags() {
+		return m_groupUserFlags;
+	}
+
+	public void setGroupUserFlags(int groupuserFlags) {
+		this.m_groupUserFlags = groupuserFlags;
+	}
+
+	public String getUserId() {
+		return m_userId;
+	}
+
+	public void setUserId(String userId) {
+		this.m_userId = userId;
+	}
+
+
+	public static class CmsDAOGroupUsersPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOGroupUsers"); }
+			catch(Exception e) {}
+		}
+	
+		public String m_groupId;
+		public String m_userId;
+	
+		public CmsDAOGroupUsersPK() {
+		}
+	
+		public CmsDAOGroupUsersPK(String str) {
+			fromString(str);
+		}
+	
+		public String getGroupId() {
+			return m_groupId;
+		}
+	
+		public void setGroupId(String groupId) {
+			this.m_groupId = groupId;
+		}
+	
+		public String getUserId() {
+			return m_userId;
+		}
+	
+		public void setUserId(String userId) {
+			this.m_userId = userId;
+		}
+	
+		public String toString() {
+			return m_groupId
+				+ "::" + m_userId;
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + ((m_groupId == null) ? 0 : m_groupId.hashCode());
+			rs = rs * 37 + ((m_userId == null) ? 0 : m_userId.hashCode());
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOGroupUsersPK other = (CmsDAOGroupUsersPK) obj;
+			return ((m_groupId == null && other.m_groupId == null)
+				|| (m_groupId != null && m_groupId.equals(other.m_groupId)))
+				&& ((m_userId == null && other.m_userId == null)
+				|| (m_userId != null && m_userId.equals(other.m_userId)));
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_groupId = null;
+			else
+				m_groupId = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_userId = null;
+			else
+				m_userId = str;
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryPrincipals.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryPrincipals.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryPrincipals.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryPrincipals.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,140 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_history_principals")
+public class CmsDAOHistoryPrincipals {
+	@Basic
+	@Column(name="principal_datedeleted")
+	private long m_principalDateDeleted;
+
+	@Basic
+	@Column(name="principal_description", nullable=false)
+	private String m_principalDescription;
+
+	@Basic
+	@Column(name="principal_email", nullable=false, length=128)
+	private String m_principalEmail;
+
+	@Id
+	@Column(name="principal_id", length=36)
+	private String m_principalId;
+
+	@Basic
+	@Column(name="principal_name", nullable=false, length=128)
+	private String m_principalName;
+
+	@Basic
+	@Column(name="principal_ou", length=128)
+	private String m_principalOu;
+
+	@Basic
+	@Column(name="principal_type", nullable=false, length=5)
+	private String m_principalType;
+
+	@Basic
+	@Column(name="principal_userdeleted", nullable=false, length=36)
+	private String m_principalUserDeleted;
+
+
+	public CmsDAOHistoryPrincipals() {
+	}
+
+	public CmsDAOHistoryPrincipals(String principalId) {
+		this.m_principalId = principalId;
+	}
+
+	public long getPrincipalDateDeleted() {
+		return m_principalDateDeleted;
+	}
+
+	public void setPrincipalDateDeleted(long principalDatedeleted) {
+		this.m_principalDateDeleted = principalDatedeleted;
+	}
+
+	public String getPrincipalDescription() {
+		return m_principalDescription;
+	}
+
+	public void setPrincipalDescription(String principalDescription) {
+		this.m_principalDescription = principalDescription;
+	}
+
+	public String getPrincipalEmail() {
+		return m_principalEmail;
+	}
+
+	public void setPrincipalEmail(String principalEmail) {
+		this.m_principalEmail = principalEmail;
+	}
+
+	public String getPrincipalId() {
+		return m_principalId;
+	}
+
+	public void setPrincipalId(String principalId) {
+		this.m_principalId = principalId;
+	}
+
+	public String getPrincipalName() {
+		return m_principalName;
+	}
+
+	public void setPrincipalName(String principalName) {
+		this.m_principalName = principalName;
+	}
+
+	public String getPrincipalOu() {
+		return m_principalOu;
+	}
+
+	public void setPrincipalOu(String principalOu) {
+		this.m_principalOu = principalOu;
+	}
+
+	public String getPrincipalType() {
+		return m_principalType;
+	}
+
+	public void setPrincipalType(String principalType) {
+		this.m_principalType = principalType;
+	}
+
+	public String getPrincipalUserDeleted() {
+		return m_principalUserDeleted;
+	}
+
+	public void setPrincipalUserDeleted(String principalUserdeleted) {
+		this.m_principalUserDeleted = principalUserdeleted;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProjectResources.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProjectResources.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProjectResources.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProjectResources.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,194 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_history_projectresources")
+@IdClass(CmsDAOHistoryProjectResources.CmsDAOHistoryProjectResourcesPK.class)
+public class CmsDAOHistoryProjectResources {
+	@Id
+	@Column(name="project_id", length=36)
+	private String m_projectId;
+
+	@Id
+	@Column(name="publish_tag")
+	private int m_publishTag;
+
+	@Id
+	@Column(name="resource_path", length=1024)
+	private String m_resourcePath;
+
+
+	public CmsDAOHistoryProjectResources() {
+	}
+
+	public CmsDAOHistoryProjectResources(String projectId, int publishTag, String resourcePath) {
+		this.m_projectId = projectId;
+		this.m_publishTag = publishTag;
+		this.m_resourcePath = resourcePath;
+	}
+
+	public String getProjectId() {
+		return m_projectId;
+	}
+
+	public void setProjectId(String projectId) {
+		this.m_projectId = projectId;
+	}
+
+	public int getPublishTag() {
+		return m_publishTag;
+	}
+
+	public void setPublishTag(int publishTag) {
+		this.m_publishTag = publishTag;
+	}
+
+	public String getResourcePath() {
+		return m_resourcePath;
+	}
+
+	public void setResourcePath(String resourcePath) {
+		this.m_resourcePath = resourcePath;
+	}
+
+
+	public static class CmsDAOHistoryProjectResourcesPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsHistoryProjectresources"); }
+			catch(Exception e) {}
+		}
+	
+		public String m_projectId;
+		public int m_publishTag;
+		public String m_resourcePath;
+	
+		public CmsDAOHistoryProjectResourcesPK() {
+		}
+	
+		public CmsDAOHistoryProjectResourcesPK(String str) {
+			fromString(str);
+		}
+	
+		public String getProjectId() {
+			return m_projectId;
+		}
+	
+		public void setProjectId(String projectId) {
+			this.m_projectId = projectId;
+		}
+	
+		public int getPublishTag() {
+			return m_publishTag;
+		}
+	
+		public void setPublishTag(int publishTag) {
+			this.m_publishTag = publishTag;
+		}
+	
+		public String getResourcePath() {
+			return m_resourcePath;
+		}
+	
+		public void setResourcePath(String resourcePath) {
+			this.m_resourcePath = resourcePath;
+		}
+	
+		public String toString() {
+			return m_projectId
+				+ "::" + String.valueOf(m_publishTag)
+				+ "::" + m_resourcePath;
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + ((m_projectId == null) ? 0 : m_projectId.hashCode());
+			rs = rs * 37 + m_publishTag;
+			rs = rs * 37 + ((m_resourcePath == null) ? 0 : m_resourcePath.hashCode());
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOHistoryProjectResourcesPK other = (CmsDAOHistoryProjectResourcesPK) obj;
+			return ((m_projectId == null && other.m_projectId == null)
+				|| (m_projectId != null && m_projectId.equals(other.m_projectId)))
+				&& (m_publishTag == other.m_publishTag)
+				&& ((m_resourcePath == null && other.m_resourcePath == null)
+				|| (m_resourcePath != null && m_resourcePath.equals(other.m_resourcePath)));
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_projectId = null;
+			else
+				m_projectId = str;
+			str = toke.nextToken();
+			m_publishTag = Integer.parseInt(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_resourcePath = null;
+			else
+				m_resourcePath = str;
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProjects.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProjects.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProjects.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProjects.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,188 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_history_projects")
+public class CmsDAOHistoryProjects {
+	@Basic
+	@Column(name="date_created")
+	private long m_dateCreated;
+
+	@Basic
+	@Column(name="group_id", nullable=false, length=36)
+	private String m_groupId;
+
+	@Basic
+	@Column(name="managergroup_id", nullable=false, length=36)
+	private String m_managerGroupId;
+
+	@Basic
+	@Column(name="project_description", nullable=false)
+	private String m_projectDescription;
+
+	@Basic
+	@Column(name="project_id", nullable=false, length=36)
+	private String m_projectId;
+
+	@Basic
+	@Column(name="project_name", nullable=false)
+	private String m_projectName;
+
+	@Basic
+	@Column(name="project_ou", nullable=false, length=128)
+	private String m_projectOu;
+
+	@Basic
+	@Column(name="project_publishdate")
+	private long m_projectPublishDate;
+
+	@Basic
+	@Column(name="project_published_by", nullable=false, length=36)
+	private String m_projectPublishedBy;
+
+	@Basic
+	@Column(name="project_type")
+	private int m_projectType;
+
+	@Id
+	@Column(name="publish_tag")
+	private int m_publishTag;
+
+	@Basic
+	@Column(name="user_id", nullable=false, length=36)
+	private String m_userId;
+
+
+	public CmsDAOHistoryProjects() {
+	}
+
+	public CmsDAOHistoryProjects(int publishTag) {
+		this.m_publishTag = publishTag;
+	}
+
+	public long getDateCreated() {
+		return m_dateCreated;
+	}
+
+	public void setDateCreated(long dateCreated) {
+		this.m_dateCreated = dateCreated;
+	}
+
+	public String getGroupId() {
+		return m_groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.m_groupId = groupId;
+	}
+
+	public String getManagerGroupId() {
+		return m_managerGroupId;
+	}
+
+	public void setManagerGroupId(String managergroupId) {
+		this.m_managerGroupId = managergroupId;
+	}
+
+	public String getProjectDescription() {
+		return m_projectDescription;
+	}
+
+	public void setProjectDescription(String projectDescription) {
+		this.m_projectDescription = projectDescription;
+	}
+
+	public String getProjectId() {
+		return m_projectId;
+	}
+
+	public void setProjectId(String projectId) {
+		this.m_projectId = projectId;
+	}
+
+	public String getProjectName() {
+		return m_projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.m_projectName = projectName;
+	}
+
+	public String getProjectOu() {
+		return m_projectOu;
+	}
+
+	public void setProjectOu(String projectOu) {
+		this.m_projectOu = projectOu;
+	}
+
+	public long getProjectPublishDate() {
+		return m_projectPublishDate;
+	}
+
+	public void setProjectPublishDate(long projectPublishdate) {
+		this.m_projectPublishDate = projectPublishdate;
+	}
+
+	public String getProjectPublishedBy() {
+		return m_projectPublishedBy;
+	}
+
+	public void setProjectPublishedBy(String projectPublishedBy) {
+		this.m_projectPublishedBy = projectPublishedBy;
+	}
+
+	public int getProjectType() {
+		return m_projectType;
+	}
+
+	public void setProjectType(int projectType) {
+		this.m_projectType = projectType;
+	}
+
+	public int getPublishTag() {
+		return m_publishTag;
+	}
+
+	public void setPublishTag(int publishTag) {
+		this.m_publishTag = publishTag;
+	}
+
+	public String getUserId() {
+		return m_userId;
+	}
+
+	public void setUserId(String userId) {
+		this.m_userId = userId;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProperties.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProperties.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProperties.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryProperties.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,245 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_history_properties")
+@IdClass(CmsDAOHistoryProperties.CmsDAOHistoryPropertiesPK.class)
+public class CmsDAOHistoryProperties {
+	@Basic
+	@Column(name="property_mapping_id", nullable=false, length=36)
+	private String m_propertyMappingId;
+
+	@Id
+	@Column(name="property_mapping_type")
+	private int m_propertyMappingType;
+
+	@Basic
+	@Column(name="property_value", nullable=false, length=2048)
+	private String m_propertyValue;
+
+	@Id
+	@Column(name="propertydef_id", length=36)
+	private String m_propertyDefId;
+
+	@Id
+	@Column(name="publish_tag")
+	private int m_publishTag;
+
+	@Id
+	@Column(name="structure_id", length=36)
+	private String m_structureId;
+
+
+	public CmsDAOHistoryProperties() {
+	}
+
+	public CmsDAOHistoryProperties(int propertyMappingType, String propertydefId, int publishTag, String structureId) {
+		this.m_propertyMappingType = propertyMappingType;
+		this.m_propertyDefId = propertydefId;
+		this.m_publishTag = publishTag;
+		this.m_structureId = structureId;
+	}
+
+	public String getPropertyMappingId() {
+		return m_propertyMappingId;
+	}
+
+	public void setPropertyMappingId(String propertyMappingId) {
+		this.m_propertyMappingId = propertyMappingId;
+	}
+
+	public int getPropertyMappingType() {
+		return m_propertyMappingType;
+	}
+
+	public void setPropertyMappingType(int propertyMappingType) {
+		this.m_propertyMappingType = propertyMappingType;
+	}
+
+	public String getPropertyValue() {
+		return m_propertyValue;
+	}
+
+	public void setPropertyValue(String propertyValue) {
+		this.m_propertyValue = propertyValue;
+	}
+
+	public String getPropertyDefId() {
+		return m_propertyDefId;
+	}
+
+	public void setPropertyDefId(String propertydefId) {
+		this.m_propertyDefId = propertydefId;
+	}
+
+	public int getPublishTag() {
+		return m_publishTag;
+	}
+
+	public void setPublishTag(int publishTag) {
+		this.m_publishTag = publishTag;
+	}
+
+	public String getStructureId() {
+		return m_structureId;
+	}
+
+	public void setStructureId(String structureId) {
+		this.m_structureId = structureId;
+	}
+
+
+	public static class CmsDAOHistoryPropertiesPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOHistoryProperties"); }
+			catch(Exception e) {}
+		}
+	
+		public int m_propertyMappingType;
+		public String m_propertyDefId;
+		public int m_publishTag;
+		public String m_structureId;
+	
+		public CmsDAOHistoryPropertiesPK() {
+		}
+	
+		public CmsDAOHistoryPropertiesPK(String str) {
+			fromString(str);
+		}
+	
+		public int getPropertyMappingType() {
+			return m_propertyMappingType;
+		}
+	
+		public void setPropertyMappingType(int propertyMappingType) {
+			this.m_propertyMappingType = propertyMappingType;
+		}
+	
+		public String getPropertyDefId() {
+			return m_propertyDefId;
+		}
+	
+		public void setPropertyDefId(String propertydefId) {
+			this.m_propertyDefId = propertydefId;
+		}
+	
+		public int getPublishTag() {
+			return m_publishTag;
+		}
+	
+		public void setPublishTag(int publishTag) {
+			this.m_publishTag = publishTag;
+		}
+	
+		public String getStructureId() {
+			return m_structureId;
+		}
+	
+		public void setStructureId(String structureId) {
+			this.m_structureId = structureId;
+		}
+	
+		public String toString() {
+			return String.valueOf(m_propertyMappingType)
+				+ "::" + m_propertyDefId
+				+ "::" + String.valueOf(m_publishTag)
+				+ "::" + m_structureId;
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + m_propertyMappingType;
+			rs = rs * 37 + ((m_propertyDefId == null) ? 0 : m_propertyDefId.hashCode());
+			rs = rs * 37 + m_publishTag;
+			rs = rs * 37 + ((m_structureId == null) ? 0 : m_structureId.hashCode());
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOHistoryPropertiesPK other = (CmsDAOHistoryPropertiesPK) obj;
+			return (m_propertyMappingType == other.m_propertyMappingType)
+				&& ((m_propertyDefId == null && other.m_propertyDefId == null)
+				|| (m_propertyDefId != null && m_propertyDefId.equals(other.m_propertyDefId)))
+				&& (m_publishTag == other.m_publishTag)
+				&& ((m_structureId == null && other.m_structureId == null)
+				|| (m_structureId != null && m_structureId.equals(other.m_structureId)));
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			m_propertyMappingType = Integer.parseInt(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_propertyDefId = null;
+			else
+				m_propertyDefId = str;
+			str = toke.nextToken();
+			m_publishTag = Integer.parseInt(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_structureId = null;
+			else
+				m_structureId = str;
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryPropertyDef.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryPropertyDef.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryPropertyDef.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryPropertyDef.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,80 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_history_propertydef")
+public class CmsDAOHistoryPropertyDef {
+	@Id
+	@Column(name="propertydef_id", length=36)
+	private String m_propertyDefId;
+
+	@Basic
+	@Column(name="propertydef_name", nullable=false, length=128)
+	private String m_propertyDefName;
+
+	@Basic
+	@Column(name="propertydef_type")
+	private int m_propertyDefType;
+
+
+	public CmsDAOHistoryPropertyDef() {
+	}
+
+	public CmsDAOHistoryPropertyDef(String propertydefId) {
+		this.m_propertyDefId = propertydefId;
+	}
+
+	public String getPropertyDefId() {
+		return m_propertyDefId;
+	}
+
+	public void setPropertyDefId(String propertydefId) {
+		this.m_propertyDefId = propertydefId;
+	}
+
+	public String getPropertyDefName() {
+		return m_propertyDefName;
+	}
+
+	public void setPropertyDefName(String propertydefName) {
+		this.m_propertyDefName = propertydefName;
+	}
+
+	public int getPropertyDefType() {
+		return m_propertyDefType;
+	}
+
+	public void setPropertyDefType(int propertydefType) {
+		this.m_propertyDefType = propertydefType;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryResources.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryResources.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryResources.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryResources.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,307 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_history_resources")
+@IdClass(CmsDAOHistoryResources.CmsDAOHistoryResourcesPK.class)
+public class CmsDAOHistoryResources {
+	@Basic
+	@Column(name="date_content")
+	private long m_dateContent;
+
+	@Basic
+	@Column(name="date_created")
+	private long m_dateCreated;
+
+	@Basic
+	@Column(name="date_lastmodified")
+	private long m_dateLastModified;
+
+	@Basic
+	@Column(name="project_lastmodified", nullable=false, length=36)
+	private String m_projectLastModified;
+
+	@Id
+	@Column(name="publish_tag")
+	private int m_publishTag;
+
+	@Basic
+	@Column(name="resource_flags")
+	private int m_resourceFlags;
+
+	@Id
+	@Column(name="resource_id", length=36)
+	private String m_resourceId;
+
+	@Basic
+	@Column(name="resource_size")
+	private int m_resourceSize;
+
+	@Basic
+	@Column(name="resource_state")
+	private int m_resourceState;
+
+	@Basic
+	@Column(name="resource_type")
+	private int m_resourceType;
+
+	@Basic
+	@Column(name="resource_version")
+	private int m_resourceVersion;
+
+	@Basic
+	@Column(name="sibling_count")
+	private int m_siblingCount;
+
+	@Basic
+	@Column(name="user_created", nullable=false, length=36)
+	private String m_userCreated;
+
+	@Basic
+	@Column(name="user_lastmodified", nullable=false, length=36)
+	private String m_userLastModified;
+
+
+	public CmsDAOHistoryResources() {
+	}
+
+	public CmsDAOHistoryResources(int publishTag, String resourceId) {
+		this.m_publishTag = publishTag;
+		this.m_resourceId = resourceId;
+	}
+
+	public long getDateContent() {
+		return m_dateContent;
+	}
+
+	public void setDateContent(long dateContent) {
+		this.m_dateContent = dateContent;
+	}
+
+	public long getDateCreated() {
+		return m_dateCreated;
+	}
+
+	public void setDateCreated(long dateCreated) {
+		this.m_dateCreated = dateCreated;
+	}
+
+	public long getDateLastModified() {
+		return m_dateLastModified;
+	}
+
+	public void setDateLastModified(long dateLastmodified) {
+		this.m_dateLastModified = dateLastmodified;
+	}
+
+	public String getProjectLastModified() {
+		return m_projectLastModified;
+	}
+
+	public void setProjectLastModified(String projectLastmodified) {
+		this.m_projectLastModified = projectLastmodified;
+	}
+
+	public int getPublishTag() {
+		return m_publishTag;
+	}
+
+	public void setPublishTag(int publishTag) {
+		this.m_publishTag = publishTag;
+	}
+
+	public int getResourceFlags() {
+		return m_resourceFlags;
+	}
+
+	public void setResourceFlags(int resourceFlags) {
+		this.m_resourceFlags = resourceFlags;
+	}
+
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+	public int getResourceSize() {
+		return m_resourceSize;
+	}
+
+	public void setResourceSize(int resourceSize) {
+		this.m_resourceSize = resourceSize;
+	}
+
+	public int getResourceState() {
+		return m_resourceState;
+	}
+
+	public void setResourceState(int resourceState) {
+		this.m_resourceState = resourceState;
+	}
+
+	public int getResourceType() {
+		return m_resourceType;
+	}
+
+	public void setResourceType(int resourceType) {
+		this.m_resourceType = resourceType;
+	}
+
+	public int getResourceVersion() {
+		return m_resourceVersion;
+	}
+
+	public void setResourceVersion(int resourceVersion) {
+		this.m_resourceVersion = resourceVersion;
+	}
+
+	public int getSiblingCount() {
+		return m_siblingCount;
+	}
+
+	public void setSiblingCount(int siblingCount) {
+		this.m_siblingCount = siblingCount;
+	}
+
+	public String getUserCreated() {
+		return m_userCreated;
+	}
+
+	public void setUserCreated(String userCreated) {
+		this.m_userCreated = userCreated;
+	}
+
+	public String getUserLastModified() {
+		return m_userLastModified;
+	}
+
+	public void setUserLastModified(String userLastmodified) {
+		this.m_userLastModified = userLastmodified;
+	}
+
+
+	public static class CmsDAOHistoryResourcesPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOHistoryResources"); }
+			catch(Exception e) {}
+		}
+	
+		public int m_publishTag;
+		public String m_resourceId;
+	
+		public CmsDAOHistoryResourcesPK() {
+		}
+	
+		public CmsDAOHistoryResourcesPK(String str) {
+			fromString(str);
+		}
+	
+		public int getPublishTag() {
+			return m_publishTag;
+		}
+	
+		public void setPublishTag(int publishTag) {
+			this.m_publishTag = publishTag;
+		}
+	
+		public String getResourceId() {
+			return m_resourceId;
+		}
+	
+		public void setResourceId(String resourceId) {
+			this.m_resourceId = resourceId;
+		}
+	
+		public String toString() {
+			return String.valueOf(m_publishTag)
+				+ "::" + m_resourceId;
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + m_publishTag;
+			rs = rs * 37 + ((m_resourceId == null) ? 0 : m_resourceId.hashCode());
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOHistoryResourcesPK other = (CmsDAOHistoryResourcesPK) obj;
+			return (m_publishTag == other.m_publishTag)
+				&& ((m_resourceId == null && other.m_resourceId == null)
+				|| (m_resourceId != null && m_resourceId.equals(other.m_resourceId)));
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			m_publishTag = Integer.parseInt(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_resourceId = null;
+			else
+				m_resourceId = str;
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryStructure.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryStructure.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOHistoryStructure.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOHistoryStructure.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,274 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_history_structure")
+@IdClass(CmsDAOHistoryStructure.CmsDAOHistoryStructurePK.class)
+public class CmsDAOHistoryStructure {
+	@Basic
+	@Column(name="date_expired")
+	private long m_dateExpired;
+
+	@Basic
+	@Column(name="date_released")
+	private long m_dateReleased;
+
+	@Basic
+	@Column(name="parent_id", nullable=false, length=36)
+	private String m_parentId;
+
+	@Id
+	@Column(name="publish_tag")
+	private int m_publishTag;
+
+	@Basic
+	@Column(name="resource_id", nullable=false, length=36)
+	private String m_resourceId;
+
+	@Basic
+	@Column(name="resource_path", length=1024)
+	private String m_resourcePath;
+
+	@Id
+	@Column(name="structure_id", length=36)
+	private String m_structureId;
+
+	@Basic
+	@Column(name="structure_state")
+	private int m_structureState;
+
+	@Basic
+	@Column(name="structure_version")
+	private int m_structureVersion;
+
+	@Id
+	@Column(name="version")
+	private int m_version;
+
+
+	public CmsDAOHistoryStructure() {
+	}
+
+	public CmsDAOHistoryStructure(int publishTag, String structureId, int version) {
+		this.m_publishTag = publishTag;
+		this.m_structureId = structureId;
+		this.m_version = version;
+	}
+
+	public long getDateExpired() {
+		return m_dateExpired;
+	}
+
+	public void setDateExpired(long dateExpired) {
+		this.m_dateExpired = dateExpired;
+	}
+
+	public long getDateReleased() {
+		return m_dateReleased;
+	}
+
+	public void setDateReleased(long dateReleased) {
+		this.m_dateReleased = dateReleased;
+	}
+
+	public String getParentId() {
+		return m_parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.m_parentId = parentId;
+	}
+
+	public int getPublishTag() {
+		return m_publishTag;
+	}
+
+	public void setPublishTag(int publishTag) {
+		this.m_publishTag = publishTag;
+	}
+
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+	public String getResourcePath() {
+		return m_resourcePath;
+	}
+
+	public void setResourcePath(String resourcePath) {
+		this.m_resourcePath = resourcePath;
+	}
+
+	public String getStructureId() {
+		return m_structureId;
+	}
+
+	public void setStructureId(String structureId) {
+		this.m_structureId = structureId;
+	}
+
+	public int getStructureState() {
+		return m_structureState;
+	}
+
+	public void setStructureState(int structureState) {
+		this.m_structureState = structureState;
+	}
+
+	public int getStructureVersion() {
+		return m_structureVersion;
+	}
+
+	public void setStructureVersion(int structureVersion) {
+		this.m_structureVersion = structureVersion;
+	}
+
+	public int getVersion() {
+		return m_version;
+	}
+
+	public void setVersion(int version) {
+		this.m_version = version;
+	}
+
+
+	public static class CmsDAOHistoryStructurePK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOHistoryStructure"); }
+			catch(Exception e) {}
+		}
+	
+		public int m_publishTag;
+		public String m_structureId;
+		public int m_version;
+	
+		public CmsDAOHistoryStructurePK() {
+		}
+	
+		public CmsDAOHistoryStructurePK(String str) {
+			fromString(str);
+		}
+	
+		public int getPublishTag() {
+			return m_publishTag;
+		}
+	
+		public void setPublishTag(int publishTag) {
+			this.m_publishTag = publishTag;
+		}
+	
+		public String getStructureId() {
+			return m_structureId;
+		}
+	
+		public void setStructureId(String structureId) {
+			this.m_structureId = structureId;
+		}
+	
+		public int getVersion() {
+			return m_version;
+		}
+	
+		public void setVersion(int version) {
+			this.m_version = version;
+		}
+	
+		public String toString() {
+			return String.valueOf(m_publishTag)
+				+ "::" + m_structureId
+				+ "::" + String.valueOf(m_version);
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + m_publishTag;
+			rs = rs * 37 + ((m_structureId == null) ? 0 : m_structureId.hashCode());
+			rs = rs * 37 + m_version;
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOHistoryStructurePK other = (CmsDAOHistoryStructurePK) obj;
+			return (m_publishTag == other.m_publishTag)
+				&& ((m_structureId == null && other.m_structureId == null)
+				|| (m_structureId != null && m_structureId.equals(other.m_structureId)))
+				&& (m_version == other.m_version);
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			m_publishTag = Integer.parseInt(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_structureId = null;
+			else
+				m_structureId = str;
+			str = toke.nextToken();
+			m_version = Integer.parseInt(str);
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineAccessControl.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineAccessControl.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineAccessControl.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineAccessControl.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,233 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_offline_accesscontrol")
+@IdClass(CmsDAOOfflineAccessControl.CmsDAOOfflineAccessControlPK.class)
+public class CmsDAOOfflineAccessControl implements I_CmsDAOAccessControl {
+	@Basic
+	@Column(name="access_allowed")
+	private int m_accessAllowed;
+
+	@Basic
+	@Column(name="access_denied")
+	private int m_accessDenied;
+
+	@Basic
+	@Column(name="access_flags")
+	private int m_accessFlags;
+
+	@Id
+	@Column(name="principal_id", length=36)
+	private String m_principalId;
+
+	@Id
+	@Column(name="resource_id", length=36)
+	private String m_resourceId;
+
+
+	public CmsDAOOfflineAccessControl() {
+	}
+
+	public CmsDAOOfflineAccessControl(String principalId, String resourceId) {
+		this.m_principalId = principalId;
+		this.m_resourceId = resourceId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOAccessControl#getAccessAllowed()
+	 */
+	public int getAccessAllowed() {
+		return m_accessAllowed;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOAccessControl#setAccessAllowed(int)
+	 */
+	public void setAccessAllowed(int accessAllowed) {
+		this.m_accessAllowed = accessAllowed;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOAccessControl#getAccessDenied()
+	 */
+	public int getAccessDenied() {
+		return m_accessDenied;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOAccessControl#setAccessDenied(int)
+	 */
+	public void setAccessDenied(int accessDenied) {
+		this.m_accessDenied = accessDenied;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOAccessControl#getAccessFlags()
+	 */
+	public int getAccessFlags() {
+		return m_accessFlags;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOAccessControl#setAccessFlags(int)
+	 */
+	public void setAccessFlags(int accessFlags) {
+		this.m_accessFlags = accessFlags;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOAccessControl#getPrincipalId()
+	 */
+	public String getPrincipalId() {
+		return m_principalId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOAccessControl#setPrincipalId(java.lang.String)
+	 */
+	public void setPrincipalId(String principalId) {
+		this.m_principalId = principalId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOAccessControl#getResourceId()
+	 */
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOAccessControl#setResourceId(java.lang.String)
+	 */
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+
+	public static class CmsDAOOfflineAccessControlPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOOfflineAccessControl"); }
+			catch(Exception e) {}
+		}
+	
+		public String m_principalId;
+		public String m_resourceId;
+	
+		public CmsDAOOfflineAccessControlPK() {
+		}
+	
+		public CmsDAOOfflineAccessControlPK(String str) {
+			fromString(str);
+		}
+	
+		public String getPrincipalId() {
+			return m_principalId;
+		}
+	
+		public void setPrincipalId(String principalId) {
+			this.m_principalId = principalId;
+		}
+	
+		public String getResourceId() {
+			return m_resourceId;
+		}
+	
+		public void setResourceId(String resourceId) {
+			this.m_resourceId = resourceId;
+		}
+	
+		public String toString() {
+			return m_principalId
+				+ "::" + m_resourceId;
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + ((m_principalId == null) ? 0 : m_principalId.hashCode());
+			rs = rs * 37 + ((m_resourceId == null) ? 0 : m_resourceId.hashCode());
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOOfflineAccessControlPK other = (CmsDAOOfflineAccessControlPK) obj;
+			return ((m_principalId == null && other.m_principalId == null)
+				|| (m_principalId != null && m_principalId.equals(other.m_principalId)))
+				&& ((m_resourceId == null && other.m_resourceId == null)
+				|| (m_resourceId != null && m_resourceId.equals(other.m_resourceId)));
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_principalId = null;
+			else
+				m_principalId = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_resourceId = null;
+			else
+				m_resourceId = str;
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineContents.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineContents.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineContents.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineContents.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,68 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_offline_contents")
+public class CmsDAOOfflineContents {
+	@Basic
+	@Column(name="file_content", nullable=false)
+	private byte[] m_fileContent;
+
+	@Id
+	@Column(name="resource_id", length=36)
+	private String m_resourceId;
+
+
+	public CmsDAOOfflineContents() {
+	}
+
+	public CmsDAOOfflineContents(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+	public byte[] getFileContent() {
+		return m_fileContent;
+	}
+
+	public void setFileContent(byte[] fileContent) {
+		this.m_fileContent = fileContent;
+	}
+
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineProperties.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineProperties.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineProperties.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineProperties.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,134 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_offline_properties", uniqueConstraints=@UniqueConstraint(columnNames={"propertydef_id","property_mapping_id"}))
+public class CmsDAOOfflineProperties implements I_CmsDAOProperties {
+	@Id
+	@Column(name="property_id", length=36)
+	private String m_propertyId;
+
+	@Basic
+	@Column(name="property_mapping_id", nullable=false, length=36)
+	private String m_propertyMappingId;
+
+	@Basic
+	@Column(name="property_mapping_type")
+	private int m_propertyMappingType;
+
+	@Basic
+	@Column(name="property_value", nullable=false, length=2048)
+	private String m_propertyValue;
+
+	@Basic
+	@Column(name="propertydef_id", nullable=false, length=36)
+	private String m_propertyDefId;
+
+
+	public CmsDAOOfflineProperties() {
+	}
+
+	public CmsDAOOfflineProperties(String propertyId) {
+		this.m_propertyId = propertyId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOProperties#getPropertyId()
+	 */
+	public String getPropertyId() {
+		return m_propertyId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOProperties#setPropertyId(java.lang.String)
+	 */
+	public void setPropertyId(String propertyId) {
+		this.m_propertyId = propertyId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOProperties#getPropertyMappingId()
+	 */
+	public String getPropertyMappingId() {
+		return m_propertyMappingId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOProperties#setPropertyMappingId(java.lang.String)
+	 */
+	public void setPropertyMappingId(String propertyMappingId) {
+		this.m_propertyMappingId = propertyMappingId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOProperties#getPropertyMappingType()
+	 */
+	public int getPropertyMappingType() {
+		return m_propertyMappingType;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOProperties#setPropertyMappingType(int)
+	 */
+	public void setPropertyMappingType(int propertyMappingType) {
+		this.m_propertyMappingType = propertyMappingType;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOProperties#getPropertyValue()
+	 */
+	public String getPropertyValue() {
+		return m_propertyValue;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOProperties#setPropertyValue(java.lang.String)
+	 */
+	public void setPropertyValue(String propertyValue) {
+		this.m_propertyValue = propertyValue;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOProperties#getPropertydefId()
+	 */
+	public String getPropertyDefId() {
+		return m_propertyDefId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOProperties#setPropertydefId(java.lang.String)
+	 */
+	public void setPropertyDefId(String propertydefId) {
+		this.m_propertyDefId = propertydefId;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflinePropertyDef.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflinePropertyDef.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflinePropertyDef.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflinePropertyDef.java	2008-09-02 11:14:29.063884490 +0300
@@ -0,0 +1,80 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_offline_propertydef", uniqueConstraints=@UniqueConstraint(columnNames={"propertydef_name"}))
+public class CmsDAOOfflinePropertyDef implements I_CmsDAOPropertyDef {
+	@Id
+	@Column(name="propertydef_id", length=36)
+	private String m_propertyDefId;
+
+	@Basic
+	@Column(name="propertydef_name", nullable=false, length=128)
+	private String m_propertyDefName;
+
+	@Basic
+	@Column(name="propertydef_type")
+	private int m_propertyDefType;
+
+
+	public CmsDAOOfflinePropertyDef() {
+	}
+
+	public CmsDAOOfflinePropertyDef(String propertydefId) {
+		this.m_propertyDefId = propertydefId;
+	}
+
+	public String getPropertyDefId() {
+		return m_propertyDefId;
+	}
+
+	public void setPropertyDefId(String propertydefId) {
+		this.m_propertyDefId = propertydefId;
+	}
+
+	public String getPropertyDefName() {
+		return m_propertyDefName;
+	}
+
+	public void setPropertyDefName(String propertydefName) {
+		this.m_propertyDefName = propertydefName;
+	}
+
+	public int getPropertyDefType() {
+		return m_propertyDefType;
+	}
+
+	public void setPropertyDefType(int propertydefType) {
+		this.m_propertyDefType = propertydefType;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineResourceRelations.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineResourceRelations.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineResourceRelations.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineResourceRelations.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,256 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_offline_resource_relations")
+@IdClass(org.opencms.db.jpa.persistence.CmsDAOOfflineResourceRelations.CmsDAOOfflineResourceRelationsPK.class)
+public class CmsDAOOfflineResourceRelations implements I_CmsDAOResourceRelations {
+	@Id
+	@Column(name="relation_source_id", nullable=false, length=36)
+	private String m_relationSourceId;
+
+	@Id
+	@Column(name="relation_source_path", nullable=false, length=1024)
+	private String m_relationSourcePath;
+
+	@Id
+	@Column(name="relation_target_id", nullable=false, length=36)
+	private String m_relationTargetId;
+
+	@Id
+	@Column(name="relation_target_path", nullable=false, length=1024)
+	private String m_relationTargetPath;
+
+	@Id
+	@Column(name="relation_type")
+	private int m_relationType;
+
+	public CmsDAOOfflineResourceRelations() {
+	}
+
+	public CmsDAOOfflineResourceRelations(String relationSourceId, String relationSourcePath, String relationTargetId, String relationTargetPath, int relationType) {
+		this.m_relationSourceId = relationSourceId;
+		this.m_relationSourcePath = relationSourcePath;
+		this.m_relationTargetId = relationTargetId;
+		this.m_relationTargetPath = relationTargetPath;
+		this.m_relationType = relationType;
+	}
+
+	public String getRelationSourceId() {
+		return m_relationSourceId;
+	}
+
+	public void setRelationSourceId(String relationSourceId) {
+		this.m_relationSourceId = relationSourceId;
+	}
+
+	public String getRelationSourcePath() {
+		return m_relationSourcePath;
+	}
+
+	public void setRelationSourcePath(String relationSourcePath) {
+		this.m_relationSourcePath = relationSourcePath;
+	}
+
+	public String getRelationTargetId() {
+		return m_relationTargetId;
+	}
+
+	public void setRelationTargetId(String relationTargetId) {
+		this.m_relationTargetId = relationTargetId;
+	}
+
+	public String getRelationTargetPath() {
+		return m_relationTargetPath;
+	}
+
+	public void setRelationTargetPath(String relationTargetPath) {
+		this.m_relationTargetPath = relationTargetPath;
+	}
+
+	public int getRelationType() {
+		return m_relationType;
+	}
+
+	public void setRelationType(int relationType) {
+		this.m_relationType = relationType;
+	}
+
+	
+	public static class CmsDAOOfflineResourceRelationsPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOOfflineResourceRelations"); }
+			catch(Exception e) {}
+		}
+	
+		public String m_relationSourceId;
+		public String m_relationSourcePath;
+		public String m_relationTargetId;
+		public String m_relationTargetPath;
+		public int m_relationType;
+	
+		public CmsDAOOfflineResourceRelationsPK() {
+		}
+	
+		public CmsDAOOfflineResourceRelationsPK(String str) {
+			fromString(str);
+		}
+	
+		public String getRelationSourceId() {
+			return m_relationSourceId;
+		}
+	
+		public void setRelationSourceId(String relationSourceId) {
+			this.m_relationSourceId = relationSourceId;
+		}
+	
+		public String getRelationSourcePath() {
+			return m_relationSourcePath;
+		}
+	
+		public void setRelationSourcePath(String relationSourcePath) {
+			this.m_relationSourcePath = relationSourcePath;
+		}
+	
+		public String getRelationTargetId() {
+			return m_relationTargetId;
+		}
+	
+		public void setRelationTargetId(String relationTargetId) {
+			this.m_relationTargetId = relationTargetId;
+		}
+	
+		public String getRelationTargetPath() {
+			return m_relationTargetPath;
+		}
+	
+		public void setRelationTargetPath(String relationTargetPath) {
+			this.m_relationTargetPath = relationTargetPath;
+		}
+	
+		public int getRelationType() {
+			return m_relationType;
+		}
+	
+		public void setRelationType(int relationType) {
+			this.m_relationType = relationType;
+		}
+	
+		public String toString() {
+			return m_relationSourceId
+				+ "::" + m_relationSourcePath
+				+ "::" + m_relationTargetId
+				+ "::" + m_relationTargetPath
+				+ "::" + String.valueOf(m_relationType);
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + ((m_relationSourceId == null) ? 0 : m_relationSourceId.hashCode());
+			rs = rs * 37 + ((m_relationSourcePath == null) ? 0 : m_relationSourcePath.hashCode());
+			rs = rs * 37 + ((m_relationTargetId == null) ? 0 : m_relationTargetId.hashCode());
+			rs = rs * 37 + ((m_relationTargetPath == null) ? 0 : m_relationTargetPath.hashCode());
+			rs = rs * 37 + m_relationType;
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOOfflineResourceRelationsPK other = (CmsDAOOfflineResourceRelationsPK) obj;
+			return ((m_relationSourceId == null && other.m_relationSourceId == null)
+				|| (m_relationSourceId != null && m_relationSourceId.equals(other.m_relationSourceId)))
+				&& ((m_relationSourcePath == null && other.m_relationSourcePath == null)
+				|| (m_relationSourcePath != null && m_relationSourcePath.equals(other.m_relationSourcePath)))
+				&& ((m_relationTargetId == null && other.m_relationTargetId == null)
+				|| (m_relationTargetId != null && m_relationTargetId.equals(other.m_relationTargetId)))
+				&& ((m_relationTargetPath == null && other.m_relationTargetPath == null)
+				|| (m_relationTargetPath != null && m_relationTargetPath.equals(other.m_relationTargetPath)))
+				&& (m_relationType == other.m_relationType);
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_relationSourceId = null;
+			else
+				m_relationSourceId = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_relationSourcePath = null;
+			else
+				m_relationSourcePath = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_relationTargetId = null;
+			else
+				m_relationTargetId = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_relationTargetPath = null;
+			else
+				m_relationTargetPath = str;
+			str = toke.nextToken();
+			m_relationType = Integer.parseInt(str);
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineResources.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineResources.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineResources.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineResources.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,200 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_offline_resources")
+public class CmsDAOOfflineResources implements I_CmsDAOResources {
+	@Basic
+	@Column(name="date_content")
+	private long m_dateContent;
+
+	@Basic
+	@Column(name="date_created")
+	private long m_dateCreated;
+
+	@Basic
+	@Column(name="date_lastmodified")
+	private long m_dateLastModified;
+
+	@Basic
+	@Column(name="project_lastmodified", nullable=false, length=36)
+	private String m_projectLastModified;
+
+	@Basic
+	@Column(name="resource_flags")
+	private int m_resourceFlags;
+
+	@Id
+	@Column(name="resource_id", length=36)
+	private String m_resourceId;
+
+	@Basic
+	@Column(name="resource_size")
+	private int m_resourceSize;
+
+	@Basic
+	@Column(name="resource_state")
+	private int m_resourceState;
+
+	@Basic
+	@Column(name="resource_type")
+	private int m_resourceType;
+
+	@Basic
+	@Column(name="resource_version")
+	private int m_resourceVersion;
+
+	@Basic
+	@Column(name="sibling_count")
+	private int m_siblingCount;
+
+	@Basic
+	@Column(name="user_created", nullable=false, length=36)
+	private String m_userCreated;
+
+	@Basic
+	@Column(name="user_lastmodified", nullable=false, length=36)
+	private String m_userLastModified;
+
+
+	public CmsDAOOfflineResources() {
+	}
+
+	public CmsDAOOfflineResources(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+	public long getDateContent() {
+		return m_dateContent;
+	}
+
+	public void setDateContent(long dateContent) {
+		this.m_dateContent = dateContent;
+	}
+
+	public long getDateCreated() {
+		return m_dateCreated;
+	}
+
+	public void setDateCreated(long dateCreated) {
+		this.m_dateCreated = dateCreated;
+	}
+
+	public long getDateLastModified() {
+		return m_dateLastModified;
+	}
+
+	public void setDateLastModified(long dateLastmodified) {
+		this.m_dateLastModified = dateLastmodified;
+	}
+
+	public String getProjectLastModified() {
+		return m_projectLastModified;
+	}
+
+	public void setProjectLastModified(String projectLastmodified) {
+		this.m_projectLastModified = projectLastmodified;
+	}
+
+	public int getResourceFlags() {
+		return m_resourceFlags;
+	}
+
+	public void setResourceFlags(int resourceFlags) {
+		this.m_resourceFlags = resourceFlags;
+	}
+
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+	public int getResourceSize() {
+		return m_resourceSize;
+	}
+
+	public void setResourceSize(int resourceSize) {
+		this.m_resourceSize = resourceSize;
+	}
+
+	public int getResourceState() {
+		return m_resourceState;
+	}
+
+	public void setResourceState(int resourceState) {
+		this.m_resourceState = resourceState;
+	}
+
+	public int getResourceType() {
+		return m_resourceType;
+	}
+
+	public void setResourceType(int resourceType) {
+		this.m_resourceType = resourceType;
+	}
+
+	public int getResourceVersion() {
+		return m_resourceVersion;
+	}
+
+	public void setResourceVersion(int resourceVersion) {
+		this.m_resourceVersion = resourceVersion;
+	}
+
+	public int getSiblingCount() {
+		return m_siblingCount;
+	}
+
+	public void setSiblingCount(int siblingCount) {
+		this.m_siblingCount = siblingCount;
+	}
+
+	public String getUserCreated() {
+		return m_userCreated;
+	}
+
+	public void setUserCreated(String userCreated) {
+		this.m_userCreated = userCreated;
+	}
+
+	public String getUserLastModified() {
+		return m_userLastModified;
+	}
+
+	public void setUserLastModified(String userLastmodified) {
+		this.m_userLastModified = userLastmodified;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineStructure.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineStructure.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOfflineStructure.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOfflineStructure.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,188 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_offline_structure")
+public class CmsDAOOfflineStructure implements I_CmsDAOStructure {
+	@Basic
+	@Column(name="date_expired")
+	private long m_dateExpired;
+
+	@Basic
+	@Column(name="date_released")
+	private long m_dateReleased;
+
+	@Basic
+	@Column(name="parent_id", nullable=false, length=36)
+	private String m_parentId;
+
+	@Basic
+	@Column(name="resource_id", nullable=false, length=36)
+	private String m_resourceId;
+
+	@Basic
+	@Column(name="resource_path", length=1024)
+	private String m_resourcePath;
+
+	@Id
+	@Column(name="structure_id", length=36)
+	private String m_structureId;
+
+	@Basic
+	@Column(name="structure_state")
+	private int m_structureState;
+
+	@Basic
+	@Column(name="structure_version")
+	private int m_structureVersion;
+
+
+	public CmsDAOOfflineStructure() {
+	}
+
+	public CmsDAOOfflineStructure(String structureId) {
+		this.m_structureId = structureId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#getDateExpired()
+	 */
+	public long getDateExpired() {
+		return m_dateExpired;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#setDateExpired(long)
+	 */
+	public void setDateExpired(long dateExpired) {
+		this.m_dateExpired = dateExpired;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#getDateReleased()
+	 */
+	public long getDateReleased() {
+		return m_dateReleased;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#setDateReleased(long)
+	 */
+	public void setDateReleased(long dateReleased) {
+		this.m_dateReleased = dateReleased;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#getParentId()
+	 */
+	public String getParentId() {
+		return m_parentId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#setParentId(java.lang.String)
+	 */
+	public void setParentId(String parentId) {
+		this.m_parentId = parentId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#getResourceId()
+	 */
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#setResourceId(java.lang.String)
+	 */
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#getResourcePath()
+	 */
+	public String getResourcePath() {
+		return m_resourcePath;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#setResourcePath(java.lang.String)
+	 */
+	public void setResourcePath(String resourcePath) {
+		this.m_resourcePath = resourcePath;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#getStructureId()
+	 */
+	public String getStructureId() {
+		return m_structureId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#setStructureId(java.lang.String)
+	 */
+	public void setStructureId(String structureId) {
+		this.m_structureId = structureId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#getStructureState()
+	 */
+	public int getStructureState() {
+		return m_structureState;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#setStructureState(int)
+	 */
+	public void setStructureState(int structureState) {
+		this.m_structureState = structureState;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#getStructureVersion()
+	 */
+	public int getStructureVersion() {
+		return m_structureVersion;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOStructure#setStructureVersion(int)
+	 */
+	public void setStructureVersion(int structureVersion) {
+		this.m_structureVersion = structureVersion;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlineAccessControl.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlineAccessControl.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlineAccessControl.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlineAccessControl.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,203 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_online_accesscontrol")
+@IdClass(CmsDAOOnlineAccessControl.CmsDAOOnlineAccessControlPK.class)
+public class CmsDAOOnlineAccessControl implements I_CmsDAOAccessControl {
+	@Basic
+	@Column(name="access_allowed")
+	private int m_accessAllowed;
+
+	@Basic
+	@Column(name="access_denied")
+	private int m_accessDenied;
+
+	@Basic
+	@Column(name="access_flags")
+	private int m_accessFlags;
+
+	@Id
+	@Column(name="principal_id", length=36)
+	private String m_principalId;
+
+	@Id
+	@Column(name="resource_id", length=36)
+	private String m_resourceId;
+
+
+	public CmsDAOOnlineAccessControl() {
+	}
+
+	public CmsDAOOnlineAccessControl(String principalId, String resourceId) {
+		this.m_principalId = principalId;
+		this.m_resourceId = resourceId;
+	}
+
+	public int getAccessAllowed() {
+		return m_accessAllowed;
+	}
+
+	public void setAccessAllowed(int accessAllowed) {
+		this.m_accessAllowed = accessAllowed;
+	}
+
+	public int getAccessDenied() {
+		return m_accessDenied;
+	}
+
+	public void setAccessDenied(int accessDenied) {
+		this.m_accessDenied = accessDenied;
+	}
+
+	public int getAccessFlags() {
+		return m_accessFlags;
+	}
+
+	public void setAccessFlags(int accessFlags) {
+		this.m_accessFlags = accessFlags;
+	}
+
+	public String getPrincipalId() {
+		return m_principalId;
+	}
+
+	public void setPrincipalId(String principalId) {
+		this.m_principalId = principalId;
+	}
+
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+
+	public static class CmsDAOOnlineAccessControlPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOOnlineAccessControl"); }
+			catch(Exception e) {}
+		}
+	
+		public String m_principalId;
+		public String m_resourceId;
+	
+		public CmsDAOOnlineAccessControlPK() {
+		}
+	
+		public CmsDAOOnlineAccessControlPK(String str) {
+			fromString(str);
+		}
+	
+		public String getPrincipalId() {
+			return m_principalId;
+		}
+	
+		public void setPrincipalId(String principalId) {
+			this.m_principalId = principalId;
+		}
+	
+		public String getResourceId() {
+			return m_resourceId;
+		}
+	
+		public void setResourceId(String resourceId) {
+			this.m_resourceId = resourceId;
+		}
+	
+		public String toString() {
+			return m_principalId
+				+ "::" + m_resourceId;
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + ((m_principalId == null) ? 0 : m_principalId.hashCode());
+			rs = rs * 37 + ((m_resourceId == null) ? 0 : m_resourceId.hashCode());
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOOnlineAccessControlPK other = (CmsDAOOnlineAccessControlPK) obj;
+			return ((m_principalId == null && other.m_principalId == null)
+				|| (m_principalId != null && m_principalId.equals(other.m_principalId)))
+				&& ((m_resourceId == null && other.m_resourceId == null)
+				|| (m_resourceId != null && m_resourceId.equals(other.m_resourceId)));
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_principalId = null;
+			else
+				m_principalId = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_resourceId = null;
+			else
+				m_resourceId = str;
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlineProperties.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlineProperties.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlineProperties.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlineProperties.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,104 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_online_properties", uniqueConstraints=@UniqueConstraint(columnNames={"propertydef_id","property_mapping_id"}))
+public class CmsDAOOnlineProperties implements I_CmsDAOProperties {
+	@Id
+	@Column(name="property_id", length=36)
+	private String m_propertyId;
+
+	@Basic
+	@Column(name="property_mapping_id", nullable=false, length=36)
+	private String m_propertyMappingId;
+
+	@Basic
+	@Column(name="property_mapping_type")
+	private int m_propertyMappingType;
+
+	@Basic
+	@Column(name="property_value", nullable=false, length=2048)
+	private String m_propertyValue;
+
+	@Basic
+	@Column(name="propertydef_id", nullable=false, length=36)
+	private String m_propertyDefId;
+
+
+	public CmsDAOOnlineProperties() {
+	}
+
+	public CmsDAOOnlineProperties(String propertyId) {
+		this.m_propertyId = propertyId;
+	}
+
+	public String getPropertyId() {
+		return m_propertyId;
+	}
+
+	public void setPropertyId(String propertyId) {
+		this.m_propertyId = propertyId;
+	}
+
+	public String getPropertyMappingId() {
+		return m_propertyMappingId;
+	}
+
+	public void setPropertyMappingId(String propertyMappingId) {
+		this.m_propertyMappingId = propertyMappingId;
+	}
+
+	public int getPropertyMappingType() {
+		return m_propertyMappingType;
+	}
+
+	public void setPropertyMappingType(int propertyMappingType) {
+		this.m_propertyMappingType = propertyMappingType;
+	}
+
+	public String getPropertyValue() {
+		return m_propertyValue;
+	}
+
+	public void setPropertyValue(String propertyValue) {
+		this.m_propertyValue = propertyValue;
+	}
+
+	public String getPropertyDefId() {
+		return m_propertyDefId;
+	}
+
+	public void setPropertyDefId(String propertydefId) {
+		this.m_propertyDefId = propertydefId;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlinePropertyDef.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlinePropertyDef.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlinePropertyDef.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlinePropertyDef.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,98 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_online_propertydef", uniqueConstraints=@UniqueConstraint(columnNames={"propertydef_name"}))
+public class CmsDAOOnlinePropertyDef implements I_CmsDAOPropertyDef {
+	@Id
+	@Column(name="propertydef_id", length=36)
+	private String m_propertyDefId;
+
+	@Basic
+	@Column(name="propertydef_name", nullable=false, length=128)
+	private String m_propertyDefName;
+
+	@Basic
+	@Column(name="propertydef_type")
+	private int m_propertyDefType;
+
+
+	public CmsDAOOnlinePropertyDef() {
+	}
+
+	public CmsDAOOnlinePropertyDef(String propertydefId) {
+		this.m_propertyDefId = propertydefId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOPropertyDef#getPropertydefId()
+	 */
+	public String getPropertyDefId() {
+		return m_propertyDefId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOPropertyDef#setPropertydefId(java.lang.String)
+	 */
+	public void setPropertyDefId(String propertydefId) {
+		this.m_propertyDefId = propertydefId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOPropertyDef#getPropertydefName()
+	 */
+	public String getPropertyDefName() {
+		return m_propertyDefName;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOPropertyDef#setPropertydefName(java.lang.String)
+	 */
+	public void setPropertyDefName(String propertydefName) {
+		this.m_propertyDefName = propertydefName;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOPropertyDef#getPropertydefType()
+	 */
+	public int getPropertyDefType() {
+		return m_propertyDefType;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOPropertyDef#setPropertydefType(int)
+	 */
+	public void setPropertyDefType(int propertydefType) {
+		this.m_propertyDefType = propertydefType;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlineResourceRelations.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlineResourceRelations.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlineResourceRelations.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlineResourceRelations.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,286 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.Serializable;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_online_resource_relations")
+@IdClass(org.opencms.db.jpa.persistence.CmsDAOOnlineResourceRelations.CmsDAOOnlineResourceRelationsPK.class)
+public class CmsDAOOnlineResourceRelations implements I_CmsDAOResourceRelations {
+	@Id
+	@Column(name="relation_source_id", nullable=false, length=36)
+	private String m_relationSourceId;
+
+	@Id
+	@Column(name="relation_source_path", nullable=false, length=1024)
+	private String m_relationSourcePath;
+
+	@Id
+	@Column(name="relation_target_id", nullable=false, length=36)
+	private String m_relationTargetId;
+
+	@Id
+	@Column(name="relation_target_path", nullable=false, length=1024)
+	private String m_relationTargetPath;
+
+	@Id
+	@Column(name="relation_type")
+	private int m_relationType;
+
+	public CmsDAOOnlineResourceRelations() {
+	}
+
+	public CmsDAOOnlineResourceRelations(String relationSourceId, String relationSourcePath, String relationTargetId, String relationTargetPath, int relationType) {
+		this.m_relationSourceId = relationSourceId;
+		this.m_relationSourcePath = relationSourcePath;
+		this.m_relationTargetId = relationTargetId;
+		this.m_relationTargetPath = relationTargetPath;
+		this.m_relationType = relationType;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations#getRelationSourceId()
+	 */
+	public String getRelationSourceId() {
+		return m_relationSourceId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations#setRelationSourceId(java.lang.String)
+	 */
+	public void setRelationSourceId(String relationSourceId) {
+		this.m_relationSourceId = relationSourceId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations#getRelationSourcePath()
+	 */
+	public String getRelationSourcePath() {
+		return m_relationSourcePath;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations#setRelationSourcePath(java.lang.String)
+	 */
+	public void setRelationSourcePath(String relationSourcePath) {
+		this.m_relationSourcePath = relationSourcePath;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations#getRelationTargetId()
+	 */
+	public String getRelationTargetId() {
+		return m_relationTargetId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations#setRelationTargetId(java.lang.String)
+	 */
+	public void setRelationTargetId(String relationTargetId) {
+		this.m_relationTargetId = relationTargetId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations#getRelationTargetPath()
+	 */
+	public String getRelationTargetPath() {
+		return m_relationTargetPath;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations#setRelationTargetPath(java.lang.String)
+	 */
+	public void setRelationTargetPath(String relationTargetPath) {
+		this.m_relationTargetPath = relationTargetPath;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations#getRelationType()
+	 */
+	public int getRelationType() {
+		return m_relationType;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResourceRelations#setRelationType(int)
+	 */
+	public void setRelationType(int relationType) {
+		this.m_relationType = relationType;
+	}
+
+	
+	public static class CmsDAOOnlineResourceRelationsPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOOnlineResourceRelations"); }
+			catch(Exception e) {}
+		}
+	
+		public String m_relationSourceId;
+		public String m_relationSourcePath;
+		public String m_relationTargetId;
+		public String m_relationTargetPath;
+		public int m_relationType;
+	
+		public CmsDAOOnlineResourceRelationsPK() {
+		}
+	
+		public CmsDAOOnlineResourceRelationsPK(String str) {
+			fromString(str);
+		}
+	
+		public String getRelationSourceId() {
+			return m_relationSourceId;
+		}
+	
+		public void setRelationSourceId(String relationSourceId) {
+			this.m_relationSourceId = relationSourceId;
+		}
+	
+		public String getRelationSourcePath() {
+			return m_relationSourcePath;
+		}
+	
+		public void setRelationSourcePath(String relationSourcePath) {
+			this.m_relationSourcePath = relationSourcePath;
+		}
+	
+		public String getRelationTargetId() {
+			return m_relationTargetId;
+		}
+	
+		public void setRelationTargetId(String relationTargetId) {
+			this.m_relationTargetId = relationTargetId;
+		}
+	
+		public String getRelationTargetPath() {
+			return m_relationTargetPath;
+		}
+	
+		public void setRelationTargetPath(String relationTargetPath) {
+			this.m_relationTargetPath = relationTargetPath;
+		}
+	
+		public int getRelationType() {
+			return m_relationType;
+		}
+	
+		public void setRelationType(int relationType) {
+			this.m_relationType = relationType;
+		}
+	
+		public String toString() {
+			return m_relationSourceId
+				+ "::" + m_relationSourcePath
+				+ "::" + m_relationTargetId
+				+ "::" + m_relationTargetPath
+				+ "::" + String.valueOf(m_relationType);
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + ((m_relationSourceId == null) ? 0 : m_relationSourceId.hashCode());
+			rs = rs * 37 + ((m_relationSourcePath == null) ? 0 : m_relationSourcePath.hashCode());
+			rs = rs * 37 + ((m_relationTargetId == null) ? 0 : m_relationTargetId.hashCode());
+			rs = rs * 37 + ((m_relationTargetPath == null) ? 0 : m_relationTargetPath.hashCode());
+			rs = rs * 37 + m_relationType;
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOOnlineResourceRelationsPK other = (CmsDAOOnlineResourceRelationsPK) obj;
+			return ((m_relationSourceId == null && other.m_relationSourceId == null)
+				|| (m_relationSourceId != null && m_relationSourceId.equals(other.m_relationSourceId)))
+				&& ((m_relationSourcePath == null && other.m_relationSourcePath == null)
+				|| (m_relationSourcePath != null && m_relationSourcePath.equals(other.m_relationSourcePath)))
+				&& ((m_relationTargetId == null && other.m_relationTargetId == null)
+				|| (m_relationTargetId != null && m_relationTargetId.equals(other.m_relationTargetId)))
+				&& ((m_relationTargetPath == null && other.m_relationTargetPath == null)
+				|| (m_relationTargetPath != null && m_relationTargetPath.equals(other.m_relationTargetPath)))
+				&& (m_relationType == other.m_relationType);
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_relationSourceId = null;
+			else
+				m_relationSourceId = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_relationSourcePath = null;
+			else
+				m_relationSourcePath = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_relationTargetId = null;
+			else
+				m_relationTargetId = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_relationTargetPath = null;
+			else
+				m_relationTargetPath = str;
+			str = toke.nextToken();
+			m_relationType = Integer.parseInt(str);
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlineResources.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlineResources.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlineResources.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlineResources.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,278 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_online_resources")
+public class CmsDAOOnlineResources implements I_CmsDAOResources {
+	@Basic
+	@Column(name="date_content")
+	private long m_dateContent;
+
+	@Basic
+	@Column(name="date_created")
+	private long m_dateCreated;
+
+	@Basic
+	@Column(name="date_lastmodified")
+	private long m_dateLastModified;
+
+	@Basic
+	@Column(name="project_lastmodified", nullable=false, length=36)
+	private String m_projectLastModified;
+
+	@Basic
+	@Column(name="resource_flags")
+	private int m_resourceFlags;
+
+	@Id
+	@Column(name="resource_id", length=36)
+	private String m_resourceId;
+
+	@Basic
+	@Column(name="resource_size")
+	private int m_resourceSize;
+
+	@Basic
+	@Column(name="resource_state")
+	private int m_resourceState;
+
+	@Basic
+	@Column(name="resource_type")
+	private int m_resourceType;
+
+	@Basic
+	@Column(name="resource_version")
+	private int m_resourceVersion;
+
+	@Basic
+	@Column(name="sibling_count")
+	private int m_siblingCount;
+
+	@Basic
+	@Column(name="user_created", nullable=false, length=36)
+	private String m_userCreated;
+
+	@Basic
+	@Column(name="user_lastmodified", nullable=false, length=36)
+	private String m_userLastModified;
+
+
+	public CmsDAOOnlineResources() {
+	}
+
+	public CmsDAOOnlineResources(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getDateContent()
+	 */
+	public long getDateContent() {
+		return m_dateContent;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setDateContent(long)
+	 */
+	public void setDateContent(long dateContent) {
+		this.m_dateContent = dateContent;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getDateCreated()
+	 */
+	public long getDateCreated() {
+		return m_dateCreated;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setDateCreated(long)
+	 */
+	public void setDateCreated(long dateCreated) {
+		this.m_dateCreated = dateCreated;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getDateLastmodified()
+	 */
+	public long getDateLastModified() {
+		return m_dateLastModified;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setDateLastmodified(long)
+	 */
+	public void setDateLastModified(long dateLastmodified) {
+		this.m_dateLastModified = dateLastmodified;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getProjectLastmodified()
+	 */
+	public String getProjectLastModified() {
+		return m_projectLastModified;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setProjectLastmodified(java.lang.String)
+	 */
+	public void setProjectLastModified(String projectLastmodified) {
+		this.m_projectLastModified = projectLastmodified;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getResourceFlags()
+	 */
+	public int getResourceFlags() {
+		return m_resourceFlags;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setResourceFlags(int)
+	 */
+	public void setResourceFlags(int resourceFlags) {
+		this.m_resourceFlags = resourceFlags;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getResourceId()
+	 */
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setResourceId(java.lang.String)
+	 */
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getResourceSize()
+	 */
+	public int getResourceSize() {
+		return m_resourceSize;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setResourceSize(int)
+	 */
+	public void setResourceSize(int resourceSize) {
+		this.m_resourceSize = resourceSize;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getResourceState()
+	 */
+	public int getResourceState() {
+		return m_resourceState;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setResourceState(int)
+	 */
+	public void setResourceState(int resourceState) {
+		this.m_resourceState = resourceState;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getResourceType()
+	 */
+	public int getResourceType() {
+		return m_resourceType;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setResourceType(int)
+	 */
+	public void setResourceType(int resourceType) {
+		this.m_resourceType = resourceType;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getResourceVersion()
+	 */
+	public int getResourceVersion() {
+		return m_resourceVersion;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setResourceVersion(int)
+	 */
+	public void setResourceVersion(int resourceVersion) {
+		this.m_resourceVersion = resourceVersion;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getSiblingCount()
+	 */
+	public int getSiblingCount() {
+		return m_siblingCount;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setSiblingCount(int)
+	 */
+	public void setSiblingCount(int siblingCount) {
+		this.m_siblingCount = siblingCount;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getUserCreated()
+	 */
+	public String getUserCreated() {
+		return m_userCreated;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setUserCreated(java.lang.String)
+	 */
+	public void setUserCreated(String userCreated) {
+		this.m_userCreated = userCreated;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#getUserLastmodified()
+	 */
+	public String getUserLastModified() {
+		return m_userLastModified;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.opencms.db.jpa.persistence.I_CmsDAOResources#setUserLastmodified(java.lang.String)
+	 */
+	public void setUserLastModified(String userLastmodified) {
+		this.m_userLastModified = userLastmodified;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlineStructure.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlineStructure.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOOnlineStructure.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOOnlineStructure.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,140 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_online_structure")
+public class CmsDAOOnlineStructure implements I_CmsDAOStructure {
+	@Basic
+	@Column(name="date_expired")
+	private long m_dateExpired;
+
+	@Basic
+	@Column(name="date_released")
+	private long m_dateReleased;
+
+	@Basic
+	@Column(name="parent_id", nullable=false, length=36)
+	private String m_parentId;
+
+	@Basic
+	@Column(name="resource_id", nullable=false, length=36)
+	private String m_resourceId;
+
+	@Basic
+	@Column(name="resource_path", length=1024)
+	private String m_resourcePath;
+
+	@Id
+	@Column(name="structure_id", length=36)
+	private String m_structureId;
+
+	@Basic
+	@Column(name="structure_state")
+	private int m_structureState;
+
+	@Basic
+	@Column(name="structure_version")
+	private int m_structureVersion;
+
+
+	public CmsDAOOnlineStructure() {
+	}
+
+	public CmsDAOOnlineStructure(String structureId) {
+		this.m_structureId = structureId;
+	}
+
+	public long getDateExpired() {
+		return m_dateExpired;
+	}
+
+	public void setDateExpired(long dateExpired) {
+		this.m_dateExpired = dateExpired;
+	}
+
+	public long getDateReleased() {
+		return m_dateReleased;
+	}
+
+	public void setDateReleased(long dateReleased) {
+		this.m_dateReleased = dateReleased;
+	}
+
+	public String getParentId() {
+		return m_parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.m_parentId = parentId;
+	}
+
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+	public String getResourcePath() {
+		return m_resourcePath;
+	}
+
+	public void setResourcePath(String resourcePath) {
+		this.m_resourcePath = resourcePath;
+	}
+
+	public String getStructureId() {
+		return m_structureId;
+	}
+
+	public void setStructureId(String structureId) {
+		this.m_structureId = structureId;
+	}
+
+	public int getStructureState() {
+		return m_structureState;
+	}
+
+	public void setStructureState(int structureState) {
+		this.m_structureState = structureState;
+	}
+
+	public int getStructureVersion() {
+		return m_structureVersion;
+	}
+
+	public void setStructureVersion(int structureVersion) {
+		this.m_structureVersion = structureVersion;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOProjectResources.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOProjectResources.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOProjectResources.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOProjectResources.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,167 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_projectresources")
+@IdClass(CmsDAOProjectResources.CmsDAOProjectResourcesPK.class)
+public class CmsDAOProjectResources {
+	@Id
+	@Column(name="project_id", length=36)
+	private String m_projectId;
+
+	@Id
+	@Column(name="resource_path", length=1024)
+	private String m_resourcePath;
+
+
+	public CmsDAOProjectResources() {
+	}
+
+	public CmsDAOProjectResources(String projectId, String resourcePath) {
+		this.m_projectId = projectId;
+		this.m_resourcePath = resourcePath;
+	}
+
+	public String getProjectId() {
+		return m_projectId;
+	}
+
+	public void setProjectId(String projectId) {
+		this.m_projectId = projectId;
+	}
+
+	public String getResourcePath() {
+		return m_resourcePath;
+	}
+
+	public void setResourcePath(String resourcePath) {
+		this.m_resourcePath = resourcePath;
+	}
+
+
+	public static class CmsDAOProjectResourcesPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOProjectResources"); }
+			catch(Exception e) {}
+		}
+	
+		public String m_projectId;
+		public String m_resourcePath;
+	
+		public CmsDAOProjectResourcesPK() {
+		}
+	
+		public CmsDAOProjectResourcesPK(String str) {
+			fromString(str);
+		}
+	
+		public String getProjectId() {
+			return m_projectId;
+		}
+	
+		public void setProjectId(String projectId) {
+			this.m_projectId = projectId;
+		}
+	
+		public String getResourcePath() {
+			return m_resourcePath;
+		}
+	
+		public void setResourcePath(String resourcePath) {
+			this.m_resourcePath = resourcePath;
+		}
+	
+		public String toString() {
+			return m_projectId
+				+ "::" + m_resourcePath;
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + ((m_projectId == null) ? 0 : m_projectId.hashCode());
+			rs = rs * 37 + ((m_resourcePath == null) ? 0 : m_resourcePath.hashCode());
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOProjectResourcesPK other = (CmsDAOProjectResourcesPK) obj;
+			return ((m_projectId == null && other.m_projectId == null)
+				|| (m_projectId != null && m_projectId.equals(other.m_projectId)))
+				&& ((m_resourcePath == null && other.m_resourcePath == null)
+				|| (m_resourcePath != null && m_resourcePath.equals(other.m_resourcePath)));
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_projectId = null;
+			else
+				m_projectId = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_resourcePath = null;
+			else
+				m_resourcePath = str;
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOProjects.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOProjects.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOProjects.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOProjects.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,164 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_projects", uniqueConstraints=@UniqueConstraint(columnNames={"project_ou", "project_name", "date_created"}))
+public class CmsDAOProjects {
+	@Basic
+	@Column(name="date_created")
+	private long m_dateCreated;
+
+	@Basic
+	@Column(name="group_id", nullable=false, length=36)
+	private String m_groupId;
+
+	@Basic
+	@Column(name="managergroup_id", nullable=false, length=36)
+	private String m_managerGroupId;
+
+	@Basic
+	@Column(name="project_description", nullable=false)
+	private String m_projectDescription;
+
+	@Basic
+	@Column(name="project_flags")
+	private int m_projectFlags;
+
+	@Id
+	@Column(name="project_id", length=36)
+	private String m_projectId;
+
+	@Basic
+	@Column(name="project_name", nullable=false, length=200)
+	private String m_projectName;
+
+	@Basic
+	@Column(name="project_ou", nullable=false, length=128)
+	private String m_projectOu;
+
+	@Basic
+	@Column(name="project_type")
+	private int m_projectType;
+
+	@Basic
+	@Column(name="user_id", nullable=false, length=36)
+	private String m_userId;
+
+
+	public CmsDAOProjects() {
+	}
+
+	public CmsDAOProjects(String projectId) {
+		this.m_projectId = projectId;
+	}
+
+	public long getDateCreated() {
+		return m_dateCreated;
+	}
+
+	public void setDateCreated(long dateCreated) {
+		this.m_dateCreated = dateCreated;
+	}
+
+	public String getGroupId() {
+		return m_groupId;
+	}
+
+	public void setGroupId(String groupId) {
+		this.m_groupId = groupId;
+	}
+
+	public String getManagerGroupId() {
+		return m_managerGroupId;
+	}
+
+	public void setManagerGroupId(String managergroupId) {
+		this.m_managerGroupId = managergroupId;
+	}
+
+	public String getProjectDescription() {
+		return m_projectDescription;
+	}
+
+	public void setProjectDescription(String projectDescription) {
+		this.m_projectDescription = projectDescription;
+	}
+
+	public int getProjectFlags() {
+		return m_projectFlags;
+	}
+
+	public void setProjectFlags(int projectFlags) {
+		this.m_projectFlags = projectFlags;
+	}
+
+	public String getProjectId() {
+		return m_projectId;
+	}
+
+	public void setProjectId(String projectId) {
+		this.m_projectId = projectId;
+	}
+
+	public String getProjectName() {
+		return m_projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.m_projectName = projectName;
+	}
+
+	public String getProjectOu() {
+		return m_projectOu;
+	}
+
+	public void setProjectOu(String projectOu) {
+		this.m_projectOu = projectOu;
+	}
+
+	public int getProjectType() {
+		return m_projectType;
+	}
+
+	public void setProjectType(int projectType) {
+		this.m_projectType = projectType;
+	}
+
+	public String getUserId() {
+		return m_userId;
+	}
+
+	public void setUserId(String userId) {
+		this.m_userId = userId;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOPublishHistory.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOPublishHistory.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOPublishHistory.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOPublishHistory.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,273 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_publish_history")
+@IdClass(CmsDAOPublishHistory.CmsDAOPublishHistoryPK.class)
+public class CmsDAOPublishHistory {
+	@Id
+	@Column(name="history_id", length=36)
+	private String m_historyId;
+
+	@Id
+	@Column(name="publish_tag")
+	private int m_publishTag;
+
+	@Basic
+	@Column(name="resource_id", nullable=false, length=36)
+	private String m_resourceId;
+
+	@Id
+	@Column(name="resource_path", length=1024)
+	private String m_resourcePath;
+
+	@Basic
+	@Column(name="resource_state")
+	private int m_resourceState;
+
+	@Basic
+	@Column(name="resource_type")
+	private int m_resourceType;
+
+	@Basic
+	@Column(name="sibling_count")
+	private int m_siblingCount;
+
+	@Id
+	@Column(name="structure_id", length=36)
+	private String m_structureId;
+
+
+	public CmsDAOPublishHistory() {
+	}
+
+	public CmsDAOPublishHistory(String historyId, int publishTag, String resourcePath, String structureId) {
+		this.m_historyId = historyId;
+		this.m_publishTag = publishTag;
+		this.m_resourcePath = resourcePath;
+		this.m_structureId = structureId;
+	}
+
+	public String getHistoryId() {
+		return m_historyId;
+	}
+
+	public void setHistoryId(String historyId) {
+		this.m_historyId = historyId;
+	}
+
+	public int getPublishTag() {
+		return m_publishTag;
+	}
+
+	public void setPublishTag(int publishTag) {
+		this.m_publishTag = publishTag;
+	}
+
+	public String getResourceId() {
+		return m_resourceId;
+	}
+
+	public void setResourceId(String resourceId) {
+		this.m_resourceId = resourceId;
+	}
+
+	public String getResourcePath() {
+		return m_resourcePath;
+	}
+
+	public void setResourcePath(String resourcePath) {
+		this.m_resourcePath = resourcePath;
+	}
+
+	public int getResourceState() {
+		return m_resourceState;
+	}
+
+	public void setResourceState(int resourceState) {
+		this.m_resourceState = resourceState;
+	}
+
+	public int getResourceType() {
+		return m_resourceType;
+	}
+
+	public void setResourceType(int resourceType) {
+		this.m_resourceType = resourceType;
+	}
+
+	public int getSiblingCount() {
+		return m_siblingCount;
+	}
+
+	public void setSiblingCount(int siblingCount) {
+		this.m_siblingCount = siblingCount;
+	}
+
+	public String getStructureId() {
+		return m_structureId;
+	}
+
+	public void setStructureId(String structureId) {
+		this.m_structureId = structureId;
+	}
+
+
+	public static class CmsDAOPublishHistoryPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOPublishHistory"); }
+			catch(Exception e) {}
+		}
+	
+		public String m_historyId;
+		public int m_publishTag;
+		public String m_resourcePath;
+		public String m_structureId;
+	
+		public CmsDAOPublishHistoryPK() {
+		}
+	
+		public CmsDAOPublishHistoryPK(String str) {
+			fromString(str);
+		}
+	
+		public String getHistoryId() {
+			return m_historyId;
+		}
+	
+		public void setHistoryId(String historyId) {
+			this.m_historyId = historyId;
+		}
+	
+		public int getPublishTag() {
+			return m_publishTag;
+		}
+	
+		public void setPublishTag(int publishTag) {
+			this.m_publishTag = publishTag;
+		}
+	
+		public String getResourcePath() {
+			return m_resourcePath;
+		}
+	
+		public void setResourcePath(String resourcePath) {
+			this.m_resourcePath = resourcePath;
+		}
+	
+		public String getStructureId() {
+			return m_structureId;
+		}
+	
+		public void setStructureId(String structureId) {
+			this.m_structureId = structureId;
+		}
+	
+		public String toString() {
+			return m_historyId
+				+ "::" + String.valueOf(m_publishTag)
+				+ "::" + m_resourcePath
+				+ "::" + m_structureId;
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + ((m_historyId == null) ? 0 : m_historyId.hashCode());
+			rs = rs * 37 + m_publishTag;
+			rs = rs * 37 + ((m_resourcePath == null) ? 0 : m_resourcePath.hashCode());
+			rs = rs * 37 + ((m_structureId == null) ? 0 : m_structureId.hashCode());
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOPublishHistoryPK other = (CmsDAOPublishHistoryPK) obj;
+			return ((m_historyId == null && other.m_historyId == null)
+				|| (m_historyId != null && m_historyId.equals(other.m_historyId)))
+				&& (m_publishTag == other.m_publishTag)
+				&& ((m_resourcePath == null && other.m_resourcePath == null)
+				|| (m_resourcePath != null && m_resourcePath.equals(other.m_resourcePath)))
+				&& ((m_structureId == null && other.m_structureId == null)
+				|| (m_structureId != null && m_structureId.equals(other.m_structureId)));
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_historyId = null;
+			else
+				m_historyId = str;
+			str = toke.nextToken();
+			m_publishTag = Integer.parseInt(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_resourcePath = null;
+			else
+				m_resourcePath = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_structureId = null;
+			else
+				m_structureId = str;
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOPublishJobs.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOPublishJobs.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOPublishJobs.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOPublishJobs.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,188 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_publish_jobs")
+public class CmsDAOPublishJobs {
+	@Basic
+	@Column(name="enqueue_time")
+	private long m_enqueueTime;
+
+	@Basic
+	@Column(name="finish_time")
+	private long m_finishTime;
+
+	@Id
+	@Column(name="history_id", length=36)
+	private String m_historyId;
+
+	@Basic
+	@Column(name="project_id", nullable=false, length=36)
+	private String m_projectId;
+
+	@Basic
+	@Column(name="project_name", nullable=false)
+	private String m_projectName;
+
+	@Basic
+	@Column(name="publish_flags")
+	private int m_publishFlags;
+
+	@Basic
+	@Column(name="publish_list")
+	private byte[] m_publishList;
+
+	@Basic
+	@Column(name="publish_locale", nullable=false, length=16)
+	private String m_publishLocale;
+
+	@Basic
+	@Column(name="publish_report")
+	private byte[] m_publishReport;
+
+	@Basic
+	@Column(name="resource_count")
+	private int m_resourceCount;
+
+	@Basic
+	@Column(name="start_time")
+	private long m_startTime;
+
+	@Basic
+	@Column(name="user_id", nullable=false, length=36)
+	private String m_userId;
+
+
+	public CmsDAOPublishJobs() {
+	}
+
+	public CmsDAOPublishJobs(String historyId) {
+		this.m_historyId = historyId;
+	}
+
+	public long getEnqueueTime() {
+		return m_enqueueTime;
+	}
+
+	public void setEnqueueTime(long enqueueTime) {
+		this.m_enqueueTime = enqueueTime;
+	}
+
+	public long getFinishTime() {
+		return m_finishTime;
+	}
+
+	public void setFinishTime(long finishTime) {
+		this.m_finishTime = finishTime;
+	}
+
+	public String getHistoryId() {
+		return m_historyId;
+	}
+
+	public void setHistoryId(String historyId) {
+		this.m_historyId = historyId;
+	}
+
+	public String getProjectId() {
+		return m_projectId;
+	}
+
+	public void setProjectId(String projectId) {
+		this.m_projectId = projectId;
+	}
+
+	public String getProjectName() {
+		return m_projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.m_projectName = projectName;
+	}
+
+	public int getPublishFlags() {
+		return m_publishFlags;
+	}
+
+	public void setPublishFlags(int publishFlags) {
+		this.m_publishFlags = publishFlags;
+	}
+
+	public byte[] getPublishList() {
+		return m_publishList;
+	}
+
+	public void setPublishList(byte[] publishList) {
+		this.m_publishList = publishList;
+	}
+
+	public String getPublishLocale() {
+		return m_publishLocale;
+	}
+
+	public void setPublishLocale(String publishLocale) {
+		this.m_publishLocale = publishLocale;
+	}
+
+	public byte[] getPublishReport() {
+		return m_publishReport;
+	}
+
+	public void setPublishReport(byte[] publishReport) {
+		this.m_publishReport = publishReport;
+	}
+
+	public int getResourceCount() {
+		return m_resourceCount;
+	}
+
+	public void setResourceCount(int resourceCount) {
+		this.m_resourceCount = resourceCount;
+	}
+
+	public long getStartTime() {
+		return m_startTime;
+	}
+
+	public void setStartTime(long startTime) {
+		this.m_startTime = startTime;
+	}
+
+	public String getUserId() {
+		return m_userId;
+	}
+
+	public void setUserId(String userId) {
+		this.m_userId = userId;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOResourceLocks.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOResourceLocks.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOResourceLocks.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOResourceLocks.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,92 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_resource_locks")
+public class CmsDAOResourceLocks {
+	@Basic
+	@Column(name="lock_type")
+	private int m_lockType;
+
+	@Basic
+	@Column(name="project_id", nullable=false, length=36)
+	private String m_projectId;
+
+	@Id
+	@Column(name="resource_path", length=1024)
+	private String m_resourcePath;
+
+	@Basic
+	@Column(name="user_id", nullable=false, length=36)
+	private String m_userId;
+
+
+	public CmsDAOResourceLocks() {
+	}
+
+	public CmsDAOResourceLocks(String resourcePath) {
+		this.m_resourcePath = resourcePath;
+	}
+
+	public int getLockType() {
+		return m_lockType;
+	}
+
+	public void setLockType(int lockType) {
+		this.m_lockType = lockType;
+	}
+
+	public String getProjectId() {
+		return m_projectId;
+	}
+
+	public void setProjectId(String projectId) {
+		this.m_projectId = projectId;
+	}
+
+	public String getResourcePath() {
+		return m_resourcePath;
+	}
+
+	public void setResourcePath(String resourcePath) {
+		this.m_resourcePath = resourcePath;
+	}
+
+	public String getUserId() {
+		return m_userId;
+	}
+
+	public void setUserId(String userId) {
+		this.m_userId = userId;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOStaticExportLinks.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOStaticExportLinks.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOStaticExportLinks.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOStaticExportLinks.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,104 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_staticexport_links")
+public class CmsDAOStaticExportLinks {
+	@Id
+	@Column(name="link_id", length=36)
+	private String m_linkId;
+
+	@Basic
+	@Column(name="link_parameter", length=1024)
+	private String m_linkParameter;
+
+	@Basic
+	@Column(name="link_rfs_path", length=1024)
+	private String m_linkRfsPath;
+
+	@Basic
+	@Column(name="link_timestamp")
+	private long m_linkTimestamp;
+
+	@Basic
+	@Column(name="link_type")
+	private int m_linkType;
+
+
+	public CmsDAOStaticExportLinks() {
+	}
+
+	public CmsDAOStaticExportLinks(String linkId) {
+		this.m_linkId = linkId;
+	}
+
+	public String getLinkId() {
+		return m_linkId;
+	}
+
+	public void setLinkId(String linkId) {
+		this.m_linkId = linkId;
+	}
+
+	public String getLinkParameter() {
+		return m_linkParameter;
+	}
+
+	public void setLinkParameter(String linkParameter) {
+		this.m_linkParameter = linkParameter;
+	}
+
+	public String getLinkRfsPath() {
+		return m_linkRfsPath;
+	}
+
+	public void setLinkRfsPath(String linkRfsPath) {
+		this.m_linkRfsPath = linkRfsPath;
+	}
+
+	public long getLinkTimestamp() {
+		return m_linkTimestamp;
+	}
+
+	public void setLinkTimestamp(long linkTimestamp) {
+		this.m_linkTimestamp = linkTimestamp;
+	}
+
+	public int getLinkType() {
+		return m_linkType;
+	}
+
+	public void setLinkType(int linkType) {
+		this.m_linkType = linkType;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOUserData.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOUserData.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOUserData.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOUserData.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,191 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import java.io.*;
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_userdata")
+@IdClass(CmsDAOUserData.CmsDAOUserDataPK.class)
+public class CmsDAOUserData {
+	@Id
+	@Column(name="data_key")
+	private String m_dataKey;
+
+	@Basic
+	@Column(name="data_type", nullable=false, length=128)
+	private String m_dataType;
+
+	@Basic
+	@Column(name="data_value")
+	private byte[] m_dataValue;
+
+	@Id
+	@Column(name="user_id", length=36)
+	private String m_userId;
+
+
+	public CmsDAOUserData() {
+	}
+
+	public CmsDAOUserData(String dataKey, String userId) {
+		this.m_dataKey = dataKey;
+		this.m_userId = userId;
+	}
+
+	public String getDataKey() {
+		return m_dataKey;
+	}
+
+	public void setDataKey(String dataKey) {
+		this.m_dataKey = dataKey;
+	}
+
+	public String getDataType() {
+		return m_dataType;
+	}
+
+	public void setDataType(String dataType) {
+		this.m_dataType = dataType;
+	}
+
+	public byte[] getDataValue() {
+		return m_dataValue;
+	}
+
+	public void setDataValue(byte[] dataValue) {
+		this.m_dataValue = dataValue;
+	}
+
+	public String getUserId() {
+		return m_userId;
+	}
+
+	public void setUserId(String userId) {
+		this.m_userId = userId;
+	}
+
+
+	public static class CmsDAOUserDataPK implements Serializable {
+		static {
+			// register persistent class in JVM
+			try { Class.forName("org.opencms.db.jpa.persistence.CmsDAOUserData"); }
+			catch(Exception e) {}
+		}
+	
+		public String m_dataKey;
+		public String m_userId;
+	
+		public CmsDAOUserDataPK() {
+		}
+	
+		public CmsDAOUserDataPK(String str) {
+			fromString(str);
+		}
+	
+		public String getDataKey() {
+			return m_dataKey;
+		}
+	
+		public void setDataKey(String dataKey) {
+			this.m_dataKey = dataKey;
+		}
+	
+		public String getUserId() {
+			return m_userId;
+		}
+	
+		public void setUserId(String userId) {
+			this.m_userId = userId;
+		}
+	
+		public String toString() {
+			return m_dataKey
+				+ "::" + m_userId;
+		}
+	
+		public int hashCode() {
+			int rs = 17;
+			rs = rs * 37 + ((m_dataKey == null) ? 0 : m_dataKey.hashCode());
+			rs = rs * 37 + ((m_userId == null) ? 0 : m_userId.hashCode());
+			return rs;
+		}
+	
+		public boolean equals(Object obj) {
+			if(this == obj)
+				return true;
+			if(obj == null || obj.getClass() != getClass())
+				return false;
+	
+			CmsDAOUserDataPK other = (CmsDAOUserDataPK) obj;
+			return ((m_dataKey == null && other.m_dataKey == null)
+				|| (m_dataKey != null && m_dataKey.equals(other.m_dataKey)))
+				&& ((m_userId == null && other.m_userId == null)
+				|| (m_userId != null && m_userId.equals(other.m_userId)));
+		}
+	
+		private void fromString(String str) {
+			Tokenizer toke = new Tokenizer(str);
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_dataKey = null;
+			else
+				m_dataKey = str;
+			str = toke.nextToken();
+			if("null".equals(str))
+				m_userId = null;
+			else
+				m_userId = str;
+		}
+	
+		protected static class Tokenizer {
+			private final String str;
+			private int last;
+	
+			public Tokenizer (String str) {
+				this.str = str;
+			}
+	
+			public String nextToken () {
+				int next = str.indexOf("::", last);
+				String part;
+				if(next == -1) {
+					part = str.substring(last);
+					last = str.length();
+				} else {
+					part = str.substring(last, next);
+					last = next + 2;
+				}
+				return part;
+			}
+		}
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOUsers.java trunk/src/org/opencms/db/jpa/persistence/CmsDAOUsers.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/CmsDAOUsers.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/CmsDAOUsers.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,164 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+import javax.persistence.*;
+
+
+@Entity
+@Table(name="cms_users", uniqueConstraints=@UniqueConstraint(columnNames={"user_name", "user_ou"}))
+public class CmsDAOUsers {
+	@Basic
+	@Column(name="user_datecreated")
+	private long m_userDateCreated;
+
+	@Basic
+	@Column(name="user_email", nullable=false, length=128)
+	private String m_userEmail;
+
+	@Basic
+	@Column(name="user_firstname", nullable=false, length=128)
+	private String m_userFirstName;
+
+	@Basic
+	@Column(name="user_flags")
+	private int m_userFlags;
+
+	@Id
+	@Column(name="user_id", length=36)
+	private String m_userId;
+
+	@Basic
+	@Column(name="user_lastlogin")
+	private long m_userLastLogin;
+
+	@Basic
+	@Column(name="user_lastname", nullable=false, length=128)
+	private String m_userLastName;
+
+	@Basic
+	@Column(name="user_name", nullable=false, length=128)
+	private String m_userName;
+
+	@Basic
+	@Column(name="user_ou", nullable=false, length=128)
+	private String m_userOu;
+
+	@Basic
+	@Column(name="user_password", nullable=false, length=64)
+	private String m_userPassword;
+
+
+	public CmsDAOUsers() {
+	}
+
+	public CmsDAOUsers(String userId) {
+		this.m_userId = userId;
+	}
+
+	public long getUserDateCreated() {
+		return m_userDateCreated;
+	}
+
+	public void setUserDateCreated(long userDatecreated) {
+		this.m_userDateCreated = userDatecreated;
+	}
+
+	public String getUserEmail() {
+		return m_userEmail;
+	}
+
+	public void setUserEmail(String userEmail) {
+		this.m_userEmail = userEmail;
+	}
+
+	public String getUserFirstName() {
+		return m_userFirstName;
+	}
+
+	public void setUserFirstName(String userFirstname) {
+		this.m_userFirstName = userFirstname;
+	}
+
+	public int getUserFlags() {
+		return m_userFlags;
+	}
+
+	public void setUserFlags(int userFlags) {
+		this.m_userFlags = userFlags;
+	}
+
+	public String getUserId() {
+		return m_userId;
+	}
+
+	public void setUserId(String userId) {
+		this.m_userId = userId;
+	}
+
+	public long getUserLastLogin() {
+		return m_userLastLogin;
+	}
+
+	public void setUserLastLogin(long userLastlogin) {
+		this.m_userLastLogin = userLastlogin;
+	}
+
+	public String getUserLastName() {
+		return m_userLastName;
+	}
+
+	public void setUserLastName(String userLastname) {
+		this.m_userLastName = userLastname;
+	}
+
+	public String getUserName() {
+		return m_userName;
+	}
+
+	public void setUserName(String userName) {
+		this.m_userName = userName;
+	}
+
+	public String getUserOu() {
+		return m_userOu;
+	}
+
+	public void setUserOu(String userOu) {
+		this.m_userOu = userOu;
+	}
+
+	public String getUserPassword() {
+		return m_userPassword;
+	}
+
+	public void setUserPassword(String userPassword) {
+		this.m_userPassword = userPassword;
+	}
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOAccessControl.java trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOAccessControl.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOAccessControl.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOAccessControl.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,53 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+public interface I_CmsDAOAccessControl {
+
+	public abstract int getAccessAllowed();
+
+	public abstract void setAccessAllowed(int accessAllowed);
+
+	public abstract int getAccessDenied();
+
+	public abstract void setAccessDenied(int accessDenied);
+
+	public abstract int getAccessFlags();
+
+	public abstract void setAccessFlags(int accessFlags);
+
+	public abstract String getPrincipalId();
+
+	public abstract void setPrincipalId(String principalId);
+
+	public abstract String getResourceId();
+
+	public abstract void setResourceId(String resourceId);
+
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOProperties.java trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOProperties.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOProperties.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOProperties.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,53 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+public interface I_CmsDAOProperties {
+
+	public String getPropertyId();
+
+	public void setPropertyId(String propertyId);
+
+	public String getPropertyMappingId();
+
+	public void setPropertyMappingId(String propertyMappingId);
+
+	public int getPropertyMappingType();
+
+	public void setPropertyMappingType(int propertyMappingType);
+
+	public String getPropertyValue();
+
+	public void setPropertyValue(String propertyValue);
+
+	public String getPropertyDefId();
+
+	public void setPropertyDefId(String propertydefId);
+
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOPropertyDef.java trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOPropertyDef.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOPropertyDef.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOPropertyDef.java	2008-09-02 11:14:29.055884284 +0300
@@ -0,0 +1,45 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+public interface I_CmsDAOPropertyDef {
+
+	public String getPropertyDefId();
+
+	public void setPropertyDefId(String propertydefId);
+
+	public String getPropertyDefName();
+
+	public void setPropertyDefName(String propertydefName);
+
+	public int getPropertyDefType();
+
+	public void setPropertyDefType(int propertydefType);
+
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOResourceRelations.java trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOResourceRelations.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOResourceRelations.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOResourceRelations.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,53 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+public interface I_CmsDAOResourceRelations {
+
+	public String getRelationSourceId();
+
+	public void setRelationSourceId(String relationSourceId);
+
+	public String getRelationSourcePath();
+
+	public void setRelationSourcePath(String relationSourcePath);
+
+	public String getRelationTargetId();
+
+	public void setRelationTargetId(String relationTargetId);
+
+	public String getRelationTargetPath();
+
+	public void setRelationTargetPath(String relationTargetPath);
+
+	public int getRelationType();
+
+	public void setRelationType(int relationType);
+
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOResources.java trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOResources.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOResources.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOResources.java	2008-09-02 11:14:29.059883947 +0300
@@ -0,0 +1,85 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+public interface I_CmsDAOResources {
+
+	public long getDateContent();
+
+	public void setDateContent(long dateContent);
+
+	public long getDateCreated();
+
+	public void setDateCreated(long dateCreated);
+
+	public long getDateLastModified();
+
+	public void setDateLastModified(long dateLastmodified);
+
+	public String getProjectLastModified();
+
+	public void setProjectLastModified(String projectLastmodified);
+
+	public int getResourceFlags();
+
+	public void setResourceFlags(int resourceFlags);
+
+	public String getResourceId();
+
+	public void setResourceId(String resourceId);
+
+	public int getResourceSize();
+
+	public void setResourceSize(int resourceSize);
+
+	public int getResourceState();
+
+	public void setResourceState(int resourceState);
+
+	public int getResourceType();
+
+	public void setResourceType(int resourceType);
+
+	public int getResourceVersion();
+
+	public void setResourceVersion(int resourceVersion);
+
+	public int getSiblingCount();
+
+	public void setSiblingCount(int siblingCount);
+
+	public String getUserCreated();
+
+	public void setUserCreated(String userCreated);
+
+	public String getUserLastModified();
+
+	public void setUserLastModified(String userLastmodified);
+
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOStructure.java trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOStructure.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/persistence/I_CmsDAOStructure.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/persistence/I_CmsDAOStructure.java	2008-09-02 11:14:29.051883980 +0300
@@ -0,0 +1,65 @@
+/*
+ *
+ * This library is part of OpenCms - 
+ * the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa.persistence;
+
+public interface I_CmsDAOStructure {
+
+	public long getDateExpired();
+
+	public void setDateExpired(long dateExpired);
+
+	public long getDateReleased();
+
+	public void setDateReleased(long dateReleased);
+
+	public String getParentId();
+
+	public void setParentId(String parentId);
+
+	public String getResourceId();
+
+	public void setResourceId(String resourceId);
+
+	public String getResourcePath();
+
+	public void setResourcePath(String resourcePath);
+
+	public String getStructureId();
+
+	public void setStructureId(String structureId);
+
+	public int getStructureState();
+
+	public void setStructureState(int structureState);
+
+	public int getStructureVersion();
+
+	public void setStructureVersion(int structureVersion);
+
+}
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/PoolEntityManagerFactory.java trunk/src/org/opencms/db/jpa/PoolEntityManagerFactory.java
--- opencms_7.0.5_src/src/org/opencms/db/jpa/PoolEntityManagerFactory.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/PoolEntityManagerFactory.java	2008-09-02 11:14:29.183884150 +0300
@@ -0,0 +1,73 @@
+/*
+ *
+ * This work is derivate of generic SQL driver and it's part of 
+ * OpenCms - the Open Source Content Management System
+ *
+ * Copyright (c) 2008 Georgi Naplatanov (http://www.oles.biz)
+ *
+ * Special thanks to:
+ *  - Michael Moossen and Alexander Kandzior from Alkacon Software GmbH (http://www.alkacon.com)
+ *  - Ivan Codarin, idependеnt IT professional
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * For further information about OpenCms, please see the
+ * project website: http://www.opencms.org
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.opencms.db.jpa;
+
+import javax.persistence.EntityManager;
+
+import org.apache.commons.pool.BasePoolableObjectFactory;
+
+/**
+ * @author gosho
+ *
+ */
+public class PoolEntityManagerFactory extends BasePoolableObjectFactory { 
+	
+	/** EntityManagerFactory which creates EntityManager instances.*/
+	protected javax.persistence.EntityManagerFactory m_emFactory ;
+	
+	/** Public constructor
+	 * @param emFactory 
+	 */
+	public PoolEntityManagerFactory(javax.persistence.EntityManagerFactory emFactory){
+		this.m_emFactory = emFactory ;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.apache.commons.pool.BasePoolableObjectFactory#makeObject()
+	 */
+	public Object makeObject() {
+        return m_emFactory.createEntityManager() ;
+    }
+	
+	/* (non-Javadoc)
+	 * @see org.apache.commons.pool.BasePoolableObjectFactory#passivateObject(java.lang.Object)
+	 */
+	public void passivateObject(Object obj) { 
+        EntityManager em = (EntityManager) obj ;
+        em.clear() ;
+    }
+	
+	/* (non-Javadoc)
+	 * @see org.apache.commons.pool.BasePoolableObjectFactory#destroyObject(java.lang.Object)
+	 */
+	public void destroyObject(Object obj){
+		EntityManager em = (EntityManager) obj ;
+        em.close() ;
+	}
+}
diff -urN opencms_7.0.5_src/src/org/opencms/db/jpa/query.properties trunk/src/org/opencms/db/jpa/query.properties
--- opencms_7.0.5_src/src/org/opencms/db/jpa/query.properties	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src/org/opencms/db/jpa/query.properties	2008-09-02 11:14:29.183884150 +0300
@@ -0,0 +1,1566 @@
+#
+# The pattern ${PROJECT} in table names is replaced by the SqlManager with 
+# "Online" or "Offline" to choose the right database tables for
+# JPQL queries that are project dependent!
+# The CmsSqlManager numbers parameters placeholders, so set the parameter placeholders "?"
+# whithout number.
+#
+
+#
+# Project table attributes
+#
+
+C_RESOURCES_SELECT_ATTRIBS_HISTORY=\
+	T_CmsDAOHistoryStructure , \
+	T_CmsDAOHistoryResources 
+
+C_RESOURCES_SELECT_TABLES_HISTORY=CmsDAOHistoryStructure T_CmsDAOHistoryStructure, CmsDAOHistoryResources T_CmsDAOHistoryResources
+
+C_JOIN_STRUCTURE_RESOURCE_HISTORY=T_CmsDAOHistoryStructure.m_resourceId=T_CmsDAOHistoryResources.m_resourceId AND \
+	T_CmsDAOHistoryStructure.m_publishTag=T_CmsDAOHistoryResources.m_publishTag
+
+C_STRUCTURE_HISTORY_MAXVER=\
+SELECT \
+	MAX(T_CmsDAOHistoryStructure.m_version) \
+FROM \
+	CmsDAOHistoryStructure T_CmsDAOHistoryStructure \
+WHERE \
+	T_CmsDAOHistoryStructure.m_structureId=?
+	
+
+C_STRUCTURE_HISTORY_MAXVER_BYTIME=\
+SELECT \
+	MAX(T_CmsDAOHistoryStructure.m_version) \
+FROM \
+	CmsDAOHistoryStructure T_CmsDAOHistoryStructure , \
+	CmsDAOHistoryProjects T_CmsDAOHistoryProjects \
+WHERE \
+	T_CmsDAOHistoryStructure.m_structureId=? \
+	AND T_CmsDAOHistoryStructure.m_publishTag = T_CmsDAOHistoryProjects.m_publishTag \
+	AND T_CmsDAOHistoryProjects.m_publishDate < ?
+	
+C_HISTORY_READ_MAXTAG_FOR_VERSION=\
+SELECT \
+	MAX(T_CmsDAOHistoryStructure.m_publishTag) \
+FROM \
+	CmsDAOHistoryStructure T_CmsDAOHistoryStructure \
+WHERE \
+	T_CmsDAOHistoryStructure.m_structureId=? \
+	AND T_CmsDAOHistoryStructure.m_version<?
+	
+C_PROPERTIES_HISTORY_DELETE=\
+SELECT \
+	T_CmsDAOHistoryProperties \
+FROM \
+	CmsDAOHistoryProperties T_CmsDAOHistoryProperties \
+WHERE \
+	T_CmsDAOHistoryProperties.m_structureId = ? \
+	AND T_CmsDAOHistoryProperties.m_publishTag < ?
+	
+C_STRUCTURE_HISTORY_DELETE=\
+SELECT \
+	T_CmsDAOHistoryStructure \
+FROM \
+	CmsDAOHistoryStructure T_CmsDAOHistoryStructure \
+WHERE \
+	T_CmsDAOHistoryStructure.m_structureId = ? \
+	AND T_CmsDAOHistoryStructure.m_publishTag < ?
+	
+C_HISTORY_READ_MIN_USED_TAG=\
+SELECT \
+	MIN(T_CmsDAOHistoryStructure.m_publishTag) \
+FROM \
+	CmsDAOHistoryStructure T_CmsDAOHistoryStructure \
+WHERE \
+	T_CmsDAOHistoryStructure.m_resourceId = ?
+	
+C_RESOURCES_HISTORY_DELETE=\
+SELECT \
+	T_CmsDAOHistoryResources \
+FROM \
+	CmsDAOHistoryResources T_CmsDAOHistoryResources \
+WHERE \
+	T_CmsDAOHistoryResources.m_resourceId = ? \
+	AND T_CmsDAOHistoryResources.m_publishTag < ?
+	
+C_CONTENT_HISTORY_DELETE=\
+SELECT \
+	T_CmsDAOContents \
+FROM \
+	CmsDAOContents T_CmsDAOContents \
+WHERE \
+	T_CmsDAOContents.m_onlineFlag = 0 \
+	AND T_CmsDAOContents.m_resourceId = ? \
+	AND T_CmsDAOContents.m_publishTagTo < ?
+	
+C_STRUCTURE_HISTORY_READ_SUBRESOURCES=\
+SELECT \
+	T_CmsDAOHistoryStructure.m_structureId, MAX(T_CmsDAOHistoryStructure.m_version) \
+FROM \
+	CmsDAOHistoryStructure T_CmsDAOHistoryStructure \
+WHERE \
+    T_CmsDAOHistoryStructure.m_parentId = ? \
+GROUP BY \
+    T_CmsDAOHistoryStructure.m_structureId
+	
+C_PROPERTYDEF_DELETE_HISTORY=\
+SELECT \
+	T_CmsDAOHistoryPropertyDef \
+FROM \
+	CmsDAOHistoryPropertyDef  T_CmsDAOHistoryPropertyDef \
+WHERE \
+	T_CmsDAOHistoryPropertyDef.m_propertyDefId = ?
+
+C_STRUCTURE_HISTORY_READ_DELETED=\
+SELECT \
+	T_CmsDAOHistoryStructure.m_structureId, MAX(T_CmsDAOHistoryStructure.m_version) \
+FROM \
+	CmsDAOHistoryStructure T_CmsDAOHistoryStructure \
+WHERE \
+    T_CmsDAOHistoryStructure.m_structureId NOT IN (SELECT hos.m_structureId FROM CmsDAOOnlineStructure hos) \
+GROUP BY \
+    T_CmsDAOHistoryStructure.m_structureId
+    
+C_RESOURCES_HISTORY_READ_ALL_VERSIONS=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS_HISTORY} ,\
+	T_CmsDAOHistoryResources.m_projectLastModified \
+FROM \
+	${C_RESOURCES_SELECT_TABLES_HISTORY} \
+WHERE \
+	T_CmsDAOHistoryStructure.m_structureId = ? \
+	AND ${C_JOIN_STRUCTURE_RESOURCE_HISTORY} \
+ORDER BY \
+	T_CmsDAOHistoryStructure.m_publishTag DESC
+	
+	
+C_RESOURCES_HISTORY_READ_NEW_VERSIONS=\
+SELECT \
+    T_CmsDAOHistoryResources \
+FROM \
+	CmsDAOHistoryResources T_CmsDAOHistoryResources \
+WHERE \
+	T_CmsDAOHistoryResources.m_resourceId=? \
+	AND T_CmsDAOHistoryResources.m_publishTag > ? \
+ORDER BY \
+	T_CmsDAOHistoryResources.m_publishTag ASC
+	
+C_RESOURCES_HISTORY_READ_BTW_VERSIONS=\
+SELECT \
+    T_CmsDAOHistoryResources \
+FROM \
+	CmsDAOHistoryResources T_CmsDAOHistoryResources \
+WHERE \
+	T_CmsDAOHistoryResources.m_resourceId=? \
+	AND T_CmsDAOHistoryResources.m_publishTag>? \
+	AND T_CmsDAOHistoryResources.m_publishTag<? \
+ORDER BY \
+	T_CmsDAOHistoryResources.m_publishTag ASC
+	
+
+C_RESOURCES_HISTORY_READ_OLD_VERSIONS=\
+SELECT \
+    T_CmsDAOHistoryResources \
+FROM \
+	CmsDAOHistoryResources T_CmsDAOHistoryResources \
+WHERE \
+	T_CmsDAOHistoryResources.m_resourceId=? \
+	AND T_CmsDAOHistoryResources.m_publishTag<? \
+ORDER BY \
+	T_CmsDAOHistoryResources.m_publishTag DESC
+	
+C_PROPERTIES_READALL_COUNT=\
+SELECT \
+	COUNT(T_CmsDAOQProperties) \
+FROM \
+	CmsDAO${PROJECT}Properties T_CmsDAOQProperties \
+WHERE \
+	T_CmsDAOQProperties.m_propertyDefId=?
+	
+
+C_RESOURCES_HISTORY_READ_VERSION=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS_HISTORY},\
+	T_CmsDAOHistoryResources.m_projectLastModified \
+FROM \
+	${C_RESOURCES_SELECT_TABLES_HISTORY} \
+WHERE \
+	T_CmsDAOHistoryStructure.m_structureId = ? \
+	AND T_CmsDAOHistoryStructure.m_version=? \
+	AND ${C_JOIN_STRUCTURE_RESOURCE_HISTORY}
+	
+C_HISTORY_READ_CONTENT=\
+SELECT \
+	T_CmsDAOContents \
+FROM \
+	CmsDAOContents T_CmsDAOContents \
+WHERE \
+	T_CmsDAOContents.m_resourceId = ? \
+	AND T_CmsDAOContents.m_publishTagTo >= ? \
+	AND T_CmsDAOContents.m_publishTagFrom <= ?
+	
+
+C_RESOURCES_HISTORY_READ_DELETED=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS_HISTORY},\
+	T_CmsDAOHistoryResources.m_projectLastModified \
+FROM \
+	${C_RESOURCES_SELECT_TABLES_HISTORY} \
+WHERE \
+    T_CmsDAOHistoryStructure.m_parentId=? AND \
+    (T_CmsDAOHistoryStructure.m_structureState=3 OR T_CmsDAOHistoryResources.m_resourceState=3) AND \
+	${C_JOIN_STRUCTURE_RESOURCE_HISTORY} \
+ORDER BY \
+	T_CmsDAOHistoryStructure.m_version DESC
+	
+
+C_RESOURCES_HISTORY_READ_DELETED_RESTRICTED=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS_HISTORY},\
+	T_CmsDAOHistoryResources.m_projectLastModified \
+FROM \
+	${C_RESOURCES_SELECT_TABLES_HISTORY} \
+WHERE \
+    T_CmsDAOHistoryStructure.m_parentId=? AND \
+    T_CmsDAOHistoryResources.m_userLastModified = ? AND \
+    (T_CmsDAOHistoryStructure.m_structureState=3 OR T_CmsDAOHistoryResources.m_resourceState=3) AND \
+	${C_JOIN_STRUCTURE_RESOURCE_HISTORY} \
+ORDER BY \
+	T_CmsDAOHistoryStructure.m_version DESC
+	
+############
+# This query is just used by deprecated methods
+# remove it as soon as possible
+# see org.m_opencms.db.I_CmsDAOHistoryDriver#readFile(CmsDAODbContext, CmsDAOUUID, int)
+############	
+C_FILES_READ_HISTORY_BYID=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS_HISTORY},\
+	T_CmsDAOHistoryResources.m_projectLastModified \
+FROM \
+	${C_RESOURCES_SELECT_TABLES_HISTORY}\
+WHERE \
+	T_CmsDAOHistoryStructure.m_structureId=? \
+	AND T_CmsDAOHistoryStructure.m_publishTag=? \
+	AND ${C_JOIN_STRUCTURE_RESOURCE_HISTORY} 
+
+C_RESOURCES_READ_MAX_PUBLISH_TAG=\
+SELECT \
+	MAX(T_CmsDAOHistoryResources.m_publishTag) \
+FROM \
+	CmsDAOHistoryResources T_CmsDAOHistoryResources \
+WHERE \
+	T_CmsDAOHistoryResources.m_resourceId=?
+	
+C_PROJECTS_HISTORY_MAXTAG=\
+SELECT \
+	MAX(T_CmsDAOHistoryProjects.m_publishTag) \
+FROM \
+	CmsDAOHistoryProjects T_CmsDAOHistoryProjects
+	
+C_RESOURCES_HISTORY_MAXTAG=\
+SELECT \
+	MAX(T_CmsDAOHistoryStructure.m_publishTag) \
+FROM \
+	CmsDAOHistoryStructure T_CmsDAOHistoryStructure
+	
+C_HISTORY_PRINCIPAL_READ=\
+SELECT \
+	T_CmsDAOHistoryPrincipals \
+FROM \
+	CmsDAOHistoryPrincipals T_CmsDAOHistoryPrincipals \
+WHERE \
+	T_CmsDAOHistoryPrincipals.m_principalId=?
+	
+C_PROJECTS_HISTORY_READ=\
+SELECT \
+	 T_CmsDAOHistoryProjects \
+FROM \
+	CmsDAOHistoryProjects T_CmsDAOHistoryProjects \
+WHERE \
+	T_CmsDAOHistoryProjects.m_publishTag=?
+	
+C_PROJECTRESOURCES_HISTORY_READ=\
+SELECT \
+	T_CmsDAOHistoryProjectResources.m_resourcePath \
+FROM \
+	CmsDAOHistoryProjectResources  T_CmsDAOHistoryProjectResources \
+WHERE \
+	T_CmsDAOHistoryProjectResources.m_publishTag=?
+	
+C_PROJECTS_HISTORY_READ_ALL=\
+SELECT \
+	T_CmsDAOHistoryProjects \
+FROM \
+	CmsDAOHistoryProjects T_CmsDAOHistoryProjects \
+ORDER BY \
+	T_CmsDAOHistoryProjects.m_publishTag DESC
+	
+C_PROPERTIES_HISTORY_READ_PUBTAG=\
+SELECT \
+	MAX(T_CmsDAOHistoryProperties.m_publishTag) \
+FROM \
+	CmsDAOHistoryProperties T_CmsDAOHistoryProperties \
+WHERE \
+	T_CmsDAOHistoryProperties.m_structureId=? \
+	AND T_CmsDAOHistoryProperties.m_publishTag<=?
+	
+C_PROPERTIES_HISTORY_READALL_STR=\
+SELECT \
+	T_CmsDAOHistoryPropertyDef.m_propertyDefName, \
+	T_CmsDAOHistoryProperties.m_propertyValue,\
+	T_CmsDAOHistoryProperties.m_propertyMappingType \
+FROM \
+	CmsDAOHistoryProperties T_CmsDAOHistoryProperties , \
+	CmsDAOHistoryPropertyDef T_CmsDAOHistoryPropertyDef \
+WHERE \
+	T_CmsDAOHistoryProperties.m_propertyDefId=T_CmsDAOHistoryPropertyDef.m_propertyDefId \
+	AND T_CmsDAOHistoryProperties.m_structureId=? \
+	AND T_CmsDAOHistoryProperties.m_publishTag=?
+	
+C_PROPERTIES_HISTORY_READALL_RES=\
+SELECT \
+	T_CmsDAOHistoryPropertyDef.m_propertyDefName, \
+	T_CmsDAOHistoryProperties.m_propertyValue,\
+	T_CmsDAOHistoryProperties.m_propertyMappingType \
+FROM \
+	CmsDAOHistoryProperties T_CmsDAOHistoryProperties ,\
+	CmsDAOHistoryPropertyDef T_CmsDAOHistoryPropertyDef \
+WHERE \
+	T_CmsDAOHistoryProperties.m_propertyDefId=T_CmsDAOHistoryPropertyDef.m_propertyDefId \
+	AND T_CmsDAOHistoryProperties.m_propertyMappingId=? \
+	AND T_CmsDAOHistoryProperties.m_publishTag=?
+	
+C_PROPERTYDEF_READ_HISTORY=\
+SELECT \
+	T_CmsDAOHistoryPropertyDef \
+FROM \
+	CmsDAOHistoryPropertyDef T_CmsDAOHistoryPropertyDef \
+WHERE \
+	T_CmsDAOHistoryPropertyDef.m_propertyDefName=?
+	
+C_PROJECTS_HISTORY_READ_TAG_FOR_DATE=\
+SELECT \
+	MAX(T_CmsDAOHistoryProjects.m_publishTag) \
+FROM \
+	CmsDAOHistoryProjects T_CmsDAOHistoryProjects \
+WHERE \
+	T_CmsDAOHistoryProjects.m_projectPublishDate<?
+	
+C_HISTORY_EXISTS_RESOURCE=\
+SELECT \
+	T_CmsDAOHistoryResources.m_resourceId \
+FROM \
+	CmsDAOHistoryResources T_CmsDAOHistoryResources \
+WHERE \
+	T_CmsDAOHistoryResources.m_resourceId=? \
+	AND T_CmsDAOHistoryResources.m_publishTag=?
+	
+C_STRUCTURE_HISTORY_READ_NOTDELETED=\
+SELECT \
+	T_CmsDAOHistoryStructure.m_structureId, MAX(T_CmsDAOHistoryStructure.m_version) \
+FROM \
+	CmsDAOHistoryStructure T_CmsDAOHistoryStructure \
+WHERE \
+    T_CmsDAOHistoryStructure.m_structureId IN (SELECT T1_CmsDAOOnlineStructure.m_structureId FROM CmsDAOOnlineStructure T1_CmsDAOOnlineStructure) \
+GROUP BY \
+    T_CmsDAOHistoryStructure.m_structureId
+    
+C_STATICEXPORT_DELETE_ALL_PUBLISHED_LINKS=\
+SELECT \
+	T_CmsDAOStaticExportLinks \
+FROM \
+	CmsDAOStaticExportLinks T_CmsDAOStaticExportLinks \
+WHERE \
+	T_CmsDAOStaticExportLinks.m_linkType=?
+	
+C_PROJECTRESOURCES_DELETEALL_1=\
+SELECT \
+	T_CmsDAOProjectResources \
+FROM \
+	CmsDAOProjectResources T_CmsDAOProjectResources \
+WHERE \
+	T_CmsDAOProjectResources.m_projectId=? 
+	
+C_DELETE_PUBLISH_HISTORY=\
+SELECT \
+	T_CmsDAOPublishHistory \
+FROM \
+	CmsDAOPublishHistory T_CmsDAOPublishHistory \
+WHERE \
+	T_CmsDAOPublishHistory.m_publishTag>=0 \
+	AND T_CmsDAOPublishHistory.m_publishTag<?
+	
+C_RESOURCES_DELETE_PUBLISH_HISTORY_ENTRY=\
+SELECT \
+	T_CmsDAOPublishHistory \
+FROM \
+    CmsDAOPublishHistory T_CmsDAOPublishHistory \
+WHERE \
+    T_CmsDAOPublishHistory.m_historyId = ? \
+    AND T_CmsDAOPublishHistory.m_publishTag = ? \
+    AND T_CmsDAOPublishHistory.m_structureId = ? \
+    AND T_CmsDAOPublishHistory.m_resourcePath = ?
+	
+#C_PUBLISHJOB_DELETE_PUBLISHLIST=\
+#UPDATE \
+#	CmsDAOPublishJobs T_CmsDAOPublishJobs \
+#SET \
+#	T_CmsDAOPublishJobs.m_publishList=NULL \
+#WHERE \
+#	T_CmsDAOPublishJobs.m_historyId=?
+
+C_PUBLISHJOB_DELETE_PUBLISHLIST=\
+SELECT T_CmsDAOPublishJobs \
+FROM CmsDAOPublishJobs T_CmsDAOPublishJobs \
+WHERE \
+	T_CmsDAOPublishJobs.m_historyId=?
+
+C_STATICEXPORT_DELETE_PUBLISHED_LINKS=\
+SELECT \
+	T_CmsDAOStaticExportLinks \
+FROM \
+	CmsDAOStaticExportLinks T_CmsDAOStaticExportLinks \
+WHERE \
+	T_CmsDAOStaticExportLinks.m_linkRfsPath=? \
+	AND T_CmsDAOStaticExportLinks.m_linkType=? \
+	AND T_CmsDAOStaticExportLinks.m_linkParameter=?
+	
+C_RESOURCE_LOCKS_READALL=\
+SELECT \
+	T_CmsDAOResourceLocks \
+FROM \
+	CmsDAOResourceLocks T_CmsDAOResourceLocks
+	
+C_PROJECTS_READ_1=\
+SELECT \
+	T_CmsDAOProjects \
+FROM \
+	CmsDAOProjects T_CmsDAOProjects \
+WHERE \
+	T_CmsDAOProjects.m_projectId=? \
+ORDER BY \
+	T_CmsDAOProjects.m_projectOu, T_CmsDAOProjects.m_projectName
+	
+C_PROJECTS_READ_BYNAME_2=\
+SELECT \
+	T_CmsDAOProjects \
+FROM \
+	CmsDAOProjects T_CmsDAOProjects \
+WHERE \
+	T_CmsDAOProjects.m_projectName=? \
+	AND T_CmsDAOProjects.m_projectOu=? \
+ORDER BY \
+	T_CmsDAOProjects.m_projectOu, T_CmsDAOProjects.m_projectName 
+	
+C_PROJECTRESOURCES_READ_2=\
+SELECT \
+	T_CmsDAOProjectResources.m_resourcePath \
+FROM \
+	CmsDAOProjectResources T_CmsDAOProjectResources \
+WHERE \
+	T_CmsDAOProjectResources.m_projectId=? \
+	AND T_CmsDAOProjectResources.m_resourcePath=?
+	
+C_PROJECTRESOURCES_READ_BY_ID_1=\
+SELECT \
+	T_CmsDAOProjectResources.m_resourcePath \
+FROM \
+	CmsDAOProjectResources T_CmsDAOProjectResources \
+WHERE \
+	T_CmsDAOProjectResources.m_projectId=?
+	
+C_PROJECTS_READ_BYOU_1=\
+SELECT \
+	T_CmsDAOProjects \
+FROM \
+	CmsDAOProjects T_CmsDAOProjects \
+WHERE \
+	T_CmsDAOProjects.m_projectOu LIKE ? \
+ORDER BY \
+	T_CmsDAOProjects.m_projectOu, T_CmsDAOProjects.m_projectName
+	
+C_PROJECTS_READ_BYGROUP_2=\
+SELECT \
+	T_CmsDAOProjects \
+FROM \
+	CmsDAOProjects T_CmsDAOProjects \
+WHERE \
+	(T_CmsDAOProjects.m_groupId=? OR T_CmsDAOProjects.m_managerGroupId=?) \
+	AND T_CmsDAOProjects.m_projectFlags=0 \
+ORDER BY \
+	T_CmsDAOProjects.m_projectOu, T_CmsDAOProjects.m_projectName
+	
+C_PROJECTS_READ_BYMANAGER_1=\
+SELECT \
+	T_CmsDAOProjects \
+FROM \
+	CmsDAOProjects T_CmsDAOProjects \
+WHERE \
+	T_CmsDAOProjects.m_managerGroupId=? \
+    AND T_CmsDAOProjects.m_projectFlags=0 \
+ORDER BY \
+	T_CmsDAOProjects.m_projectOu, T_CmsDAOProjects.m_projectName
+	
+C_PROJECTS_READ_BYUSER_1=\
+SELECT \
+	T_CmsDAOProjects \
+FROM \
+	CmsDAOProjects T_CmsDAOProjects \
+WHERE \
+	T_CmsDAOProjects.m_userId=? \
+	AND T_CmsDAOProjects.m_projectFlags=0 \
+ORDER BY \
+	T_CmsDAOProjects.m_projectOu, T_CmsDAOProjects.m_projectName
+	
+C_SELECT_PUBLISHED_RESOURCES=\
+SELECT \
+	T_CmsDAOPublishHistory \
+FROM \
+	CmsDAOPublishHistory T_CmsDAOPublishHistory \
+WHERE \
+	T_CmsDAOPublishHistory.m_historyId=? \
+ORDER BY \
+	T_CmsDAOPublishHistory.m_resourceType ASC,\
+	T_CmsDAOPublishHistory.m_resourceState ASC,\
+	T_CmsDAOPublishHistory.m_resourcePath ASC
+	
+C_PUBLISHJOB_READ_JOB=\
+SELECT \
+	T_CmsDAOPublishJobs \
+FROM \
+	CmsDAOPublishJobs T_CmsDAOPublishJobs \
+WHERE \
+	T_CmsDAOPublishJobs.m_historyId=?
+	
+C_PUBLISHJOB_READ_JOBS_IN_TIMERANGE=\
+SELECT \
+	T_CmsDAOPublishJobs \
+FROM \
+	CmsDAOPublishJobs T_CmsDAOPublishJobs \
+WHERE \
+	T_CmsDAOPublishJobs.m_finishTime>=? \
+	AND T_CmsDAOPublishJobs.m_finishTime<=? \
+ORDER BY \
+	T_CmsDAOPublishJobs.m_enqueueTime ASC
+	
+C_PUBLISHJOB_READ_PUBLISHLIST=\
+SELECT \
+	T_CmsDAOPublishJobs \
+FROM \
+	CmsDAOPublishJobs T_CmsDAOPublishJobs \
+WHERE \
+	T_CmsDAOPublishJobs.m_historyId=?
+	
+C_PUBLISHJOB_READ_REPORT=\
+SELECT \
+	T_CmsDAOPublishJobs \
+FROM \
+	CmsDAOPublishJobs T_CmsDAOPublishJobs \
+WHERE \
+	T_CmsDAOPublishJobs.m_historyId=?
+	
+C_STATICEXPORT_READ_PUBLISHED_LINK_PARAMETERS=\
+SELECT \
+	T_CmsDAOStaticExportLinks.m_linkParameter \
+FROM \
+	CmsDAOStaticExportLinks T_CmsDAOStaticExportLinks \
+WHERE \
+	T_CmsDAOStaticExportLinks.m_linkRfsPath=?
+	
+C_STATICEXPORT_READ_ALL_PUBLISHED_LINKS=\
+SELECT \
+	T_CmsDAOStaticExportLinks.m_linkRfsPath \
+FROM \
+	CmsDAOStaticExportLinks T_CmsDAOStaticExportLinks \
+WHERE \
+	T_CmsDAOStaticExportLinks.m_linkType=? \
+	AND T_CmsDAOStaticExportLinks.m_linkTimestamp>=?
+	
+C_RESOURCES_UNMARK=\
+SELECT T_CmsDAOOfflineResources \
+FROM CmsDAOOfflineResources T_CmsDAOOfflineResources \
+WHERE \
+	T_CmsDAOOfflineResources.m_projectLastModified=?
+	
+C_RESOURCE_LOCKS_DELETEALL=\
+SELECT T_CmsDAOResourceLocks \
+FROM CmsDAOResourceLocks T_CmsDAOResourceLocks 
+	
+C_PROJECTS_WRITE_6=\
+SELECT T_CmsDAOProjects \
+FROM CmsDAOProjects T_CmsDAOProjects \
+WHERE \
+	T_CmsDAOProjects.m_projectId=?
+	
+C_STATICEXPORT_READ_PUBLISHED_RESOURCES=\
+SELECT \
+	COUNT(T_CmsDAOStaticExportLinks) \
+FROM \
+	CmsDAOStaticExportLinks T_CmsDAOStaticExportLinks \
+WHERE \
+	T_CmsDAOStaticExportLinks.m_linkRfsPath=?
+	
+C_GROUPS_DELETE_GROUP_2=\
+SELECT \
+	T_CmsDAOGroups \
+FROM \
+	CmsDAOGroups T_CmsDAOGroups \
+WHERE \
+	T_CmsDAOGroups.m_groupName=? AND \
+	T_CmsDAOGroups.m_groupOu=?
+	
+C_USERS_DELETE_2=\
+SELECT \
+	T_CmsDAOUsers \
+FROM \
+	CmsDAOUsers T_CmsDAOUsers \
+WHERE \
+	T_CmsDAOUsers.m_userName = ? AND \
+	T_CmsDAOUsers.m_userOu = ?
+	
+C_GROUPS_CHECK_BY_NAME_2=\
+SELECT \
+	COUNT(T_CmsDAOGroups) \
+FROM \
+	CmsDAOGroups T_CmsDAOGroups \
+WHERE \
+	T_CmsDAOGroups.m_groupName=? AND \
+	T_CmsDAOGroups.m_groupOu=?
+	
+C_USERS_CHECK_BY_NAME_2=\
+SELECT \
+	COUNT(T_CmsDAOUsers) \
+FROM \
+	CmsDAOUsers T_CmsDAOUsers \
+WHERE \
+	T_CmsDAOUsers.m_userName=? \
+    AND T_CmsDAOUsers.m_userOu=?
+    
+C_GROUPS_GET_GROUPS_0=\
+SELECT \
+	T_CmsDAOGroups \
+FROM \
+	CmsDAOGroups T_CmsDAOGroups \
+WHERE 
+
+C_USERS_GET_WEBUSERS_FOR_ORGUNIT_1=\
+SELECT \
+	T_CmsDAOUsers \
+FROM \
+	CmsDAOUsers T_CmsDAOUsers \
+WHERE \
+    T_CmsDAOUsers.m_userFlags >= 32768 \
+    AND T_CmsDAOUsers.m_userFlags < 65536 \
+    AND T_CmsDAOUsers.m_userOu LIKE ? \
+ORDER BY \
+	T_CmsDAOUsers.m_userName
+	
+C_USERS_GET_USERS_FOR_ORGUNIT_1=\
+SELECT \
+	T_CmsDAOUsers \
+FROM \
+	CmsDAOUsers T_CmsDAOUsers \
+WHERE \
+    (T_CmsDAOUsers.m_userFlags < 32768 \
+    OR T_CmsDAOUsers.m_userFlags >= 65536) \
+    AND T_CmsDAOUsers.m_userOu LIKE ? \
+ORDER BY \
+	T_CmsDAOUsers.m_userName
+	
+C_ACCESS_READ_ENTRIES_1=\
+SELECT \
+	T_CmsDAO${PROJECT}AccessControl \
+FROM \
+	CmsDAO${PROJECT}AccessControl T_CmsDAO${PROJECT}AccessControl \
+WHERE \
+	T_CmsDAO${PROJECT}AccessControl.m_resourceId=?
+	
+C_ACCESS_READ_ENTRY_2=\
+SELECT \
+	T_CmsDAO${PROJECT}AccessControl \
+FROM \
+	CmsDAO${PROJECT}AccessControl T_CmsDAO${PROJECT}AccessControl \
+WHERE \
+	T_CmsDAO${PROJECT}AccessControl.m_resourceId=? \
+	AND T_CmsDAO${PROJECT}AccessControl.m_principalId=?
+	
+C_GROUPS_GET_CHILD_1=\
+SELECT \
+	T_CmsDAOGroups \
+FROM \
+	CmsDAOGroups T_CmsDAOGroups \
+WHERE \
+	T_CmsDAOGroups.m_parentGroupId=?
+	
+C_GROUPS_READ_BY_NAME_2=\
+SELECT \
+	T_CmsDAOGroups \
+FROM \
+	CmsDAOGroups T_CmsDAOGroups \
+WHERE \
+	T_CmsDAOGroups.m_groupName=? AND \
+	T_CmsDAOGroups.m_groupOu=?
+	
+# Query is built within the CmsDAOUserDriver class
+C_GROUPS_GET_GROUPS_OF_USER_1=\
+SELECT \
+	T_CmsDAOGroups, T_CmsDAOGroupUsers \
+FROM \
+	CmsDAOGroups T_CmsDAOGroups, \
+	CmsDAOGroupUsers T_CmsDAOGroupUsers \
+WHERE \
+	T_CmsDAOGroupUsers.m_userId=? \
+    AND T_CmsDAOGroups.m_groupId=T_CmsDAOGroupUsers.m_groupId \
+    AND
+
+C_USERS_READ_BY_NAME_2=\
+SELECT \
+	 T_CmsDAOUsers \
+FROM \
+	CmsDAOUsers T_CmsDAOUsers \
+WHERE \
+	T_CmsDAOUsers.m_userName=? \
+    AND T_CmsDAOUsers.m_userOu=?
+    
+C_USERS_READ_WITH_PWD_3=\
+SELECT \
+	 T_CmsDAOUsers \
+FROM \
+	CmsDAOUsers T_CmsDAOUsers \
+WHERE \
+	T_CmsDAOUsers.m_userName=? \
+    AND T_CmsDAOUsers.m_userOu=? \
+    AND T_CmsDAOUsers.m_userPassword=?
+    
+C_USERDATA_READ_1=\
+SELECT \
+	T_CmsDAOUserData \
+FROM \
+    CmsDAOUserData T_CmsDAOUserData \
+WHERE \
+	T_CmsDAOUserData.m_userId = ?
+	
+C_GROUPS_GET_USERS_OF_GROUP_2=\
+SELECT \
+	T_CmsDAOUsers \
+FROM \
+	CmsDAOGroups T_CmsDAOGroups, \
+	CmsDAOUsers T_CmsDAOUsers , \
+	CmsDAOGroupUsers T_CmsDAOGroupUsers \
+WHERE \
+	T_CmsDAOGroups.m_groupName=? \
+	AND T_CmsDAOGroups.m_groupOu=? \
+	AND T_CmsDAOGroups.m_groupOu=T_CmsDAOUsers.m_userOu \
+    AND T_CmsDAOUsers.m_userId=T_CmsDAOGroupUsers.m_userId \
+    AND T_CmsDAOGroupUsers.m_groupId=T_CmsDAOGroups.m_groupId \
+ORDER BY \
+	T_CmsDAOUsers.m_userOu,T_CmsDAOUsers.m_userName
+	
+C_GROUPS_GET_ALL_USERS_OF_GROUP_2=\
+SELECT \
+	T_CmsDAOUsers \
+FROM \
+	CmsDAOGroups T_CmsDAOGroups, \
+	CmsDAOUsers T_CmsDAOUsers , \
+	CmsDAOGroupUsers T_CmsDAOGroupUsers \
+WHERE \
+	T_CmsDAOGroups.m_groupName=? \
+	AND T_CmsDAOGroups.m_groupOu=? \
+    AND T_CmsDAOUsers.m_userId=T_CmsDAOGroupUsers.m_userId \
+    AND T_CmsDAOGroupUsers.m_groupId=T_CmsDAOGroups.m_groupId \
+ORDER BY \
+	T_CmsDAOUsers.m_userOu,T_CmsDAOUsers.m_userName
+	
+C_ACCESS_REMOVE_ALL_1=\
+SELECT \
+	T_CmsDAO${PROJECT}AccessControl \
+FROM \
+	CmsDAO${PROJECT}AccessControl T_CmsDAO${PROJECT}AccessControl \
+WHERE \
+	T_CmsDAO${PROJECT}AccessControl.m_resourceId=?
+	
+C_ACCESS_REMOVE_ALL_FOR_PRINCIPAL_1=\
+SELECT \
+	T_CmsDAO${PROJECT}AccessControl \
+FROM \
+	CmsDAO${PROJECT}AccessControl T_CmsDAO${PROJECT}AccessControl \
+WHERE \
+	T_CmsDAO${PROJECT}AccessControl.m_principalId=? 
+
+C_ACCESS_REMOVE_2=\
+SELECT \
+	T_CmsDAO${PROJECT}AccessControl \
+FROM \
+	CmsDAO${PROJECT}AccessControl T_CmsDAO${PROJECT}AccessControl \
+WHERE \
+	T_CmsDAO${PROJECT}AccessControl.m_resourceId=? \
+	AND T_CmsDAO${PROJECT}AccessControl.m_principalId =?
+
+C_USERS_SET_ORGUNIT_2=\
+SELECT T_CmsDAOUsers \
+FROM  CmsDAOUsers T_CmsDAOUsers \
+WHERE \
+  T_CmsDAOUsers.m_userId = ?
+  
+C_ACCESS_UPDATE_5=\
+SELECT T_CmsDAO${PROJECT}AccessControl \
+FROM CmsDAO${PROJECT}AccessControl T_CmsDAO${PROJECT}AccessControl \
+WHERE \
+	T_CmsDAO${PROJECT}AccessControl.m_resourceId=? \
+	AND T_CmsDAO${PROJECT}AccessControl.m_principalId=?
+	
+C_GROUPS_WRITE_GROUP_4=\
+SELECT T_CmsDAOGroups \
+FROM CmsDAOGroups T_CmsDAOGroups \
+WHERE \
+	T_CmsDAOGroups.m_groupId=?
+	
+C_USERS_SET_PWD_3=\
+SELECT T_CmsDAOUsers \
+FROM CmsDAOUsers T_CmsDAOUsers \
+WHERE \
+	T_CmsDAOUsers.m_userName=? AND \
+	T_CmsDAOUsers.m_userOu=?
+	
+C_USERS_WRITE_6=\
+SELECT T_CmsDAOUsers \
+FROM CmsDAOUsers T_CmsDAOUsers \
+WHERE \
+	T_CmsDAOUsers.m_userId=?
+	
+C_GROUPS_GROUP_OU_EQUALS_1	=T_CmsDAOGroups.m_groupOu = ?
+C_GROUPS_GROUP_OU_LIKE_1	=T_CmsDAOGroups.m_groupOu LIKE ?
+C_GROUPS_SELECT_GROUPS_1	=T_CmsDAOGroups.m_groupFlags < ?
+C_GROUPS_SELECT_ROLES_1		=T_CmsDAOGroups.m_groupFlags >= ?
+C_GROUPS_ORDER_0			=ORDER BY T_CmsDAOGroups.m_groupOu, T_CmsDAOGroups.m_groupName
+
+C_GROUPS_USER_IN_GROUP_2=\
+SELECT \
+	T_CmsDAOGroupUsers \
+FROM \
+	CmsDAOGroupUsers T_CmsDAOGroupUsers \
+WHERE \
+	T_CmsDAOGroupUsers.m_groupId=? \
+	AND T_CmsDAOGroupUsers.m_userId=?
+	
+C_RESOURCES_COUNT_SIBLINGS=\
+SELECT \
+	COUNT(T_CmsDAO${PROJECT}Structure) \
+FROM \
+	CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_resourceId=?
+	
+C_ONLINE_CONTENTS_HISTORY=\
+SELECT T_CmsDAOContents \
+FROM CmsDAOContents T_CmsDAOContents \
+WHERE \
+	T_CmsDAOContents.m_resourceId = ? \
+	AND T_CmsDAOContents.m_onlineFlag = 1
+	
+C_HISTORY_CONTENTS_UPDATE=\
+SELECT T_CmsDAOContents \
+FROM CmsDAOContents T_CmsDAOContents \
+WHERE \
+	T_CmsDAOContents.m_resourceId = ? \
+	AND T_CmsDAOContents.m_onlineFlag = 1
+	
+C_RESOURCES_UPDATE_RESOURCES=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCES_UPDATE_SIBLING_COUNT=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCES_UPDATE_FLAGS=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCES_UPDATE_RESOURCE_PROJECT=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_PROPERTYDEF_DELETE=\
+SELECT \
+	T_CmsDAO${PROJECT}PropertyDef \
+FROM \
+	CmsDAO${PROJECT}PropertyDef T_CmsDAO${PROJECT}PropertyDef \
+WHERE \
+	T_CmsDAO${PROJECT}PropertyDef.m_propertyDefId=?
+	
+C_PROPERTIES_DELETE_ALL_STRUCTURE_AND_RESOURCE_VALUES=\
+SELECT \
+	T_CmsDAO${PROJECT}Properties \
+FROM \
+	CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties \
+WHERE \
+	(\
+		T_CmsDAO${PROJECT}Properties.m_propertyMappingId=? \
+		AND T_CmsDAO${PROJECT}Properties.m_propertyMappingType=? \
+	) \
+	OR \
+	(\
+		T_CmsDAO${PROJECT}Properties.m_propertyMappingId=? \
+		AND T_CmsDAO${PROJECT}Properties.m_propertyMappingType=? \
+	)
+
+C_PROPERTIES_DELETE_ALL_VALUES_FOR_MAPPING_TYPE=\
+SELECT \
+	T_CmsDAO${PROJECT}Properties \
+FROM \
+	CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties \
+WHERE \
+	T_CmsDAO${PROJECT}Properties.m_propertyMappingId=? \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyMappingType=?
+	
+C_DELETE_RELATIONS=\
+SELECT \
+	T_CmsDAO${PROJECT}ResourceRelations \
+FROM \
+    CmsDAO${PROJECT}ResourceRelations T_CmsDAO${PROJECT}ResourceRelations \
+WHERE
+
+C_RESOURCES_MOVE=\
+SELECT T_CmsDAO${PROJECT}Structure \
+FROM CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_structureId=?
+	
+C_RESOURCES_UPDATE_STRUCTURE_VERSION=\
+SELECT T_CmsDAO${PROJECT}Structure \
+FROM CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_structureId = ?
+	
+C_RESOURCES_UPDATE_STRUCTURE=\
+SELECT T_CmsDAO${PROJECT}Structure \
+FROM CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_structureId=?
+
+C_RESOURCES_UPDATE_RESOURCE_VERSION=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId = ?
+	
+C_RESOURCES_GET_SUBRESOURCES_GET_FOLDERS=AND T_CmsDAO${PROJECT}Resources.m_resourceSize < 0
+C_RESOURCES_GET_SUBRESOURCES_GET_FILES=AND T_CmsDAO${PROJECT}Resources.m_resourceSize >= 0
+
+C_RESOURCES_SELECT_TABLES=CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources, CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure 
+C_RESOURCES_SELECT_ATTRIBS=\
+    T_CmsDAO${PROJECT}Resources,\
+    T_CmsDAO${PROJECT}Structure,\
+	T_CmsDAO${PROJECT}Resources.m_projectLastModified
+
+C_JOIN_STRUCTURE_RESOURCE=T_CmsDAO${PROJECT}Structure.m_resourceId=T_CmsDAO${PROJECT}Resources.m_resourceId 
+
+C_RESOURCES_GET_SUBRESOURCES=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_parentId=? \
+	AND ${C_JOIN_STRUCTURE_RESOURCE}
+						
+C_ONLINE_FILES_CONTENT=\
+SELECT \
+	T_CmsDAOContents \
+FROM \
+	CmsDAOContents T_CmsDAOContents, \
+	CmsDAOOnlineResources T_CmsDAOOnlineResources \
+WHERE \
+	T_CmsDAOContents.m_resourceId = ? \
+	AND	T_CmsDAOContents.m_onlineFlag=1 \
+	AND T_CmsDAOContents.m_resourceId = T_CmsDAOOnlineResources.m_resourceId 
+	
+
+C_RESOURCES_READBYID=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_structureId=? \
+	AND ${C_JOIN_STRUCTURE_RESOURCE}
+	
+C_RESOURCES_READ=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_resourcePath=? \
+	AND ${C_JOIN_STRUCTURE_RESOURCE} \
+ORDER BY \
+	T_CmsDAO${PROJECT}Structure.m_structureState ASC
+	
+C_RESOURCES_READ_PARENT_BY_ID=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES}, \
+	CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure2 \
+WHERE \
+    T_CmsDAO${PROJECT}Structure2.m_structureId=? \
+	AND T_CmsDAO${PROJECT}Structure.m_structureId=T_CmsDAO${PROJECT}Structure2.m_parentId \
+	AND ${C_JOIN_STRUCTURE_RESOURCE}
+	
+C_PROPERTYDEF_READ=\
+SELECT \
+	T_CmsDAO${PROJECT}PropertyDef \
+FROM \
+	CmsDAO${PROJECT}PropertyDef T_CmsDAO${PROJECT}PropertyDef \
+WHERE \
+	T_CmsDAO${PROJECT}PropertyDef.m_propertyDefName=?
+	
+C_PROPERTYDEF_READALL=\
+SELECT \
+	T_CmsDAO${PROJECT}PropertyDef \
+FROM \
+	CmsDAO${PROJECT}PropertyDef T_CmsDAO${PROJECT}PropertyDef
+	
+C_PROPERTIES_READ=\
+SELECT \
+	T_CmsDAO${PROJECT}Properties.m_propertyValue,\
+	T_CmsDAO${PROJECT}Properties.m_propertyMappingType \
+FROM \
+	CmsDAO${PROJECT}PropertyDef T_CmsDAO${PROJECT}PropertyDef,\
+	CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties \
+WHERE \
+	T_CmsDAO${PROJECT}PropertyDef.m_propertyDefName=? \
+    AND T_CmsDAO${PROJECT}Properties.m_propertyDefId=T_CmsDAO${PROJECT}PropertyDef.m_propertyDefId \
+	AND \
+	(\
+		T_CmsDAO${PROJECT}Properties.m_propertyMappingId=? \
+			OR \
+		T_CmsDAO${PROJECT}Properties.m_propertyMappingId=? \
+	)	
+	
+C_PROPERTIES_READALL=\
+SELECT \
+	T_CmsDAO${PROJECT}PropertyDef.m_propertyDefName,\
+	T_CmsDAO${PROJECT}Properties.m_propertyValue,\
+	T_CmsDAO${PROJECT}Properties.m_propertyMappingType \
+FROM \
+	CmsDAO${PROJECT}PropertyDef T_CmsDAO${PROJECT}PropertyDef ,\
+	CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties \
+WHERE \
+	(\
+		T_CmsDAO${PROJECT}Properties.m_propertyMappingId=? \
+			OR \
+		T_CmsDAO${PROJECT}Properties.m_propertyMappingId=? \
+	) \
+	AND \
+	(\
+		T_CmsDAO${PROJECT}Properties.m_propertyDefId=T_CmsDAO${PROJECT}PropertyDef.m_propertyDefId \
+	)  
+
+C_RELATIONS_SELECT_ATTRIBS = T_CmsDAO${PROJECT}ResourceRelations
+
+C_READ_RELATIONS=\
+SELECT DISTINCT \
+	${C_RELATIONS_SELECT_ATTRIBS} \
+FROM \
+	CmsDAO${PROJECT}ResourceRelations T_CmsDAO${PROJECT}ResourceRelations \
+WHERE
+# the conditions are build in the vfs driver
+
+C_RESOURCES_GET_RESOURCE_IN_PROJECT_WITH_STATE=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE (\
+	T_CmsDAO${PROJECT}Structure.m_resourceId=T_CmsDAO${PROJECT}Resources.m_resourceId) \
+	AND T_CmsDAO${PROJECT}Resources.m_projectLastModified = ? \
+	AND \
+	(\
+		(\
+			T_CmsDAO${PROJECT}Resources.m_resourceSate=? \
+			AND T_CmsDAO${PROJECT}Structure.m_structureState<=? \
+		)\
+		OR \
+		(\
+			T_CmsDAO${PROJECT}Structure.m_structureState=? \
+			AND T_CmsDAO${PROJECT}Resources.m_resourceState<=? \
+		)\
+	) \
+ORDER BY \
+	T_CmsDAO${PROJECT}Structure.m_resourcePath ASC
+
+C_RESOURCES_GET_RESOURCE_IN_PROJECT_WITHOUT_STATE=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_resourceId=T_CmsDAO${PROJECT}Resources.m_resourceId \
+	AND T_CmsDAO${PROJECT}Resources.m_projectLastModified = ? \
+	AND \
+	(\
+		T_CmsDAO${PROJECT}Resources.m_resourceState <> ? \
+		OR T_CmsDAO${PROJECT}Structure.m_structureState <> ? \
+	)\
+ORDER BY \
+	T_CmsDAO${PROJECT}Structure.m_resourcePath ASC
+	
+C_RESOURCES_GET_RESOURCE_IN_PROJECT_IGNORE_STATE=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_resourceId=T_CmsDAO${PROJECT}Resources.m_resourceId \
+	AND T_CmsDAO${PROJECT}Resources.m_projectLastModified = ? \
+ORDER BY \
+	T_CmsDAO${PROJECT}Structure.m_resourcePath ASC	
+	
+C_SELECT_RESOURCES_FOR_PRINCIPAL_ACE=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	CmsDAO${PROJECT}AccessControl T_CmsDAO${PROJECT}AccessControl , \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}AccessControl.m_principalId=? \
+	AND T_CmsDAO${PROJECT}AccessControl.m_resourceId=T_CmsDAO${PROJECT}Resources.m_resourceId \
+	AND ${C_JOIN_STRUCTURE_RESOURCE} \
+ORDER BY \
+	T_CmsDAO${PROJECT}Structure.m_resourcePath ASC
+	
+C_SELECT_RESOURCES_FOR_PRINCIPAL_ATTR1=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_userCreated=? \
+	AND ${C_JOIN_STRUCTURE_RESOURCE} 
+	
+
+C_SELECT_RESOURCES_FOR_PRINCIPAL_ATTR2=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_userLastModified=? \
+	AND ${C_JOIN_STRUCTURE_RESOURCE} 
+	
+C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF1=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties , \
+	CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources , \
+	CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Properties.m_propertyDefId = ? \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyMappingId = T_CmsDAO${PROJECT}Resources.m_resourceId \
+	AND T_CmsDAO${PROJECT}Structure.m_resourceId = T_CmsDAO${PROJECT}Resources.m_resourceId \
+	AND T_CmsDAO${PROJECT}Structure.m_resourcePath LIKE ?
+
+C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF2=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties , \
+	CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources , \
+	CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Properties.m_propertyDefId = ? \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyMappingId = T_CmsDAO${PROJECT}Structure.m_structureId \
+	AND T_CmsDAO${PROJECT}Structure.m_resourceId = T_CmsDAO${PROJECT}Resources.m_resourceId \
+	AND T_CmsDAO${PROJECT}Structure.m_resourcePath LIKE ? \
+ORDER BY T_CmsDAO${PROJECT}Structure.m_resourcePath DESC
+
+C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF_VALUE1=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties , \
+	CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources , \
+	CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Properties.m_propertyDefId=? \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyMappingId = T_CmsDAO${PROJECT}Resources.m_resourceId \
+	AND T_CmsDAO${PROJECT}Structure.m_resourceId = T_CmsDAO${PROJECT}Resources.m_resourceId \
+	AND T_CmsDAO${PROJECT}Structure.m_resourcePath LIKE ? \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyValue LIKE ?  
+
+C_RESOURCES_GET_RESOURCE_WITH_PROPERTYDEF_VALUE2=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties , \
+	CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources , \
+	CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Properties.m_propertyDefId = ? \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyMappingId = T_CmsDAO${PROJECT}Structure.m_structureId \
+	AND T_CmsDAO${PROJECT}Structure.m_resourceId = T_CmsDAO${PROJECT}Resources.m_resourceId \
+	AND T_CmsDAO${PROJECT}Structure.m_resourcePath LIKE ? \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyValue LIKE ?  \
+ORDER BY RESOURCE_PATH DESC
+
+C_JOIN_RESOURCE_STRUCTURE=T_CmsDAO${PROJECT}Resources.m_resourceId=T_CmsDAO${PROJECT}Structure.m_resourceId
+
+#
+# General subtree selection statement
+#
+C_RESOURCES_READ_TREE=\
+SELECT \
+    ${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	${C_JOIN_RESOURCE_STRUCTURE}
+	
+#
+# Resources order
+#
+C_RESOURCES_ORDER_BY_PATH=\
+	ORDER BY T_CmsDAO${PROJECT}Structure.m_resourcePath
+	
+C_SELECT_VFS_SIBLINGS=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=? \
+	AND ${C_JOIN_STRUCTURE_RESOURCE} \
+ORDER BY \
+	T_CmsDAO${PROJECT}Structure.m_resourcePath ASC	
+	
+#
+# Warning: Expects C_STATE_DELETED = 3 and all states >= 0 / <= 3
+#
+C_SELECT_NONDELETED_VFS_SIBLINGS=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=? \
+	AND T_CmsDAO${PROJECT}Structure.m_structureState IN(0,1,2) \
+	AND ${C_JOIN_STRUCTURE_RESOURCE} \
+ORDER BY \
+	T_CmsDAO${PROJECT}Structure.m_resourcePath ASC
+	
+C_RESOURCES_READ_VERSION_RES=\
+SELECT \
+    T_CmsDAO${PROJECT}Resources.m_resourceVersion \
+FROM \
+	CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCES_READ_VERSION_STR=\
+SELECT \
+	T_CmsDAO${PROJECT}Structure.m_structureVersion \
+FROM \
+	CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_structureId=?
+	
+C_STRUCTURE_DELETE_BY_STRUCTUREID=\
+SELECT \
+	T_CmsDAO${PROJECT}Structure \
+FROM \
+	CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_structureId=?
+	
+C_RESOURCES_DELETE_BY_RESOURCEID=\
+SELECT \
+	T_CmsDAO${PROJECT}Resources \
+FROM \
+	CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCE_REPLACE=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCES_TRANSFER_RESOURCE=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCES_READ_RESOURCE_STATE=\
+SELECT \
+	T_CmsDAO${PROJECT}Resources.m_resourceState \
+FROM \
+	CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCES_SELECT_STRUCTURE_ID=\
+SELECT \
+	COUNT(T_CmsDAO${PROJECT}Structure.m_structureId) \
+FROM \
+	CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_structureId=?
+	
+C_OFFLINE_CONTENTS_UPDATE=\
+SELECT T_CmsDAOOfflineContents \
+FROM CmsDAOOfflineContents T_CmsDAOOfflineContents \
+WHERE \
+	T_CmsDAOOfflineContents.m_resourceId=?
+	
+C_RESOURCES_UPDATE_PROJECT_LASTMODIFIED=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_PROPERTIES_UPDATE=\
+SELECT T_CmsDAO${PROJECT}Properties \
+FROM CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties \
+WHERE \
+	T_CmsDAO${PROJECT}Properties.m_propertyMappingId=? \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyMappingType=? \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyDefId=?
+	
+C_PROPERTIES_DELETE=\
+SELECT \
+	T_CmsDAO${PROJECT}Properties \
+FROM \
+	CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties \
+WHERE \
+	T_CmsDAO${PROJECT}Properties.m_propertyDefId=?  \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyMappingId=? \
+	AND T_CmsDAO${PROJECT}Properties.m_propertyMappingType=?
+	
+C_RESOURCES_UPDATE_RESOURCES_WITHOUT_STATE=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCES_UPDATE_RESOURCE_STATELASTMODIFIED=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCES_UPDATE_RESOURCE_STATE=\
+SELECT T_CmsDAO${PROJECT}Resources \
+FROM CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+	T_CmsDAO${PROJECT}Resources.m_resourceId=?
+	
+C_RESOURCES_UPDATE_STRUCTURE_STATE=\
+SELECT T_CmsDAO${PROJECT}Structure \
+FROM CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_structureId=?
+	
+C_RESOURCES_UPDATE_RELEASE_EXPIRED=\
+SELECT T_CmsDAO${PROJECT}Structure \
+FROM CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_structureId=?
+	
+C_RESOURCES_READ_WITH_ACE_1=\
+SELECT DISTINCT \
+	${C_RESOURCES_SELECT_ATTRIBS} \
+FROM \
+	CmsDAO${PROJECT}AccessControl T_CmsDAO${PROJECT}AccessControl, ${C_RESOURCES_SELECT_TABLES} \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_resourceId=T_CmsDAO${PROJECT}Resources.m_resourceId \
+	AND T_CmsDAO${PROJECT}Structure.m_resourcePath LIKE ? \
+	AND T_CmsDAO${PROJECT}Structure.m_resourceId = T_CmsDAO${PROJECT}AccessControl.m_resourceId \
+ORDER BY \
+	T_CmsDAO${PROJECT}Structure.m_resourcePath ASC
+	
+C_PROPERTIES_READALL_COUNT=\
+SELECT \
+	COUNT(T_CmsDAO${PROJECT}Properties) \
+FROM \
+	CmsDAO${PROJECT}Properties T_CmsDAO${PROJECT}Properties \
+WHERE \
+	T_CmsDAO${PROJECT}Properties.m_propertyDefId=?
+	
+C_RESOURCES_READ_PARENT_STRUCTURE_ID=\
+SELECT \
+	T_CmsDAO${PROJECT}Structure.m_structureId \
+FROM \
+	CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+	T_CmsDAO${PROJECT}Structure.m_resourcePath=?
+	
+C_READ_RESOURCE_STATE=\
+SELECT \
+    T_CmsDAO${PROJECT}Resources.m_resourceState \
+FROM \
+    CmsDAO${PROJECT}Resources T_CmsDAO${PROJECT}Resources \
+WHERE \
+    T_CmsDAO${PROJECT}Resources.m_resourceId = ?
+    
+C_READ_STRUCTURE_STATE=\
+SELECT \
+    T_CmsDAO${PROJECT}Structure.m_structureState \
+FROM \
+    CmsDAO${PROJECT}Structure T_CmsDAO${PROJECT}Structure \
+WHERE \
+    T_CmsDAO${PROJECT}Structure.m_structureId = ?
+    
+C_MOVE_RELATIONS_SOURCE=\
+SELECT T_CmsDAO${PROJECT}ResourceRelations \
+FROM CmsDAO${PROJECT}ResourceRelations T_CmsDAO${PROJECT}ResourceRelations \
+WHERE \
+	T_CmsDAO${PROJECT}ResourceRelations.m_relationSourceId=?
+	
+C_MOVE_RELATIONS_TARGET=\
+SELECT T_CmsDAO${PROJECT}ResourceRelations \
+FROM CmsDAO${PROJECT}ResourceRelations T_CmsDAO${PROJECT}ResourceRelations \
+WHERE \
+	T_CmsDAO${PROJECT}ResourceRelations.m_relationTargetId=?
+	
+C_STRUCTURE_SELECT_BY_DATE_EXPIRED_AFTER=\
+	(T_CmsDAO${PROJECT}Structure.m_dateExpired <> 0) AND (T_CmsDAO${PROJECT}Structure.m_dateExpired >= ?)
+	
+C_STRUCTURE_SELECT_BY_DATE_EXPIRED_BEFORE=\
+	(T_CmsDAO${PROJECT}Structure.m_dateExpired <> 0) AND (T_CmsDAO${PROJECT}Structure.m_dateExpired <= ?)
+	
+C_RESOURCES_SELECT_BY_PARENT_UUID=\
+	T_CmsDAO${PROJECT}Structure.m_parentId = ?
+	
+C_RESOURCES_SELECT_BY_PATH_PREFIX=\
+	T_CmsDAO${PROJECT}Structure.m_resourcePath LIKE ? ESCAPE '|'
+	
+C_RESOURCES_SELECT_BY_PROJECT_LASTMODIFIED=\
+	T_CmsDAO${PROJECT}Resources.m_projectLastModified=?
+	
+C_RELATION_FILTER_TARGET_ID=T_CmsDAO${PROJECT}ResourceRelations.m_relationTargetId = ?
+
+C_RELATION_FILTER_TARGET_PATH=T_CmsDAO${PROJECT}ResourceRelations.m_relationTargetPath LIKE ?
+
+C_RELATION_FILTER_SOURCE_ID=T_CmsDAO${PROJECT}ResourceRelations.m_relationSourceId = ?
+
+C_RELATION_FILTER_SOURCE_PATH=T_CmsDAO${PROJECT}ResourceRelations.m_relationSourcePath LIKE ?
+
+C_RELATION_FILTER_TYPE=T_CmsDAO${PROJECT}ResourceRelations.m_relationType IN 
+
+C_STRUCTURE_SELECT_BY_DATE_RELEASED_AFTER=\
+	(T_CmsDAO${PROJECT}Structure.m_dateReleased <> 0) AND (T_CmsDAO${PROJECT}Structure.m_dateReleased >= ?)
+	
+C_STRUCTURE_SELECT_BY_DATE_RELEASED_BEFORE=\
+	(T_CmsDAO${PROJECT}Structure.m_dateReleased <> 0) AND (T_CmsDAO${PROJECT}Structure.m_dateReleased <= ?)
+	
+C_RESOURCES_SELECT_ONLY_FOLDERS=\
+	T_CmsDAO${PROJECT}Resources.m_resourceSize = -1
+	
+C_RESOURCES_SELECT_ONLY_FILES=\
+	T_CmsDAO${PROJECT}Resources.m_resourceSize > -1
+	
+C_RESOURCES_SELECT_BY_RESOURCE_STATE=\
+	((T_CmsDAO${PROJECT}Structure.m_structureState=? AND T_CmsDAO${PROJECT}Structure.m_structureState >= T_CmsDAO${PROJECT}Resources.m_resourceState) OR \
+	(T_CmsDAO${PROJECT}Resources.m_resourceState=? AND T_CmsDAO${PROJECT}Resources.m_resourceState >= T_CmsDAO${PROJECT}Structure.m_structureState))
+	
+C_RESOURCES_SELECT_BY_DATE_LASTMODIFIED_AFTER=\
+	T_CmsDAO${PROJECT}Resources.m_dateLastModified >= ?
+	
+C_RESOURCES_SELECT_BY_DATE_LASTMODIFIED_BEFORE=\
+	T_CmsDAO${PROJECT}Resources.m_dateLastModified <= ?
+	
+C_RESOURCES_SELECT_BY_RESOURCE_TYPE=\
+	T_CmsDAO${PROJECT}Resources.m_resourceType=?
+	
+C_RELATIONS_REPAIR_BROKEN=\
+SELECT T_CmsDAO${PROJECT}ResourceRelations \
+FROM CmsDAO${PROJECT}ResourceRelations T_CmsDAO${PROJECT}ResourceRelations \
+WHERE \
+    T_CmsDAO${PROJECT}ResourceRelations.m_relationTargetPath = ? \
+    AND T_CmsDAO${PROJECT}ResourceRelations.m_relationTargetId NOT IN (SELECT T1_CmsDAO${PROJECT}Structure.m_structureId FROM CmsDAO${PROJECT}Structure T1_CmsDAO${PROJECT}Structure)
+   
+C_RELATIONS_UPDATE_BROKEN=\
+SELECT T_CmsDAO${PROJECT}ResourceRelations \
+FROM CmsDAO${PROJECT}ResourceRelations T_CmsDAO${PROJECT}ResourceRelations \
+WHERE \
+    T_CmsDAO${PROJECT}ResourceRelations.m_relationTargetPath = ? \
+    AND T_CmsDAO${PROJECT}ResourceRelations.m_relationTargetId NOT IN (SELECT T1_CmsDAO${PROJECT}Structure.m_structureId FROM CmsDAO${PROJECT}Structure T1_CmsDAO${PROJECT}Structure )
+    
+C_RESOURCES_HISTORY_READ_DELETED_NAME=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS_HISTORY},\
+	T_CmsDAOHistoryResources.m_projectLastModified \
+FROM \
+	${C_RESOURCES_SELECT_TABLES_HISTORY} \
+WHERE \
+    T_CmsDAOHistoryStructure.m_resourcePath LIKE ? AND \
+    T_CmsDAOHistoryStructure.m_resourcePath <> ? AND \
+    (T_CmsDAOHistoryStructure.m_structureState=3 OR T_CmsDAOHistoryResources.m_resourceState=3) AND \
+	${C_JOIN_STRUCTURE_RESOURCE_HISTORY} \
+ORDER BY \
+	T_CmsDAOHistoryStructure.m_version DESC
+    
+ C_RESOURCES_HISTORY_READ_DELETED_RESTRICTED=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS_HISTORY},\
+	T_CmsDAOHistoryResources.m_projectLastModified  \
+FROM \
+	${C_RESOURCES_SELECT_TABLES_HISTORY} \
+WHERE \
+    T_CmsDAOHistoryStructure.m_parentId=? AND \
+    T_CmsDAOHistoryResources.m_userLastModified=? AND \
+    (T_CmsDAOHistoryStructure.m_structureState=3 OR T_CmsDAOHistoryResources.m_resourceState=3) AND \
+	${C_JOIN_STRUCTURE_RESOURCE_HISTORY} \
+ORDER BY \
+	T_CmsDAOHistoryStructure.m_version DESC
+
+C_RESOURCES_HISTORY_READ_DELETED_NAME_RESTRICTED=\
+SELECT \
+	${C_RESOURCES_SELECT_ATTRIBS_HISTORY},\
+	T_CmsDAOHistoryResources.m_projectLastModified \
+FROM \
+	${C_RESOURCES_SELECT_TABLES_HISTORY} \
+WHERE \
+    T_CmsDAOHistoryStructure.m_resourcePath LIKE ? AND \
+    T_CmsDAOHistoryStructure.m_resourcePath <> ? AND \
+    T_CmsDAOHistoryResources.m_userLastModified=? AND \
+    (T_CmsDAOHistoryStructure.m_structureState=3 OR T_CmsDAOHistoryResources.m_resourceState=3) AND \
+	${C_JOIN_STRUCTURE_RESOURCE_HISTORY} \
+ORDER BY \
+	T_CmsDAOHistoryStructure.m_version DESC
+	
+C_CONTENT_PUBLISH_MAXTAG=\
+SELECT MAX(T_CmsDAOContents.m_publishTagTo) FROM CmsDAOContents T_CmsDAOContents 
+
+C_PROJECTS_HISTORY_READ_BYID=\
+SELECT \
+	T_CmsDAOHistoryProjects \
+FROM \
+	CmsDAOHistoryProjects T_CmsDAOHistoryProjects \
+WHERE \
+	T_CmsDAOHistoryProjects.m_projectId=? \
+ORDER BY \
+	T_CmsDAOHistoryProjects.m_publishTag DESC
+	
+C_READ_RESOURCE_OUS=\
+SELECT DISTINCT \
+	${C_RELATIONS_SELECT_ATTRIBS} \
+FROM \
+	CmsDAO${PROJECT}ResourceRelations T_CmsDAO${PROJECT}ResourceRelations \
+WHERE \
+    T_CmsDAO${PROJECT}ResourceRelations.m_relationType = ? \
+    AND LOCATE(T_CmsDAO${PROJECT}ResourceRelations.m_relationTargetPath, ?) <> -1
\ No newline at end of file
diff -urN opencms_7.0.5_src/src/org/opencms/main/CmsSystemInfo.java trunk/src/org/opencms/main/CmsSystemInfo.java
--- opencms_7.0.5_src/src/org/opencms/main/CmsSystemInfo.java	2008-07-01 14:29:02.000000000 +0300
+++ trunk/src/org/opencms/main/CmsSystemInfo.java	2008-09-02 11:14:28.243885074 +0300
@@ -71,6 +71,10 @@
 
     /** Path to the "WEB-INF" folder relative to the directory of the application. */
     public static final String FOLDER_WEBINF = "WEB-INF" + File.separatorChar;
+    
+    /** Relative path to persistence.xml file. */
+    public static final String FILE_PERSISTENCE = "classes" + 
+    	File.separatorChar + "META-INF" + File.separatorChar + "persistence.xml" ; 
 
     /** Default encoding. */
     private static final String DEFAULT_ENCODING = CmsEncoder.ENCODING_UTF_8;
@@ -117,6 +121,9 @@
     /** The absolute path to the "packages" folder (in the "real" file system). */
     private String m_packagesRfsPath;
 
+    /** The absolute path to the persistence.xml file (in the "real" file system). */
+    private String m_persistenceFileRfsPath ;
+    
     /** The name of the OpenCms server. */
     private String m_serverName;
 
@@ -224,6 +231,19 @@
     }
 
     /**
+     * Returns the abolute path to the "persistence.xml" file (in the "real" file system).<p>
+     * 
+     * @return the abolute path to the "persistence.xml" configuration file
+     */
+    public String getPersistenceFileRfsPath() {
+
+        if (m_persistenceFileRfsPath == null) {
+        	m_persistenceFileRfsPath = getAbsoluteRfsPathRelativeToWebInf(FILE_PERSISTENCE);
+        }
+        return m_persistenceFileRfsPath;
+    }
+    
+    /**
      * Returns the web application context path, e.g. "" (empty String) if the web application 
      * is the default web application (usually "ROOT"), or "/opencms" if the web application 
      * is called "opencms".<p>
diff -urN opencms_7.0.5_src/src/org/opencms/main/OpenCmsCore.java trunk/src/org/opencms/main/OpenCmsCore.java
--- opencms_7.0.5_src/src/org/opencms/main/OpenCmsCore.java	2008-07-01 14:29:02.000000000 +0300
+++ trunk/src/org/opencms/main/OpenCmsCore.java	2008-09-02 11:14:28.239884771 +0300
@@ -35,6 +35,7 @@
 import org.opencms.configuration.CmsConfigurationManager;
 import org.opencms.configuration.CmsImportExportConfiguration;
 import org.opencms.configuration.CmsModuleConfiguration;
+import org.opencms.configuration.CmsPersistenceUnitConfigurator;
 import org.opencms.configuration.CmsSearchConfiguration;
 import org.opencms.configuration.CmsSystemConfiguration;
 import org.opencms.configuration.CmsVfsConfiguration;
@@ -1244,8 +1245,21 @@
 
         // Collect the configurations 
         ExtendedProperties configuration;
+        ExtendedProperties persistenceConfiguration ;
+        
+     	// reads persistence unit configuration 
+        CmsPersistenceUnitConfigurator configurator = new CmsPersistenceUnitConfigurator(
+        		org.opencms.db.jpa.CmsSqlManager.JPA_PERSISTENCE_UNIT, 
+        		getSystemInfo().getPersistenceFileRfsPath()) ;
+        persistenceConfiguration = ExtendedProperties.convertProperties(
+        		configurator.getProperties()) ;
+        
         try {
             configuration = CmsPropertyUtils.loadProperties(getSystemInfo().getConfigurationFileRfsPath());
+            
+            // combines properties
+	        configuration.combine(persistenceConfiguration) ;
+            
         } catch (Exception e) {
             throw new CmsInitException(Messages.get().container(
                 Messages.ERR_CRITICAL_INIT_PROPFILE_1,
diff -urN opencms_7.0.5_src/src/org/opencms/publish/CmsPublishEngine.java trunk/src/org/opencms/publish/CmsPublishEngine.java
--- opencms_7.0.5_src/src/org/opencms/publish/CmsPublishEngine.java	2008-07-02 16:59:06.000000000 +0300
+++ trunk/src/org/opencms/publish/CmsPublishEngine.java	2008-09-02 11:14:33.515884145 +0300
@@ -315,6 +315,7 @@
         try {
             m_adminUserId = m_driverManager.readUser(dbc, OpenCms.getDefaultUsers().getUserAdmin()).getId();
         } catch (CmsException e) {
+        	dbc.rollback() ;
             LOG.error(e.getLocalizedMessage(), e);
         } finally {
             dbc.clear();
@@ -514,12 +515,20 @@
      */
     protected byte[] getReportContents(CmsPublishJobFinished publishJob) throws CmsException {
 
+    	byte[] result = null ;
         CmsDbContext dbc = m_dbContextFactory.getDbContext();
         try {
-            return m_driverManager.readPublishReportContents(dbc, publishJob.getPublishHistoryId());
-        } finally {
+            result =  m_driverManager.readPublishReportContents(dbc, publishJob.getPublishHistoryId());
+        } 
+        catch(CmsException e){
+        	dbc.rollback() ;
+        	LOG.error(e.getLocalizedMessage(), e);
+        	throw e ;
+        }
+        finally {
             dbc.clear();
         }
+        return result ;
     }
 
     /**
@@ -535,6 +544,7 @@
         try {
             return m_driverManager.readUser(dbc, userId);
         } catch (CmsException e) {
+        	dbc.rollback() ;
             LOG.error(e.getLocalizedMessage(), e);
         } finally {
             dbc.clear();
@@ -598,7 +608,12 @@
                 CmsResource resource = (CmsResource)itResources.next();
                 m_driverManager.lockResource(dbc, resource, CmsLockType.PUBLISH);
             }
-        } finally {
+        } catch(CmsException e){
+        	dbc.rollback() ;
+        	LOG.error(e.getLocalizedMessage(), e);
+        	throw e;
+        }
+        finally {
             dbc.clear();
         }
     }
@@ -634,15 +649,17 @@
             CmsEvent afterPublishEvent = new CmsEvent(I_CmsEventListener.EVENT_PUBLISH_PROJECT, eventData);
             OpenCms.fireCmsEvent(afterPublishEvent);
         } catch (Throwable t) {
+        	dbc.rollback() ;
+        	LOG.error(t);
             // catch every thing including runtime exceptions
             publishJob.getPublishReport().println(t);
         } finally {
-            try {
-                dbc.clear();
-            } catch (Throwable t) {
-                // ignore
-            }
-            dbc = null;
+        	try {
+        		dbc.clear();
+        	} catch (Throwable t) {
+        		// ignore
+        	}
+        	dbc = null;
         }
         // fire the publish finish event
         m_listeners.fireFinish(new CmsPublishJobRunning(publishJob));
@@ -713,6 +730,7 @@
                 OpenCms.getSessionManager().sendBroadcast(null, message, toUser);
             }
         } catch (CmsException e) {
+        	dbc.rollback() ;
             LOG.error(e.getLocalizedMessage(), e);
         } finally {
             dbc.clear();
@@ -759,7 +777,12 @@
                 CmsResource resource = (CmsResource)itResources.next();
                 m_driverManager.unlockResource(dbc, resource, true, true);
             }
-        } finally {
+        } catch(CmsException e){
+        	dbc.rollback() ;
+        	LOG.error(e.getLocalizedMessage(), e);
+        	throw e;
+        }
+        finally {
             dbc.clear();
         }
     }
diff -urN opencms_7.0.5_src/src/org/opencms/publish/CmsPublishHistory.java trunk/src/org/opencms/publish/CmsPublishHistory.java
--- opencms_7.0.5_src/src/org/opencms/publish/CmsPublishHistory.java	2008-03-01 10:32:14.000000000 +0200
+++ trunk/src/org/opencms/publish/CmsPublishHistory.java	2008-09-02 11:14:33.523883951 +0300
@@ -132,7 +132,12 @@
                 m_publishEngine.getDriverManager().writePublishReport(dbc, publishJob);
                 // delete publish list of started job
                 m_publishEngine.getDriverManager().deletePublishList(dbc, publishJob.getPublishHistoryId());
-            } finally {
+            } catch(CmsException e){
+            	dbc.rollback() ;
+            	LOG.error(e.getLocalizedMessage(), e);
+            	throw e;
+            }
+            finally {
                 dbc.clear();
             }
         }
@@ -172,6 +177,7 @@
                 OpenCms.getMemoryMonitor().cachePublishJobInHistory(job);
             }
         } catch (CmsException exc) {
+        	dbc.rollback() ;
             if (LOG.isErrorEnabled()) {
                 LOG.error(exc.getLocalizedMessage(), exc);
             }
@@ -197,7 +203,12 @@
                 OpenCms.getPublishManager().getEngine().getDriverManager().deletePublishJob(
                     dbc,
                     publishJob.getPublishHistoryId());
-            } finally {
+            } catch(CmsException e){
+            	dbc.rollback() ;
+            	LOG.error(e.getLocalizedMessage(), e);
+            	throw e;
+            } 
+            finally {
                 dbc.clear();
             }
         }
diff -urN opencms_7.0.5_src/src/org/opencms/publish/CmsPublishQueue.java trunk/src/org/opencms/publish/CmsPublishQueue.java
--- opencms_7.0.5_src/src/org/opencms/publish/CmsPublishQueue.java	2008-03-01 10:32:04.000000000 +0200
+++ trunk/src/org/opencms/publish/CmsPublishQueue.java	2008-09-02 11:14:33.519884248 +0300
@@ -140,7 +140,13 @@
             CmsDbContext dbc = m_publishEngine.getDbContextFactory().getDbContext();
             try {
                 m_publishEngine.getDriverManager().createPublishJob(dbc, publishJob);
-            } finally {
+            } 
+            catch(CmsException e){
+            	dbc.rollback() ;
+            	LOG.error(e.getLocalizedMessage(), e);
+            	throw e;
+            }
+            finally {
                 dbc.clear();
             }
         }
@@ -178,10 +184,14 @@
             if (revive) {
                 // read all pending publish jobs from the database
                 CmsDbContext dbc = m_publishEngine.getDbContextFactory().getDbContext();
-                List publishJobs;
+                List publishJobs = null;
                 try {
                     publishJobs = driverManager.readPublishJobs(dbc, 0L, 0L);
-                } finally {
+                } 
+                catch(Exception e){
+                	dbc.rollback() ;
+                }
+                finally {
                     dbc.clear();
                     dbc = null;
                 }
@@ -196,6 +206,7 @@
                             OpenCms.getMemoryMonitor().cachePublishJob(job);
                         } catch (CmsException exc) {
                             // skip job
+                        	dbc.rollback() ;
                             if (LOG.isErrorEnabled()) {
                                 LOG.error(Messages.get().getBundle().key(
                                     Messages.ERR_PUBLISH_JOB_INVALID_1,
@@ -213,8 +224,12 @@
                             new CmsPublishJobEnqueued(job).m_publishJob.finish();
                             m_publishEngine.getPublishHistory().add(job);
                         } catch (CmsException exc) {
+                        	dbc.rollback() ;
                             LOG.error(exc.getLocalizedMessage(), exc);
                         }
+                        finally{
+                        	dbc.clear() ;
+                        }
                     }
                 }
             }
@@ -270,7 +285,12 @@
             CmsDbContext dbc = m_publishEngine.getDbContextFactory().getDbContext();
             try {
                 m_publishEngine.getDriverManager().deletePublishJob(dbc, publishJob.getPublishHistoryId());
-            } finally {
+            } catch(CmsException e){
+            	dbc.rollback() ;
+            	LOG.error(e.getLocalizedMessage(), e);
+            	throw e;
+            }
+            finally{
                 dbc.clear();
             }
         }
@@ -289,7 +309,13 @@
             CmsDbContext dbc = m_publishEngine.getDbContextFactory().getDbContext();
             try {
                 m_publishEngine.getDriverManager().writePublishJob(dbc, publishJob);
-            } finally {
+            } 
+            catch(CmsException e){
+            	dbc.rollback() ;
+            	LOG.error(e.getLocalizedMessage(), e);
+            	throw e;
+            }
+            finally {
                 dbc.clear();
             }
         }
diff -urN opencms_7.0.5_src/src/org/opencms/publish/CmsPublishThread.java trunk/src/org/opencms/publish/CmsPublishThread.java
--- opencms_7.0.5_src/src/org/opencms/publish/CmsPublishThread.java	2008-03-01 10:13:18.000000000 +0200
+++ trunk/src/org/opencms/publish/CmsPublishThread.java	2008-09-02 11:14:33.515884145 +0300
@@ -140,6 +140,7 @@
             try {
                 m_publishEngine.getDriverManager().publishJob(getCms(), dbc, m_publishJob.getPublishList(), m_report);
             } catch (Throwable e) {
+            	dbc.rollback() ;
                 // catch every thing including runtime exceptions
                 m_report.println(e);
                 LOG.error(Messages.get().getBundle().key(Messages.LOG_PUBLISH_PROJECT_FAILED_0), e);
diff -urN opencms_7.0.5_src/src/org/opencms/relations/CmsRelationSystemValidator.java trunk/src/org/opencms/relations/CmsRelationSystemValidator.java
--- opencms_7.0.5_src/src/org/opencms/relations/CmsRelationSystemValidator.java	2008-03-01 10:31:56.000000000 +0200
+++ trunk/src/org/opencms/relations/CmsRelationSystemValidator.java	2008-09-02 11:14:32.571883965 +0300
@@ -339,7 +339,7 @@
                     // search the target of link in the online project
                     try {
                         link = m_driverManager.getVfsDriver().readResource(
-                            new CmsDbContext(),
+                            dbc,
                             project.getUuid(),
                             relation.getTargetId(),
                             true).getRootPath();
@@ -351,7 +351,7 @@
                                 project.getName()), e);
                         }
                         m_driverManager.getVfsDriver().readResource(
-                            new CmsDbContext(),
+                            dbc,
                             project.getUuid(),
                             relation.getTargetPath(),
                             true);
diff -urN opencms_7.0.5_src/src/org/opencms/util/CmsDataTypeUtil.java trunk/src/org/opencms/util/CmsDataTypeUtil.java
--- opencms_7.0.5_src/src/org/opencms/util/CmsDataTypeUtil.java	2008-03-01 10:32:20.000000000 +0200
+++ trunk/src/org/opencms/util/CmsDataTypeUtil.java	2008-09-02 11:14:34.795884639 +0300
@@ -492,4 +492,16 @@
 
         return new CmsUUID(data);
     }
+    
+    /**
+     * Converts Number to int
+     * 
+     * @param n - the number object
+     * 
+     * @return - Number.inValue(), 0 - if the parameter is null
+     */
+    public static int numberToInt(Number n){
+    	
+    	return (n == null ? 0 : n.intValue()) ;
+    }
 }
diff -urN opencms_7.0.5_src/src-setup/org/opencms/setup/CmsSetupBean.java trunk/src-setup/org/opencms/setup/CmsSetupBean.java
--- opencms_7.0.5_src/src-setup/org/opencms/setup/CmsSetupBean.java	2008-04-21 16:38:26.000000000 +0300
+++ trunk/src-setup/org/opencms/setup/CmsSetupBean.java	2008-09-02 11:13:45.275887779 +0300
@@ -35,12 +35,14 @@
 import org.opencms.configuration.CmsConfigurationManager;
 import org.opencms.configuration.CmsImportExportConfiguration;
 import org.opencms.configuration.CmsModuleConfiguration;
+import org.opencms.configuration.CmsPersistenceUnitConfigurator;
 import org.opencms.configuration.CmsSearchConfiguration;
 import org.opencms.configuration.CmsSystemConfiguration;
 import org.opencms.configuration.CmsVfsConfiguration;
 import org.opencms.configuration.CmsWorkplaceConfiguration;
 import org.opencms.configuration.I_CmsXmlConfiguration;
 import org.opencms.db.CmsDbPool;
+import org.opencms.db.jpa.CmsSqlManager;
 import org.opencms.file.CmsObject;
 import org.opencms.file.CmsResource;
 import org.opencms.i18n.CmsEncoder;
@@ -168,9 +170,16 @@
 
     /** DB provider constant for postgresql. */
     public static final String POSTGRESQL_PROVIDER = "postgresql";
+    
+    /** */
+    public static final String JPA_PROVIDER = "jpa" ;
 
     /** The default component position, is missing. */
     protected static final int DEFAULT_POSITION = 9999;
+    
+    public static final byte DRIVER_TYPE_JPA = 1 ;
+    
+    public static final byte DRIVER_TYPE_SQL = 0 ;
 
     /** Properties file key constant post fix. */
     protected static final String PROPKEY_CHECKED = ".checked";
@@ -293,7 +302,15 @@
 
     /** Xml read/write helper object. */
     private CmsSetupXmlHelper m_xmlHelper;
+    
+    /** List of supported RDBMSes by both - SQL and JPA drivers*/
+    private List<CmsSetupDbInfo> m_supportedRdbmses ;
+    
+    /** Driver implementation should be used (SQL or JPA)*/
+    private byte m_driverType ;
 
+    private CmsPersistenceUnitConfigurator m_peristenceConfigurator ;
+    
     /** 
      * Default constructor.<p>
      */
@@ -548,8 +565,19 @@
      */
     public String getDatabaseConfigPage(String key) {
 
+    	String dbConfigPage = null;
+    	CmsSetupDbInfo dbInfo = getDbInfo(key) ;
+    	
+    	if(dbInfo != null ){
+    		dbConfigPage = dbInfo.getSupportedBySqlDriver()
+    			? dbInfo.getKey()
+    			: JPA_PROVIDER ;
+    	}else{
+    		dbConfigPage = "mysql" ;
+    	}
+    	
         // don't use File.separatorChar here, result must be a valid URL with "/" path delimiters
-        String configUri = FOLDER_DATABASE + key + "/" + "step_4_database_setup.jsp";
+        String configUri = FOLDER_DATABASE + dbConfigPage + "/" + "step_4_database_setup.jsp";
         return CmsStringUtil.substitute(configUri, File.separator, "/");
     }
 
@@ -561,9 +589,15 @@
      * @return a list of needed jar filenames
      */
     public List getDatabaseLibs(String databaseKey) {
-
-        return CmsStringUtil.splitAsList((String)((Map)getDatabaseProperties().get(databaseKey)).get(databaseKey
-            + ".libs"), ',', true);
+    	List list ;
+    	if(JPA_PROVIDER.equalsIgnoreCase(m_provider)){
+    		list = new ArrayList() ;
+    	} else{
+    		list = CmsStringUtil.splitAsList((String)((Map)getDatabaseProperties().get(databaseKey)).get(databaseKey
+    	            + ".libs"), ',', true);
+    	}
+    	
+        return list ;
     }
 
     /**
@@ -727,6 +761,9 @@
         String databaseKey = key.substring(0, key.indexOf('.'));
         Map databaseProperties = (Map)getDatabaseProperties().get(databaseKey);
 
+        if(databaseProperties == null){
+        	databaseProperties = new Properties() ;
+        }
         Object value = databaseProperties.get(key);
         return (value != null) ? (String)value : "";
     }
@@ -1263,6 +1300,12 @@
             e.printStackTrace();
             m_errors.add(e.toString());
         }
+        
+        // init persistence configurator
+        String inFileName = m_webAppRfsPath +CmsSystemInfo.FOLDER_WEBINF+ CmsSystemInfo.FILE_PERSISTENCE ;
+    	m_peristenceConfigurator = 
+    		new CmsPersistenceUnitConfigurator(CmsSqlManager.JPA_PERSISTENCE_UNIT,
+    				inFileName) ;
     }
 
     /**
@@ -1489,6 +1532,9 @@
             lockWizard();
             // save Properties to file "opencms.properties" 
             saveProperties(getProperties(), CmsSystemInfo.FILE_PROPERTIES, false);
+            
+            setSchemaGeneration(false) ;
+            m_peristenceConfigurator.save() ;
         }
     }
 
@@ -1524,8 +1570,17 @@
             backupConfiguration(
                 CmsConfigurationManager.DEFAULT_XML_FILE_NAME,
                 CmsConfigurationManager.DEFAULT_XML_FILE_NAME + CmsConfigurationManager.POSTFIX_ORI);
+            
             // save Properties to file "opencms.properties" 
             saveProperties(getProperties(), CmsSystemInfo.FILE_PROPERTIES, true);
+            
+            // update persistence.xml
+            setUpPersistenceUnit(getDbWorkConStr(), getDbDriver(), 
+            		getDbWorkUser(), getDbWorkPwd()) ;
+            
+            // if has sql driver the sql scripts will be eventualy executed
+            setSchemaGeneration(!hasSqlDriver(m_databaseKey)) ;
+            m_peristenceConfigurator.save() ;
 
             CmsSetupTestResult testResult = new CmsSetupTestSimapi().execute(this);
             if (testResult.getResult().equals(I_CmsSetupTest.RESULT_FAILED)) {
@@ -1680,13 +1735,33 @@
      */
     public void setDatabase(String databaseKey) {
 
+        String vfsDriver ;
+        String userDriver ;
+        String projectDriver ;
+        String historyDriver ;
+        String sqlManager ;
+        CmsSetupDbInfo dbi  = getDbInfo(databaseKey) ;
+        
         m_databaseKey = databaseKey;
-
-        String vfsDriver = getDbProperty(m_databaseKey + ".vfs.driver");
-        String userDriver = getDbProperty(m_databaseKey + ".user.driver");
-        String projectDriver = getDbProperty(m_databaseKey + ".project.driver");
-        String historyDriver = getDbProperty(m_databaseKey + ".history.driver");
-        String sqlManager = getDbProperty(m_databaseKey + ".sqlmanager");
+        
+        if(dbi == null){
+        	throw new RuntimeException("Unsupported database type.") ; 
+        }
+        else if(m_driverType == DRIVER_TYPE_JPA || !dbi.getSupportedBySqlDriver()){
+        
+        	vfsDriver = "org.opencms.db.jpa.CmsVfsDriver" ;
+        	userDriver = "org.opencms.db.jpa.CmsUserDriver" ;
+        	projectDriver = "org.opencms.db.jpa.CmsProjectDriver" ;
+        	historyDriver = "org.opencms.db.jpa.CmsHistoryDriver" ;
+        	sqlManager = "org.opencms.db.jpa.CmsSqlManager" ;
+        }
+        else{
+        	vfsDriver = getDbProperty(m_databaseKey + ".vfs.driver");
+        	userDriver = getDbProperty(m_databaseKey + ".user.driver");
+        	projectDriver = getDbProperty(m_databaseKey + ".project.driver");
+        	historyDriver = getDbProperty(m_databaseKey + ".history.driver");
+        	sqlManager = getDbProperty(m_databaseKey + ".sqlmanager");
+        }
 
         setExtProperty("db.name", m_databaseKey);
         setExtProperty("db.vfs.driver", vfsDriver);
@@ -1775,7 +1850,13 @@
         String conStr = request.getParameter("dbCreateConStr");
         // store the DB provider
         m_provider = provider;
-
+        String driverType = request.getParameter("driverType") ;
+        
+        if(JPA_PROVIDER.equalsIgnoreCase(m_provider)){
+        	m_driverType = DRIVER_TYPE_JPA ;
+        	driverType = JPA_PROVIDER ;
+        }
+        
         boolean isFormSubmitted = ((request.getParameter("submit") != null) && (conStr != null));
         if (conStr == null) {
             conStr = "";
@@ -1809,6 +1890,22 @@
             }
 
             if (isFormSubmitted) {
+            	
+            	System.out.println("driverType :" +driverType);
+            	
+            	if((driverType == null) || (driverType.equalsIgnoreCase("sql"))){
+                	m_driverType = DRIVER_TYPE_SQL ;
+                }else{
+                	m_driverType = DRIVER_TYPE_JPA ;
+                	System.out.println("provider : "+m_databaseKey);
+                	if(!getDbInfo(m_databaseKey).getSupportedBySqlDriver()){
+                		// driver name should be specified for only JPA supported
+                		// databases
+                		String driverName = request.getParameter("jdbcDriver") ;
+                		setDbDriver(driverName) ;
+                	}
+                }
+            	
                 if (provider.equals(POSTGRESQL_PROVIDER)) {
                     setDb(database);
 
@@ -1910,8 +2007,9 @@
                     || provider.equals(POSTGRESQL_PROVIDER)
                     || provider.equals(MAXDB_PROVIDER)) {
                     setDbWorkUser(dbName);
-                } else {
-                    setDb(dbName);
+                } 
+                else if(dbName != null){
+                	setDb(dbName);
                 }
             }
         }
@@ -1929,6 +2027,10 @@
         // extract the database key out of the entire key
         String databaseKey = key.substring(0, key.indexOf('.'));
         Map databaseProperties = (Map)getDatabaseProperties().get(databaseKey);
+        if(databaseProperties == null){
+        	databaseProperties = new Properties() ;
+        	m_databaseProperties.put(databaseKey, databaseProperties) ;
+        }
         databaseProperties.put(key, value);
     }
 
@@ -1939,9 +2041,14 @@
      */
     public void setDbWorkConStr(String dbWorkConStr) {
 
-        String driver = getDbProperty(m_databaseKey + ".driver");
+        String driver ;
         String pool = '.' + getPool() + '.';
 
+        if(m_driverType == DRIVER_TYPE_JPA){
+        	driver = getDbDriver();
+        } else{
+        	driver = getDbProperty(m_databaseKey + ".driver");
+        }
         setExtProperty(CmsDbPool.KEY_DATABASE_POOL + pool + CmsDbPool.KEY_JDBC_DRIVER, driver);
         setExtProperty(CmsDbPool.KEY_DATABASE_POOL + pool + CmsDbPool.KEY_JDBC_URL, dbWorkConStr);
         setExtProperty(CmsDbPool.KEY_DATABASE_POOL + pool + CmsDbPool.KEY_TEST_QUERY, getDbTestQuery());
@@ -2092,6 +2199,14 @@
     public boolean validateJdbc() {
 
         boolean result = false;
+        
+        /* There is not defined libraries for 
+         * supported databases from OpenJPA
+         */
+        if(m_driverType == DRIVER_TYPE_JPA){
+        	return true ;
+        }
+        
         String libFolder = getLibFolder();
         Iterator it = getDatabaseLibs(getDatabase()).iterator();
         while (it.hasNext()) {
@@ -2105,6 +2220,165 @@
     }
 
     /**
+     * Make a List of supported RDBMS by both - SQL and JPA drivers.
+     * 
+     * @return list in alphabet order of RDBMS's names
+     */
+    public List<CmsSetupDbInfo> getSupportedRdbmses(){
+    	if(m_supportedRdbmses != null){
+    		return m_supportedRdbmses ;
+    	}
+    	
+    	CmsSetupDbInfo dbInfo ;
+    	m_supportedRdbmses = new ArrayList<CmsSetupDbInfo>() ;
+    	
+    	// MySql 4.1 & 5.0
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("MySQL 4.1 & 5.0") ;
+    	dbInfo.setKey("mysql_41") ;
+    	dbInfo.setSupportedBySqlDriver(true) ;
+    	dbInfo.setJdbcDriverName("com.mysql.jdbc.Driver") ;
+    	dbInfo.setJdbcUrl("jdbc:mysql://localhost:3306/") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// MySql 4.0
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("MySQL 4.0") ;
+    	dbInfo.setKey("mysql") ;
+    	dbInfo.setSupportedBySqlDriver(true) ;
+    	dbInfo.setJdbcDriverName("com.mysql.jdbc.Driver") ;
+    	dbInfo.setJdbcUrl("jdbc:mysql://localhost:3306/") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// Oracle 9i, 10g, 11g
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("Oracle 9i, 10g & 11g") ;
+    	dbInfo.setKey("oracle") ;
+    	dbInfo.setSupportedBySqlDriver(true) ;
+    	dbInfo.setJdbcDriverName("") ;
+    	dbInfo.setJdbcUrl("jdbc:oracle:thin:@localhost:1521:") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// Oracle 8
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("Oracle 8") ;
+    	dbInfo.setKey("oracle_8") ;
+    	dbInfo.setSupportedBySqlDriver(true) ;
+    	dbInfo.setJdbcDriverName("") ;
+    	dbInfo.setJdbcUrl("jdbc:oracle:thin:@localhost:1521:") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// DB2 v. 9
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("DB2 V9") ;
+    	dbInfo.setKey("db2") ;
+    	dbInfo.setSupportedBySqlDriver(true) ;
+    	dbInfo.setJdbcDriverName("") ;
+    	dbInfo.setJdbcUrl("jdbc:db2://localhost:50000/") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// DB2 AS400
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("DB2 AS400") ;
+    	dbInfo.setKey("as400") ;
+    	dbInfo.setSupportedBySqlDriver(true) ;
+    	dbInfo.setJdbcDriverName("") ;
+    	dbInfo.setJdbcUrl("jdbc:as400://127.0.0.1") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// MS SQL Server
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("MS SQL Server") ;
+    	dbInfo.setKey("mssql") ;
+    	dbInfo.setSupportedBySqlDriver(true) ;
+    	dbInfo.setJdbcDriverName("") ;
+    	dbInfo.setJdbcUrl("jdbc:jtds:sqlserver://localhost:1433") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// PostgreSQL
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("PostgreSQL 7.4 - 8.3") ;
+    	dbInfo.setKey("postgresql") ;
+    	dbInfo.setSupportedBySqlDriver(true) ;
+    	dbInfo.setJdbcDriverName("org.postgresql.Driver") ;
+    	dbInfo.setJdbcUrl("jdbc:postgresql://localhost:5432/") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// HSQLDB
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("HSQLDB 1.8") ;
+    	dbInfo.setKey("hsqldb") ;
+    	dbInfo.setSupportedBySqlDriver(true) ;
+    	dbInfo.setJdbcDriverName("") ;
+    	dbInfo.setJdbcUrl("jdbc:hsqldb:file:") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// MS Access
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("MS Access") ;
+    	dbInfo.setKey("msaccess") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// Apache Derby
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("Apache Derby") ;
+    	dbInfo.setKey("derby") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// Empress
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("Empress") ;
+    	dbInfo.setKey("empress") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// FoxPro
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("FoxPro") ;
+    	dbInfo.setKey("foxpro") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// Informix
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("Informix") ;
+    	dbInfo.setKey("informix") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// PointBase
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("PointBase") ;
+    	dbInfo.setKey("pointbase") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// JDataStore
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("JDataStore") ;
+    	dbInfo.setKey("jdatastore") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	// Sybase
+    	dbInfo = new CmsSetupDbInfo() ;
+    	dbInfo.setRdbmsName("Sybase") ;
+    	dbInfo.setKey("sybase") ;
+    	m_supportedRdbmses.add(dbInfo) ;
+    	
+    	Comparator comparator = 
+    		new Comparator (){
+
+    		public int compare(Object o1, Object o2){
+    			return ((CmsSetupDbInfo)o1).getRdbmsName().compareToIgnoreCase(((CmsSetupDbInfo)o2).getRdbmsName()) ;
+    		}
+    		
+    		public boolean equal(Object o1, Object o2){
+    			return ((CmsSetupDbInfo)o1).getRdbmsName().equalsIgnoreCase(((CmsSetupDbInfo)o2).getRdbmsName()) ;
+    		}
+    	} ;
+    	
+    	Collections.sort(m_supportedRdbmses, comparator) ;
+    	
+    	return m_supportedRdbmses ;
+    }
+    
+    /**
      * Reads all components from the given location, a folder or a zip file.<p>
      * 
      * @param fileName the location to read the components from
@@ -2645,4 +2919,84 @@
         }
         m_configRfsPath = m_webAppRfsPath + CmsSystemInfo.FOLDER_WEBINF + CmsSystemInfo.FOLDER_CONFIG;
     }
+    
+    /**
+     * Setups persistence.xml file
+     * @param url - jdbc URL
+     * @param driverName - JDBC driver class name
+     * @param userName - database user name
+     * @param userPassword - database user password
+     */
+    private void setUpPersistenceUnit(String url, String driverName, 
+    		String userName, String userPassword){
+    	
+    	m_peristenceConfigurator.setUpConfiguration(driverName, url, userName, userPassword) ;
+    }
+    
+    
+    /**
+     * Lock/unlock schema generation in persistence xml file
+     * @param generate - true schema generation is on.
+     */
+    private void setSchemaGeneration(boolean generate){
+    	if(generate){
+    		m_peristenceConfigurator.setPropertyValue(
+    				CmsPersistenceUnitConfigurator.ATTR_GENERATE_SCHEMA, 
+    				CmsPersistenceUnitConfigurator.ATTR_GENERATE_SCHEMA_VALUE) ;
+    	}
+    	else {
+    		m_peristenceConfigurator.removeProperty(
+    				CmsPersistenceUnitConfigurator.ATTR_GENERATE_SCHEMA) ;
+    	}
+    }
+    
+    private boolean hasSqlDriver(String provider){
+    	boolean result = false ;
+    	CmsSetupDbInfo dbi = getDbInfo(provider) ;
+    	if(dbi != null){
+    		result = dbi.getSupportedBySqlDriver() ;
+    	}
+    	
+    	return result ;
+    }
+    
+    /**
+     * Returns an CmsSetupDbInfo object which key is equal to key parameter value.
+     * 
+     * @param key - key value for particular database - postgresql, mysql etc
+     * @return an object with information about the database associated with particular key value.
+     */
+    public CmsSetupDbInfo getDbInfo(String key){
+
+    	CmsSetupDbInfo dbi = null ;
+    	
+    	for(CmsSetupDbInfo db:getSupportedRdbmses()){
+    		if(db.getKey().equalsIgnoreCase(key)){
+    			dbi = db ;
+    			break ;
+    		}
+    	}
+    	
+    	return dbi ;
+    }
+    
+    private String getDriverType(String key){
+    	String driverType = null ;
+    	
+    	if(key == null){
+    		return null ;
+    	}
+    	else if (JPA_PROVIDER.equalsIgnoreCase(key)){
+    		return key ;
+    	}
+    	
+    	CmsSetupDbInfo dbi = getDbInfo(key) ;
+    	if(!dbi.getSupportedBySqlDriver()){
+    		driverType = JPA_PROVIDER ;
+    	} else {
+    			driverType = key ;
+    	}
+    	
+    	return driverType ;
+    }
 }
\ No newline at end of file
diff -urN opencms_7.0.5_src/src-setup/org/opencms/setup/CmsSetupDbInfo.java trunk/src-setup/org/opencms/setup/CmsSetupDbInfo.java
--- opencms_7.0.5_src/src-setup/org/opencms/setup/CmsSetupDbInfo.java	1970-01-01 02:00:00.000000000 +0200
+++ trunk/src-setup/org/opencms/setup/CmsSetupDbInfo.java	2008-09-02 11:13:45.271884355 +0300
@@ -0,0 +1,121 @@
+/**
+ * 
+ */
+package org.opencms.setup;
+/**
+ * Container for information about particular RDBMS
+ * and supported features.
+ * 
+ * @author gosho
+ *
+ */
+public class CmsSetupDbInfo {
+
+	/** Does installer have native/SQL driver */
+	protected boolean m_supportedBySqlDriver ;
+	
+	/** Does current JPA implementation support this RDBMS */
+	protected boolean m_isJpaSupported ;
+	
+	/** DB key */
+	protected String m_key ;
+	
+	/** JDBC driver class name */
+	protected String m_jdbcDriverName ;
+	
+	/** JDBC URL*/
+	protected String m_jdbcUrl ;
+	
+	/** RDBMS name (example - PostgreSQL)*/
+	protected String m_RdbmsName ;
+	
+	/**
+	 * @return the m_RdbmsName
+	 */
+	public String getRdbmsName() {
+		return m_RdbmsName;
+	}
+
+	/**
+	 * @param rdbmsName the m_RdbmsName to set
+	 */
+	public void setRdbmsName(String rdbmsName) {
+		m_RdbmsName = rdbmsName;
+	}
+
+	public CmsSetupDbInfo(){
+		m_isJpaSupported = true ;
+		m_supportedBySqlDriver = false ;
+	}
+
+	/**
+	 * @return the m_supportedBySqlDriver
+	 */
+	public boolean getSupportedBySqlDriver() {
+		return m_supportedBySqlDriver;
+	}
+
+	/**
+	 * @param bySqlDriver the m_supportedBySqlDriver to set
+	 */
+	public void setSupportedBySqlDriver(boolean bySqlDriver) {
+		m_supportedBySqlDriver = bySqlDriver;
+	}
+
+	/**
+	 * @return the m_isJpaSupported
+	 */
+	public boolean getSupportedByJpa() {
+		return m_isJpaSupported;
+	}
+
+	/**
+	 * @param jpaSupported the m_isJpaSupported to set
+	 */
+	public void setSupportedByJpa(boolean jpaSupported) {
+		m_isJpaSupported = jpaSupported;
+	}
+
+	/**
+	 * @return the m_key
+	 */
+	public String getKey() {
+		return m_key;
+	}
+
+	/**
+	 * @param m_key the m_key to set
+	 */
+	public void setKey(String m_key) {
+		this.m_key = m_key;
+	}
+
+	/**
+	 * @return the m_jdbcDriverName
+	 */
+	public String getJdbcDriverName() {
+		return m_jdbcDriverName;
+	}
+
+	/**
+	 * @param driverName the m_jdbcDriverName to set
+	 */
+	public void setJdbcDriverName(String driverName) {
+		m_jdbcDriverName = driverName;
+	}
+
+	/**
+	 * @return the m_jdbcUrl
+	 */
+	public String getJdbcUrl() {
+		return m_jdbcUrl;
+	}
+
+	/**
+	 * @param url the m_jdbcUrl to set
+	 */
+	public void setJdbcUrl(String url) {
+		m_jdbcUrl = url;
+	}
+	
+}
diff -urN opencms_7.0.5_src/webapp/setup/database/as400/step_4_database_setup.jsp trunk/webapp/setup/database/as400/step_4_database_setup.jsp
--- opencms_7.0.5_src/webapp/setup/database/as400/step_4_database_setup.jsp	2007-11-23 10:37:52.000000000 +0200
+++ trunk/webapp/setup/database/as400/step_4_database_setup.jsp	2008-09-02 11:15:13.719884323 +0300
@@ -60,12 +60,12 @@
 			<!-- --------------------- JSP CODE --------------------------- -->
 			<%
 				/* get all available databases */
-				List databases = Bean.getSortedDatabases();
+				List<CmsSetupDbInfo> databases = Bean.getSupportedRdbmses();
 				/* 	List all databases found in the dbsetup.properties */
 				if (databases !=null && databases.size() > 0)	{
-					for(int i=0;i<databases.size();i++)	{
-						String db = (String) databases.get(i);
-						String dn = Bean.getDatabaseName(db);
+					for(CmsSetupDbInfo dbi:databases)	{
+						String db = dbi.getKey();
+						String dn = dbi.getRdbmsName();
 						String selected = "";
 						if(Bean.getDatabase().equals(db))	{
 							selected = "selected";
@@ -126,6 +126,13 @@
 		</td>
 		<td><%= Bean.getHtmlHelpIcon("5", "../../") %></td>
 	</tr>
+	<tr>
+		<td>OpenCms Driver</td>
+		<td><input type="radio" name="driverType" value="sql" checked="true"/> Traditional SQL</td>
+		<td><input type="radio" name="driverType" value="jpa"/> New JPA</td>
+		<td><%= Bean.getHtmlHelpIcon("7", "../../") %></td>
+		<td>&nbsp;</td>
+	</tr>
 </table>
 <%= Bean.getHtmlPart("C_BLOCK_END") %>
 </td></tr>
@@ -165,6 +172,14 @@
 The Setup Wizard does not create the library, so please create it before continuing.
 <%= Bean.getHtmlPart("C_HELP_END") %>
 
+<%= Bean.getHtmlPart("C_HELP_START", "7") %>
+<b>Traditional SQL drivers</b> are well tested and offer a 
+slight performance increase in comparison with JPA driver. 
+Because SQL drivers are specific for each RDBMS they may be not available for some databases.<br>&nbsp;<br>
+<b>JPA driver</b> is a new generation driver based on JPA specification (Java Persistence API). 
+It uses modern JPA implementation - <b>Apache OpenJPA</b> which is quite extensible and flexible.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
 <% } else	{ %>
 Alkacon OpenCms Setup Wizard - Database setup
 <%= Bean.getHtmlPart("C_CONTENT_SETUP_START") %>
diff -urN opencms_7.0.5_src/webapp/setup/database/db2/step_4_database_setup.jsp trunk/webapp/setup/database/db2/step_4_database_setup.jsp
--- opencms_7.0.5_src/webapp/setup/database/db2/step_4_database_setup.jsp	2007-11-05 17:15:46.000000000 +0200
+++ trunk/webapp/setup/database/db2/step_4_database_setup.jsp	2008-09-02 11:15:17.047883960 +0300
@@ -60,12 +60,12 @@
 			<!-- --------------------- JSP CODE --------------------------- -->
 			<%
 				/* get all available databases */
-				List databases = Bean.getSortedDatabases();
+				List<CmsSetupDbInfo> databases = Bean.getSupportedRdbmses();
 				/* 	List all databases found in the dbsetup.properties */
 				if (databases !=null && databases.size() > 0)	{
-					for(int i=0;i<databases.size();i++)	{
-						String db = (String) databases.get(i);
-						String dn = Bean.getDatabaseName(db);
+					for(CmsSetupDbInfo dbi:databases)	{
+						String db = dbi.getKey();
+						String dn = dbi.getRdbmsName();
 						String selected = "";
 						if(Bean.getDatabase().equals(db))	{
 							selected = "selected";
@@ -126,6 +126,13 @@
 		</td>
 		<td><%= Bean.getHtmlHelpIcon("5", "../../") %></td>
 	</tr>
+	<tr>
+		<td>OpenCms Driver</td>
+		<td><input type="radio" name="driverType" value="sql" checked="true"/> Traditional SQL</td>
+		<td><input type="radio" name="driverType" value="jpa"/> New JPA</td>
+		<td><%= Bean.getHtmlHelpIcon("7", "../../") %></td>
+		<td>&nbsp;</td>
+	</tr>
 </table>
 <%= Bean.getHtmlPart("C_BLOCK_END") %>
 </td></tr>
@@ -166,6 +173,14 @@
 The Setup Wizard does not create the database, so please create it before continuing, using a statement like <code>CREATE DATABASE ${database} USING CODESET UTF-8 TERRITORY DE PAGESIZE 32 K;</code>.
 <%= Bean.getHtmlPart("C_HELP_END") %>
 
+<%= Bean.getHtmlPart("C_HELP_START", "7") %>
+<b>Traditional SQL drivers</b> are well tested and offer a 
+slight performance increase in comparison with JPA driver. 
+Because SQL drivers are specific for each RDBMS they may be not available for some databases.<br>&nbsp;<br>
+<b>JPA driver</b> is a new generation driver based on JPA specification (Java Persistence API). 
+It uses modern JPA implementation - <b>Apache OpenJPA</b> which is quite extensible and flexible.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
 <% } else	{ %>
 Alkacon OpenCms Setup Wizard - Database setup
 <%= Bean.getHtmlPart("C_CONTENT_SETUP_START") %>
diff -urN opencms_7.0.5_src/webapp/setup/database/hsqldb/step_4_database_setup.jsp trunk/webapp/setup/database/hsqldb/step_4_database_setup.jsp
--- opencms_7.0.5_src/webapp/setup/database/hsqldb/step_4_database_setup.jsp	2007-11-05 17:39:18.000000000 +0200
+++ trunk/webapp/setup/database/hsqldb/step_4_database_setup.jsp	2008-09-02 11:15:19.271886135 +0300
@@ -60,12 +60,12 @@
 			<!-- --------------------- JSP CODE --------------------------- -->
 			<%
 				/* get all available databases */
-				List databases = Bean.getSortedDatabases();
+				List<CmsSetupDbInfo> databases = Bean.getSupportedRdbmses();
 				/* 	List all databases found in the dbsetup.properties */
 				if (databases !=null && databases.size() > 0)	{
-					for(int i=0;i<databases.size();i++)	{
-						String db = (String) databases.get(i);
-						String dn = Bean.getDatabaseName(db);
+					for(CmsSetupDbInfo dbi:databases)	{
+						String db = dbi.getKey();
+						String dn = dbi.getRdbmsName();
 						String selected = "";
 						if(Bean.getDatabase().equals(db))	{
 							selected = "selected";
@@ -135,6 +135,13 @@
 		</td>
 		<td><%= Bean.getHtmlHelpIcon("5", "../../") %></td>
 	</tr>
+	<tr>
+		<td>OpenCms Driver</td>
+		<td><input type="radio" name="driverType" value="sql" checked="true"/> Traditional SQL</td>
+		<td><input type="radio" name="driverType" value="jpa"/> New JPA</td>
+		<td><%= Bean.getHtmlHelpIcon("6", "../../") %></td>
+		<td>&nbsp;</td>
+	</tr>
 </table>
 <%= Bean.getHtmlPart("C_BLOCK_END") %>
 </td></tr>
@@ -170,6 +177,14 @@
 Uncheck this option if an already existing database should be used.
 <%= Bean.getHtmlPart("C_HELP_END") %>
 
+<%= Bean.getHtmlPart("C_HELP_START", "6") %>
+<b>Traditional SQL drivers</b> are well tested and offer a 
+slight performance increase in comparison with JPA driver. 
+Because SQL drivers are specific for each RDBMS they may be not available for some databases.<br>&nbsp;<br>
+<b>JPA driver</b> is a new generation driver based on JPA specification (Java Persistence API). 
+It uses modern JPA implementation - <b>Apache OpenJPA</b> which is quite extensible and flexible.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
 <% } else	{ %>
 Alkacon OpenCms Setup Wizard - Database setup
 <%= Bean.getHtmlPart("C_CONTENT_SETUP_START") %>
diff -urN opencms_7.0.5_src/webapp/setup/database/jpa/database_information.html trunk/webapp/setup/database/jpa/database_information.html
--- opencms_7.0.5_src/webapp/setup/database/jpa/database_information.html	1970-01-01 02:00:00.000000000 +0200
+++ trunk/webapp/setup/database/jpa/database_information.html	2008-09-02 11:15:18.011884447 +0300
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+<head>
+	<title>Alkacon OpenCms Setup Wizard</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	
+	<style>
+	body {
+		font-family: verdana, sans-serif;
+		font-size: 11px;
+		color: #000;
+		padding: 0;
+		margin: 0;
+		background-color: ButtonFace;
+	}
+	a {
+		color: #cc0033;
+		text-decoration: none;
+	}
+	</style>
+	
+</head>
+
+<body unselectable="on">
+
+<table border="0" cellpadding="0" cellspacing="0" style="width: 100%;">
+<tr>
+	<td style="vertical-align: top;"><p style="margin-top: 0px;">
+		This JPA driver has been tested with PostgreSQL, MySql and Apache Derby. 
+		It has been developed by the OpenCms communty.		
+		Please write to the <a href="http://www.opencms.org/opencms/en/development/mailinglist.html">opencms-dev</a> mailing list for questions regarding this driver.
+		<br>
+		The initial version of this driver was developed by Georgi&nbsp;Naplatanov.
+		Special thanks to Alkacon - Alexander Kandzior and Michael Moossen,
+		Ivan Codarin and Kevin Sutter.
+	</td>
+	<td>&nbsp;</td>
+	<td style="vertical-align: top; text-align: center; font-size: 8pt; white-space:nowrap;">
+		<img src="logo_opencms.png" border="0" hspace="5" alt="OpenCms"><br>
+		<i><a href="http://www.opencms.org" target="alkacon">http://www.opencms.org</a></i>
+	</td>
+</tr>
+</table>
+
+</body>
+</html>
\ No newline at end of file
diff -urN opencms_7.0.5_src/webapp/setup/database/jpa/database.properties trunk/webapp/setup/database/jpa/database.properties
--- opencms_7.0.5_src/webapp/setup/database/jpa/database.properties	1970-01-01 02:00:00.000000000 +0200
+++ trunk/webapp/setup/database/jpa/database.properties	2008-09-02 11:15:18.011884447 +0300
@@ -0,0 +1,59 @@
+#
+# clear text name
+##############################################################################
+postgresql.name=Postgres 7.4.x and newer
+
+#
+# Alkacon OpenCms driver classes
+##############################################################################
+postgresql.vfs.driver=org.opencms.db.postgresql.CmsVfsDriver
+postgresql.user.driver=org.opencms.db.postgresql.CmsUserDriver
+postgresql.project.driver=org.opencms.db.postgresql.CmsProjectDriver
+postgresql.history.driver=org.opencms.db.postgresql.CmsHistoryDriver
+
+#
+# validation query
+##############################################################################
+#postgresql.testQuery=SELECT * FROM CMS_OFFLINE_PROPERTYDEF WHERE PROPERTYDDEF_NAME = 'Title'
+postgresql.testQuery=
+
+#
+# JDBC driver
+##############################################################################
+postgresql.driver=org.postgresql.Driver
+
+#
+# JDBC connect string
+##############################################################################
+postgresql.constr=jdbc:postgresql://localhost:5432/
+postgresql.constr.params=
+
+#
+# database user
+##############################################################################
+postgresql.user=postgres
+
+#
+# default database used when creating an postgres user/database 
+##############################################################################
+postgresql.templateDb=template1
+
+#
+# new database to be created for OpenCms 
+##############################################################################
+postgresql.newDb=
+
+#
+# ranking used for setup select box
+##############################################################################
+postgresql.ranking=50
+
+#
+# SQL manager class
+##############################################################################
+postgresql.sqlmanager=org.opencms.db.postgresql.CmsSqlManager
+
+#
+# Jdbc Drivers - Comma separated list of jars
+##############################################################################
+postgresql.libs=postgresql-8.3-603.jdbc3.jar
Binary files opencms_7.0.5_src/webapp/setup/database/jpa/logo_opencms.png and trunk/webapp/setup/database/jpa/logo_opencms.png differ
diff -urN opencms_7.0.5_src/webapp/setup/database/jpa/step_4_database_setup.jsp trunk/webapp/setup/database/jpa/step_4_database_setup.jsp
--- opencms_7.0.5_src/webapp/setup/database/jpa/step_4_database_setup.jsp	1970-01-01 02:00:00.000000000 +0200
+++ trunk/webapp/setup/database/jpa/step_4_database_setup.jsp	2008-09-02 11:15:18.011884447 +0300
@@ -0,0 +1,195 @@
+<%@ page import="org.opencms.setup.*,java.util.*" session="true" %><%--
+--%><jsp:useBean id="Bean" class="org.opencms.setup.CmsSetupBean" scope="session" /><%--
+--%><jsp:setProperty name="Bean" property="*" /><%
+
+	// next page
+	String nextPage = "../../step_4a_database_validation.jsp";		
+	// previous page
+	String prevPage = "../../step_2_check_components.jsp";
+	
+    boolean isFormSubmitted = Bean.setDbParamaters(request, CmsSetupBean.JPA_PROVIDER);
+
+%>
+<%= Bean.getHtmlPart("C_HTML_START") %>
+Alkacon OpenCms Setup Wizard
+<%= Bean.getHtmlPart("C_HEAD_START") %>
+<%= Bean.getHtmlPart("C_STYLES") %>
+<%= Bean.getHtmlPart("C_STYLES_SETUP") %>
+<%= Bean.getHtmlPart("C_SCRIPT_HELP") %>
+<script type="text/javascript">
+<!--
+	function checkSubmit()	{
+		if(document.forms[0].dbCreateConStr.value == "")	{
+			alert("Please insert the Connection String");
+			document.forms[0].dbCreateConStr.focus();
+			return false;
+		}
+		else if (document.forms[0].db.value == "")	{
+			alert("Please insert a Database name");
+			document.forms[0].db.focus();
+			return false;
+		}
+		else	{
+			return true;
+		}
+	}
+
+	<%
+		if(isFormSubmitted)	{
+			out.println("location.href='"+nextPage+"';");
+		}
+	%>
+//-->
+</script>
+<%= Bean.getHtmlPart("C_HEAD_END") %>
+
+<% if (Bean.isInitialized()) { %>
+Alkacon OpenCms Setup Wizard - Apache OpenJPA compatible database setup
+<%= Bean.getHtmlPart("C_CONTENT_SETUP_START") %>
+<form method="post" onSubmit="return checkSubmit()" class="nomargin">
+
+<table border="0" cellpadding="0" cellspacing="0" style="width: 100%; height: 100%;">
+<tr><td style="vertical-align: top;">
+
+<%= Bean.getHtmlPart("C_BLOCK_START", "Database") %>
+<table border="0" cellpadding="2" cellspacing="0">
+	<tr>
+		<td>Select Database</td>
+		<td>
+			<select name="database" style="width: 250px;" size="1" onchange="location.href='../../step_3_database_selection.jsp?database='+this.options[this.selectedIndex].value;">
+			<!-- --------------------- JSP CODE --------------------------- -->
+			<%
+				/* get all available databases */
+				List<CmsSetupDbInfo> databases = Bean.getSupportedRdbmses();
+				/* 	List all databases found in the dbsetup.properties */
+				if (databases !=null && databases.size() > 0)	{
+					for(CmsSetupDbInfo dbi:databases)	{
+						String db = dbi.getKey();
+						String dn = dbi.getRdbmsName();
+						String selected = "";
+						if(Bean.getDatabase().equals(db))	{
+							selected = "selected";
+						}
+						out.println("<option value='"+db+"' "+selected+">"+dn);
+					}
+				}
+				else	{
+					out.println("<option value='null'>no database found");
+				}
+			%>
+			<!-- --------------------------------------------------------- -->
+			</select>
+		</td>
+		<td><%= Bean.getHtmlHelpIcon("6", "../../") %></td>
+	</tr>
+</table>
+<%= Bean.getHtmlPart("C_BLOCK_END") %>
+
+</td></tr>
+<tr><td style="vertical-align: middle;">
+
+<div class="dialogspacer" unselectable="on">&nbsp;</div>
+<iframe src="database_information.html" name="dbinfo" style="width: 100%; height: 80px; margin: 0; padding: 0; border-style: none;" frameborder="0" scrolling="no"></iframe>
+<div class="dialogspacer" unselectable="on">&nbsp;</div>
+
+</td></tr>
+<tr><td style="vertical-align: bottom;">
+
+<%= Bean.getHtmlPart("C_BLOCK_START", "Database specific settings") %>
+
+<table border="0" cellpadding="2" cellspacing="0">
+	<tr>
+		<td>&nbsp;</td>
+		<td>User</td>
+		<td>Password</td>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td>OpenCms Connection</td>
+		<td><input type="text" name="dbWorkUser" size="8" style="width:150px;" value='<%= Bean.getDbWorkUser() %>'></td>
+		<td style="text-align: right;"><input type="text" name="dbWorkPwd" size="8" style="width:150px;" value='<%= Bean.getDbWorkPwd() %>'></td>
+		<td><%= Bean.getHtmlHelpIcon("2", "../../") %></td>
+	</tr>
+	<tr>
+		<td>JDBC driver class name</td>
+		<td colspan="2"><input type="text" name="jdbcDriver" size="22" style="width:315px;" value='<%= Bean.getDbDriver() %>'></td>
+		<td><%= Bean.getHtmlHelpIcon("3", "../../") %></td>
+	</tr>
+	<tr>
+		<td>Connection String</td>
+		<td colspan="2"><input type="text" name="dbCreateConStr" size="22" style="width:315px;" value='<%= Bean.getDbCreateConStr() %>'></td>
+		<td><%= Bean.getHtmlHelpIcon("3", "../../") %></td>
+	</tr>
+	<tr>
+		<td>Database</td>
+		<td colspan="2"><input type="text" name="db" size="22" style="width:315px;" value='add your database name to the connection string' disabled="true"></td>
+		<td><%= Bean.getHtmlHelpIcon("4", "../../") %></td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td colspan="2"><input type="checkbox" name="createTables" value="true" disabled="true" checked> Create tables 
+		</td>
+		<td><%= Bean.getHtmlHelpIcon("5", "../../") %></td>
+	</tr>
+	<tr>
+		<td>OpenCms Driver</td>
+		<td><input type="radio" name="driverType" value="sql" disabled="true"/> Traditional SQL</td>
+		<td><input type="radio" name="driverType" value="jpa"checked="true" disabled="true"/> New JPA</td>
+		<td><%= Bean.getHtmlHelpIcon("7", "../../") %></td>
+		<td>&nbsp;</td>
+	</tr>
+</table>
+<%= Bean.getHtmlPart("C_BLOCK_END") %>
+</td></tr>
+</table>
+<%= Bean.getHtmlPart("C_CONTENT_END") %>
+
+<%= Bean.getHtmlPart("C_BUTTONS_START") %>
+<input name="back" type="button" value="&#060;&#060; Back" class="dialogbutton" onclick="location.href='<%= prevPage %>';">
+<input name="submit" type="submit" value="Continue &#062;&#062;" class="dialogbutton">
+<input name="cancel" type="button" value="Cancel" class="dialogbutton" onclick="location.href='../../index.jsp';" style="margin-left: 50px;">
+</form>
+<%= Bean.getHtmlPart("C_BUTTONS_END") %>
+
+<%= Bean.getHtmlPart("C_HELP_START", "2") %>
+The <b>OpenCms Connection</b> is used when running Alkacon OpenCms.<br>&nbsp;<br>
+During setup, this user needs to be able to create tables and indexes (if you want the Setup Wizard to create them).
+For security reasons, the specified user should <i>not</i> have database administration permissions.
+This user information is stored in the <code>opencms.properties</code> file after the setup.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
+<%= Bean.getHtmlPart("C_HELP_START", "3") %>
+Enter the JDBC <b>Connection String</b> to your database (without DB Name).
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
+<%= Bean.getHtmlPart("C_HELP_START", "4") %>
+Enter the name of the DB2 <b>Database</b> which should be used by Alkacon OpenCms.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
+<%= Bean.getHtmlPart("C_HELP_START", "5") %>
+The setup wizard <b>creates</b> only the tables (and not the database) for Alkacon OpenCms.<br>&nbsp;<br>
+<b>Attention</b>: create your database with a command like <code>CREATE DATABASE ${database} USING CODESET UTF-8 TERRITORY DE PAGESIZE 32 K;</code><br>&nbsp;<br>
+Uncheck this option if already existing tables should be used.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
+<%= Bean.getHtmlPart("C_HELP_START", "6") %>
+<b>DB2 v9 configuration notes:</b><br>&nbsp;<br>
+DB2 uses the Operative System users, so be sure to create the user before continuing.<br>&nbsp;<br>
+The Setup Wizard does not create the database, so please create it before continuing, using a statement like <code>CREATE DATABASE ${database} USING CODESET UTF-8 TERRITORY DE PAGESIZE 32 K;</code>.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
+<%= Bean.getHtmlPart("C_HELP_START", "7") %>
+<b>Traditional SQL drivers</b> are well tested and offer a 
+slight performance increase in comparison with JPA driver. 
+Because SQL drivers are specific for each RDBMS they may be not available for some databases.<br>&nbsp;<br>
+<b>JPA driver</b> is a new generation driver based on JPA specification (Java Persistence API). 
+It uses modern JPA implementation - <b>Apache OpenJPA</b> which is quite extensible and flexible.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
+<% } else	{ %>
+Alkacon OpenCms Setup Wizard - Database setup
+<%= Bean.getHtmlPart("C_CONTENT_SETUP_START") %>
+<%= Bean.displayError("../../")%>
+<%= Bean.getHtmlPart("C_CONTENT_END") %>
+<% } %>
+<%= Bean.getHtmlPart("C_HTML_END") %>
\ No newline at end of file
diff -urN opencms_7.0.5_src/webapp/setup/database/mssql/step_4_database_setup.jsp trunk/webapp/setup/database/mssql/step_4_database_setup.jsp
--- opencms_7.0.5_src/webapp/setup/database/mssql/step_4_database_setup.jsp	2007-11-05 17:39:18.000000000 +0200
+++ trunk/webapp/setup/database/mssql/step_4_database_setup.jsp	2008-09-02 11:15:03.075883916 +0300
@@ -59,12 +59,12 @@
 			<!-- --------------------- JSP CODE --------------------------- -->
 			<%
 				/* get all available databases */
-				List databases = Bean.getSortedDatabases();
+				List<CmsSetupDbInfo> databases = Bean.getSupportedRdbmses();
 				/* 	List all databases found in the dbsetup.properties */
 				if (databases !=null && databases.size() > 0)	{
-					for(int i=0;i<databases.size();i++)	{
-						String db = (String) databases.get(i);
-						String dn = Bean.getDatabaseName(db);
+					for(CmsSetupDbInfo dbi:databases)	{
+						String db = dbi.getKey();
+						String dn = dbi.getRdbmsName();
 						String selected = "";
 						if(Bean.getDatabase().equals(db))	{
 							selected = "selected";
@@ -131,6 +131,13 @@
 		</td>
 		<td><%= Bean.getHtmlHelpIcon("5", "../../") %></td>
 	</tr>
+	<tr>
+		<td>OpenCms Driver</td>
+		<td><input type="radio" name="driverType" value="sql" checked="true"/> Traditional SQL</td>
+		<td><input type="radio" name="driverType" value="jpa"/> New JPA</td>
+		<td><%= Bean.getHtmlHelpIcon("7", "../../") %></td>
+		<td>&nbsp;</td>
+	</tr>
 </table>
 <%= Bean.getHtmlPart("C_BLOCK_END") %>
 </td></tr>
@@ -177,6 +184,14 @@
 
 <%= Bean.getHtmlPart("C_HELP_END") %>
 
+<%= Bean.getHtmlPart("C_HELP_START", "7") %>
+<b>Traditional SQL drivers</b> are well tested and offer a 
+slight performance increase in comparison with JPA driver. 
+Because SQL drivers are specific for each RDBMS they may be not available for some databases.<br>&nbsp;<br>
+<b>JPA driver</b> is a new generation driver based on JPA specification (Java Persistence API). 
+It uses modern JPA implementation - <b>Apache OpenJPA</b> which is quite extensible and flexible.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
 <% } else	{ %>
 Alkacon OpenCms Setup Wizard - Database setup
 <%= Bean.getHtmlPart("C_CONTENT_SETUP_START") %>
diff -urN opencms_7.0.5_src/webapp/setup/database/mysql/step_4_database_setup.jsp trunk/webapp/setup/database/mysql/step_4_database_setup.jsp
--- opencms_7.0.5_src/webapp/setup/database/mysql/step_4_database_setup.jsp	2006-03-27 15:52:54.000000000 +0300
+++ trunk/webapp/setup/database/mysql/step_4_database_setup.jsp	2008-09-02 11:15:03.879885715 +0300
@@ -59,12 +59,12 @@
 			<!-- --------------------- JSP CODE --------------------------- -->
 			<%
 				/* get all available databases */
-				List databases = Bean.getSortedDatabases();
+				List<CmsSetupDbInfo> databases = Bean.getSupportedRdbmses();
 				/* 	List all databases found in the dbsetup.properties */
 				if (databases !=null && databases.size() > 0)	{
-					for(int i=0;i<databases.size();i++)	{
-						String db = (String) databases.get(i);
-						String dn = Bean.getDatabaseName(db);
+					for(CmsSetupDbInfo dbi:databases)	{
+						String db = dbi.getKey();
+						String dn = dbi.getRdbmsName();
 						String selected = "";
 						if(Bean.getDatabase().equals(db))	{
 							selected = "selected";
@@ -131,6 +131,13 @@
 		</td>
 		<td><%= Bean.getHtmlHelpIcon("5", "../../") %></td>
 	</tr>
+	<tr>
+		<td>OpenCms Driver</td>
+		<td><input type="radio" name="driverType" value="sql" checked="true"/> Traditional SQL</td>
+		<td><input type="radio" name="driverType" value="jpa"/> New JPA</td>
+		<td><%= Bean.getHtmlHelpIcon("7", "../../") %></td>
+		<td>&nbsp;</td>
+	</tr>
 </table>
 <%= Bean.getHtmlPart("C_BLOCK_END") %>
 </td></tr>
@@ -182,6 +189,14 @@
 MySQL versions <b>4.0.x</b> are only limited by the amount of available memory on the server.
 <%= Bean.getHtmlPart("C_HELP_END") %>
 
+<%= Bean.getHtmlPart("C_HELP_START", "7") %>
+<b>Traditional SQL drivers</b> are well tested and offer a 
+slight performance increase in comparison with JPA driver. 
+Because SQL drivers are specific for each RDBMS they may be not available for some databases.<br>&nbsp;<br>
+<b>JPA driver</b> is a new generation driver based on JPA specification (Java Persistence API). 
+It uses modern JPA implementation - <b>Apache OpenJPA</b> which is quite extensible and flexible.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
 <% } else	{ %>
 Alkacon OpenCms Setup Wizard - Database setup
 <%= Bean.getHtmlPart("C_CONTENT_SETUP_START") %>
diff -urN opencms_7.0.5_src/webapp/setup/database/mysql_41/step_4_database_setup.jsp trunk/webapp/setup/database/mysql_41/step_4_database_setup.jsp
--- opencms_7.0.5_src/webapp/setup/database/mysql_41/step_4_database_setup.jsp	2006-03-28 11:30:50.000000000 +0300
+++ trunk/webapp/setup/database/mysql_41/step_4_database_setup.jsp	2008-09-02 11:15:17.995884474 +0300
@@ -60,12 +60,12 @@
 			<!-- --------------------- JSP CODE --------------------------- -->
 			<%
 				/* get all available databases */
-				List databases = Bean.getSortedDatabases();
+				List<CmsSetupDbInfo> databases = Bean.getSupportedRdbmses();
 				/* 	List all databases found in the dbsetup.properties */
 				if (databases !=null && databases.size() > 0)	{
-					for(int i=0;i<databases.size();i++)	{
-						String db = (String) databases.get(i);
-						String dn = Bean.getDatabaseName(db);
+					for(CmsSetupDbInfo dbi:databases)	{
+						String db = dbi.getKey();
+						String dn = dbi.getRdbmsName();
 						String selected = "";
 						if(Bean.getDatabase().equals(db))	{
 							selected = "selected";
@@ -132,6 +132,13 @@
 		</td>
 		<td><%= Bean.getHtmlHelpIcon("5", "../../") %></td>
 	</tr>
+	<tr>
+		<td>OpenCms Driver</td>
+		<td><input type="radio" name="driverType" value="sql" checked="true"/> Traditional SQL</td>
+		<td><input type="radio" name="driverType" value="jpa"/> New JPA</td>
+		<td><%= Bean.getHtmlHelpIcon("7", "../../") %></td>
+		<td>&nbsp;</td>
+	</tr>
 </table>
 <%= Bean.getHtmlPart("C_BLOCK_END") %>
 </td></tr>
@@ -184,6 +191,14 @@
 All tables are created using the <code>utf8</code> charset.
 <%= Bean.getHtmlPart("C_HELP_END") %>
 
+<%= Bean.getHtmlPart("C_HELP_START", "7") %>
+<b>Traditional SQL drivers</b> are well tested and offer a 
+slight performance increase in comparison with JPA driver. 
+Because SQL drivers are specific for each RDBMS they may be not available for some databases.<br>&nbsp;<br>
+<b>JPA driver</b> is a new generation driver based on JPA specification (Java Persistence API). 
+It uses modern JPA implementation - <b>Apache OpenJPA</b> which is quite extensible and flexible.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
 <% } else	{ %>
 Alkacon OpenCms Setup Wizard - Database setup
 <%= Bean.getHtmlPart("C_CONTENT_SETUP_START") %>
diff -urN opencms_7.0.5_src/webapp/setup/database/oracle/step_4_database_setup.jsp trunk/webapp/setup/database/oracle/step_4_database_setup.jsp
--- opencms_7.0.5_src/webapp/setup/database/oracle/step_4_database_setup.jsp	2006-07-20 12:00:38.000000000 +0300
+++ trunk/webapp/setup/database/oracle/step_4_database_setup.jsp	2008-09-02 11:15:06.515883972 +0300
@@ -79,12 +79,12 @@
 			<!-- --------------------- JSP CODE --------------------------- -->
 			<%
 				/* get all available databases */
-				List databases = Bean.getSortedDatabases();
+				List<CmsSetupDbInfo> databases = Bean.getSupportedRdbmses();
 				/* 	List all databases found in the dbsetup.properties */
 				if (databases !=null && databases.size() > 0)	{
-					for(int i=0;i<databases.size();i++)	{
-						String db = (String) databases.get(i);
-						String dn = Bean.getDatabaseName(db);
+					for(CmsSetupDbInfo dbi:databases)	{
+						String db = dbi.getKey();
+						String dn = dbi.getRdbmsName();
 						String selected = "";
 						if(Bean.getDatabase().equals(db))	{
 							selected = "selected";
@@ -166,6 +166,13 @@
 							<td><%= Bean.getHtmlHelpIcon("5", "../../") %></td>
 							<td>&nbsp;</td>
 						</tr>
+						<tr>
+							<td>OpenCms Driver</td>
+							<td><input type="radio" name="driverType" value="sql" checked="true"/> Traditional SQL</td>
+							<td><input type="radio" name="driverType" value="jpa"/> New JPA</td>
+							<td><%= Bean.getHtmlHelpIcon("6", "../../") %></td>
+							<td>&nbsp;</td>
+						</tr>
 					</table>
 				
 <%= Bean.getHtmlPart("C_BLOCK_END") %>
@@ -209,6 +216,14 @@
 Uncheck this option if an already existing tablespace should be used.
 <%= Bean.getHtmlPart("C_HELP_END") %>
 
+<%= Bean.getHtmlPart("C_HELP_START", "6") %>
+<b>Traditional SQL drivers</b> are well tested and offer a 
+slight performance increase in comparison with JPA driver. 
+Because SQL drivers are specific for each RDBMS they may be not available for some databases.<br>&nbsp;<br>
+<b>JPA driver</b> is a new generation driver based on JPA specification (Java Persistence API). 
+It uses modern JPA implementation - <b>Apache OpenJPA</b> which is quite extensible and flexible.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
 <% } else	{ %>
 Alkacon OpenCms Setup Wizard - Database setup
 <%= Bean.getHtmlPart("C_CONTENT_SETUP_START") %>
diff -urN opencms_7.0.5_src/webapp/setup/database/oracle_8/step_4_database_setup.jsp trunk/webapp/setup/database/oracle_8/step_4_database_setup.jsp
--- opencms_7.0.5_src/webapp/setup/database/oracle_8/step_4_database_setup.jsp	2006-03-28 11:30:50.000000000 +0300
+++ trunk/webapp/setup/database/oracle_8/step_4_database_setup.jsp	2008-09-02 11:15:18.027884340 +0300
@@ -79,12 +79,12 @@
 			<!-- --------------------- JSP CODE --------------------------- -->
 			<%
 				/* get all available databases */
-				List databases = Bean.getSortedDatabases();
+				List<CmsSetupDbInfo> databases = Bean.getSupportedRdbmses();
 				/* 	List all databases found in the dbsetup.properties */
 				if (databases !=null && databases.size() > 0)	{
-					for(int i=0;i<databases.size();i++)	{
-						String db = (String) databases.get(i);
-						String dn = Bean.getDatabaseName(db);
+					for(CmsSetupDbInfo dbi:databases)	{
+						String db = dbi.getKey();
+						String dn = dbi.getRdbmsName();
 						String selected = "";
 						if(Bean.getDatabase().equals(db))	{
 							selected = "selected";
@@ -172,6 +172,13 @@
 							<td><%= Bean.getHtmlHelpIcon("5", "../../") %></td>
 							<td>&nbsp;</td>
 						</tr>
+						<tr>
+							<td>OpenCms Driver</td>
+							<td><input type="radio" name="driverType" value="sql" checked="true"/> Traditional SQL</td>
+							<td><input type="radio" name="driverType" value="jpa"/> New JPA</td>
+							<td><%= Bean.getHtmlHelpIcon("6", "../../") %></td>
+							<td>&nbsp;</td>
+						</tr>
 					</table>
 				
 <%= Bean.getHtmlPart("C_BLOCK_END") %>
@@ -215,6 +222,14 @@
 Uncheck this option if an already existing tablespace should be used.
 <%= Bean.getHtmlPart("C_HELP_END") %>
 
+<%= Bean.getHtmlPart("C_HELP_START", "6") %>
+<b>Traditional SQL drivers</b> are well tested and offer a 
+slight performance increase in comparison with JPA driver. 
+Because SQL drivers are specific for each RDBMS they may be not available for some databases.<br>&nbsp;<br>
+<b>JPA driver</b> is a new generation driver based on JPA specification (Java Persistence API). 
+It uses modern JPA implementation - <b>Apache OpenJPA</b> which is quite extensible and flexible.
+<%= Bean.getHtmlPart("C_HELP_END") %>
+
 <% } else	{ %>
 Alkacon OpenCms Setup Wizard - Database setup
 <%= Bean.getHtmlPart("C_CONTENT_SETUP_START") %>
diff -urN opencms_7.0.5_src/webapp/setup/database/postgresql/step_4_database_setup.jsp trunk/webapp/setup/database/postgresql/step_4_database_setup.jsp
--- opencms_7.0.5_src/webapp/setup/database/postgresql/step_4_database_setup.jsp	2006-03-28 11:30:50.000000000 +0300
+++ trunk/webapp/setup/database/postgresql/step_4_database_setup.jsp	2008-09-02 11:15:03.859884199 +0300
@@ -74,12 +74,12 @@
 			<!-- --------------------- JSP CODE --------------------------- -->
 			<%
 				/* get all available databases */
-				List databases = Bean.getSortedDatabases();
+				List<CmsSetupDbInfo> databases = Bean.getSupportedRdbmses();
 				/* 	List all databases found in the dbsetup.properties */
 				if (databases !=null && databases.size() > 0)	{
-					for(int i=0;i<databases.size();i++)	{
-						String db = (String) databases.get(i);
-						String dn = Bean.getDatabaseName(db);
+					for(CmsSetupDbInfo dbi:databases)	{
+						String db = dbi.getKey();
+						String dn = dbi.getRdbmsName();
 						String selected = "";
 						if(Bean.getDatabase().equals(db))	{
 							selected = "selected";
@@ -166,6 +166,13 @@
 							<td><%= Bean.getHtmlHelpIcon("5", "../../") %></td>
 							<td>&nbsp;</td>
 						</tr>
+						<tr>
+							<td>OpenCms Driver</td>
+							<td><input type="radio" name="driverType" value="sql" checked="true"/> Traditional SQL</td>
+							<td><input type="radio" name="driverType" value="jpa"/> New JPA</td>
+							<td><%= Bean.getHtmlHelpIcon("6", "../../") %></td>
+							<td>&nbsp;</td>
+						</tr>
 					</table>
 				
 <%= Bean.getHtmlPart("C_BLOCK_END") %>
@@ -210,7 +217,13 @@
 Uncheck this option if an already existing user/database should be used.
 <%= Bean.getHtmlPart("C_HELP_END") %>
 
-
+<%= Bean.getHtmlPart("C_HELP_START", "6") %>
+<b>Traditional SQL drivers</b> are well tested and offer a 
+slight performance increase in comparison with JPA driver. 
+Because SQL drivers are specific for each RDBMS they may be not available for some databases.<br>&nbsp;<br>
+<b>JPA driver</b> is a new generation driver based on JPA specification (Java Persistence API). 
+It uses modern JPA implementation - <b>Apache OpenJPA</b> which is quite extensible and flexible.
+<%= Bean.getHtmlPart("C_HELP_END") %>
 
 <% } else	{ %>
 Alkacon OpenCms Setup Wizard - Database setup
diff -urN opencms_7.0.5_src/webapp/setup/step_3_database_selection.jsp trunk/webapp/setup/step_3_database_selection.jsp
--- opencms_7.0.5_src/webapp/setup/step_3_database_selection.jsp	2006-03-27 15:52:20.000000000 +0300
+++ trunk/webapp/setup/step_3_database_selection.jsp	2008-09-02 11:15:19.347884337 +0300
@@ -9,7 +9,7 @@
 <head>
 <title>Alkacon OpenCms Setup Wizard</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="refresh" content="0;url=<%=Bean.getDatabaseConfigPage(Bean.getDatabase()) %>">
+<meta http-equiv="refresh" content="0;url=<%=Bean.getDatabaseConfigPage(request.getParameter("database")) %>">
 </head>
 <body>
 </body>
diff -urN opencms_7.0.5_src/webapp/WEB-INF/classes/META-INF/persistence.xml trunk/webapp/WEB-INF/classes/META-INF/persistence.xml
--- opencms_7.0.5_src/webapp/WEB-INF/classes/META-INF/persistence.xml	1970-01-01 02:00:00.000000000 +0200
+++ trunk/webapp/WEB-INF/classes/META-INF/persistence.xml	2008-09-02 11:15:19.567884737 +0300
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+	<persistence-unit name="OpenCmsJPAPool">
+
+		<class>org.opencms.db.jpa.persistence.CmsDAOContents</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOGroups</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOGroupUsers</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOHistoryPrincipals</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOHistoryProjectResources</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOHistoryProjects</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOHistoryProperties</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOHistoryPropertyDef</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOHistoryResources</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOHistoryStructure</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOfflineAccessControl</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOfflineContents</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOfflineProperties</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOfflinePropertyDef</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOfflineResourceRelations</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOfflineResources</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOfflineStructure</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOnlineAccessControl</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOnlineProperties</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOnlinePropertyDef</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOnlineResourceRelations</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOnlineResources</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOOnlineStructure</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOProjectResources</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOProjects</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOPublishHistory</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOPublishJobs</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOResourceLocks</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOStaticExportLinks</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOUserData</class>
+		<class>org.opencms.db.jpa.persistence.CmsDAOUsers</class>
+				
+		<properties>
+                  <!-- *** DBCP Connection pool configuration *** -->
+                  <property name="openjpa.ConnectionProperties" 
+                         value="DriverClassName=__driverName__,
+                         Url=__jdbcUrl__,
+                         Username=__userName__,
+                         Password=__userPassword__,
+                         MaxActive=20,
+                         maxIdle=20,
+                         initialSize=20"/>
+                  
+                  <property name="openjpa.ConnectionDriverName" 
+                         value="org.apache.commons.dbcp.BasicDataSource"/>
+                    
+                  <!-- *** Pool size for EntityManager instances *** -->
+                  <property name="opencms.jpa.EntityManagerPoolSize" value="300"/>
+                         
+                  <!-- *** Connection management *** -->
+				  <property name="openjpa.ConnectionRetainMode" value="on-demand"/>
+                         
+                  <!-- *** Synchronize database schema with persistence classes. *** -->
+                  <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+                  <property name="openjpa.jdbc.SchemaFactory" value="native(ForeignKeys=true)"/>
+                  
+                  <!-- *** OpenJPA Query cache configuration *** -->
+                  <property name="openjpa.QueryCompilationCache" value="true"/>
+                  <property name="openjpa.jdbc.QuerySQLCache" value="true"/>
+                  
+                  <!-- *** OpenJPA Query data cache configuration *** -->
+		  		  <property name="openjpa.QueryCache" value="false"/>
+      			
+      			  <!-- *** OpenJPA Data cache configuration *** -->
+				  <property name="openjpa.RemoteCommitProvider" value="sjvm"/>
+				  <property name="openjpa.DataCache" value="true(CacheSize=2000, SoftReferenceSize=0)"/>     
+
+				  <!-- *** DB dictionary settings *** -->
+                  <property name="openjpa.jdbc.DBDictionary" value="mysql(SupportsSubselect=true,UseGetBytesForBlobs,UseSetBytesForBlobs)"/>
+                  <property name="openjpa.jdbc.DBDictionary" value="JoinSyntax=traditional, SupportsUniqueConstraints=false"/>
+        </properties>
+	</persistence-unit>
+</persistence>