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 [3/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...

Added: portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/security-schema.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/security-schema.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/security-schema.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/jetspeed-webapp-logging/src/ddl-schema/security-schema.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,216 @@
+<?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">
+<!--
+    	CREATING TABLES FOR SINGLE SIGN ON (SSO)
+    	It has dependency on the Security tables PRINCIPAL and CREDENTIALS
+    -->
+        
+    <!--
+       Create Site to Principals association Table
+    -->
+    <!--
+       Create Security Principal Table
+    -->
+    <table name="SECURITY_PRINCIPAL">
+        <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="CLASSNAME" required="true" size="254" type="VARCHAR"/>
+        <column name="IS_MAPPING_ONLY" required="true" type="BOOLEANINT"/>
+        <column name="IS_ENABLED" required="true" type="BOOLEANINT"/>
+        <column name="FULL_PATH" required="true" size="254" type="VARCHAR"/>
+        <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
+        <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
+        <unique name="UIX_SECURITY_PRINCIPAL">
+          <unique-column name="FULL_PATH" />
+        </unique>        
+    </table>
+
+    <!--
+       Create Security Permission Table
+    -->
+    <table name="SECURITY_PERMISSION">
+        <column name="PERMISSION_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="CLASSNAME" required="true" size="254" type="VARCHAR"/>
+        <column name="NAME" required="true" size="254" type="VARCHAR"/>
+        <column name="ACTIONS" required="true" size="254" type="VARCHAR"/>
+        <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
+        <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
+    </table>
+    
+    <!--
+       Create Security Principal Permission Table
+    -->
+    <table name="PRINCIPAL_PERMISSION">
+        <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PERMISSION_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <foreign-key foreignTable="SECURITY_PERMISSION" name="FK_PRINCIPAL_PERMISSION_1" onDelete="cascade">
+            <reference foreign="PERMISSION_ID" local="PERMISSION_ID"/>
+        </foreign-key>
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_PRINCIPAL_PERMISSION_2" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
+        </foreign-key>
+    </table>
+        
+    <!--
+       Create Security Credential Table
+    -->
+    <table name="SECURITY_CREDENTIAL">
+        <column name="CREDENTIAL_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PRINCIPAL_ID" required="true" type="INTEGER"/>
+        <column name="COLUMN_VALUE" required="true" size="254" type="VARCHAR"/>
+        <column name="TYPE" required="true" type="SMALLINT"/>
+        <column name="CLASSNAME" size="254" type="VARCHAR"/>
+        <column name="UPDATE_REQUIRED" required="true" type="BOOLEANINT"/>
+        <column name="IS_ENCODED" required="true" type="BOOLEANINT"/>
+        <column name="IS_ENABLED" required="true" type="BOOLEANINT"/>
+        <column name="AUTH_FAILURES" required="true" type="SMALLINT"/>
+        <column name="IS_EXPIRED" required="true" type="BOOLEANINT"/>
+        <column name="CREATION_DATE" required="true" type="TIMESTAMP"/>
+        <column name="MODIFIED_DATE" required="true" type="TIMESTAMP"/>
+        <column name="PREV_AUTH_DATE" required="false" type="TIMESTAMP"/>
+        <column name="LAST_AUTH_DATE" required="false" type="TIMESTAMP"/>
+        <column name="EXPIRATION_DATE" required="false" type="DATE"/>
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SECURITY_CREDENTIAL_1" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
+        </foreign-key>
+    </table>
+	
+
+    <!--
+       Create SiteTable
+    -->
+    <table name="SSO_SITE">
+        <column name="SITE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="NAME" required="true" size="254" type="VARCHAR"/>
+        <column name="URL" required="true" size="254" type="VARCHAR"/>
+        <column name="ALLOW_USER_SET" default="0" type="BOOLEANINT"/>
+        <column name="REQUIRES_CERTIFICATE" default="0" type="BOOLEANINT"/>
+        <column name="CHALLENGE_RESPONSE_AUTH" default="0" type="BOOLEANINT"/>
+        <column name="FORM_AUTH" default="0" type="BOOLEANINT"/>
+        <column name="FORM_USER_FIELD" required="false" size="128" type="VARCHAR"/>
+        <column name="FORM_PWD_FIELD" required="false" size="128" type="VARCHAR"/>
+        <column name="REALM" required="false" size="128" type="VARCHAR"/>
+        
+        <unique name="UIX_SITE_URL">
+          <unique-column name="URL" />
+        </unique>                
+    </table>
+    
+    <table name="SSO_COOKIE">
+        <column name="COOKIE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="COOKIE" required="true" size="1024" type="VARCHAR"/> 
+        <column name="CREATE_DATE" required="true" type="TIMESTAMP"/>         
+    </table>
+	
+    <table name="SSO_SITE_TO_PRINCIPALS">
+    	<column name="SITE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
+         <foreign-key foreignTable="SSO_SITE" name="SSO_SITE_TO_PRINC_FK1" onDelete="cascade">             
+            <reference foreign="SITE_ID" local="SITE_ID"/>
+        </foreign-key>
+       <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="SSO_SITE_TO_PRINC_FK2" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
+        </foreign-key>
+    </table>
+    
+    <!--
+       Create Principals to Remote Principals association Table
+    -->
+    
+    <table name="SSO_PRINCIPAL_TO_REMOTE">
+    	<column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="REMOTE_PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
+         <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_PRINCIPAL_TO_REMOTE_1" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
+        </foreign-key>
+       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_PRINCIPAL_TO_REMOTE_2" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="REMOTE_PRINCIPAL_ID"/>
+        </foreign-key>
+    </table>
+    
+    <table name="SSO_SITE_TO_REMOTE">
+    	<column name="SITE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
+           
+         <foreign-key foreignTable="SSO_SITE"  name="FK_SSO_SITE_TO_REMOTE_1" onDelete="cascade">
+            <reference foreign="SITE_ID" local="SITE_ID"/>
+        </foreign-key>
+       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_SITE_TO_REMOTE_2" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="PRINCIPAL_ID"/>
+        </foreign-key>
+    </table>
+    
+    <table name="SSO_COOKIE_TO_REMOTE">
+    	<column name="COOKIE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="REMOTE_PRINCIPAL_ID" primaryKey="true" required="true" type="INTEGER"/>
+           
+         <foreign-key foreignTable="SSO_COOKIE" name="FK_SSO_COOKIE_TO_REMOTE_1" onDelete="cascade">
+            <reference foreign="COOKIE_ID" local="COOKIE_ID"/>
+        </foreign-key>
+       <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SSO_COOKIE_TO_REMOTE_2" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="REMOTE_PRINCIPAL_ID"/>
+        </foreign-key>
+    </table>
+         
+    <!--
+       Create Security User Role Table
+    -->
+    <table name="SECURITY_USER_ROLE">
+        <column name="USER_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="ROLE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SECURITY_USER_ROLE_1" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="ROLE_ID"/>
+        </foreign-key>
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SECURITY_USER_ROLE_2" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="USER_ID"/>
+        </foreign-key>
+    </table>
+    
+    <!-- 
+       Create Security User Group Table
+    -->
+    <table name="SECURITY_USER_GROUP">
+        <column name="USER_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="GROUP_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SECURITY_USER_GROUP_1" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="GROUP_ID"/>
+        </foreign-key>
+        <foreign-key foreignTable="SECURITY_PRINCIPAL" name="FK_SECURITY_USER_GROUP_2" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="USER_ID"/>
+        </foreign-key>
+    </table>
+    
+    <!--
+       Create Security Group Role Table
+    -->
+    <table name="SECURITY_GROUP_ROLE">
+        <column name="GROUP_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <column name="ROLE_ID" primaryKey="true" required="true" type="INTEGER"/>
+        <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="FK_SECURITY_GROUP_ROLE_1" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="GROUP_ID"/>
+        </foreign-key>
+        <foreign-key foreignTable="SECURITY_PRINCIPAL"  name="FK_SECURITY_GROUP_ROLE_2" onDelete="cascade">
+            <reference foreign="PRINCIPAL_ID" local="ROLE_ID"/>
+        </foreign-key>
+    </table>
+
+        
+    
+</database>

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

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

Added: portals/jetspeed-2/branches/J2-M2-REDUX/components/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/components/pom.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/components/pom.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/components/pom.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,44 @@
+<?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>components</artifactId>
+    <name>Jetspeed-2 Components</name>
+    <description>Jetspeed-2 Components</description>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-2</artifactId>
+        <version>J2-M2-REDUX-SNAPSHOT</version>
+    </parent>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>jetspeed-cm</module>
+        <module>jetspeed-deploy-tools</module>
+        <module>jetspeed-webapp-logging</module>
+    </modules>
+    
+</project>

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

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

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

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-api/pom.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-api/pom.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-api/pom.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,38 @@
+<?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-api</artifactId>
+  <name>Jetspeed-2 Core API</name>
+  <description>Core API for implementing Jetspeed.</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>jetspeed-2</artifactId>
+    <version>J2-M2-REDUX-SNAPSHOT</version>
+  </parent>
+  <packaging>jar</packaging>
+
+</project>

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

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

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

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-commons/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-commons/pom.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-commons/pom.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-commons/pom.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,51 @@
+<?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-commons</artifactId>
+    <name>Jetspeed-2 Portal Commons</name>
+    <description>
+        Common code used by engine(portal) and container.
+    </description>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-2</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>
+        
+    </dependencies>        
+    
+</project>

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

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

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/pom.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/pom.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/pom.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,86 @@
+<?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-portal-resources</artifactId>
+    <name>Jetspeed-2 Portal Resources</name>
+    <description>All resources used for configuring and running a jetspeed portal application</description>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-2</artifactId>
+        <version>J2-M2-REDUX-SNAPSHOT</version>
+    </parent>
+    <packaging>jar</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>jetspeed-ddl-generator</artifactId>
+        <version>${pom.version}</version>        
+        <executions>
+          <execution>
+            <goals>
+              <goal>ddl</goal>
+            </goals>
+            <configuration>
+              <outputTarget>${project.build.directory}/classes/ddl</outputTarget>
+              <useDelimitedSqlIdentifiers>true</useDelimitedSqlIdentifiers>
+              <doDrops>true</doDrops>
+              <sortForeignKeys>false</sortForeignKeys>
+              <validateXml>false</validateXml>
+              <useInternalDtd>true</useInternalDtd>
+              <databases>
+                <param>postgresql</param>
+                <param>mysql</param>
+                <param>mysql5</param>
+                <param>derby</param>
+                <param>oracle9</param>
+                <param>oracle10</param>
+                <!-- DB2v7 -->
+                <param>db2</param>
+                <param>db2v8</param>
+                <param>mssql</param>
+                <param>sapdb</param>
+              </databases>
+              <!-- optional platform and table specific parameters, currently only supported for mysql
+              <parameters>
+                <tablespecificParameter>
+                  <name>foo</name>
+                  <value>bar</value>
+                  <platforms>mysql</platforms>
+                  <!- an empty tables configuration means *all* tables ->
+                  <tables></tables>
+                </tablespecificParameter>
+              </parameters>
+              -->
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

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

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

Copied: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase1-schema.xml (from r522255, portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/phase1-schema.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase1-schema.xml?view=diff&rev=522665&p1=portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/phase1-schema.xml&r1=522255&p2=portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase1-schema.xml&r2=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase1-schema.xml
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase1-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase1-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml (from r522255, portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/phase2-schema.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml?view=diff&rev=522665&p1=portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/phase2-schema.xml&r1=522255&p2=portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml&r2=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.9

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase2-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase3ojb-schema.xml (from r522255, portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/phase3ojb-schema.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase3ojb-schema.xml?view=diff&rev=522665&p1=portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/phase3ojb-schema.xml&r1=522255&p2=portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase3ojb-schema.xml&r2=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase3ojb-schema.xml
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.3

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase3ojb-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/phase3ojb-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/prefs-schema.xml (from r522255, portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/prefs-schema.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/prefs-schema.xml?view=diff&rev=522665&p1=portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/prefs-schema.xml&r1=522255&p2=portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/prefs-schema.xml&r2=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/prefs-schema.xml
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.5

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/prefs-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/prefs-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml (from r522255, portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/registry-schema.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml?view=diff&rev=522665&p1=portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/registry-schema.xml&r1=522255&p2=portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml&r2=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.24

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/registry-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml (from r522255, portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/security-schema.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml?view=diff&rev=522665&p1=portals/jetspeed-2/branches/J2-M2-REDUX/etc/schema/security-schema.xml&r1=522255&p2=portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml&r2=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.14

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/ddl-schema/security-schema.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/javascript/dojo/VERSION.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/javascript/dojo/VERSION.txt?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/javascript/dojo/VERSION.txt (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/javascript/dojo/VERSION.txt Mon Mar 26 16:53:34 2007
@@ -0,0 +1 @@
+dojo-release-0.4.0

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/javascript/dojo/VERSION.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/javascript/dojo/VERSION.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/javascript/dojo/dojo.zip
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/javascript/dojo/dojo.zip?view=auto&rev=522665
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/javascript/dojo/dojo.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Copied: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml (from r522255, portals/jetspeed-2/branches/J2-M2-REDUX/etc/sql/j2-seed.xml)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml?view=diff&rev=522665&p1=portals/jetspeed-2/branches/J2-M2-REDUX/etc/sql/j2-seed.xml&r1=522255&p2=portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml&r2=522665
==============================================================================
    (empty)

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/LogInRedirector.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/LogInRedirector.jsp?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/LogInRedirector.jsp (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/LogInRedirector.jsp Mon Mar 26 16:53:34 2007
@@ -0,0 +1,20 @@
+<%--
+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.
+--%>
+<%
+ response.sendRedirect(response.encodeURL(""));
+%>
+

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/LogInRedirector.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/LogInRedirector.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/META-INF/NOTICE.txt?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/META-INF/NOTICE.txt (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/META-INF/NOTICE.txt Mon Mar 26 16:53:34 2007
@@ -0,0 +1,14 @@
+Apache Portals Jetspeed-2
+   Copyright 1999-2007 The Apache Software Foundation
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+
+   This product includes software developed at The Dojo Foundation (http://dojotoolkit.org)
+   Copyright (c) 2004-2006, The Dojo Foundation, All Rights Reserved
+
+   This product includes images provided under the Creative Commons Attribution-ShareAlike 2.5
+   
+   This product includes the JSCookMenu v.1.4 javascript library developed by Heng Yuan
+   JSCookMenu v1.4. (c) Copyright 2002-2005 by Heng Yuan
+      
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/administration.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/administration.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/administration.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/administration.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    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.
+-->
+<beans>
+  <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+    <property name="host"><value>localhost</value></property>
+    <property name="username"><value></value></property>
+    <property name="password"><value></value></property>
+      <property name="javaMailProperties">
+          <props>
+              <prop key="mail.smtp.auth">false</prop>
+          </props>
+      </property>
+  </bean>
+  
+<bean id="adminVelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+    <property name="resourceLoaderPath"><value>/WEB-INF/templates/</value></property>
+    <property name="velocityProperties">
+      <props>
+        <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger -->
+        <prop key="runtime.log.logsystem.class">org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem</prop>
+        <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
+        <!-- clear out default global VM_global_library.vm leading to ERROR logging because its not available -->
+        <prop key="velocimacro.library"></prop>
+      </props>
+    </property>
+    <!--  use our own CommonsLoggingLog4JLogSystem specified above, not the default one provided by Spring -->
+    <property name="overrideLogging"><value>false</value></property>
+</bean>
+  
+<bean id='PortalAdministrationImpl' init-method="start"
+      class='org.apache.jetspeed.administration.PortalAdministrationImpl'>
+    	<constructor-arg index='0'>
+    		<ref bean="org.apache.jetspeed.security.UserManager"/>
+    	</constructor-arg>
+        <constructor-arg index='1'>
+    		<ref bean="org.apache.jetspeed.security.RoleManager"/>
+    	</constructor-arg>
+        <constructor-arg index='2'>
+    		<ref bean="org.apache.jetspeed.security.GroupManager"/>
+    	</constructor-arg>
+        <constructor-arg index='3'>
+    		<ref bean="org.apache.jetspeed.page.PageManager"/>
+    	</constructor-arg>
+        <constructor-arg index='4'>
+    		<ref bean="org.apache.jetspeed.prefs.PreferencesProvider"/>
+    	</constructor-arg>        
+        <constructor-arg index='5'>
+    		<ref bean="org.apache.jetspeed.profiler.Profiler"/>
+    	</constructor-arg>
+        <constructor-arg index='6'>
+    		<ref bean="mailSender"/>
+    	</constructor-arg>
+        <constructor-arg index='7'>
+    		<ref bean="adminVelocityEngine"/>
+    	</constructor-arg>                                                            
+</bean>
+    
+<bean id="PortalAdministration" parent="baseTransactionProxy">
+        <property name="proxyInterfaces">
+            <value>org.apache.jetspeed.administration.PortalAdministration</value>
+        </property>
+
+        <property name="target">
+            <ref bean="PortalAdministrationImpl" />
+        </property>
+        <property name="transactionAttributes">
+            <props>
+                <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.administration.RegistrationException</prop>
+            </props>
+        </property>
+</bean>
+
+<bean id="org.apache.jetspeed.security.SecurityAccessController"
+      class='org.apache.jetspeed.security.impl.SecurityAccessControllerImpl'>
+    	<constructor-arg index='0'>
+    		<ref bean="org.apache.jetspeed.page.PageManager"/> 
+    	</constructor-arg>
+    	<!--
+    	   Security Mode:
+    	      1 = Permissions = use Jetspeed Java Security Policy
+    	      2 = Constraints = use Jetspeed (PageManager) Constraint-based Security  
+    	 -->
+    	 <constructor-arg index="1">
+            <value>2</value>
+        </constructor-arg>
+</bean>
+    
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/administration.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/aggregation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/aggregation.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/aggregation.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/aggregation.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    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.
+-->
+<beans>
+   
+     <bean id="org.apache.jetspeed.aggregator.PortletTrackingManager" class="org.apache.jetspeed.aggregator.impl.PortletTrackingManagerImpl">          
+        <constructor-arg index='0'>
+           <ref bean="PortletWindowAccessor"/>
+ 	    </constructor-arg>
+       <!-- Default portlet timeout in milliseconds:
+        Zero means no portlet timeout option by default.
+        -->        
+        <constructor-arg index='1'>
+            <value>0</value>
+        </constructor-arg>        
+        <!--  Out of service limit, if a portlet entity times out past its limit (or default limit) n consecutive times, it is taken out of service -->
+       <constructor-arg index="2">
+           <value>3</value>
+       </constructor-arg>
+     </bean>
+       
+   
+  <!-- Aggregation: Portlet -->
+    <bean id="org.apache.jetspeed.aggregator.PortletAggregator" class="org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl">
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
+        </constructor-arg>        
+    </bean>
+
+    <bean id="org.apache.jetspeed.aggregator.PortletAggregatorTitleInHeader" class="org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl">
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.aggregator.PortletRendererWithTitleHeader" />
+        </constructor-arg>
+    </bean>
+
+    <!-- Portlet Renderer -->
+    <bean id="org.apache.jetspeed.aggregator.PortletRenderer" class="org.apache.jetspeed.aggregator.impl.PortletRendererImpl" init-method="start"
+        destroy-method="stop">
+        <constructor-arg>
+            <ref bean="org.apache.pluto.PortletContainer" />
+        </constructor-arg>
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
+        </constructor-arg>
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.aggregator.WorkerMonitor" />
+        </constructor-arg>        
+        <constructor-arg>
+            <ref bean="PortalStatistics" />
+        </constructor-arg>                        
+        <constructor-arg>
+            <ref bean="org.apache.pluto.services.title.DynamicTitleService" />
+        </constructor-arg>
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager" />
+        </constructor-arg>
+        <!-- flag indicating whether to check jetspeed-portlet.xml security constraints
+             before rendering a portlet. If security check fails, do not display portlet content
+          -->
+        <constructor-arg type="boolean">
+            <value>true</value>
+        </constructor-arg>           
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.security.SecurityAccessController" />
+        </constructor-arg>             
+        <constructor-arg>
+        	<ref bean="portletContentCache"/>
+        </constructor-arg>
+    </bean>
+
+    <!-- Portlet Renderer w/title in http response header -->
+    <bean id="org.apache.jetspeed.aggregator.PortletRendererWithTitleHeader" class="org.apache.jetspeed.aggregator.impl.PortletRendererImpl" init-method="start"
+        destroy-method="stop">
+        <constructor-arg>
+            <ref bean="org.apache.pluto.PortletContainer" />
+        </constructor-arg>
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
+        </constructor-arg>
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.aggregator.WorkerMonitor" />
+        </constructor-arg>        
+        <constructor-arg>
+            <ref bean="PortalStatistics" />
+        </constructor-arg>
+        <constructor-arg>
+            <ref bean="org.apache.pluto.services.title.DynamicTitleService" />
+        </constructor-arg>
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager" />
+        </constructor-arg>
+        <!-- flag indicating whether to check jetspeed-portlet.xml security constraints
+             before rendering a portlet. If security check fails, do not display portlet content
+          -->
+        <constructor-arg type="boolean">
+            <value>true</value>
+        </constructor-arg>           
+        <constructor-arg>
+            <ref bean="org.apache.jetspeed.security.SecurityAccessController" />
+        </constructor-arg>             
+        <constructor-arg>
+        	<ref bean="portletContentCache"/>
+        </constructor-arg>
+        <constructor-arg type="boolean">
+            <value>true</value>   
+        </constructor-arg>       
+    </bean>
+
+    <bean id="org.apache.jetspeed.aggregator.PageAggregator" class="org.apache.jetspeed.aggregator.impl.PageAggregatorImpl">
+        <constructor-arg index="0">
+            <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
+        </constructor-arg>
+    </bean>
+
+    <bean id="org.apache.jetspeed.aggregator.AsyncPageAggregator" 
+          class="org.apache.jetspeed.aggregator.impl.AsyncPageAggregatorImpl">
+        <constructor-arg index='0'>
+            <ref bean="org.apache.jetspeed.aggregator.PortletRenderer" />
+        </constructor-arg>
+    </bean>
+    
+    <bean id="org.apache.jetspeed.aggregator.WorkerMonitor"
+          class="org.apache.jetspeed.aggregator.impl.WorkerMonitorImpl"
+          init-method="start"  destroy-method="stop" >
+
+        <constructor-arg index="0">
+            <!-- Minimum number of workers to create -->
+            <value>5</value>            
+        </constructor-arg>          
+        <constructor-arg index="1">
+            <!-- Maximum number of workers to create -->
+            <value>50</value>            
+        </constructor-arg>          
+        <constructor-arg index="2">
+            <!-- Spare number of workers to create -->
+            <value>3</value>            
+        </constructor-arg>          
+        <constructor-arg index="3">
+            <!-- Maximum number of jobs processed by a worker before being released -->
+            <value>3</value>            
+        </constructor-arg>          
+          
+    </bean>
+
+    <bean id="HeaderAggregatorPortal" class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
+        <constructor-arg index="0">
+            <ref bean="portletFactory" />
+        </constructor-arg>
+        <constructor-arg index="1">
+            <ref bean="PortletWindowAccessor"/>
+        </constructor-arg>
+        <constructor-arg index="2">
+            <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
+        </constructor-arg>
+        <constructor-arg index="3" type="boolean">
+            <value>false</value>   <!-- isDesktop == false -->
+        </constructor-arg>
+        <constructor-arg index="4">
+            <ref bean="HeaderResourceConfigurationPortal"/>
+        </constructor-arg>
+        <constructor-arg index="5">
+            <ref bean="HeaderResourceRegistry"/>
+        </constructor-arg>
+        <constructor-arg index="6">
+            <ref bean="DecorationFactory"/>
+        </constructor-arg>
+        
+        <!-- Uncomment this to HARD CODE your portal URL -->
+        <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
+    </bean>
+           
+    <bean id="HeaderAggregatorDesktop" class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
+        <constructor-arg index="0">
+            <ref bean="portletFactory" />
+        </constructor-arg>
+        <constructor-arg index="1">
+            <ref bean="PortletWindowAccessor"/>
+        </constructor-arg>
+        <constructor-arg index="2">
+            <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
+        </constructor-arg>
+        <constructor-arg index="3" type="boolean">
+            <value>true</value>   <!-- isDesktop == true -->
+        </constructor-arg>
+        <constructor-arg index="4">
+            <ref bean="HeaderResourceConfigurationDesktop"/>
+        </constructor-arg>
+        <constructor-arg index="5">
+            <ref bean="HeaderResourceRegistry"/>
+        </constructor-arg>
+        <constructor-arg index="6">
+            <ref bean="DecorationFactory"/>
+        </constructor-arg>
+        
+        <!-- Uncomment this to HARD CODE your portal URL -->
+        <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
+    </bean>
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/aggregation.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax-layout.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax-layout.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax-layout.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax-layout.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,614 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+    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.
+-->
+<beans>
+
+<!-- AJAX Actions 
+    
+    == Constructor Arguments ==
+    index 0 = render response VM template, generates XML NORMAL response
+    index 1 = render response VM template, generates XML ERROR response
+    index 2 = action name from AJAX Request
+    index 3 = Page Manager
+    index 4 = Registry (getPortlets)
+    -->
+<bean id="PortletActionSecurityBehavior"
+	  class="org.apache.jetspeed.layout.impl.PortletActionSecurityConstraintsBehavior">
+    <constructor-arg index='0'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>    	
+</bean>	
+
+<bean id="RolesSecurityBehavior"
+	  class="org.apache.jetspeed.layout.impl.RolesSecurityBehavior">
+       <!-- List of required roles (comma-separated) 
+            Only need to match one of the listed  roles to pass security requirements
+           -->
+        <constructor-arg>
+            <list>
+                <value>admin</value>
+            </list>
+        </constructor-arg>
+</bean>	
+    
+<bean id="AjaxMove"
+    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/xmove.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+        <value>move</value>
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>    
+    <constructor-arg index='4'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    	
+</bean>
+    	
+<bean id="AjaxMovePortletAbsolute"
+    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+        <value>moveabs</value>
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>    
+    <constructor-arg index='4'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    	
+</bean>
+
+<bean id="AjaxMovePortletLeft"
+    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+        <value>moveleft</value>
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>        
+    <constructor-arg index='4'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		
+</bean>
+
+<bean id="AjaxMovePortletRight"
+    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+        <value>moveright</value>
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>      
+    <constructor-arg index='4'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		  
+</bean>
+
+<bean id="AjaxMovePortletUp"
+    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+        <value>moveup</value>
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>      
+    <constructor-arg index='4'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		  
+</bean>
+
+<bean id="AjaxMovePortletDown"
+    class="org.apache.jetspeed.layout.impl.MovePortletAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/move.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+        <value>movedown</value>
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>      
+    <constructor-arg index='4'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		  
+</bean>
+
+<bean id="AjaxAddPortlet"
+    class="org.apache.jetspeed.layout.impl.AddPortletAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/add.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>      
+    <constructor-arg index='3'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		  
+    <constructor-arg index='4'>
+        <ref bean="AjaxGetPortlets"/>        
+    </constructor-arg>     	    
+</bean>
+
+<bean id="AjaxRemovePortlet"
+    class="org.apache.jetspeed.layout.impl.RemovePortletAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/remove.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>        
+    <constructor-arg index='3'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		
+</bean>
+
+<bean id="AjaxGetPortlets"
+    class="org.apache.jetspeed.layout.impl.GetPortletsAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/getportlets.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>        
+    <constructor-arg index='3'>
+        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+    </constructor-arg>              
+    <constructor-arg index='4'>
+        <ref bean="org.apache.jetspeed.search.SearchEngine"/>        
+    </constructor-arg>              
+    <constructor-arg index='5'>
+        <ref bean="org.apache.jetspeed.security.SecurityAccessController"/>        
+    </constructor-arg>       
+    <constructor-arg index='6'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		       
+</bean>
+
+<bean id="AjaxGetPage"
+    class="org.apache.jetspeed.layout.impl.GetPageAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/psml.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>
+    <constructor-arg index='4'>
+        <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/>        
+    </constructor-arg>              
+    <constructor-arg index='5'>
+        <ref bean="DecorationValve"/>
+    </constructor-arg>
+</bean>
+
+<bean id="AjaxGetPages"
+    class="org.apache.jetspeed.layout.impl.GetPagesAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/getpages.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		        
+</bean>
+
+<bean id="AjaxGetFolder"
+    class="org.apache.jetspeed.layout.impl.GetFolderAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/getfolder.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		        
+</bean>
+
+<bean id="AjaxGetLink"
+    class="org.apache.jetspeed.layout.impl.GetLinkAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/getlink.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		        
+</bean>
+
+<bean id="AjaxGetFolderList"
+    class="org.apache.jetspeed.layout.impl.GetFolderListAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/getfolderlist.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		        
+</bean>
+<bean id="AjaxGetFoldersList"
+    class="org.apache.jetspeed.layout.impl.GetFoldersListAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/getfolders.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		        
+</bean>
+        
+<bean id="AjaxGetThemes"
+    class="org.apache.jetspeed.layout.impl.GetThemesAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/getthemes.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="DecorationFactory"/>        
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    		        
+</bean>
+        
+<bean id="AjaxChangeWindow"
+    class="org.apache.jetspeed.layout.impl.ChangePortletAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/window.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+        <value>window</value>
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>
+    </constructor-arg>    
+    <constructor-arg index='4'>
+        <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/>
+    </constructor-arg>
+    <constructor-arg index='5'>
+        <ref bean="PortletActionSecurityBehavior"/>
+    </constructor-arg>
+</bean>
+
+<bean id="AjaxGetActions"
+    class="org.apache.jetspeed.layout.impl.GetPortletActionsAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/getactions.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+        <value>getactions</value>
+    </constructor-arg>
+    <constructor-arg index='3'>
+        <ref bean="DecorationValve"/>
+    </constructor-arg>    
+    <constructor-arg index='4'>
+        <ref bean="org.apache.jetspeed.page.PageManager"/>
+    </constructor-arg>        
+    <constructor-arg index='5'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    	
+</bean>
+
+<bean id="AjaxGetMenus"
+    class="org.apache.jetspeed.layout.impl.GetMenusAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/menus.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    	
+</bean>
+
+<bean id="AjaxGetMenu"
+    class="org.apache.jetspeed.layout.impl.GetMenuAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/menu.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>
+        <ref bean="PortletActionSecurityBehavior"/>        
+    </constructor-arg>    	
+</bean>
+
+<bean id="AjaxSecurityPermissions"
+    class="org.apache.jetspeed.layout.impl.SecurityPermissionAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/permissions.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>    
+        <ref bean="org.apache.jetspeed.security.PermissionManager"/>        
+    </constructor-arg>    
+    <constructor-arg index='3'>
+        <ref bean="RolesSecurityBehavior"/>        
+    </constructor-arg>    	
+    <constructor-arg index='4'>    
+        <map>
+            <entry key="portlet">
+                <value>org.apache.jetspeed.security.PortletPermission</value>
+            </entry>                        
+            <entry key="page">
+                <value>org.apache.jetspeed.security.PagePermission</value>
+            </entry>                                    
+            <entry key="folder">
+                <value>org.apache.jetspeed.security.FolderPermission</value>
+            </entry>                                    
+        </map>
+    </constructor-arg>
+</bean>
+
+<bean id="AjaxSecurityConstraints"
+    class="org.apache.jetspeed.layout.impl.SecurityConstraintsAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/constraints.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>    
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>    
+</bean>
+
+<bean id="AjaxUpdateFolder"
+    class="org.apache.jetspeed.layout.impl.UpdateFolderAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/update.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>    
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>    
+</bean>
+
+<bean id="AjaxUpdatePage"
+    class="org.apache.jetspeed.layout.impl.UpdatePageAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/update.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>    
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>    
+    <constructor-arg index='3'>
+        <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/>
+    </constructor-arg>  
+    <constructor-arg index='4'>
+        <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent" />
+    </constructor-arg>      
+</bean>
+                
+<bean id="AjaxUpdateLink"
+    class="org.apache.jetspeed.layout.impl.UpdateLinkAction">
+    <constructor-arg index="0">
+        <value>org/apache/jetspeed/layout/ajax-xml/update.vm</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+        <value>org/apache/jetspeed/layout/ajax-xml/error.vm</value>
+    </constructor-arg>
+    <constructor-arg index='2'>    
+        <ref bean="org.apache.jetspeed.page.PageManager"/>        
+    </constructor-arg>    
+</bean>
+    
+<bean id="AjaxActionMap" class="java.util.HashMap">
+    <constructor-arg index="0">
+        <map>
+            <entry key="move">
+                <ref bean="AjaxMove"/>
+            </entry>            
+            <entry key="moveabs">
+                <ref bean="AjaxMovePortletAbsolute"/>
+            </entry>
+            <entry key="moveleft">
+                <ref bean="AjaxMovePortletLeft"/>
+            </entry>
+            <entry key="moveright">
+                <ref bean="AjaxMovePortletRight"/>
+            </entry>
+            <entry key="moveup">
+                <ref bean="AjaxMovePortletUp"/>
+            </entry>
+            <entry key="movedown">
+                <ref bean="AjaxMovePortletDown"/>
+            </entry>
+            <entry key="add">
+                <ref bean="AjaxAddPortlet"/>
+            </entry>
+            <entry key="remove">
+                <ref bean="AjaxRemovePortlet"/>
+            </entry>
+            <entry key="getportlets">
+                <ref bean="AjaxGetPortlets"/>
+            </entry>
+            <entry key="getpage">
+                <ref bean="AjaxGetPage"/>
+            </entry>
+            <entry key="getpages">
+                <ref bean="AjaxGetPages"/>
+            </entry>			
+            <entry key="getfolder">
+                <ref bean="AjaxGetFolder"/>
+            </entry>			            
+            <entry key="getlink">
+                <ref bean="AjaxGetLink"/>
+            </entry>			                        
+            <entry key="getfolderlist">
+                <ref bean="AjaxGetFolderList"/>
+            </entry>			                        
+            <entry key="getfolders">
+                <ref bean="AjaxGetFoldersList"/>
+            </entry>			      						
+            <entry key="getthemes">
+                <ref bean="AjaxGetThemes"/>
+            </entry>
+            <entry key="getactions">
+                <ref bean="AjaxGetActions"/>
+            </entry>
+            <entry key="window">
+                <ref bean="AjaxChangeWindow"/>
+            </entry>
+            <entry key="getmenus">
+                <ref bean="AjaxGetMenus"/>
+            </entry>			            
+            <entry key="getmenu">
+                <ref bean="AjaxGetMenu"/>
+            </entry>			            
+            <entry key="permissions">
+                <ref bean="AjaxSecurityPermissions"/>
+            </entry>			                        
+            <entry key="constraints">
+                <ref bean="AjaxSecurityConstraints"/>
+            </entry>			          
+            <entry key="updatefolder">
+                <ref bean="AjaxUpdateFolder"/>                
+            </entry>                          
+            <entry key="updatepage">
+                <ref bean="AjaxUpdatePage"/>                
+            </entry>              
+            <entry key="updatelink">
+                <ref bean="AjaxUpdateLink"/>                
+            </entry>                                                              
+        </map>
+    </constructor-arg>    
+</bean>    
+
+<bean id="AjaxRequestService" class="org.apache.jetspeed.ajax.AjaxRequestServiceImpl">
+    <constructor-arg index="0">
+        <ref bean="AjaxActionMap"/>
+    </constructor-arg>   
+    <constructor-arg index="1">
+        <ref bean="AjaxVelocityEngine"/>
+    </constructor-arg>
+</bean>
+        
+<bean id="AjaxVelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+    <property name="velocityProperties">
+        <props>
+           <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger -->
+           <prop key="runtime.log.logsystem.class">org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem</prop>
+           <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
+            <!-- clear out default global VM_global_library.vm leading to ERROR logging because its not available -->
+            <prop key="velocimacro.library"></prop>
+            <prop key="resource.loader">class</prop>
+            <prop key="class.resource.loader.class">
+                org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
+            </prop>
+        </props>
+    </property>
+    <!--  use our own CommonsLoggingLog4JLogSystem specified above, not the default one provided by Spring -->
+    <property name="overrideLogging"><value>false</value></property>
+  </bean>
+  
+	<bean id="layoutValve"
+		class="org.apache.jetspeed.layout.impl.LayoutValve"
+		init-method="initialize">
+		<constructor-arg index="0">
+			<ref bean="AjaxRequestService"/>
+		</constructor-arg>
+	</bean>
+      
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax-layout.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax-layout.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+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.
+-->
+
+<beans>
+  <bean id="AJAXService"
+      class="org.apache.jetspeed.ajax.AJAXServiceImpl">
+    <constructor-arg>
+      <map>
+		<entry key="portletRegistry.getPortletApplications">
+			<value>
+			  org.apache.jetspeed.components.portletregistry.PortletRegistry	
+			</value>
+		</entry>
+		<entry key="portletRegistry.getPortletApplication">
+			<value>
+			  org.apache.jetspeed.components.portletregistry.PortletRegistry	
+			</value>
+		</entry>
+		<entry key="entityAccess.getPortletEntities">
+			<value>
+			  org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
+			</value>
+		</entry>
+		<entry key="entityAccess.getPortletEntity">
+			<value>
+			  org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent
+			</value>
+		</entry>
+	  </map>
+    </constructor-arg>
+    <constructor-arg>
+      <bean class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
+        <property name="velocityProperties">
+           <props>
+           <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger -->
+           <prop key="runtime.log.logsystem.class">org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem</prop>
+           <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
+           <!-- clear out default global VM_global_library.vm leading to ERROR logging because its not available -->
+           <prop key="velocimacro.library"></prop>
+          </props>
+        </property>
+        <!--  use our own CommonsLoggingLog4JLogSystem specified above, not the default one provided by Spring -->
+        <property name="overrideLogging"><value>false</value></property>
+      </bean>
+    </constructor-arg>
+  <constructor-arg>
+      <map>
+		<entry key="portletRegistry.getPortletApplications">
+			<value>/ajax/portlet_apps.ajax</value>
+		</entry>
+		<entry key="portletRegistry.getPortletApplication">
+			<value>/ajax/portlet_definitions.ajax</value>
+		</entry>
+		<entry key="entityAccess.getPortletEntities">
+			<value>/ajax/portlet_entities.ajax</value>
+		</entry>
+		<entry key="entityAccess.getPortletEntity">
+			<value>/ajax/portlet_entity.ajax</value>
+		</entry>
+	  </map>
+    </constructor-arg>    
+  </bean>  
+	
+</beans>
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/ajax.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/db-page-manager.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/db-page-manager.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/db-page-manager.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+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.
+-->
+<beans>
+    
+  <!-- DB PageManager -->
+  <bean id="org.apache.jetspeed.page.PageManagerImpl" 
+        name="pageManagerImpl"
+        init-method="init"
+        class="org.apache.jetspeed.page.impl.DatabasePageManager">
+      <!-- OJB configuration file resource path -->
+      <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>       
+      <!-- folder/page/link cache size, default=128, min=128 -->
+      <constructor-arg index="1"><value>128</value></constructor-arg>
+      <!-- folder/page/link cache expires seconds, default=-1, infinite=0, min=30 -->
+      <!--                                         (default is 150 seconds) -->
+      <constructor-arg index="2"><value>-1</value></constructor-arg>
+      <!-- permissions security enabled flag, default=false -->
+      <constructor-arg index="3"><value>false</value></constructor-arg>
+      <!-- constraints security enabled flag, default=true -->
+      <constructor-arg index="4"><value>true</value></constructor-arg>
+  </bean>
+
+  <!-- Transaction Proxying -->
+  <bean id="org.apache.jetspeed.page.PageManager" name="pageManager" parent="PageManagerTransactionProxy">
+      <property name="proxyInterfaces">
+          <value>org.apache.jetspeed.page.PageManager</value>
+      </property>
+      <property name="target">
+          <ref bean="pageManagerImpl" />
+      </property>
+      <property name="transactionAttributes">
+          <props>
+              <prop key="*">PROPAGATION_SUPPORTS</prop>
+              <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="add*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+          </props>
+      </property>
+  </bean>
+
+  <!-- Inject Page Manager Proxy into Page Manager -->
+  <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+      <property name="targetObject"><ref bean="pageManagerImpl"/></property>
+      <property name="targetMethod"><value>setPageManagerProxy</value></property>
+      <property name="arguments">
+          <list>
+              <ref bean="pageManager"/>
+          </list>
+      </property>
+  </bean>
+
+  <!-- PortalSite -->
+  <bean id="org.apache.jetspeed.portalsite.PortalSite" 
+       name="portalSite"
+       class="org.apache.jetspeed.portalsite.impl.PortalSiteImpl">         
+       <constructor-arg index="0"><ref bean="pageManager"/></constructor-arg>
+  </bean>
+
+</beans>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/WEB-INF/assembly/alternate/db-page-manager.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