You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/03/27 01:55:41 UTC

svn commit: r522665 [2/29] - in /portals/jetspeed-2/branches/J2-M2-REDUX: ./ components/ components/jetspeed-cm/ components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/ components/jetspeed-cm/src/test/resources/ components/jetspeed-cm/s...

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/
------------------------------------------------------------------------------
    (empty)

Modified: portals/jetspeed-2/branches/J2-M2-REDUX/.classpath
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/.classpath?view=diff&rev=522665&r1=522664&r2=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/.classpath (original)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/.classpath Mon Mar 26 16:53:34 2007
@@ -11,7 +11,7 @@
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/jetspeed-capability/src/test/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/jetspeed-cm/src/main/java"/>
 	<classpathentry excluding="**/.svn/*|Log4j.properties" kind="src" path="components/jetspeed-cm/src/test/java"/>
-	<classpathentry excluding="**/.svn/*" kind="src" path="components/jetspeed-deploy-tool/src/main/java"/>
+	<classpathentry excluding="**/.svn/*" kind="src" path="components/jetspeed-deploy-tools/src/main/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/jetspeed-file-cache/src/main/java"/>
 	<classpathentry excluding="**/.svn/*|log4j.properties" kind="src" path="components/jetspeed-file-cache/src/test/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="components/jetspeed-header-resource/src/main/java"/>
@@ -55,65 +55,69 @@
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/gems/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/j2-admin/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/rss/src/java"/>
+	<classpathentry kind="src" path="maven/jetspeed-ddl-generator/src/main/java"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/castor/castor/0.9.4.3/castor-0.9.4.3.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.5/commons-digester-1.5.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/0.1/commons-io-0.1.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
-    <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
-    <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
-    <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-    <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
-    <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" exported="true"/>
-    <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-    <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.3.0/xercesImpl-2.3.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/velocity/velocity/1.4/velocity-1.4.jar"/>
-    <classpathentry kind="var" path="M2_REPO/tyrex/tyrex/1.0.1/tyrex-1.0.1.jar" exported="true"/>
-    <classpathentry kind="var" path="M2_REPO/ojb/db-ojb/1.0.3/db-ojb-1.0.3.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/velocity-tools/velocity-tools/1.2/velocity-tools-1.2.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-configuration/commons-configuration/1.1/commons-configuration-1.1.jar"/>
-    <classpathentry kind="var" path="M2_REPO/mockrunner/mockrunner/0.2.7/mockrunner-0.2.7.jar"/>
-    <classpathentry kind="var" path="M2_REPO/jmock/jmock/1.0.1/jmock-1.0.1.jar"/>
-    <classpathentry kind="var" path="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar"/>
-    <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar"/>
-    <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.0.6/jstl-1.0.6.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/apache/pluto/pluto/1.0.1/pluto-1.0.1.jar"/>
-    <classpathentry kind="var" path="M2_REPO/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/0.9.5/nekohtml-0.9.5.jar"/>
-    <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.7/oro-2.0.7.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
-    <classpathentry kind="var" path="M2_REPO/rome/rome/0.8/rome-0.8.jar"/>
-    <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.0.6/standard-1.0.6.jar"/>
-    <classpathentry kind="var" path="M2_REPO/cglib/cglib-full/2.0.2/cglib-full-2.0.2.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/springframework/spring-portlet/2.0/spring-portlet-2.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/2.0/spring-webmvc-2.0.jar"/>  
-    <classpathentry kind="var" path="M2_REPO/org/springmodules/spring-modules-ojb/0.6/spring-modules-ojb-0.6.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.0/commons-fileupload-1.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-common/1.0.2-RC/portals-bridges-common-1.0.2-RC.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-velocity/1.0.2-RC/portals-bridges-velocity-1.0.2-RC.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-frameworks/1.0.2-RC/portals-bridges-frameworks-1.0.2-RC.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-jsf/1.0.2-RC/portals-bridges-jsf-1.0.2-RC.jar"/>
-    <classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-portletfilter/1.0.2-RC/portals-bridges-portletfilter-1.0.2-RC.jar"/>
-    <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
-    <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.3.3/mail-1.3.3.jar"/>
-    <classpathentry kind="var" path="M2_REPO/taglibs/random/1.0.2/random-1.0.2.jar"/>
-    <classpathentry kind="var" path="M2_REPO/javolution/javolution/4.0.2/javolution-4.0.2.jar"/>
-    <classpathentry kind="var" path="M2_REPO/ddlutils/ddlutils/1.0-RC1-PATCHED/ddlutils-1.0-RC1-PATCHED.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils-core/1.7.0/commons-beanutils-core-1.7.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils-bean-collections/1.7.0/commons-beanutils-bean-collections-1.7.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
-    <classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.2.4/ehcache-1.2.4.jar"/>
-    <classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/myfaces/myfaces-api/1.1.0/myfaces-api-1.1.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/myfaces/myfaces-impl/1.1.0/myfaces-impl-1.1.0.jar"/>
-    <classpathentry kind="var" path="M2_REPO/myfaces/tomahawk/1.1.0/tomahawk-1.1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/castor/castor/0.9.4.3/castor-0.9.4.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.5/commons-digester-1.5.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/0.1/commons-io-0.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
+	<classpathentry exported="true" kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.3.0/xercesImpl-2.3.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/velocity/velocity/1.4/velocity-1.4.jar"/>
+	<classpathentry exported="true" kind="var" path="M2_REPO/tyrex/tyrex/1.0.1/tyrex-1.0.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/ojb/db-ojb/1.0.3/db-ojb-1.0.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0/commons-httpclient-3.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/velocity-tools/velocity-tools/1.2/velocity-tools-1.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2.1/commons-dbcp-1.2.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-configuration/commons-configuration/1.1/commons-configuration-1.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/mockrunner/mockrunner/0.2.7/mockrunner-0.2.7.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jmock/jmock/1.0.1/jmock-1.0.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/saxpath/saxpath/1.0-FCS/saxpath-1.0-FCS.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.0-FCS/jaxen-1.0-FCS.jar"/>
+	<classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.0.6/jstl-1.0.6.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/pluto/pluto/1.0.1/pluto-1.0.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/0.9.5/nekohtml-0.9.5.jar"/>
+	<classpathentry kind="var" path="M2_REPO/oro/oro/2.0.7/oro-2.0.7.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/rome/rome/0.8/rome-0.8.jar"/>
+	<classpathentry kind="var" path="M2_REPO/taglibs/standard/1.0.6/standard-1.0.6.jar"/>
+	<classpathentry kind="var" path="M2_REPO/cglib/cglib-full/2.0.2/cglib-full-2.0.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-mock/2.0/spring-mock-2.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-portlet/2.0/spring-portlet-2.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/2.0/spring-webmvc-2.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springmodules/spring-modules-ojb/0.6/spring-modules-ojb-0.6.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.0/commons-fileupload-1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-common/1.0.2-RC/portals-bridges-common-1.0.2-RC.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-velocity/1.0.2-RC/portals-bridges-velocity-1.0.2-RC.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-frameworks/1.0.2-RC/portals-bridges-frameworks-1.0.2-RC.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-jsf/1.0.2-RC/portals-bridges-jsf-1.0.2-RC.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/portals/bridges/portals-bridges-portletfilter/1.0.2-RC/portals-bridges-portletfilter-1.0.2-RC.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.3.3/mail-1.3.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/taglibs/random/1.0.2/random-1.0.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javolution/javolution/4.0.2/javolution-4.0.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/ddlutils/ddlutils/1.0-RC1-PATCHED/ddlutils-1.0-RC1-PATCHED.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils-core/1.7.0/commons-beanutils-core-1.7.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils-bean-collections/1.7.0/commons-beanutils-bean-collections-1.7.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+	<classpathentry kind="var" path="M2_REPO/ehcache/ehcache/1.2.4/ehcache-1.2.4.jar"/>
+	<classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/myfaces/myfaces-api/1.1.0/myfaces-api-1.1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/myfaces/myfaces-impl/1.1.0/myfaces-impl-1.1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/myfaces/tomahawk/1.1.0/tomahawk-1.1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0.5/maven-plugin-api-2.0.5.jar"/>
+    <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0.5/maven-project-2.0.5.jar"/>
+    <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 26 16:53:34 2007
@@ -1,2 +1,2 @@
-target
+target
 surefire*.properties

Added: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/pom.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/pom.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/pom.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    
+    $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    <prerequisites>
+        <maven>2.0.5</maven>
+    </prerequisites>
+    
+    <artifactId>jetspeed-cm</artifactId>
+    <name>Jetspeed-2 Component Manager</name>
+    <description>Jetspeed Component Manager</description>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>components</artifactId>
+        <version>J2-M2-REDUX-SNAPSHOT</version>
+    </parent>
+    <packaging>jar</packaging>
+
+    <!-- Dependencies -->
+
+    <dependencies>
+
+        <!-- Build Dependencies -->
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>jetspeed-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring</artifactId>
+        </dependency>
+         <dependency>
+            <groupId>org.springmodules</groupId>
+            <artifactId>spring-modules-ojb</artifactId>
+        </dependency>        
+        <dependency>
+            <groupId>aopalliance</groupId>
+            <artifactId>aopalliance</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>mockrunner</groupId>
+            <artifactId>mockrunner</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <!--
+            Note: junit is normally required only for test, but 
+            in this case, abstract test cases are included in the
+            component build... this should probably be fixed...
+            for now, assume that junit will be provided if these
+            test classes are used.
+        -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>ojb</groupId>
+            <artifactId>db-ojb</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Runtime Dependencies -->
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-full</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+        	<groupId>ehcache</groupId>
+        	<artifactId>ehcache</artifactId>
+        </dependency>
+         <dependency>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+	    </dependency>       
+    </dependencies>
+
+    <!-- Build Configuration -->
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/TestInterceptorAdapter.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Copied: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/src/test/resources/org/apache/jetspeed/cache/general/cache-test.xml (from r522263, portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/src/test/resources/org/apache/jetspeed/cache/general/cache-test.xml?view=diff&rev=522665&p1=portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/cache-test.xml&r1=522263&p2=portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/src/test/resources/org/apache/jetspeed/cache/general/cache-test.xml&r2=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/src/test/resources/org/apache/jetspeed/cache/general/cache-test.xml
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.1

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/src/test/resources/org/apache/jetspeed/cache/general/cache-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-cm/src/test/resources/org/apache/jetspeed/cache/general/cache-test.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-deploy-tools/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-deploy-tools/pom.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-deploy-tools/pom.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-deploy-tools/pom.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+  $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.5</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-deploy-tools</artifactId>
+  <name>Jetspeed-2 Deploy Tools</name>
+  <description>Jetspeed Deploy Tools</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>components</artifactId>
+    <version>J2-M2-REDUX-SNAPSHOT</version>
+  </parent>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    
+    <!-- Build Dependencies -->
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>jetspeed-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    
+    <!-- Runtime Dependencies -->
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>saxpath</groupId>
+      <artifactId>saxpath</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    
+  </dependencies>
+  
+</project>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-deploy-tools/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-deploy-tools/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/pom.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/pom.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/pom.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+  $Id$
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.5</maven>
+  </prerequisites>
+  
+  <artifactId>jetspeed-webapp-logging</artifactId>
+  <name>Jetspeed-2 WebApp Logging</name>
+  <description>
+    The Jetspeed-2 Web Application Logging Utils allow one to use jakarta commons-logging together with Log4J in a web application
+    isolated from other Log4J configurations of your App Server and/or other web applications.
+  </description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>components</artifactId>
+    <version>J2-M2-REDUX-SNAPSHOT</version>
+  </parent>
+  <packaging>jar</packaging>
+  
+  <dependencies>
+    
+    <!-- Build Dependencies -->
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>jetspeed-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>velocity</groupId>
+      <artifactId>velocity</artifactId>
+      <optional>true</optional>
+    </dependency>
+    
+  </dependencies>
+  
+</project>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase1-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase1-schema.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase1-schema.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase1-schema.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd">
+<!-- Autogenerated by JDBCToXMLSchema! -->
+<database name="j2">
+    <!--
+       Tables for Capability mapping
+    -->
+
+    <!--
+       Media Type
+    -->
+
+    <table name="MEDIA_TYPE">
+        <column name="MEDIATYPE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="NAME" required="true" size="80" type="VARCHAR"/>
+        <column name="CHARACTER_SET" size="40" type="VARCHAR"/>
+        <column name="TITLE" size="80" type="VARCHAR"/>
+        <column name="DESCRIPTION" type="LONGVARCHAR"/>
+    </table>
+    
+    <!--
+       Client
+    -->
+
+    <table name="CLIENT">
+        <column name="CLIENT_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="EVAL_ORDER" required="true" type='INTEGER'/>
+        <column name="NAME" required="true" size="80" type="VARCHAR"/>
+        <column name="USER_AGENT_PATTERN" size="128" type="VARCHAR"/>
+        <column name="MANUFACTURER" size="80" type="VARCHAR"/>
+        <column name="MODEL" size="80" type="VARCHAR"/>
+        <column name="VERSION" size="40" type="VARCHAR"/>
+        <column name="PREFERRED_MIMETYPE_ID" required="true" type="INTEGER"/>
+    </table>
+    
+    <!--
+       Mimetype
+    -->
+
+    <table name="MIMETYPE">
+        <column name="MIMETYPE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="NAME" required="true" size="80" type="VARCHAR"/>
+    </table>
+    
+    <!--
+       Capability
+    -->
+    
+    <table name="CAPABILITY">
+        <column name="CAPABILITY_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="CAPABILITY" required="true" size="80" type="VARCHAR"/>
+    </table>
+    
+    <!--
+       Client association
+    -->
+    
+    <table name="CLIENT_TO_CAPABILITY">
+        <column name="CLIENT_ID" required="true" type="INTEGER"/>
+        <column name="CAPABILITY_ID" required="true" type="INTEGER"/>
+    </table>
+    
+    <table name="CLIENT_TO_MIMETYPE">
+        <column name="CLIENT_ID" required="true" type="INTEGER"/>
+        <column name="MIMETYPE_ID" required="true" type="INTEGER"/>
+    </table>
+    
+    <!--
+       Media Type association
+    -->
+    
+    <table name="MEDIATYPE_TO_CAPABILITY">
+        <column name="MEDIATYPE_ID" required="true" type="INTEGER"/>
+        <column name="CAPABILITY_ID" required="true" type="INTEGER"/>
+    </table>
+    
+    <table name="MEDIATYPE_TO_MIMETYPE">
+        <column name="MEDIATYPE_ID" required="true" type="INTEGER"/>
+        <column name="MIMETYPE_ID" required="true" type="INTEGER"/>
+    </table>
+
+	<table name='PORTLET_STATISTICS'>
+		<column name='IPADDRESS' type='VARCHAR' size="80"/>
+		<column name='USER_NAME' type='VARCHAR' size="80"/>
+		<column name='TIME_STAMP' type='TIMESTAMP'/>
+		<column name='PAGE' type='VARCHAR' size="80"/>
+		<column name='PORTLET' type='VARCHAR' size="255"/>
+		<column name='STATUS' type='INTEGER'/>
+		<column name='ELAPSED_TIME' type='BIGINT'/>
+	</table>    
+
+	<table name='PAGE_STATISTICS'>
+		<column name='IPADDRESS' type='VARCHAR' size="80"/>
+		<column name='USER_NAME' type='VARCHAR' size="80"/>
+		<column name='TIME_STAMP' type='TIMESTAMP'/>
+		<column name='PAGE' type='VARCHAR' size="80"/>
+		<column name='STATUS' type='INTEGER'/>
+		<column name='ELAPSED_TIME' type='BIGINT'/>
+	</table>    
+
+	<table name='USER_STATISTICS'>
+		<column name='IPADDRESS' type='VARCHAR' size="80"/>
+		<column name='USER_NAME' type='VARCHAR' size="80"/>
+		<column name='TIME_STAMP' type='TIMESTAMP'/>
+		<column name='STATUS' type='INTEGER'/>
+		<column name='ELAPSED_TIME' type='BIGINT'/>
+	</table>    
+	
+</database>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase1-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase1-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase2-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase2-schema.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase2-schema.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase2-schema.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,650 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd">
+<database name="j2">
+
+    <!--
+       Folder Definition
+    -->
+
+    <table name="FOLDER">
+        <column name="FOLDER_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PARENT_ID" type="INTEGER"/>
+        <column name="PATH" required="true" size="240" type="VARCHAR"/>
+        <column name="NAME" required="true" size="80" type="VARCHAR"/>
+        <column name="TITLE" size="100" type="VARCHAR"/>
+        <column name="SHORT_TITLE" size="40" type="VARCHAR"/>
+        <column name="IS_HIDDEN" required="true" type="BOOLEANINT"/>
+        <column name="SKIN" size="80" type="VARCHAR"/>
+        <column name="DEFAULT_LAYOUT_DECORATOR" size="80" type="VARCHAR"/>
+        <column name="DEFAULT_PORTLET_DECORATOR" size="80" type="VARCHAR"/>
+        <column name="DEFAULT_PAGE_NAME" size="80" type="VARCHAR"/>
+        <column name="SUBSITE" size="40" type="VARCHAR"/>
+        <column name="USER_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="ROLE_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="GROUP_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="MEDIATYPE" size="15" type="VARCHAR"/>
+        <column name="LOCALE" size="20" type="VARCHAR"/>
+        <column name="EXT_ATTR_NAME" size="15" type="VARCHAR"/>
+        <column name="EXT_ATTR_VALUE" size="40" type="VARCHAR"/>
+        <column name="OWNER_PRINCIPAL" size="40" type="VARCHAR"/>
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_1" onDelete="cascade">
+            <reference foreign="FOLDER_ID" local="PARENT_ID"/>
+        </foreign-key>
+        <index name="IX_FOLDER_1">
+            <index-column name="PARENT_ID"/>
+        </index>
+        <unique name="UN_FOLDER_1">
+            <unique-column name="PATH"/>
+        </unique>
+    </table>
+    
+    <table name="FOLDER_METADATA">
+        <column name="METADATA_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="FOLDER_ID" type="INTEGER" required="true"/>
+        <column name="NAME" required="true" size="15" type="VARCHAR"/>
+        <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
+        <column name="VALUE" required="true" size="100" type="VARCHAR"/>
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_METADATA_1" onDelete="cascade">
+            <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
+        </foreign-key>
+        <index name="IX_FOLDER_METADATA_1">
+            <index-column name="FOLDER_ID"/>
+        </index>
+        <unique name="UN_FOLDER_METADATA_1">
+            <unique-column name="FOLDER_ID"/>
+            <unique-column name="NAME"/>
+            <unique-column name="LOCALE"/>
+            <unique-column name="VALUE"/>
+        </unique>
+    </table>
+
+    <table name="FOLDER_CONSTRAINT">
+        <column name="CONSTRAINT_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="FOLDER_ID" type="INTEGER" required="true"/>
+        <column name="APPLY_ORDER" type="INTEGER" required="true"/>
+        <column name="USER_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_CONSTRAINT_1" onDelete="cascade">
+            <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
+        </foreign-key>
+        <index name="IX_FOLDER_CONSTRAINT_1">
+            <index-column name="FOLDER_ID"/>
+        </index>
+    </table>
+
+    <table name="FOLDER_CONSTRAINTS_REF">
+        <column name="CONSTRAINTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="FOLDER_ID" type="INTEGER" required="true"/>
+        <column name="APPLY_ORDER" type="INTEGER" required="true"/>
+        <column name="NAME" size="40" type="VARCHAR" required="true"/>
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_CONSTRAINTS_REF_1" onDelete="cascade">
+            <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
+        </foreign-key>
+        <index name="IX_FOLDER_CONSTRAINTS_REF_1">
+            <index-column name="FOLDER_ID"/>
+        </index>
+        <unique name="UN_FOLDER_CONSTRAINTS_REF_1">
+            <unique-column name="FOLDER_ID"/>
+            <unique-column name="NAME"/>
+        </unique>
+    </table>
+
+    <table name="FOLDER_ORDER">
+        <column name="ORDER_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="FOLDER_ID" type="INTEGER" required="true"/>
+        <column name="SORT_ORDER" type="INTEGER" required="true"/>
+        <column name="NAME" size="80" type="VARCHAR" required="true"/>
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_ORDER_1" onDelete="cascade">
+            <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
+        </foreign-key>
+        <index name="IX_FOLDER_ORDER_1">
+            <index-column name="FOLDER_ID"/>
+        </index>
+        <unique name="UN_FOLDER_ORDER_1">
+            <unique-column name="FOLDER_ID"/>
+            <unique-column name="NAME"/>
+        </unique>
+    </table>
+
+    <table name="FOLDER_MENU">
+        <column name="MENU_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="CLASS_NAME" required="true" size="100" type="VARCHAR"/>
+        <column name="PARENT_ID" type="INTEGER"/>
+        <column name="FOLDER_ID" type="INTEGER"/>
+        <column name="ELEMENT_ORDER" type="INTEGER"/>
+        <column name="NAME" size="100" type="VARCHAR"/>
+        <column name="TITLE" size="100" type="VARCHAR"/>
+        <column name="SHORT_TITLE" size="40" type="VARCHAR"/>
+        <column name="TEXT" size="100" type="VARCHAR"/>
+        <column name="OPTIONS" size="255" type="VARCHAR"/>
+        <column name="DEPTH" type="INTEGER"/>
+        <column name="IS_PATHS" type="BOOLEANINT"/>
+        <column name="IS_REGEXP" type="BOOLEANINT"/>
+        <column name="PROFILE" size="80" type="VARCHAR"/>
+        <column name="OPTIONS_ORDER" size="255" type="VARCHAR"/>
+        <column name="SKIN" size="80" type="VARCHAR"/>
+        <column name="IS_NEST" type="BOOLEANINT"/>
+        <foreign-key foreignTable="FOLDER_MENU" name="FK_FOLDER_MENU_1" onDelete="cascade">
+            <reference foreign="MENU_ID" local="PARENT_ID"/>
+        </foreign-key>
+        <foreign-key foreignTable="FOLDER" name="FK_FOLDER_MENU_2" onDelete="cascade">
+            <reference foreign="FOLDER_ID" local="FOLDER_ID"/>
+        </foreign-key>
+        <index name="IX_FOLDER_MENU_1">
+            <index-column name="PARENT_ID"/>
+        </index>        
+        <index name="UN_FOLDER_MENU_1">
+            <index-column name="FOLDER_ID"/>
+            <index-column name="NAME"/>
+        </index>
+    </table>
+
+    <table name="FOLDER_MENU_METADATA">
+        <column name="METADATA_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="MENU_ID" type="INTEGER" required="true"/>
+        <column name="NAME" required="true" size="15" type="VARCHAR"/>
+        <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
+        <column name="VALUE" required="true" size="100" type="VARCHAR"/>
+        <foreign-key foreignTable="FOLDER_MENU" name="FK_FOLDER_MENU_METADATA_1" onDelete="cascade">
+            <reference foreign="MENU_ID" local="MENU_ID"/>
+        </foreign-key>
+        <index name="IX_FOLDER_MENU_METADATA_1">
+            <index-column name="MENU_ID"/>
+        </index>
+        <unique name="UN_FOLDER_MENU_METADATA_1">
+            <unique-column name="MENU_ID"/>
+            <unique-column name="NAME"/>
+            <unique-column name="LOCALE"/>
+            <unique-column name="VALUE"/>
+        </unique>
+    </table>
+
+    <!--
+       Page Definition
+    -->
+
+    <table name="PAGE">
+        <column name="PAGE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PARENT_ID" type="INTEGER" required="true"/>
+        <column name="PATH" required="true" size="240" type="VARCHAR"/>
+        <column name="NAME" required="true" size="80" type="VARCHAR"/>
+        <column name="VERSION" required="false" size="40" type="VARCHAR"/>        
+        <column name="TITLE" size="100" type="VARCHAR"/>
+        <column name="SHORT_TITLE" size="40" type="VARCHAR"/>
+        <column name="IS_HIDDEN" required="true" type="BOOLEANINT"/>
+        <column name="SKIN" size="80" type="VARCHAR"/>
+        <column name="DEFAULT_LAYOUT_DECORATOR" size="80" type="VARCHAR"/>
+        <column name="DEFAULT_PORTLET_DECORATOR" size="80" type="VARCHAR"/>
+        <column name="SUBSITE" size="40" type="VARCHAR"/>
+        <column name="USER_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="ROLE_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="GROUP_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="MEDIATYPE" size="15" type="VARCHAR"/>
+        <column name="LOCALE" size="20" type="VARCHAR"/>
+        <column name="EXT_ATTR_NAME" size="15" type="VARCHAR"/>
+        <column name="EXT_ATTR_VALUE" size="40" type="VARCHAR"/>
+        <column name="OWNER_PRINCIPAL" size="40" type="VARCHAR"/>
+        <foreign-key foreignTable="FOLDER" name="FK_PAGE_1" onDelete="cascade">
+            <reference foreign="FOLDER_ID" local="PARENT_ID"/>
+        </foreign-key>
+        <index name="IX_PAGE_1">
+            <index-column name="PARENT_ID"/>
+        </index>
+        <unique name="UN_PAGE_1">
+            <unique-column name="PATH"/>
+        </unique>
+    </table>
+    
+    <table name="PAGE_METADATA">
+        <column name="METADATA_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PAGE_ID" type="INTEGER" required="true"/>
+        <column name="NAME" required="true" size="15" type="VARCHAR"/>
+        <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
+        <column name="VALUE" required="true" size="100" type="VARCHAR"/>
+        <foreign-key foreignTable="PAGE" name="FK_PAGE_METADATA_1" onDelete="cascade">
+            <reference foreign="PAGE_ID" local="PAGE_ID"/>
+        </foreign-key>
+        <index name="IX_PAGE_METADATA_1">
+            <index-column name="PAGE_ID"/>
+        </index>
+        <unique name="UN_PAGE_METADATA_1">
+            <unique-column name="PAGE_ID"/>
+            <unique-column name="NAME"/>
+            <unique-column name="LOCALE"/>
+            <unique-column name="VALUE"/>
+        </unique>
+    </table>
+
+    <table name="PAGE_CONSTRAINT">
+        <column name="CONSTRAINT_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PAGE_ID" type="INTEGER" required="true"/>
+        <column name="APPLY_ORDER" type="INTEGER" required="true"/>
+        <column name="USER_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
+        <foreign-key foreignTable="PAGE" name="FK_PAGE_CONSTRAINT_1" onDelete="cascade">
+            <reference foreign="PAGE_ID" local="PAGE_ID"/>
+        </foreign-key>
+        <index name="IX_PAGE_CONSTRAINT_1">
+            <index-column name="PAGE_ID"/>
+        </index>
+    </table>
+
+    <table name="PAGE_CONSTRAINTS_REF">
+        <column name="CONSTRAINTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PAGE_ID" type="INTEGER" required="true"/>
+        <column name="APPLY_ORDER" type="INTEGER" required="true"/>
+        <column name="NAME" size="40" type="VARCHAR" required="true"/>
+        <foreign-key foreignTable="PAGE" name="FK_PAGE_CONSTRAINTS_REF_1" onDelete="cascade">
+            <reference foreign="PAGE_ID" local="PAGE_ID"/>
+        </foreign-key>
+        <index name="IX_PAGE_CONSTRAINTS_REF_1">
+            <index-column name="PAGE_ID"/>
+        </index>
+        <unique name="UN_PAGE_CONSTRAINTS_REF_1">
+            <unique-column name="PAGE_ID"/>
+            <unique-column name="NAME"/>
+        </unique>
+    </table>
+
+    <table name="PAGE_MENU">
+        <column name="MENU_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="CLASS_NAME" required="true" size="100" type="VARCHAR"/>
+        <column name="PARENT_ID" type="INTEGER"/>
+        <column name="PAGE_ID" type="INTEGER"/>
+        <column name="ELEMENT_ORDER" type="INTEGER"/>
+        <column name="NAME" size="100" type="VARCHAR"/>
+        <column name="TITLE" size="100" type="VARCHAR"/>
+        <column name="SHORT_TITLE" size="40" type="VARCHAR"/>
+        <column name="TEXT" size="100" type="VARCHAR"/>
+        <column name="OPTIONS" size="255" type="VARCHAR"/>
+        <column name="DEPTH" type="INTEGER"/>
+        <column name="IS_PATHS" type="BOOLEANINT"/>
+        <column name="IS_REGEXP" type="BOOLEANINT"/>
+        <column name="PROFILE" size="80" type="VARCHAR"/>
+        <column name="OPTIONS_ORDER" size="255" type="VARCHAR"/>
+        <column name="SKIN" size="80" type="VARCHAR"/>
+        <column name="IS_NEST" type="BOOLEANINT"/>
+        <foreign-key foreignTable="PAGE_MENU" name="FK_PAGE_MENU_1" onDelete="cascade">
+            <reference foreign="MENU_ID" local="PARENT_ID"/>
+        </foreign-key>
+        <foreign-key foreignTable="PAGE" name="PM_M_FK_PAGE_ID_PAGE" onDelete="cascade">
+            <reference foreign="PAGE_ID" local="PAGE_ID"/>
+        </foreign-key>
+        <index name="IX_PAGE_MENU_1">
+            <index-column name="PARENT_ID"/>
+        </index>        
+        <index name="UN_PAGE_MENU_1">
+            <index-column name="PAGE_ID"/>
+            <index-column name="NAME"/>
+        </index>
+    </table>
+
+    <table name="PAGE_MENU_METADATA">
+        <column name="METADATA_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="MENU_ID" type="INTEGER" required="true"/>
+        <column name="NAME" required="true" size="15" type="VARCHAR"/>
+        <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
+        <column name="VALUE" required="true" size="100" type="VARCHAR"/>
+        <foreign-key foreignTable="PAGE_MENU" name="FK_PAGE_MENU_METADATA_1" onDelete="cascade">
+            <reference foreign="MENU_ID" local="MENU_ID"/>
+        </foreign-key>
+        <index name="IX_PAGE_MENU_METADATA_1">
+            <index-column name="MENU_ID"/>
+        </index>
+        <unique name="UN_PAGE_MENU_METADATA_1">
+            <unique-column name="MENU_ID"/>
+            <unique-column name="NAME"/>
+            <unique-column name="LOCALE"/>
+            <unique-column name="VALUE"/>
+        </unique>
+    </table>
+
+    <!--
+       Fragment Definitions (portlets, layouts)
+    -->
+
+    <table name="FRAGMENT">
+        <column name="FRAGMENT_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PARENT_ID" type="INTEGER"/>
+        <column name="PAGE_ID" type="INTEGER"/>
+        <column name="NAME" size="100" type="VARCHAR"/>
+        <column name="TITLE" size="100" type="VARCHAR"/>
+        <column name="SHORT_TITLE" size="40" type="VARCHAR"/>
+        <column name="TYPE" size="40" type="VARCHAR"/>
+        <column name="SKIN" size="80" type="VARCHAR"/>
+        <column name="DECORATOR" size="80" type="VARCHAR"/>
+        <column name="STATE" size="10" type="VARCHAR"/>
+        <column name="PMODE" size="10" type="VARCHAR"/>
+        <column name="LAYOUT_ROW" type="INTEGER"/>
+        <column name="LAYOUT_COLUMN" type="INTEGER"/>
+        <column name="LAYOUT_SIZES" size="20" type="VARCHAR"/>
+        <column name="LAYOUT_X" type="REAL"/>
+        <column name="LAYOUT_Y" type="REAL"/>
+        <column name="LAYOUT_Z" type="REAL"/>
+        <column name="LAYOUT_WIDTH" type="REAL"/>
+        <column name="LAYOUT_HEIGHT" type="REAL"/>
+        <column name="EXT_PROP_NAME_1" size="40" type="VARCHAR"/>
+        <column name="EXT_PROP_VALUE_1" size="80" type="VARCHAR"/>
+        <column name="EXT_PROP_NAME_2" size="40" type="VARCHAR"/>
+        <column name="EXT_PROP_VALUE_2" size="80" type="VARCHAR"/>
+        <column name="OWNER_PRINCIPAL" size="40" type="VARCHAR"/>
+        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_1" onDelete="cascade">
+            <reference foreign="FRAGMENT_ID" local="PARENT_ID"/>
+        </foreign-key>
+        <foreign-key foreignTable="PAGE" name="FK_FRAGMENT_2" onDelete="cascade">
+            <reference foreign="PAGE_ID" local="PAGE_ID"/>
+        </foreign-key>
+        <index name="IX_FRAGMENT_1">
+            <index-column name="PARENT_ID"/>
+        </index>        
+        <index name="UN_FRAGMENT_1">
+            <index-column name="PAGE_ID"/>
+        </index>
+    </table>
+
+    <table name="FRAGMENT_CONSTRAINT">
+        <column name="CONSTRAINT_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="FRAGMENT_ID" type="INTEGER" required="true"/>
+        <column name="APPLY_ORDER" type="INTEGER" required="true"/>
+        <column name="USER_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
+        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_CONSTRAINT_1" onDelete="cascade">
+            <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
+        </foreign-key>
+        <index name="IX_FRAGMENT_CONSTRAINT_1">
+            <index-column name="FRAGMENT_ID"/>
+        </index>
+    </table>
+
+    <table name="FRAGMENT_CONSTRAINTS_REF">
+        <column name="CONSTRAINTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="FRAGMENT_ID" type="INTEGER" required="true"/>
+        <column name="APPLY_ORDER" type="INTEGER" required="true"/>
+        <column name="NAME" size="40" type="VARCHAR" required="true"/>
+        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_CONSTRAINTS_REF_1" onDelete="cascade">
+            <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
+        </foreign-key>
+        <index name="IX_FRAGMENT_CONSTRAINTS_REF_1">
+            <index-column name="FRAGMENT_ID"/>
+        </index>
+        <unique name="UN_FRAGMENT_CONSTRAINTS_REF_1">
+            <unique-column name="FRAGMENT_ID"/>
+            <unique-column name="NAME"/>
+        </unique>
+    </table>
+
+    <table name="FRAGMENT_PREF">
+        <column name="PREF_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="FRAGMENT_ID" type="INTEGER" required="true"/>
+        <column name="NAME" size="40" type="VARCHAR" required="true"/>
+        <column name="IS_READ_ONLY" required="true" type="BOOLEANINT"/>
+        <foreign-key foreignTable="FRAGMENT" name="FK_FRAGMENT_PREF_1" onDelete="cascade">
+            <reference foreign="FRAGMENT_ID" local="FRAGMENT_ID"/>
+        </foreign-key>
+        <index name="IX_FRAGMENT_PREF_1">
+            <index-column name="FRAGMENT_ID"/>
+        </index>
+        <unique name="UN_FRAGMENT_PREF_1">
+            <unique-column name="FRAGMENT_ID"/>
+            <unique-column name="NAME"/>
+        </unique>
+    </table>
+
+    <table name="FRAGMENT_PREF_VALUE">
+        <column name="PREF_VALUE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PREF_ID" type="INTEGER" required="true"/>
+        <column name="VALUE_ORDER" type="INTEGER" required="true"/>
+        <column name="VALUE" required="true" size="100" type="VARCHAR"/>
+        <foreign-key foreignTable="FRAGMENT_PREF" name="FK_FRAGMENT_PREF_VALUE_1" onDelete="cascade">
+            <reference foreign="PREF_ID" local="PREF_ID"/>
+        </foreign-key>
+        <index name="IX_FRAGMENT_PREF_VALUE_1">
+            <index-column name="PREF_ID"/>
+        </index>
+    </table>
+
+    <!--
+       Link Definition
+    -->
+
+    <table name="LINK">
+        <column name="LINK_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PARENT_ID" type="INTEGER" required="true"/>
+        <column name="PATH" required="true" size="240" type="VARCHAR"/>
+        <column name="NAME" required="true" size="80" type="VARCHAR"/>
+        <column name="VERSION" required="false" size="40" type="VARCHAR"/>        
+        <column name="TITLE" size="100" type="VARCHAR"/>
+        <column name="SHORT_TITLE" size="40" type="VARCHAR"/>
+        <column name="IS_HIDDEN" required="true" type="BOOLEANINT"/>
+        <column name="SKIN" size="80" type="VARCHAR"/>
+        <column name="TARGET" size="80" type="VARCHAR"/>
+        <column name="URL" size="255" type="VARCHAR"/>
+        <column name="SUBSITE" size="40" type="VARCHAR"/>
+        <column name="USER_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="ROLE_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="GROUP_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="MEDIATYPE" size="15" type="VARCHAR"/>
+        <column name="LOCALE" size="20" type="VARCHAR"/>
+        <column name="EXT_ATTR_NAME" size="15" type="VARCHAR"/>
+        <column name="EXT_ATTR_VALUE" size="40" type="VARCHAR"/>
+        <column name="OWNER_PRINCIPAL" size="40" type="VARCHAR"/>
+        <foreign-key foreignTable="FOLDER" name="FK_LINK_1" onDelete="cascade">
+            <reference foreign="FOLDER_ID" local="PARENT_ID"/>
+        </foreign-key>
+        <index name="IX_LINK_1">
+            <index-column name="PARENT_ID"/>
+        </index>
+        <unique name="UN_LINK_1">
+            <unique-column name="PATH"/>
+        </unique>
+    </table>
+    
+    <table name="LINK_METADATA">
+        <column name="METADATA_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="LINK_ID" type="INTEGER" required="true"/>
+        <column name="NAME" required="true" size="15" type="VARCHAR"/>
+        <column name="LOCALE" required="true" size="20" type="VARCHAR"/>
+        <column name="VALUE" required="true" size="100" type="VARCHAR"/>
+        <foreign-key foreignTable="LINK" name="FK_LINK_METADATA_1" onDelete="cascade">
+            <reference foreign="LINK_ID" local="LINK_ID"/>
+        </foreign-key>
+        <index name="IX_LINK_METADATA_1">
+            <index-column name="LINK_ID"/>
+        </index>
+        <unique name="UN_LINK_METADATA_1">
+            <unique-column name="LINK_ID"/>
+            <unique-column name="NAME"/>
+            <unique-column name="LOCALE"/>
+            <unique-column name="VALUE"/>
+        </unique>
+    </table>
+
+    <table name="LINK_CONSTRAINT">
+        <column name="CONSTRAINT_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="LINK_ID" type="INTEGER" required="true"/>
+        <column name="APPLY_ORDER" type="INTEGER" required="true"/>
+        <column name="USER_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
+        <foreign-key foreignTable="LINK" name="FK_LINK_CONSTRAINT_1" onDelete="cascade">
+            <reference foreign="LINK_ID" local="LINK_ID"/>
+        </foreign-key>
+        <index name="IX_LINK_CONSTRAINT_1">
+            <index-column name="LINK_ID"/>
+        </index>
+    </table>
+
+    <table name="LINK_CONSTRAINTS_REF">
+        <column name="CONSTRAINTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="LINK_ID" type="INTEGER" required="true"/>
+        <column name="APPLY_ORDER" type="INTEGER" required="true"/>
+        <column name="NAME" size="40" type="VARCHAR" required="true"/>
+        <foreign-key foreignTable="LINK" name="FK_LINK_CONSTRAINTS_REF_1" onDelete="cascade">
+            <reference foreign="LINK_ID" local="LINK_ID"/>
+        </foreign-key>
+        <index name="IX_LINK_CONSTRAINTS_REF_1">
+            <index-column name="LINK_ID"/>
+        </index>
+        <unique name="UN_LINK_CONSTRAINTS_REF_1">
+            <unique-column name="LINK_ID"/>
+            <unique-column name="NAME"/>
+        </unique>
+    </table>
+
+    <!--
+       Page Security Definition
+    -->
+
+    <table name="PAGE_SECURITY">
+        <column name="PAGE_SECURITY_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PARENT_ID" type="INTEGER" required="true"/>
+        <column name="PATH" required="true" size="240" type="VARCHAR"/>
+        <column name="NAME" required="true" size="80" type="VARCHAR"/>
+        <column name="VERSION" required="false" size="40" type="VARCHAR"/>                
+        <column name="SUBSITE" size="40" type="VARCHAR"/>
+        <column name="USER_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="ROLE_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="GROUP_PRINCIPAL" size="40" type="VARCHAR"/>
+        <column name="MEDIATYPE" size="15" type="VARCHAR"/>
+        <column name="LOCALE" size="20" type="VARCHAR"/>
+        <column name="EXT_ATTR_NAME" size="15" type="VARCHAR"/>
+        <column name="EXT_ATTR_VALUE" size="40" type="VARCHAR"/>
+        <foreign-key foreignTable="FOLDER" name="FK_PAGE_SECURITY_1" onDelete="cascade">
+            <reference foreign="FOLDER_ID" local="PARENT_ID"/>
+        </foreign-key>
+        <unique name="UN_PAGE_SECURITY_1">
+            <unique-column name="PARENT_ID"/>
+        </unique>
+        <unique name="UN_PAGE_SECURITY_2">
+            <unique-column name="PATH"/>
+        </unique>
+    </table>
+    
+    <table name="PAGE_SEC_CONSTRAINTS_DEF">
+        <column name="CONSTRAINTS_DEF_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PAGE_SECURITY_ID" type="INTEGER" required="true"/>
+        <column name="NAME" required="true" size="40" type="VARCHAR"/>
+        <foreign-key foreignTable="PAGE_SECURITY" name="FK_PAGE_SEC_CONSTRAINTS_DEF_1" onDelete="cascade">
+            <reference foreign="PAGE_SECURITY_ID" local="PAGE_SECURITY_ID"/>
+        </foreign-key>
+        <index name="IX_PAGE_SEC_CONSTRAINTS_DEF_1">
+            <index-column name="PAGE_SECURITY_ID"/>
+        </index>
+        <unique name="UN_PAGE_SEC_CONSTRAINTS_DEF_1">
+            <unique-column name="PAGE_SECURITY_ID"/>
+            <unique-column name="NAME"/>
+        </unique>
+    </table>
+
+    <table name="PAGE_SEC_CONSTRAINT_DEF">
+        <column name="CONSTRAINT_DEF_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="CONSTRAINTS_DEF_ID" type="INTEGER" required="true"/>
+        <column name="APPLY_ORDER" type="INTEGER" required="true"/>
+        <column name="USER_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="ROLE_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="GROUP_PRINCIPALS_ACL" size="120" type="VARCHAR"/>
+        <column name="PERMISSIONS_ACL" size="120" type="VARCHAR"/>
+        <foreign-key foreignTable="PAGE_SEC_CONSTRAINTS_DEF" name="FK_PAGE_SEC_CONSTRAINT_DEF_1" onDelete="cascade">
+            <reference foreign="CONSTRAINTS_DEF_ID" local="CONSTRAINTS_DEF_ID"/>
+        </foreign-key>
+        <index name="IX_PAGE_SEC_CONSTRAINT_DEF_1">
+            <index-column name="CONSTRAINTS_DEF_ID"/>
+        </index>
+    </table>
+
+    <table name="PAGE_SEC_CONSTRAINTS_REF">
+        <column name="CONSTRAINTS_REF_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PAGE_SECURITY_ID" type="INTEGER" required="true"/>
+        <column name="APPLY_ORDER" type="INTEGER" required="true"/>
+        <column name="NAME" size="40" type="VARCHAR" required="true"/>
+        <foreign-key foreignTable="PAGE_SECURITY"  name="FK_PAGE_SEC_CONSTRAINTS_REF_1" onDelete="cascade">
+            <reference foreign="PAGE_SECURITY_ID" local="PAGE_SECURITY_ID"/>
+        </foreign-key>
+        <index name="IX_PAGE_SEC_CONSTRAINTS_REF_1">
+            <index-column name="PAGE_SECURITY_ID"/>
+        </index>
+        <unique name="UN_PAGE_SEC_CONSTRAINTS_REF_1">
+            <unique-column name="PAGE_SECURITY_ID"/>
+            <unique-column name="NAME"/>
+        </unique>
+    </table>
+
+    <!--
+       Profiler
+    -->
+
+    <table name="PROFILING_RULE">
+        <column name="RULE_ID" primaryKey="true" required="true"
+            size="80" type="VARCHAR"/>
+        <column name="CLASS_NAME" required="true" size="100" type="VARCHAR"/>
+        <column name="TITLE" size="100" type="VARCHAR"/>
+    </table>
+
+    <table name="RULE_CRITERION">
+        <column name="CRITERION_ID" primaryKey="true" required="true"
+            size="80" type="VARCHAR"/>
+        <column name="RULE_ID" required="true" size="80" type="VARCHAR"/>
+        <column name="FALLBACK_ORDER" required="true" type="INTEGER"/>
+        <column name="REQUEST_TYPE" required="true" size="40" type="VARCHAR"/>
+        <column name="NAME" required="true" size="80" type="VARCHAR"/>
+        <column name="COLUMN_VALUE" size="128" type="VARCHAR"/>
+        <column default="1" name="FALLBACK_TYPE" type="INTEGER"/>
+        <index name="IX_RULE_CRITERION_1">
+            <index-column name="RULE_ID" />
+            <index-column name="FALLBACK_ORDER" />
+        </index>
+        <foreign-key foreignTable="PROFILING_RULE" name="FK_RULE_CRITERION_1" onDelete="cascade">
+            <reference foreign="RULE_ID" local="RULE_ID"/>
+        </foreign-key>           
+    </table>
+          
+    <table name="PRINCIPAL_RULE_ASSOC">
+        <column name="PRINCIPAL_NAME" primaryKey="true" required="true" size="80" type="VARCHAR"/>
+        <column name="LOCATOR_NAME" primaryKey="true" required="true" size="80" type="VARCHAR"/>
+        <column name="RULE_ID" required="true" size="80" type="VARCHAR"/>
+    </table>
+                
+    <table name="PROFILE_PAGE_ASSOC">
+        <column name="LOCATOR_HASH" required="true" size="40" type="VARCHAR"/>
+        <column name="PAGE_ID" required="true" size="80" type="VARCHAR"/>
+        <unique name="UN_PROFILE_PAGE_1">
+          <unique-column name="LOCATOR_HASH" />
+          <unique-column name="PAGE_ID" />
+        </unique>
+    </table>
+    
+    <table name="CLUBS">
+        <column name="NAME" primaryKey='true' required="true" size="80" type="VARCHAR"/>
+        <column name="COUNTRY" required="true" size="40" type="VARCHAR"/>
+        <column name="CITY" required="true" size="40" type="VARCHAR"/>
+        <column name="STADIUM" required="true" size="80" type="VARCHAR"/>
+        <column name="CAPACITY" type='INTEGER'/>
+        <column name="FOUNDED" type='INTEGER'/>        
+        <column name="PITCH" size="40" type="VARCHAR"/>
+        <column name="NICKNAME" size="40" type="VARCHAR"/>
+    </table>  
+    
+</database>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase2-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase2-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase3ojb-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase3ojb-schema.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase3ojb-schema.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase3ojb-schema.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd">
+<!-- Autogenerated by JDBCToXMLSchema! -->
+<database name="j2">
+    <table name="OJB_HL_SEQ">
+        <column name="TABLENAME" primaryKey="true" required="true"
+            size="175" type="VARCHAR"/>
+        <column name="FIELDNAME" primaryKey="true" required="true"
+            size="70" type="VARCHAR"/>
+        <column name="MAX_KEY" type="INTEGER"/>
+        <column name="GRAB_SIZE" type="INTEGER"/>
+        <column name="VERSION" type="INTEGER"/>
+    </table>
+    
+    <table name="OJB_LOCKENTRY">
+        <column name="OID_" primaryKey="true" required="true" size="250" type="VARCHAR"/>
+        <column name="TX_ID" primaryKey="true" required="true" size="50" type="VARCHAR"/>
+        <column name="TIMESTAMP_" type="TIMESTAMP"/>
+        <column name="ISOLATIONLEVEL" type="INTEGER"/>
+        <column name="LOCKTYPE" type="INTEGER"/>
+    </table>
+    
+    <table name="OJB_NRM">
+        <column name="NAME" primaryKey="true" required="true" size="250" type="VARCHAR"/>
+        <column name="OID_" type="LONGVARBINARY"/>
+    </table>
+    
+    <table name="OJB_DLIST">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="SIZE_" type="INTEGER"/>
+    </table>
+    
+    <table name="OJB_DLIST_ENTRIES">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="DLIST_ID" type="INTEGER"/>
+        <column name="POSITION_" type="INTEGER"/>
+        <column name="OID_" type="LONGVARBINARY"/>
+    </table>
+    
+    <table name="OJB_DSET">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="SIZE_" type="INTEGER"/>
+    </table>
+    
+    <table name="OJB_DSET_ENTRIES">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="DLIST_ID" type="INTEGER"/>
+        <column name="POSITION_" type="INTEGER"/>
+        <column name="OID_" type="LONGVARBINARY"/>
+    </table>
+    
+    <table name="OJB_DMAP">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="SIZE_" type="INTEGER"/>
+    </table>
+<!--    
+    <table name="OJB_DMAP_ENTRIES">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="DMAP_ID" type="INTEGER"/>
+        <column name="KEY_OID" type="BINARY"/>
+        <column name="VALUE_OID" type="BINARY"/>
+    </table>
+-->
+    
+</database>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase3ojb-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/phase3ojb-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/prefs-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/prefs-schema.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/prefs-schema.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/prefs-schema.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd">
+<!-- Autogenerated by JDBCToXMLSchema! -->
+<database name="j2">
+
+    <!--
+       prefs_property_value
+    -->
+    <table name="PREFS_PROPERTY_VALUE">
+        <column name="PROPERTY_VALUE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="NODE_ID" type="INTEGER"/>
+        <column name="PROPERTY_NAME" size="100" type="VARCHAR"/>
+        <column name="PROPERTY_VALUE" size="254" type="VARCHAR"/>
+        <column name="CREATION_DATE" type="TIMESTAMP"/>
+        <column name="MODIFIED_DATE" type="TIMESTAMP"/>
+        <!-- Still an issue with OJB 1.0.3 when deleting M-N. Foreign Key Violation.
+        <foreign-key foreignTable="PREFS_NODE">
+            <reference foreign="NODE_ID" local="NODE_ID"/>
+        </foreign-key>
+        -->
+    </table>
+    
+    <!--
+       pref_node
+    -->
+    <table name="PREFS_NODE">
+        <column name="NODE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PARENT_NODE_ID" type="INTEGER"/>
+        <column name="NODE_NAME" size="100" type="VARCHAR"/>
+        <column name="NODE_TYPE" type="SMALLINT"/>
+        <column name="FULL_PATH" size="254" type="VARCHAR"/>
+        <column name="CREATION_DATE" type="TIMESTAMP"/>
+        <column name="MODIFIED_DATE" type="TIMESTAMP"/>
+        <foreign-key foreignTable="PREFS_NODE" name="FK_PREFS_NODE_1">
+            <reference foreign="NODE_ID" local="PARENT_NODE_ID"/>
+        </foreign-key>
+    </table>
+        
+</database>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/prefs-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/prefs-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/registry-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/registry-schema.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/registry-schema.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/registry-schema.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,259 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd">
+<!-- Autogenerated by JDBCToXMLSchema! -->
+<database name="j2">
+
+    <!--
+       Create Portlet Definition Table
+    -->
+    <table name="PORTLET_DEFINITION">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="NAME" size="80" type="VARCHAR"/>
+        <column name="CLASS_NAME" size="255" type="VARCHAR"/>
+        <column name="APPLICATION_ID" required="true" type="INTEGER"/>
+        <column name="PORTLET_IDENTIFIER" size="80" type="VARCHAR"/>
+        <column name="EXPIRATION_CACHE" size="30" type="VARCHAR"/>
+        <column name="RESOURCE_BUNDLE" size="255" type="VARCHAR"/>
+        <column name="PREFERENCE_VALIDATOR" size="255" type="VARCHAR"/>
+        <column name="SECURITY_REF" size="40" type="VARCHAR"/>        
+        <!-- This breaks some tests since portlet identifier is not required
+        <unique name="UK_PORTLET_IDENT">
+            <unique-column name="PORTLET_IDENTIFIER"/>
+        </unique>
+        -->
+    </table>
+
+    <!--
+       Create Portlet Application Table
+    -->
+    <table name="PORTLET_APPLICATION">
+        <column name="APPLICATION_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="APP_NAME" required="true" size="80" type="VARCHAR"/>
+        <column name="APP_IDENTIFIER" size="80" type="VARCHAR"/>
+        <column name="VERSION" size="80" type="VARCHAR"/>
+        <column name="APP_TYPE" type="INTEGER"/>
+		<column name="CHECKSUM" size="80" type="VARCHAR"/>
+        <column name="DESCRIPTION" size="80" type="VARCHAR"/>
+        <column name="WEB_APP_ID" required="true" type="INTEGER"/>
+        <column name="SECURITY_REF" size="40" type="VARCHAR"/>
+        <unique name="UK_APPLICATION">
+            <unique-column name="APP_NAME"/>
+        </unique>
+    </table>                                                               
+
+    <!--
+       Create Web Application Table
+    -->
+    <table name="WEB_APPLICATION">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="CONTEXT_ROOT" required="true" size="255" type="VARCHAR"/>
+    </table>
+    
+    <!--
+       Create Portlet Application Metadata Fields Table
+    -->    
+    <table name="PA_METADATA_FIELDS">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OBJECT_ID" required="true" type="INTEGER"/>
+        <column name="COLUMN_VALUE" required="true" type="LONGVARCHAR"/>
+        <column name="NAME" required="true" size="100" type="VARCHAR"/>
+        <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_PA_METADATA_FIELDS_1" onDelete="cascade">                        
+            <reference foreign="APPLICATION_ID" local="OBJECT_ID"/>            
+        </foreign-key>        
+    </table>
+    
+    <!--
+       Create Portlet Definition Metadata Fields Table
+    -->    
+    <table name="PD_METADATA_FIELDS">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OBJECT_ID" required="true" type="INTEGER"/>
+        <column name="COLUMN_VALUE" required="true" type="LONGVARCHAR"/>
+        <column name="NAME" required="true" size="100" type="VARCHAR"/>
+        <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
+        <foreign-key foreignTable="PORTLET_DEFINITION" name="FK_PD_METADATA_FIELDS_1" onDelete="cascade">                        
+            <reference foreign="ID" local="OBJECT_ID"/>            
+        </foreign-key>                
+    </table>
+
+    <!--
+       Create Language Table
+    -->
+    <table name="LANGUAGE">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PORTLET_ID" required="true" type="INTEGER"/>
+        <column name="TITLE" size="100" type="VARCHAR"/>
+        <column name="SHORT_TITLE" size="100" type="VARCHAR"/>
+        <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
+        <column name="KEYWORDS" type="LONGVARCHAR"/>
+    </table>
+    
+    <!--
+       Create Content Type Table
+    -->
+    <table name="PORTLET_CONTENT_TYPE">
+        <column name="CONTENT_TYPE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PORTLET_ID" required="true" type="INTEGER"/>
+        <column name="CONTENT_TYPE" required="true" size="30" type="VARCHAR"/>
+        <column name="MODES" type="LONGVARCHAR"/>
+    </table>
+    
+    <!--
+       Create Parameter Table
+       NOTE : This table supports both Servlet and Portlet parameters
+       Class Name is required to decide if this is a portlet or servlet parameter
+    -->
+    <table name="PARAMETER">
+        <column name="PARAMETER_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PARENT_ID" required="true" type="INTEGER"/>
+        <column name="CLASS_NAME" required="true" size="255" type="VARCHAR"/>
+        <column name="NAME" required="true" size="80" type="VARCHAR"/>
+        <column name="PARAMETER_VALUE" required="true" type="LONGVARCHAR"/>
+    </table>
+
+    <!--
+       Portlet Entity
+       Represents the managed state of individual portlet instance within a "page"
+       The instance within a "page" key is based on Window ID + principal
+       Without the principal, the key represents the default preferences for the window
+    -->
+    <table name="PORTLET_ENTITY">
+        <column name="PEID" primaryKey="true" required="true" type="INTEGER"/>
+       <!-- <column name="PORTLET_DEFINITION_ID" required="true" type="INTEGER"/> -->
+        <column name="ID" required="true" size="255" type="VARCHAR"/>
+        <column name="APP_NAME" required="true" size="255" type="VARCHAR"/>
+        <column name="PORTLET_NAME" required="true" size="255" type="VARCHAR"/>
+        <unique name="UK_ENTITY_ID">
+            <unique-column name="ID"/>
+        </unique>
+    </table>
+    
+    <!--
+       Security Role Reference
+    -->
+    <table name="SECURITY_ROLE_REFERENCE">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PORTLET_DEFINITION_ID" required="true" type="INTEGER"/>
+        <column name="ROLE_NAME" required="true" size="150" type="VARCHAR"/>
+        <column name="ROLE_LINK" size="150" type="VARCHAR"/>
+    </table>
+    
+    <!--                                                                   
+       Security Role                                                        
+    -->                                                                     
+    <table name="SECURITY_ROLE">                                            
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="WEB_APPLICATION_ID" required="true" type="INTEGER"/>  
+        <column name="ROLE_NAME" required="true" size="150" type="VARCHAR"/>
+        <column name="DESCRIPTION" size="150" type="VARCHAR"/>              
+        <!-- This is causing removing portlet application to fail with OJB RC4.
+        <foreign-key foreignTable="WEB_APPLICATION" onDelete="cascade">                        
+            <reference foreign="ID" local="WEB_APPLICATION_ID"/>            
+        </foreign-key>
+        -->                                                   
+    </table> 
+
+    <!--
+       User Attribute Reference
+    -->
+    <table name="USER_ATTRIBUTE_REF">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="APPLICATION_ID" required="true" type="INTEGER"/>
+        <column name="NAME" size="150" type="VARCHAR"/>
+        <column name="NAME_LINK" size="150" type="VARCHAR"/>
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_USER_ATTRIBUTE_REF_1" onDelete="cascade">
+            <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
+        </foreign-key>                
+    </table>
+
+	<!--
+       User Attribute
+    -->
+    <table name="USER_ATTRIBUTE">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="APPLICATION_ID" required="true" type="INTEGER"/>
+        <column name="NAME" size="150" type="VARCHAR"/>
+        <column name="DESCRIPTION" size="150" type="VARCHAR"/>
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_USER_ATTRIBUTE_1" onDelete="cascade">
+            <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
+        </foreign-key>        
+    </table>
+
+	<!--
+       Jetspeed Service
+    -->
+    <table name="JETSPEED_SERVICE">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="APPLICATION_ID" required="true" type="INTEGER"/>
+        <column name="NAME" size="150" type="VARCHAR"/>
+    </table>
+
+    
+    <!-- 
+       Localized Descriptions
+    -->
+    <table name="LOCALIZED_DESCRIPTION">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OBJECT_ID" required="true" type="INTEGER"/>
+        <column name="CLASS_NAME" required="true" size="255" type="VARCHAR"/>
+        <column name="DESCRIPTION" required="true" type="LONGVARCHAR"/>
+        <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
+    </table>
+    
+    <!--
+       Localized Display Names
+    -->
+    <table name="LOCALIZED_DISPLAY_NAME">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="OBJECT_ID" required="true" type="INTEGER"/>
+        <column name="CLASS_NAME" size="255" type="VARCHAR"/>
+        <column name="DISPLAY_NAME" required="true" type="LONGVARCHAR"/>
+        <column name="LOCALE_STRING" required="true" size="50" type="VARCHAR"/>
+    </table>
+    
+    <!--
+       CustomPortletMode
+    -->
+    <table name="CUSTOM_PORTLET_MODE">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="APPLICATION_ID" required="true" type="INTEGER"/>
+        <column name="CUSTOM_NAME" required="true" size="150" type="VARCHAR"/>
+        <column name="MAPPED_NAME" size="150" type="VARCHAR"/>
+        <column name="DESCRIPTION" type="LONGVARCHAR"/>
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_CUSTOM_PORTLET_MODE_1" onDelete="cascade">
+            <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
+        </foreign-key>        
+    </table>
+                         
+    <!--
+       CustomWindowState
+    -->
+    <table name="CUSTOM_WINDOW_STATE">
+        <column name="ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="APPLICATION_ID" required="true" type="INTEGER"/>
+        <column name="CUSTOM_NAME" required="true" size="150" type="VARCHAR"/>
+        <column name="MAPPED_NAME" size="150" type="VARCHAR"/>
+        <column name="DESCRIPTION" type="LONGVARCHAR"/>
+        <foreign-key foreignTable="PORTLET_APPLICATION" name="FK_CUSTOM_WINDOW_STATE_1" onDelete="cascade">
+            <reference foreign="APPLICATION_ID" local="APPLICATION_ID"/>
+        </foreign-key>        
+    </table>
+                         
+</database>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/registry-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/registry-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Id



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org