geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r595736 - in /geronimo/sandbox/jetspeed-integration: ./ jetspeed-base/ jetspeed-database/ jetspeed-database/src/main/java/ jetspeed-database/src/main/java/org/ jetspeed-database/src/main/java/org/apache/ jetspeed-database/src/main/java/org/...
Date Fri, 16 Nov 2007 16:53:52 GMT
Author: prasad
Date: Fri Nov 16 08:53:51 2007
New Revision: 595736

URL: http://svn.apache.org/viewvc?rev=595736&view=rev
Log:
* switching to Jetspeed-2.1.3-dev version

Added:
    geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/
    geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/
    geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/
    geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/
    geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/jetspeed/
    geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/jetspeed/integration/
    geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java   (with props)
    geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/j2-seed.xml   (with props)
Modified:
    geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml
    geronimo/sandbox/jetspeed-integration/pom.xml

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml?rev=595736&r1=595735&r2=595736&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml Fri Nov 16 08:53:51 2007
@@ -30,7 +30,7 @@
        This configuration carries Jetspeed's common jars that are shared by all its portlet apps.
     </description>
     <properties>
-        <jetspeedVersion>2.0</jetspeedVersion>
+        <jetspeedVersion>2.1.3-dev</jetspeedVersion>
     </properties>
     
     <dependencies>

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml?rev=595736&r1=595735&r2=595736&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml Fri Nov 16 08:53:51 2007
@@ -37,8 +37,112 @@
      </description> 
 
      <properties>
-       <jetspeedVersion>2.0</jetspeedVersion>
+       <jetspeedVersion>2.1.3-dev</jetspeedVersion>
      </properties>
+
+     <dependencies>
+       <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
+        </dependency>
+       <dependency>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-api</artifactId>
+            <version>${jetspeedVersion}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-commons</artifactId>
+            <version>${jetspeedVersion}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto</artifactId>
+            <version>1.0.1</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.bridges</groupId>
+            <artifactId>portals-bridges-common</artifactId>
+            <version>1.0.3</version>
+            <type>jar</type>
+        </dependency>
+
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-cm</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-rdbms</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-capability</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-security</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-serializer</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-profiler</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-registry</artifactId>
+            <version>${jetspeedVersion}</version>
+            <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-portal</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-portal-site</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>org.apache.portals.jetspeed-2</groupId>
+             <artifactId>jetspeed-page-manager</artifactId>
+             <version>${jetspeedVersion}</version>
+             <type>jar</type>
+         </dependency>
+        <dependency>
+             <groupId>tyrex</groupId>
+             <artifactId>tyrex</artifactId>
+             <version>1.0.1</version>
+             <type>jar</type>
+         </dependency>
+
+     </dependencies>
     
     <build>
         <resources>

Added: geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java?rev=595736&view=auto
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java (added)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java Fri Nov 16 08:53:51 2007
@@ -0,0 +1,193 @@
+/*
+ * 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.
+ */
+package org.apache.geronimo.jetspeed.integration;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import java.net.URL;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+import org.apache.jetspeed.components.jndi.SpringJNDIStarter;
+import org.apache.jetspeed.serializer.JetspeedSerializer;
+import org.apache.jetspeed.serializer.JetspeedSerializerImpl;
+
+import org.apache.geronimo.kernel.util.ClassLoaderDumper;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+/**
+ * Jetspeed Serializer  GBean
+ * 
+ * @version $Id: $
+ */
+public class JetspeedSerializerGBean {
+
+    public JetspeedSerializerGBean(String driverClass, String url, String user, String password, String logLevel, ClassLoader classLoader) throws Exception {
+
+        if ( classLoader == null ) {
+            System.out.println("CLASSLOADER IS NULL !!!");
+        }
+        else {
+            URL springUrl = classLoader.getResource("org/apache/jetspeed/components/jndi/SpringJNDIStarter.class"); 
+            if ( springUrl != null ) {
+                System.out.println("SpringJNDIStarter is in cp");
+            }
+
+            URL genUrl = classLoader.getResource("org/apache/commons/pool/impl/GenericObjectPool.class"); 
+            if ( genUrl != null ) {
+                System.out.println("GenObjectPool is in cp");
+            }
+
+            URL foo = classLoader.getResource("org/apache/commons/pool/impl/foo.class"); 
+            if ( foo != null ) {
+                System.out.println("foo is in cp");
+            }
+            else {
+                System.out.println("foo is NOT in cp");
+            }
+
+            //System.out.println("\nDumping classLoader");
+            //ClassLoaderDumper.dump(classLoader);
+        }
+
+
+        if ( driverClass == null )
+            driverClass = "org.apache.derby.jdbc.EmbeddedDriver";
+        if ( url == null )
+            url = "jdbc:derby:JetspeedDB";
+        if ( user == null )
+            user = "";
+        if ( password == null )
+            password = "";
+
+
+        // maybe we can parameterize these too in the future. For now, we don't have to.
+        String applicationPath = null;
+        String bootConfigFiles = null;
+        String configFiles = null;
+
+        if ( applicationPath == null )
+            applicationPath = "WEB-INF";
+        if ( bootConfigFiles == null )
+            bootConfigFiles = "WEB-INF/assembly/boot/";
+        if ( configFiles == null )
+            configFiles = "WEB-INF/assembly/";
+        if ( logLevel == null )
+            logLevel = "ERROR";
+
+
+        bootConfigFiles = bootConfigFiles + "*.xml";
+        configFiles = configFiles + "*.xml";
+
+
+        JetspeedSerializer serializer = null;
+
+
+        HashMap context = new HashMap();
+        context.put(SpringJNDIStarter.getDATASOURCE_DRIVER(), driverClass);
+        context.put(SpringJNDIStarter.getDATASOURCE_URL(), url);
+        context.put(SpringJNDIStarter.getDATASOURCE_USERNAME(), user);
+        context.put(SpringJNDIStarter.getDATASOURCE_PASSWORD(), password);
+
+        Logger  logger = Logger.getLogger("org.springframework");
+        Level level = logger.getLevel();
+        if ( logLevel.equalsIgnoreCase("INFO") )
+            logger.setLevel(Level.INFO);
+        else
+            if ( logLevel.equalsIgnoreCase("WARN") )
+            logger.setLevel(Level.WARN);
+        else
+            logger.setLevel(Level.ERROR);
+
+/**
+ * set the application root
+ */
+        System.out.println("APP ROOT is " + applicationPath);
+        System.setProperty("applicationRoot",applicationPath);
+        System.setProperty("portal.name","jetspeed");
+        SpringJNDIStarter starter = new SpringJNDIStarter(context, applicationPath, new String[]{bootConfigFiles}, new String[]{configFiles});
+
+        System.out.println("starter framework created " + starter);
+
+
+        try {
+            starter.setUp();
+        }
+        catch ( Exception e ) {
+            e.printStackTrace();
+            System.exit(1);
+        }
+        System.out.println("starter framework established " + starter);
+        String[] importList = null;
+
+        Map settings = new HashMap();
+        settings.put(JetspeedSerializer.KEY_OVERWRITE_EXISTING, Boolean.TRUE);
+
+        String fileName = new File(applicationPath + "/j2-seed.xml").getAbsolutePath();
+        try {
+            System.out.println("processing import  " + fileName );
+            serializer = new JetspeedSerializerImpl(starter.getComponentManager());
+            serializer.importData(fileName, settings);
+            System.out.println("processing import  " + fileName  + " done");
+        }
+        catch ( Exception e ) {
+            System.err.println("Failed to process XML import for " + fileName + ":" + e);
+            e.printStackTrace();
+        }
+        finally {
+            if ( serializer != null )
+                serializer.closeUp();
+        }
+
+        try {
+            starter.tearDown();
+            logger.setLevel(level);;
+        }
+        catch ( Exception e1 ) {
+            System.out.println("starter framework teardown caused exception "  + e1.getLocalizedMessage());
+            e1.printStackTrace();
+
+        }
+    }
+
+
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(JetspeedSerializerGBean.class, "GBean");
+        infoBuilder.addAttribute("driverClass", String.class, true);
+        infoBuilder.addAttribute("url", String.class, true);
+        infoBuilder.addAttribute("user", String.class, true);
+        infoBuilder.addAttribute("password", String.class, true);
+        infoBuilder.addAttribute("logLevel", String.class, true);
+        infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
+
+        infoBuilder.setConstructor(new String[]{"driverClass", "url", "user", "password", "logLevel", "classLoader"});
+
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}
\ No newline at end of file

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-database/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml?rev=595736&r1=595735&r2=595736&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml Fri Nov 16 08:53:51 2007
@@ -30,7 +30,7 @@
        This is the configuration for the Jetspeed Tomcat application
     </description>
     <properties>
-        <jetspeedVersion>2.0</jetspeedVersion>
+        <jetspeedVersion>2.1.3-dev</jetspeedVersion>
     </properties>
     <dependencies>
         <dependency>
@@ -61,8 +61,12 @@
     <build>
         <resources>
             <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
+                <directory>${pom.basedir}/src/main</directory>
+                <targetPath>WEB-INF</targetPath>
                 <filtering>true</filtering>
+                <includes>
+                  <include>j2-seed.xml</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
@@ -89,6 +93,7 @@
                     </module>
                 </configuration>
             </plugin>
+            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -113,6 +118,7 @@
                     </execution>
                 </executions>
             </plugin>
+            -->
         </plugins>
     </build>
 </project>

Added: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/j2-seed.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/j2-seed.xml?rev=595736&view=auto
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/j2-seed.xml (added)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/j2-seed.xml Fri Nov 16 08:53:51 2007
@@ -0,0 +1,874 @@
+<?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.
+-->
+<Snapshot name="standard-jetspeed2.xml"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<softwareVersion value="1"/>
+	<softwareSubVersion value="0"/>
+	<default_rule value="j2"/>
+	<encryption value=""/>
+	<MimeTypes>
+		<MimeType>application/xhtml+xml</MimeType>
+		<MimeType>text/html</MimeType>
+		<MimeType>text/vnd.wap.wml</MimeType>
+		<MimeType>text/vxml</MimeType>
+		<MimeType>text/xhtml</MimeType>
+		<MimeType>text/xml</MimeType>
+	</MimeTypes>
+	<MediaTypes>
+		<MediaType name="html">
+			<charcterSet value="UTF-8"/>
+			<title value="HTML"/>
+			<description value="Rich HTML for HTML 4.0 compliants browsers"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</MediaType>
+		<MediaType name="vxml">
+			<charcterSet value="UTF-8"/>
+			<title value="VoiceXML"/>
+			<description value="Format suitable for use with an audio VoiceXML server"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</MediaType>
+		<MediaType name="wml">
+			<charcterSet value="UTF-8"/>
+			<title value="WML"/>
+			<description value="Format for mobile phones and PDAs compatible with WML 1.1"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</MediaType>
+		<MediaType name="xhtml-basic">
+			<charcterSet value="UTF-8"/>
+			<title value="XHTML"/>
+			<description value="XHTML Basic"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</MediaType>
+		<MediaType name="xml">
+			<charcterSet value=""/>
+			<title value="XML"/>
+			<description value="XML 1.0"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/xml</mimeTypes>
+		</MediaType>
+		<MediaType name="html-basic">
+			<charcterSet value="UTF-8"/>
+			<title value="HTML-BASIC"/>
+			<description value="Simple HTML for Handheld PC browsers such as Pocket IE"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</MediaType>
+	</MediaTypes>
+	<Capabilities>
+		<Capability>HTML_3_2</Capability>
+		<Capability>HTML_4_0</Capability>
+		<Capability>HTML_ACTIVEX</Capability>
+		<Capability>HTML_CSS1</Capability>
+		<Capability>HTML_CSS2</Capability>
+		<Capability>HTML_CSSP</Capability>
+		<Capability>HTML_DOM</Capability>
+		<Capability>HTML_DOM_1</Capability>
+		<Capability>HTML_DOM_2</Capability>
+		<Capability>HTML_DOM_IE</Capability>
+		<Capability>HTML_DOM_NS4</Capability>
+		<Capability>HTML_FORM</Capability>
+		<Capability>HTML_FRAME</Capability>
+		<Capability>HTML_IFRAME</Capability>
+		<Capability>HTML_IMAGE</Capability>
+		<Capability>HTML_JAVA</Capability>
+		<Capability>HTML_JAVA1_0</Capability>
+		<Capability>HTML_JAVA1_1</Capability>
+		<Capability>HTML_JAVA1_2</Capability>
+		<Capability>HTML_JAVASCRIPT</Capability>
+		<Capability>HTML_JAVASCRIPT_1_0</Capability>
+		<Capability>HTML_JAVASCRIPT_1_1</Capability>
+		<Capability>HTML_JAVASCRIPT_1_2</Capability>
+		<Capability>HTML_JAVA_JRE</Capability>
+		<Capability>HTML_JSCRIPT</Capability>
+		<Capability>HTML_JSCRIPT1_0</Capability>
+		<Capability>HTML_JSCRIPT1_1</Capability>
+		<Capability>HTML_JSCRIPT1_2</Capability>
+		<Capability>HTML_LAYER</Capability>
+		<Capability>HTML_NESTED_TABLE</Capability>
+		<Capability>HTML_PLUGIN</Capability>
+		<Capability>HTML_TABLE</Capability>
+		<Capability>HTML_XML</Capability>
+		<Capability>HTML_XSL</Capability>
+		<Capability>HTTP_1_1</Capability>
+		<Capability>HTTP_COOKIE</Capability>
+		<Capability>WML_1_0</Capability>
+		<Capability>WML_1_1</Capability>
+		<Capability>WML_TABLE</Capability>
+		<Capability>XML_XINCLUDE</Capability>
+		<Capability>XML_XPATH</Capability>
+		<Capability>XML_XSLT</Capability>
+	</Capabilities>
+	<Clients>
+		<Client name="ie5mac" evalOrder="1" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 5.*Mac.*"/>
+			<version value="5.*"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_PLUGIN,HTML_CSS1,HTML_DOM_NS4,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="safari" evalOrder="2" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mac.*Safari.*"/>
+			<version value="5.*"/>
+			<model value="None"/>
+			<manufacturer value="Apple"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie6" evalOrder="3" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 6.*"/>
+			<version value="6.0"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie5" evalOrder="4" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 5.*"/>
+			<version value="5.5"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xml</mimeTypes>
+		</Client>
+		<Client name="ns4" evalOrder="5" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mozilla/4.*"/>
+			<version value="4.75"/>
+			<model value="None"/>
+			<manufacturer value="Netscape"/>
+			<capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_CSS1,HTML_LAYER,HTML_PLUGIN,HTML_DOM_NS4,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="mozilla" evalOrder="6" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Mozilla/5.*"/>
+			<version value="1.x"/>
+			<model value="Mozilla"/>
+			<manufacturer value="Mozilla"/>
+			<capabilities>HTML_3_2,HTML_4_0,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IFRAME,HTML_IMAGE,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTML_PLUGIN,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html,text/xhtml,text/xml</mimeTypes>
+		</Client>
+		<Client name="lynx" evalOrder="7" preferredMimeTypeID="text/html">
+			<userAgentPattern value="Lynx.*"/>
+			<version value=""/>
+			<model value="None"/>
+			<manufacturer value="GNU"/>
+			<capabilities>HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+		<Client name="nokia_generic" evalOrder="8" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Nokia.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Nokia"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="xhtml-basic" evalOrder="9" preferredMimeTypeID="application/xhtml+xml">
+			<userAgentPattern value="DoCoMo/2.0.*|KDDI-.*UP.Browser.*|J-PHONE/5.0.*|Vodafone/1.0/.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="WAP"/>
+			<capabilities></capabilities>
+			<mimeTypes>application/xhtml+xml</mimeTypes>
+		</Client>
+		<Client name="up" evalOrder="10" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="UP.*|.*UP.Browser.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="United Planet"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="sonyericsson" evalOrder="11" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Ercis.*|SonyE.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="SonyEricsson"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="wapalizer" evalOrder="12" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Wapalizer.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Wapalizer"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="klondike" evalOrder="13" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value="Klondike.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Klondike"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="wml_generic" evalOrder="14" preferredMimeTypeID="text/vnd.wap.wml">
+			<userAgentPattern value=".*WML.*|.*WAP.*|.*Wap.*|.*wml.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Generic"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vnd.wap.wml</mimeTypes>
+		</Client>
+		<Client name="vxml_generic" evalOrder="15" preferredMimeTypeID="text/vxml">
+			<userAgentPattern value=".*VoiceXML.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Generic"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</Client>
+		<Client name="nuance" evalOrder="16" preferredMimeTypeID="text/vxml">
+			<userAgentPattern value="Nuance.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Nuance"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/vxml</mimeTypes>
+		</Client>
+		<Client name="agentxml" evalOrder="17" preferredMimeTypeID="text/xml">
+			<userAgentPattern value="agentxml/1.0.*"/>
+			<version value=""/>
+			<model value="Generic"/>
+			<manufacturer value="Unknown"/>
+			<capabilities></capabilities>
+			<mimeTypes>text/xml</mimeTypes>
+		</Client>
+		<Client name="opera7" evalOrder="18" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*Opera/7.*"/>
+			<version value="7.x"/>
+			<model value="Opera7"/>
+			<manufacturer value="Opera"/>
+			<capabilities>HTML_3_2,HTML_4_0,HTML_TABLE,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_IFRAME,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTTP_COOKIE,HTML_PLUGIN</capabilities>
+			<mimeTypes>text/html,text/xml,text/xhtml</mimeTypes>
+		</Client>
+		<Client name="ie4ppc" evalOrder="4" preferredMimeTypeID="text/html">
+			<userAgentPattern value=".*MSIE 4.*Windows CE.*"/>
+			<version value="4.01"/>
+			<model value="None"/>
+			<manufacturer value="Microsoft"/>
+			<capabilities>HTML_3_2,HTML_TABLE,HTML_FORM,HTML_IMAGE,HTML_CSS1,HTTP_COOKIE</capabilities>
+			<mimeTypes>text/html</mimeTypes>
+		</Client>
+	</Clients>
+	<Roles>
+		<Role>admin</Role>
+		<Role>manager</Role>
+		<Role>user</Role>
+		<Role>guest</Role>
+		<Role>subsite</Role>
+		<Role>subsite2</Role>
+		<Role>dev</Role>
+		<Role>devmgr</Role>		
+	</Roles>
+	<Groups>
+		<Group>accounting</Group>
+		<Group>engineering</Group>
+		<Group>marketing</Group>
+	</Groups>
+	<Users>
+		<User name="admin">
+			<credentials password="admin" enabled="TRUE" requiresUpdate="TRUE"/>
+			<roles>user,manager,admin</roles>
+			<groups></groups>
+			<preferences>
+				<preference>
+					<name value="org.apache.jetspeed.prefered.locale"/>
+					<value value="en,,"/>
+				</preference>
+			</preferences>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="Test Dude"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="Dudley"/>
+				</preference>
+			</userinfo>
+			<Rules/>
+		</User>
+		<User name="manager">
+			<credentials password="manager" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user,manager</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules/>
+		</User>
+		<User name="user">
+			<credentials password="user" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user</roles>
+			<groups>accounting</groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="menu" rule="role-group"/>
+				<Rule locator="page" rule="j2"/>
+			</Rules>
+		</User>
+		<User name="local">
+			<credentials password="local" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user</roles>
+			<groups>accounting</groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="localhost-fallback"/>
+			</Rules>
+		</User>
+		<User name="sublocal">
+			<credentials password="sublocal" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user</roles>
+			<groups>accounting</groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="subsite-by-hostname"/>
+			</Rules>
+		</User>
+		<User name="tomcat">
+			<credentials password="tomcat" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles></roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules/>
+		</User>
+		<User name="jetspeed">
+			<credentials password="jetspeed" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>manager</roles>
+			<groups>engineering</groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="menu" rule="role-group"/>
+				<Rule locator="page" rule="role-fallback"/>
+			</Rules>
+		</User>
+		<User name="guest">
+			<Null/>
+			<roles>guest</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="j2"/>
+			</Rules>
+		</User>
+		<User name="subsite">
+			<credentials password="subsite" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user,subsite,subsite2</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="subsite-role-fallback-home"/>
+			</Rules>
+		</User>
+		<User name="subsite2">
+			<credentials password="subsite2" enabled="TRUE" requiresUpdate="FALSE"/>
+			<roles>user,subsite,subsite2</roles>
+			<groups></groups>
+			<preferences/>
+			<userinfo/>
+			<Rules>
+				<Rule locator="page" rule="subsite2-role-fallback-home"/>
+			</Rules>
+		</User>
+		<User name="devmgr">
+			<credentials password="devmgr" enabled="TRUE"/>
+			<roles>user,dev,devmgr</roles>
+			<groups></groups>
+			<userinfo>
+				<preference>
+					<name value="user.name.given"/>
+					<value value="Dev"/>
+				</preference>
+				<preference>
+					<name value="user.name.family"/>
+					<value value="Manager"/>
+				</preference>
+			</userinfo>
+			<Rules>
+			  <Rule locator="page" rule="user-role-fallback"/>
+			</Rules>
+		</User>				
+	</Users>
+	<Permissions>
+		<Permission type="folder" resource="/" actions="view">
+			<roles>user,guest,subsite,subsite2</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/*" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/anotherdir/-" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/Public" actions="view, edit">
+			<roles>guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/Public/-" actions="view, edit">
+			<roles>user,guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/top-links/-" actions="view">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/_user/user" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>user</users>
+		</Permission>
+		<Permission type="folder" resource="/_user/user/-" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>user</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root" actions="view">
+			<roles>subsite,subsite2</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/-" actions="view">
+			<roles>subsite,subsite2</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite/-" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite2" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite2</users>
+		</Permission>
+		<Permission type="folder" resource="/__subsite-root/_role/subsite2/-" actions="view, edit">
+			<roles></roles>
+			<groups></groups>
+			<users>subsite2</users>
+		</Permission>
+		<Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view, edit">
+			<roles>admin</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="folder" resource="&lt;&lt;ALL FILES&gt;&gt;" actions="view">
+			<roles>manager</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="page" resource="/default-page.psml" actions="view">
+			<roles>guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="page" resource="/rss.psml" actions="view">
+			<roles>guest</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="demo::*" actions="view, edit">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="j2-admin::*" actions="view, edit">
+			<roles>admin</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="jetspeed-layouts::*" actions="view, edit">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+		<Permission type="portal" resource="rss::*" actions="view, edit">
+			<roles>user</roles>
+			<groups></groups>
+			<users></users>
+		</Permission>
+	</Permissions>
+	<ProfilingRules>
+		<ProfilingRule id="group-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 group-based fallback"/>
+			<Criteria>
+				<Criterion name="group">
+					<type value="group"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="ip-address" standardRule="true">
+			<description value="Resolves pages based on the clients remote IP address."/>
+			<Criteria>
+				<Criterion name="ip">
+					<type value="ip"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="j1" standardRule="true">
+			<description value="The default profiling rule following the Jetspeed-1 hard-coded profiler fallback algorithm."/>
+			<Criteria>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="user">
+					<type value="group.role.user"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="mediatype">
+					<type value="mediatype"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="language">
+					<type value="language"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="country">
+					<type value="country"/>
+					<fallBackOrder value="4"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="j2" standardRule="true">
+			<description value="The default profiling rule for users and mediatype minus language and country."/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="group.role.user"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+				<Criterion name="mediatype">
+					<type value="mediatype"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="1"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="path" standardRule="true">
+			<description value="use a path to locate."/>
+			<Criteria>
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="/"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="role-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="role-group" standardRule="false">
+			<description value="A role based fallback algorithm that searches all groups and roles for a user"/>
+			<Criteria>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="group">
+					<type value="group"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="security" standardRule="true">
+			<description value="The security profiling rule needed for credential change requirements."/>
+			<Criteria>
+				<Criterion name="page">
+					<type value="hard.coded"/>
+					<value value="/my-account.psml"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="subsite-role-fallback-home" standardRule="false">
+			<description value="A rule based on role fallback algorithm with specified subsite and home page"/>
+			<Criteria>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="subsite-root"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="subsite-default-page"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="subsite2-role-fallback-home" standardRule="false">
+			<description value="A rule based on role fallback algorithm with specified subsite and home page"/>
+			<Criteria>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="subsite-root"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="subsite2-default-page"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="0"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="subsite-by-hostname" standardRule="false">
+			<description value="A rule based on role fallback algorithm with specified subsite and home page"/>
+			<Criteria>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="subsite-root"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="hostname">
+					<type value="hostname"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation-2">
+					<type value="navigation"/>
+					<value value="subsite-root"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="hostname">
+					<type value="hostname"/>
+					<fallBackOrder value="4"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="5"/>
+					<fallBackType value="2"/>
+				</Criterion>				
+				<Criterion name="path">
+					<type value="path"/>
+					<value value="home"/>
+					<fallBackOrder value="6"/>
+					<fallBackType value="2"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="user-role-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		<ProfilingRule id="user-rolecombo-fallback" standardRule="false">
+			<description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/>
+			<Criteria>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="rolecombo"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="default-page"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		
+		<ProfilingRule id="localhost" standardRule="true">
+			<description value="A hosting rule"/>
+			<Criteria>
+				<Criterion name="hostname">
+					<type value="hostname"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="home"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+
+		<ProfilingRule id="localhost-fallback" standardRule="false">
+			<description value="A hosting rule with role fallback"/>
+			<Criteria>
+				<Criterion name="hostname">
+					<type value="hostname"/>
+					<fallBackOrder value="0"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="user">
+					<type value="user"/>
+					<fallBackOrder value="1"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="navigation">
+					<type value="navigation"/>
+					<value value="/"/>
+					<fallBackOrder value="2"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="hostname">
+					<type value="hostname"/>
+					<fallBackOrder value="3"/>
+					<fallBackType value="2"/>
+				</Criterion>
+				<Criterion name="role">
+					<type value="role"/>
+					<fallBackOrder value="4"/>
+					<fallBackType value="2"/>
+				</Criterion>				
+				<Criterion name="page">
+					<type value="path.session"/>
+					<value value="home"/>
+					<fallBackOrder value="5"/>
+					<fallBackType value="1"/>
+				</Criterion>
+			</Criteria>
+		</ProfilingRule>
+		
+	</ProfilingRules>
+
+</Snapshot>

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/j2-seed.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/j2-seed.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/j2-seed.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml?rev=595736&r1=595735&r2=595736&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml Fri Nov 16 08:53:51 2007
@@ -30,4 +30,7 @@
             </role>
         </role-mappings>
     </security>
+
+    <gbean name="PopulateDB" class="org.apache.geronimo.jetspeed.integration.JetspeedSerializerGBean" />
+
 </web-app>

Modified: geronimo/sandbox/jetspeed-integration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/pom.xml?rev=595736&r1=595735&r2=595736&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/pom.xml Fri Nov 16 08:53:51 2007
@@ -24,7 +24,7 @@
     <name>Geronimo Plugins :: Jetspeed</name>
     <packaging>pom</packaging>
     <description>
-       This is the configuration for the Jetspeed Tomcat application
+       This is the configuration for the Jetspeed Tomcat plugin
     </description>
     
     <modules>



Mime
View raw message