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 dd...@apache.org on 2008/10/13 18:34:52 UTC

svn commit: r704157 [2/2] - in /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype: ./ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/ src/main/resources/archetype-resources/__rootArtifactId...

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml Mon Oct 13 09:34:51 2008
@@ -0,0 +1,63 @@
+<?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.
+-->
+<page id="default-page"
+    xmlns="http://portals.apache.org/jetspeed"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+  <defaults
+     skin="blue"
+     layout-decorator="tigris"
+     portlet-decorator="tigris"
+  />
+  <title>Welcome to Jetspeed 2</title>
+  <metadata name="title" xml:lang="fr">Bienvenue a Jetspeed</metadata>
+  <metadata name="title" xml:lang="ja">Jetspeed 2 へようこそ</metadata>
+  <metadata name="title" xml:lang="es">¡Bienvenido a Jetspeed 2!</metadata>
+  <metadata name="title" xml:lang="hu">Köszönti a Jetspeed 2!</metadata>
+  <metadata name="title" xml:lang="zh">欢迎来到Jetspeed 2</metadata>
+  <metadata name="title" xml:lang="zh-TW">歡迎來到Jetspeed 2</metadata>
+  <metadata name="title" xml:lang="ko">Jetspeed 2 에 오신 것을 환영합니다</metadata>
+
+  <fragment id="dp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+    <fragment id="dp-3" type="portlet" name="j2-admin::LocaleSelector">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>                                
+    <fragment id="dp-12" type="portlet" name="j2-admin::LoginPortlet">
+      <property layout="TwoColumns" name="row" value="1" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>                                
+    <fragment id="dp-22" type="portlet" name="j2-admin::ForgottenPasswordPortlet">
+      <property layout="TwoColumns" name="row" value="2" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>                                
+    <fragment id="dp-23" type="portlet" name="j2-admin::UserRegistrationPortlet">
+      <property layout="TwoColumns" name="row" value="3" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>                                
+    
+    <fragment id="dp-7" type="portlet" name="${parentArtifactId}-pa::myportlet" >
+      <property layout="TwoColumns" name="row" value="1" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>        
+  </fragment>
+
+  <security-constraints>
+    <security-constraints-ref>public-view</security-constraints-ref>
+  </security-constraints>
+</page>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/sql/min/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/sql/min/j2-seed.xml?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/sql/min/j2-seed.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/sql/min/j2-seed.xml Mon Oct 13 09:34:51 2008
@@ -0,0 +1,529 @@
+<?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/>
+      <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/>
+      <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/>
+      <mimeTypes>text/vnd.wap.wml</mimeTypes>
+    </MediaType>
+    <MediaType name="xhtml-basic">
+      <charcterSet value="UTF-8"/>
+      <title value="XHTML"/>
+      <description value="XHTML Basic"/>
+      <capabilities/>
+      <mimeTypes>application/xhtml+xml</mimeTypes>
+    </MediaType>
+    <MediaType name="xml">
+      <charcterSet value=""/>
+      <title value="XML"/>
+      <description value="XML 1.0"/>
+      <capabilities/>
+      <mimeTypes>text/xml</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/>
+      <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/>
+      <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/>
+      <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/>
+      <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/>
+      <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/>
+      <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/>
+      <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/>
+      <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/>
+      <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/>
+      <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>
+  </Clients>
+  <Roles>
+    <Role>admin</Role>
+    <Role>guest</Role>
+    <Role>user</Role>
+  </Roles>
+  <Groups> </Groups>
+  <Users>
+    <User name="admin">
+      <credentials password="admin" enabled="TRUE" requiresUpdate="true"/>
+      <roles>user,admin</roles>
+      <groups/>
+      <userinfo>
+        <preference>
+          <name value="user.name.given"/>
+          <value value="System"/>
+        </preference>
+        <preference>
+          <name value="user.name.family"/>
+          <value value="Administrator"/>
+        </preference>
+      </userinfo>
+      <Rules/>
+    </User>
+    <User name="guest">
+      <Null/>
+      <roles>guest</roles>
+      <groups/>
+      <preferences/>
+      <userinfo/>
+      <Rules>
+        <Rule locator="page" rule="j2"/>
+      </Rules>
+    </User>
+  </Users>
+  <Permissions>
+    <Permission type="portal" resource="j2-admin::*" actions="view, edit">
+      <roles>admin</roles>
+      <groups/>
+      <users/>
+    </Permission>
+    <Permission type="portal" resource="jetspeed-layouts::*" actions="view, edit">
+      <roles>user</roles>
+      <groups/>
+      <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>
+    <!-- Adjusted default j2 rules START -->
+    <!--Original Rule
+    	<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="j2" standardRule="true">
+      <description
+        value="The default profiling rule for users and mediatype minus language and country."/>
+      <Criteria>
+        <Criterion name="cms">
+          <type value="cmscontext"/>
+          <fallBackOrder value="0"/>
+          <fallBackType value="0"/>
+        </Criterion>
+        <Criterion name="navigation">
+          <type value="cmsnavigation"/>
+          <value value="demo-portal_site"/>
+          <fallBackOrder value="1"/>
+          <fallBackType value="0"/>
+        </Criterion>
+        <Criterion name="page">
+          <type value="path"/>
+          <value value="default-page"/>
+          <fallBackOrder value="2"/>
+          <fallBackType value="0"/>
+        </Criterion>
+      </Criteria>
+    </ProfilingRule>
+    <!-- Adjusted default j2 rules END -->
+    <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="/${parentArtifactId}-account.psml"/>
+          <fallBackOrder value="0"/>
+          <fallBackType value="0"/>
+        </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>
+  </ProfilingRules>
+</Snapshot>

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/sql/min/j2-seed.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/sql/min/j2-seed.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml?rev=704157&view=auto
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml (added)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml Mon Oct 13 09:34:51 2008
@@ -0,0 +1,87 @@
+#set($dollar = '$')
+<?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.
+  
+  jetspeed-mvn-settings.xml
+  
+  This file is usually placed in your root project folder.
+  It can be used to provide a specific Maven settings.xml with the jetspeed:mvn plugin
+  when executing specific targets, like database initialization or deployments.
+  This allows easier maintenance and configuration for different conditions and environments
+  like development|test|staging|production, *and* keeping these configurations with your
+  project source (version management). 
+  
+  By providing multiple profiles, it is easy to switch different settings by configuring the
+  specific profile(s) to be used for a specific jetspeed:mvn target with a <profiles> subelement.
+  
+  Lookup and usage of the nearest jetspeed-mvn-settings.xml file, searching current project folder
+  and then upwards to the root project, is enabled by default.
+  
+  The default lookup behavior can be disabled or overridden in 3 ways (in higest precedence order):
+  
+  a) specify a specific settings.xml file for a target with a <settingsFile> element
+  b) configure <useSettings>false</useSettings> in the configuration of the jetspeed:mvn plugin
+  to disable using a custom settings.xml all together
+  c) specify a custom settings.xml file in one of the target specific or general jetspeed-mvn properties
+  using key jetspeed.mvn.settings.xml
+  d) lookup of the nearest generic jetspeed-mvn-settings.xml
+  
+-->
+<settings xmlns="http://maven.apache.org/POM/4.0.0">
+  
+  <profiles>
+    
+    <profile>
+      <id>jetspeed-mvn-settings</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        
+      </activation>
+      <properties>
+        
+        <org.apache.jetspeed.server.home>/change/this/apache-tomcat-5.5.26/</org.apache.jetspeed.server.home>
+        
+        <!--
+          <org.apache.jetspeed.production.database.default.name>mysql</org.apache.jetspeed.production.database.default.name>
+          <org.apache.jetspeed.production.jdbc.driver.groupId>mysql</org.apache.jetspeed.production.jdbc.driver.groupId>
+          <org.apache.jetspeed.production.jdbc.driver.artifactId>mysql-connector-java</org.apache.jetspeed.production.jdbc.driver.artifactId>
+          <org.apache.jetspeed.production.jdbc.driver.version>5.1.6</org.apache.jetspeed.production.jdbc.driver.version>
+          <org.apache.jetspeed.production.database.driver>com.mysql.jdbc.Driver</org.apache.jetspeed.production.database.driver>
+          <org.apache.jetspeed.production.database.url><![CDATA[jdbc:mysql://127.0.0.1/jetspeed?useServerPrepStmts=false&amp;jdbcCompliantTruncation=false]]></org.apache.jetspeed.production.database.url>
+          <org.apache.jetspeed.production.database.user>username</org.apache.jetspeed.production.database.user>
+          <org.apache.jetspeed.production.database.password>password</org.apache.jetspeed.production.database.password>
+        -->
+        
+        <org.apache.jetspeed.production.jdbc.driver.groupId>org.apache.derby</org.apache.jetspeed.production.jdbc.driver.groupId>
+        <org.apache.jetspeed.production.jdbc.driver.artifactId>derby</org.apache.jetspeed.production.jdbc.driver.artifactId>
+        
+        <org.apache.jetspeed.production.jdbc.driver.version>10.3.2.1</org.apache.jetspeed.production.jdbc.driver.version>
+        <org.apache.jetspeed.production.database.default.name>derby</org.apache.jetspeed.production.database.default.name>
+        <org.apache.jetspeed.production.database.url>jdbc:derby:/tmp/jetspeed/derby/productiondb;create=true</org.apache.jetspeed.production.database.url>
+        <org.apache.jetspeed.production.database.driver>org.apache.derby.jdbc.EmbeddedDriver</org.apache.jetspeed.production.database.driver>
+        <org.apache.jetspeed.production.database.user></org.apache.jetspeed.production.database.user>
+        <org.apache.jetspeed.production.database.password></org.apache.jetspeed.production.database.password>
+        
+      </properties>
+    </profile>
+    
+  </profiles>
+  
+</settings>
+

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/jetspeed-mvn-settings.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml?rev=704157&r1=704156&r2=704157&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml Mon Oct 13 09:34:51 2008
@@ -1,432 +1,201 @@
-#set($dollar = '$')
-<?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.
-  
--->
-<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.9</maven>
-  </prerequisites>
-
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>  
-  <name>Jetspeed-2 Portal Application</name>
-  <description>Jetspeed-2 Portal Application</description>
-
-  <packaging>war</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.portals.jetspeed-2</groupId>
-      <artifactId>jetspeed-dependencies</artifactId>
-      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.portals.jetspeed-2</groupId>
-      <artifactId>jetspeed</artifactId>
-      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-      <type>war</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <properties>
-    <portlet-api.version>1.0</portlet-api.version>
-    <org.apache.portals.jetspeed.version>2.2-SNAPSHOT</org.apache.portals.jetspeed.version>
-    <org.apache.pluto.version>1.0.1</org.apache.pluto.version>
-    <org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
-    <portal.context.name>${artifactId}</portal.context.name>
-    <org.apache.jetspeed.server.home>${dollar}{project.build.directory}/${artifactId}-deploy</org.apache.jetspeed.server.home>
-  </properties>
-
-  <build>
-    <finalName>${dollar}{portal.context.name}</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
-        <artifactId>jetspeed-unpack-maven-plugin</artifactId>
-        <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-        <executions>
-          <execution>
-            <id>unpack-appserver</id>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <phase>process-resources</phase>
-            <configuration>
-              <unpack>
-                <artifact>org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar</artifact>
-                <targetDirectory>${dollar}{project.build.directory}/resources/META-INF</targetDirectory>
-                <resources>
-                  <resource>
-                    <path>conf/tomcat</path>
-                    <include>context.xml</include>
-                  </resource>
-                </resources>
-              </unpack>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-portal-resources</artifactId>
-            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.portals.jetspeed-2</groupId>
-        <artifactId>jetspeed-deploy-maven-plugin</artifactId>
-        <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-        <executions>
-          <execution>
-            <id>deploy-jetspeed-layouts</id>
-            <goals>
-              <goal>deploy</goal>
-            </goals>
-            <phase>process-resources</phase>
-            <configuration>
-              <targetBaseDir>${dollar}{project.build.directory}/${dollar}{project.build.finalName}</targetBaseDir>
-              <destinations>
-                <local>WEB-INF/deploy/local</local>
-              </destinations>
-              <deployments>
-                <deployment>
-                  <artifact>org.apache.portals.jetspeed-2:jetspeed-layouts:war</artifact>
-                  <destination>local</destination>
-                </deployment>
-              </deployments>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-layouts</artifactId>
-            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-            <type>war</type>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <webResources>
-            <resource>
-              <directory>${dollar}{project.build.directory}/resources</directory>
-              <filtering>true</filtering>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>${artifactId}</id>
-      <build>
-        <plugins>
-
-          <plugin>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-db-maven-plugin</artifactId>
-            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-            <goals>
-              <goal>init</goal>
-            </goals>
-            <configuration>
-              <connection>
-                <username>${dollar}{org.apache.jetspeed.production.database.user}</username>
-                <password>${dollar}{org.apache.jetspeed.production.database.password}</password>
-                <url>${dollar}{org.apache.jetspeed.production.database.url}</url>
-                <driver>${dollar}{org.apache.jetspeed.production.database.driver}</driver>
-              </connection>
-              <unpack>
-                <artifact>org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar</artifact>
-                <resources>
-                  <resource>
-                    <path>ddl</path>
-                    <include>${dollar}{org.apache.jetspeed.production.database.default.name}/</include>
-                    <destination>db/ddl</destination>
-                  </resource>
-                  <resource>
-                    <path>seed</path>
-                    <destination>db/seed</destination>
-                  </resource>
-                </resources>
-              </unpack>
-              <sql>
-                <scripts>
-                  <script>
-                    <path>
-                      ${dollar}{project.build.directory}/db/ddl/${dollar}{org.apache.jetspeed.production.database.default.name}/drop-schema.sql </path>
-                    <ignoreErrors>true</ignoreErrors>
-                  </script>
-                  <script>
-                    <path>
-                      ${dollar}{project.build.directory}/db/ddl/${dollar}{org.apache.jetspeed.production.database.default.name}/create-schema.sql
-                    </path>
-                  </script>
-                </scripts>
-              </sql>
-              <seed>
-                <categories>serializer</categories>
-                <filterPropertiesFileName>
-                  ${dollar}{project.build.directory}/${dollar}{project.build.finalName}/WEB-INF/conf/spring-filter.properties </filterPropertiesFileName>
-                <applicationRootPath>${dollar}{project.build.directory}/${dollar}{project.build.finalName}</applicationRootPath>
-                <files>
-                  <file>${dollar}{project.build.directory}/db/seed/j2-seed.xml</file>
-                </files>
-                <initProperties>
-                  <org.apache.jetspeed.database.user>
-                    ${dollar}{org.apache.jetspeed.production.database.user} </org.apache.jetspeed.database.user>
-                  <org.apache.jetspeed.database.password>
-                    ${dollar}{org.apache.jetspeed.production.database.password} </org.apache.jetspeed.database.password>
-                  <org.apache.jetspeed.database.url> ${dollar}{org.apache.jetspeed.production.database.url} </org.apache.jetspeed.database.url>
-                  <org.apache.jetspeed.database.driver>
-                    ${dollar}{org.apache.jetspeed.production.database.driver}
-                  </org.apache.jetspeed.database.driver>
-                </initProperties>
-              </seed>
-            </configuration>
-            <dependencies>
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-portal-resources</artifactId>
-                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-db-tools</artifactId>
-                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>${dollar}{org.apache.jetspeed.production.jdbc.driver.groupId}</groupId>
-                <artifactId>${dollar}{org.apache.jetspeed.production.jdbc.driver.artifactId}</artifactId>
-                <version>${dollar}{org.apache.jetspeed.production.jdbc.driver.version}</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-deploy-maven-plugin</artifactId>
-            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-            <configuration>
-              <targetBaseDir>${dollar}{org.apache.jetspeed.server.home}</targetBaseDir>
-              <portalName>${dollar}{portal.context.name}</portalName>
-              <deployments>
-                <!-- shared/lib -->
-                <deployment>
-                  <artifact>portlet-api:portlet-api:jar</artifact>
-                </deployment>
-                <deployment>
-                  <artifact>org.apache.portals.jetspeed-2:jetspeed-api:jar</artifact>
-                </deployment>
-                <deployment>
-                  <artifact>org.apache.portals.jetspeed-2:jetspeed-commons:jar</artifact>
-                </deployment>
-                <deployment>
-                  <artifact>org.apache.pluto:pluto:jar</artifact>
-                </deployment>
-                <deployment>
-                  <artifact>org.apache.portals.bridges:portals-bridges-common:jar</artifact>
-                </deployment>
-                <deployment>
-                  <artifact>
-                    ${dollar}{org.apache.jetspeed.production.jdbc.driver.groupId}:${dollar}{org.apache.jetspeed.production.jdbc.driver.artifactId}:jar </artifact>
-                  <destination>system</destination>
-                </deployment>
-                <!-- jetspeed portal expanded -->
-                <deployment>
-                  <artifact>${dollar}{pom.groupId}:${dollar}{pom.artifactId}:war</artifact>
-                  <expand>true</expand>
-                  <targetName>${dollar}{portal.context.name}</targetName>
-                  <delete>./${dollar}{portal.context.name}</delete>
-                </deployment>
-                <!-- admin pa -->
-                <deployment>
-                  <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
-                  <delete>./j2-admin</delete>
-                </deployment>
-                <!-- demo pa's -->
-                <deployment>
-                  <artifact>org.apache.portals.jetspeed-2:demo:war</artifact>
-                  <delete>./demo</delete>
-                </deployment>
-                <deployment>
-                  <artifact>org.apache.portals.jetspeed-2:rss:war</artifact>
-                  <delete>./rss</delete>
-                </deployment>
-                <deployment>
-                  <artifact>org.apache.portals.bridges:jpetstore:war</artifact>
-                  <infuse>true</infuse>
-                  <delete>./jpetstore</delete>
-                </deployment>
-                <deployment>
-                  <artifact>org.apache.portals.bridges:jsf-demo:war</artifact>
-                  <infuse>true</infuse>
-                  <expand>true</expand>
-                  <delete>./jsf-demo</delete>
-                </deployment>
-              </deployments>
-            </configuration>
-            <dependencies>
-              <!-- shared/lib deps -->
-              <dependency>
-                <groupId>${dollar}{pom.groupId}</groupId>
-                <artifactId>${dollar}{pom.artifactId}</artifactId>
-                <version>${dollar}{pom.version}</version>
-                <type>war</type>
-              </dependency>
-              <dependency>
-                <groupId>portlet-api</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>${dollar}{portlet-api.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-api</artifactId>
-                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-                <scope>runtime</scope>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-commons</artifactId>
-                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto</artifactId>
-                <version>${dollar}{org.apache.pluto.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.bridges</groupId>
-                <artifactId>portals-bridges-common</artifactId>
-                <version>${dollar}{org.apache.portals.bridges.common.version}</version>
-              </dependency>
-              <dependency>
-                <groupId>${dollar}{org.apache.jetspeed.production.jdbc.driver.groupId}</groupId>
-                <artifactId>${dollar}{org.apache.jetspeed.production.jdbc.driver.artifactId}</artifactId>
-                <version>${dollar}{org.apache.jetspeed.production.jdbc.driver.version}</version>
-              </dependency>
-              <!-- j2-admin -->
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>j2-admin</artifactId>
-                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-                <type>war</type>
-              </dependency>
-              <!-- demo pa's -->
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>rss</artifactId>
-                <version>2.1.3</version>
-                <type>war</type>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>demo</artifactId>
-                <version>2.1.3</version>
-                <type>war</type>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.bridges</groupId>
-                <artifactId>jsf-demo</artifactId>
-                <version>1.0.4</version>
-                <type>war</type>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.bridges</groupId>
-                <artifactId>jpetstore</artifactId>
-                <version>1.0.4</version>
-                <type>war</type>
-              </dependency>
-
-              <!-- plugin own dependencies -->
-              <dependency>
-                <groupId>org.apache.portals.jetspeed-2</groupId>
-                <artifactId>jetspeed-deploy-tools</artifactId>
-                <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>${dollar}{artifactId}-dbpsml</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.portals.jetspeed-2</groupId>
-            <artifactId>jetspeed-db-maven-plugin</artifactId>
-            <version>${dollar}{org.apache.portals.jetspeed.version}</version>
-            <goals>
-              <goal>init</goal>
-            </goals>
-            <configuration>
-              <psml>
-                <categories>pageSerializer</categories>
-                <filterPropertiesFileName>
-                  ${dollar}{project.build.directory}/${dollar}{project.build.finalName}/WEB-INF/conf/spring-filter.properties </filterPropertiesFileName>
-                <applicationRootPath>${dollar}{project.build.directory}/${dollar}{project.build.finalName}</applicationRootPath>
-                <initProperties>
-                  <org.apache.jetspeed.database.user>
-                    ${dollar}{org.apache.jetspeed.production.database.user} </org.apache.jetspeed.database.user>
-                  <org.apache.jetspeed.database.password>
-                    ${dollar}{org.apache.jetspeed.production.database.password} </org.apache.jetspeed.database.password>
-                  <org.apache.jetspeed.database.url> ${dollar}{org.apache.jetspeed.production.database.url} </org.apache.jetspeed.database.url>
-                  <org.apache.jetspeed.database.driver>
-                    ${dollar}{org.apache.jetspeed.production.database.driver}
-                  </org.apache.jetspeed.database.driver>
-                </initProperties>
-              </psml>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>dbpsml</id>
-      <build>
-        <resources>
-          <resource>
-            <directory>${dollar}{basedir}/src/etc/dbpsml</directory>
-            <includes>
-              <include>spring-filter-key.properties</include>
-            </includes>
-            <targetPath>../${dollar}{project.build.finalName}/WEB-INF/conf</targetPath>
-          </resource>
-        </resources>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
+#set($dollar = '$')
+<?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.
+-->
+<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.9</maven>
+  </prerequisites>
+  <groupId>${groupId}</groupId>
+  <artifactId>${artifactId}</artifactId>
+  <name>My Portal Project</name>
+  <version>${version}</version>
+  <packaging>pom</packaging>
+
+  <properties>
+    <org.apache.portals.jetspeed.version>2.2-SNAPSHOT</org.apache.portals.jetspeed.version>
+    <org.apache.pluto.version>1.0.1</org.apache.pluto.version>
+    <org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
+    <servlet-api.version>2.4</servlet-api.version>
+    <portlet-api.version>1.0</portlet-api.version>
+    <portal.context.name>${artifactId}</portal.context.name>
+    <org.apache.jetspeed.server.home>/opt/apache-tomcat-5.5.26/</org.apache.jetspeed.server.home>
+
+  </properties>
+
+  <repositories>
+    <repository>
+      <id>bluesunrise</id>
+      <name>BlueSunrise Maven 2 Repository</name>
+      <url>http://bluesunrise.com/maven2</url>
+    </repository>
+    <repository>
+      <id>bwwmm.ch.cam.ac.uk</id>
+      <name>for ostermiller pom only</name>
+      <url>http://wwmm.ch.cam.ac.uk/maven2</url>
+    </repository>
+    <repository>
+      <id>mvnsearch</id>
+      <name>for jdom and html cleaner</name>
+      <url>http://maven.xwiki.org/externals</url>
+    </repository>
+  </repositories>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>portlet-api</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>${dollar}{portlet-api.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>${dollar}{servlet-api.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <!-- Provided Dependencies -->
+    <dependency>
+      <groupId>portlet-api</groupId>
+      <artifactId>portlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <!-- Compiler -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>1.5</source>
+            <target>1.5</target>
+            <debug>true</debug>
+            <showDeprecation>true</showDeprecation>
+            <showWarnings>true</showWarnings>
+            <optimize>false</optimize>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-mvn-maven-plugin</artifactId>
+          <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+          <configuration>
+            <targets combine.children="append">
+              <target>
+                <id>install-pa</id>
+                <dir>@rootdir@/${artifactId}-pa</dir>
+                <goals>clean,install</goals>
+              </target>
+              <target>
+                <id>install-portal</id>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <goals>clean,install</goals>
+              </target>
+              <target>
+                <id>install</id>
+                <depends>install-portal,install-pa</depends>
+              </target>
+              <target>
+                <id>db-pa</id>
+                <depends>install-pa</depends>
+                <name>pa</name>
+                <dir>@rootdir@/${artifactId}-pa</dir>
+                <profiles>db</profiles>
+              </target>
+              <target>
+                <id>db-portal</id>
+                <depends>install-portal</depends>
+                <name>portal</name>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <profiles>db</profiles>
+              </target>
+              <target>
+                <id>db</id>
+                <depends>db-portal,db-pa</depends>
+              </target>
+              <target>
+                <id>deploy-pa</id>
+                <depends>install-pa</depends>
+                <name>pa</name>
+                <dir>@rootdir@/${artifactId}-pa</dir>
+                <profiles>deploy</profiles>
+              </target>
+              <target>
+                <id>deploy-portal</id>
+                <depends>install</depends>
+                <name>portal</name>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <profiles>deploy</profiles>
+              </target>
+              <target>
+                <id>portal-seed</id>
+                <depends>install-portal</depends>
+                <name>portal</name>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <profiles>seed</profiles>
+              </target>
+              <target>
+                <id>portal-seed-dbpsml</id>
+                <depends>install-portal</depends>
+                <name>portal</name>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <profiles>seed-dbpsml</profiles>
+              </target>
+              <target>
+                <id>deploy-portal-dbpsml</id>
+                <depends>install-portal</depends>
+                <name>portal</name>
+                <dir>@rootdir@/${artifactId}-portal</dir>
+                <profiles>deploy-dbpsml</profiles>
+              </target>
+              
+              <target>
+                <id>all</id>
+                <depends>install,db,deploy-portal,deploy-pa</depends>
+              </target>
+            </targets>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <!--  ensure jetspeed:mvn plugin is installed automatically when executing for the first time -->
+      <plugin>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-mvn-maven-plugin</artifactId>
+        <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+      </plugin>
+    </plugins>
+
+  </build>
+
+</project>



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