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 sg...@apache.org on 2005/09/26 14:44:55 UTC

svn commit: r291615 - in /portals/jetspeed-2/trunk: applications/pam/src/webapp/WEB-INF/jetspeed-portlet.xml applications/pam/src/webapp/WEB-INF/portlet.xml core-build.xml jetspeed-components.xml

Author: sgala
Date: Mon Sep 26 05:44:45 2005
New Revision: 291615

URL: http://svn.apache.org/viewcvs?rev=291615&view=rev
Log:
eol-style native

Modified:
    portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/jetspeed-portlet.xml   (contents, props changed)
    portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/portlet.xml   (contents, props changed)
    portals/jetspeed-2/trunk/core-build.xml   (contents, props changed)
    portals/jetspeed-2/trunk/jetspeed-components.xml   (contents, props changed)

Modified: portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/jetspeed-portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/jetspeed-portlet.xml?rev=291615&r1=291614&r2=291615&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/jetspeed-portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/jetspeed-portlet.xml Mon Sep 26 05:44:45 2005
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
--->
-<portlet-app id="security" version="1.0" 
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
-    xmlns:js="http://portals.apache.org/jetspeed" 
-    xmlns:dc="http://www.purl.org/dc">
-    
-    <dc:title>Security Portlets</dc:title>
-    <dc:title xml:lang="en">Security Portlets</dc:title>
-    <dc:creator>J2 Team</dc:creator>
-    
-    <portlet>
-        <portlet-name>LoginPortlet</portlet-name>
-        <dc:title>Login Portlet</dc:title>
-        <dc:creator>J2 Team</dc:creator>
-    </portlet>
-
-    <portlet>
-        <portlet-name>LocaleSelectorPortlet</portlet-name>
-        <dc:title>Locale Selector Portlet</dc:title>
-        <dc:creator>J2 Team</dc:creator>
-    </portlet>
-
-	<js:services>
-	    <js:service name='SearchComponent'/>
-		<js:service name='PortletRegistryComponent'/>
-		<js:service name='EntityAccessor'/>
-		<js:service name='UserManager'/>
-		<js:service name='PageManager'/>
-		<js:service name='RoleManager'/>
-		<js:service name='GroupManager'/>
-		<js:service name='Profiler'/>		
-	</js:services>
-	
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+-->
+<portlet-app id="security" version="1.0" 
+    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
+    xmlns:js="http://portals.apache.org/jetspeed" 
+    xmlns:dc="http://www.purl.org/dc">
+    
+    <dc:title>Security Portlets</dc:title>
+    <dc:title xml:lang="en">Security Portlets</dc:title>
+    <dc:creator>J2 Team</dc:creator>
+    
+    <portlet>
+        <portlet-name>LoginPortlet</portlet-name>
+        <dc:title>Login Portlet</dc:title>
+        <dc:creator>J2 Team</dc:creator>
+    </portlet>
+
+    <portlet>
+        <portlet-name>LocaleSelectorPortlet</portlet-name>
+        <dc:title>Locale Selector Portlet</dc:title>
+        <dc:creator>J2 Team</dc:creator>
+    </portlet>
+
+	<js:services>
+	    <js:service name='SearchComponent'/>
+		<js:service name='PortletRegistryComponent'/>
+		<js:service name='EntityAccessor'/>
+		<js:service name='UserManager'/>
+		<js:service name='PageManager'/>
+		<js:service name='RoleManager'/>
+		<js:service name='GroupManager'/>
+		<js:service name='Profiler'/>		
+	</js:services>
+	
 </portlet-app>

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/jetspeed-portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/portlet.xml?rev=291615&r1=291614&r2=291615&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/portlet.xml Mon Sep 26 05:44:45 2005
@@ -1,296 +1,296 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
--->
-<portlet-app id="pam" version="1.0">
-
-<portlet id="LocaleSelector">
-    <portlet-name>LocaleSelector</portlet-name>
-    <display-name>Locale Selector</display-name>
-    <description>Locale Selector is a portlet to select your preferred locale</description>
-    <portlet-class>org.apache.jetspeed.portlets.localeselector.LocaleSelectorPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <supported-locale>ja</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.localeselector.resources.LocaleSelectorResources</resource-bundle>
-    <portlet-info>
-      <title>Locale Selector</title>
-      <short-title>This is a portlet to select your preferred locale</short-title>
-      <keywords>Locale,Language</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="PortletApplicationBrowser">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/view/pam-browser.jsp</value>
-     </init-param>   
-    <portlet-name>PortletApplicationBrowser</portlet-name>
-    <display-name>Portlet Application Browser</display-name>
-    <description>The PAM (Portlet Application Manager) Portlet Application Browser displays a list of portlet applications deployed to this portal. From here you can add, edit, and delete portlet applications.</description>
-    <portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationBrowser</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>    
-    <portlet-info>
-      <title>Portlet Application Browser</title>
-      <short-title>Apps</short-title>
-      <keywords>applications,apps,PAM</keywords>
-    </portlet-info>
-  </portlet>
-
-  <portlet id="PortletApplicationDetail">
-    <init-param>
-      <description>This parameter sets the template used in view mode.</description>
-      <name>ViewPage</name>
-      <value>//WEB-INF/view/pam-detail.jsp</value>
-    </init-param>   
-    <portlet-name>PortletApplicationDetail</portlet-name>
-    <display-name>Portlet Application Detail</display-name>
-    <description>The PAM (Portlet Application Manager) Portlet Application Detail displays a specific portlet application deployed to this portal. From here you can add, edit, and delete this portlet application.</description>
-    <portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationDetail</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>    
-    <portlet-info>
-      <title>Portlet Application Detail</title>
-      <short-title>PAD</short-title>
-      <keywords>applications,apps,PAM</keywords>
-    </portlet-info>
-  </portlet>
-<!--
-<portlet id="PortalSiteBrowser">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/view/site-browser.jsp</value>
-     </init-param>   
-    <portlet-name>PortalSiteBrowser</portlet-name>
-    <display-name>Portal Site Browser</display-name>
-    <description>The Portal Site Browser displays a hierarchical view of the portal site. From here you can add, edit, and delete folders and pages.</description>
-    <portlet-class>org.apache.portals.bridges.jsf.FacesPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>Portal Site Browser</title>
-      <short-title>Site</short-title>
-      <keywords>admin,site</keywords>
-    </portlet-info>
-</portlet>
--->
-<portlet id="PortalSiteBrowser">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/view/site/site-browser.jsp</value>
-     </init-param>   
-    <portlet-name>PortalSiteBrowser</portlet-name>
-    <display-name>Portal Site Browser</display-name>
-    <description>The Portal Site Browser displays a hierarchical view of the portal site. From here you can add, edit, and delete folders and pages.</description>
-    <portlet-class>org.apache.jetspeed.portlets.site.SiteBrowserPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>Portal Site Browser</title>
-      <short-title>Site</short-title>
-      <keywords>admin,site</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="PortalSiteDetail">
-	<init-param>
-		<name>spring-configuration</name>
-		<value>/WEB-INF/model/spring-portlet-configuration.xml</value>
-	</init-param>
-	<init-param>
-		<name>validator-configuration</name>
-		<value>/WEB-INF/model/validator-configuration.xml</value>
-	</init-param>	
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>folder-view</value>
-     </init-param>   
-    <portlet-name>PortalSiteDetail</portlet-name>
-    <display-name>Portal Site Detail</display-name>
-    <description>The Portal Site Detail portlet displays the details of a selected folder/page.  From here you can add, edit, and delete folders and pages.</description>
-    <portlet-class>org.apache.jetspeed.portlets.site.SiteDetailsPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-     <resource-bundle>org.apache.jetspeed.portlets.site.resources.SiteResources</resource-bundle>            	
-    <portlet-info>
-      <title>Portal Site Detail</title>
-      <short-title>Site</short-title>
-      <keywords>admin,site</keywords>
-    </portlet-info>
-	
-</portlet>
-
-<portlet id="ProfilerAdmin">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-		<value>/WEB-INF/view/profiler-admin.jsp</value>
-     </init-param>   
-    <init-param>
-    	<description>This parameter sets the template used in help mode.</description>
-		<name>HelpPage</name>
-		<value>/WEB-INF/view/profiler-help.html</value>
-     </init-param>   
-    <portlet-name>ProfilerAdmin</portlet-name>
-    <display-name>Profiler Admin</display-name>
-    <description>The Profiler Admin is used to adminstrate profiling rules.</description>
-    <portlet-class>org.apache.jetspeed.portlets.profiler.ProfilerAdminPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>Profiler Admin</title>
-      <short-title>Profiler</short-title>
-      <keywords>admin,profiler</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="JetspeedUserAdmin">
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-                <name>ViewPage</name>
-                        <value>/WEB-INF/view/user-admin.jsp</value>
-     </init-param>   
-    <portlet-name>JetspeedUserAdmin</portlet-name>
-    <display-name>User Administration</display-name>
-    <description>User Administration of portal users in the system.</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.users.UserManagerPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>User Administration</title>
-      <short-title>Users</short-title>
-      <keywords>admin,security,users</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="PortletSelector">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/view/selectors/portlet-selector.vm</value>
-     </init-param>   
-    <portlet-name>PortletSelector</portlet-name>
-    <display-name>Portlet Selector</display-name>
-    <description>Select one or more portlets from the customizer</description>
-    <portlet-class>org.apache.jetspeed.portlets.selector.PortletSelector</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.site.resources.SiteResources</resource-bundle>            
-    <portlet-preferences>
-      <preference>                            
-        <name>WindowSize</name>                    
-        <value>15</value>    
-      </preference>                               		    
-    </portlet-preferences>            
-    <portlet-info>
-      <title>Portlet Selector</title>
-      <short-title>Portlets</short-title>
-      <keywords>portlet,selector,customizer,chooser,add</keywords>
-    </portlet-info>
-</portlet>
-<portlet id="PortletEntityBrowserPortlet">
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-            <value>/WEB-INF/view/pemp/browser_view.vm</value>
-     </init-param>
-    <portlet-name>PortletEntityBrowserPortlet</portlet-name>
-    <display-name>Portlet Entity Browser</display-name>
-    <description>Provides for browsing portlet enitites</description>
-    <portlet-class>org.apache.jetspeed.portlets.entityeditor.PortletEntityBrowserPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <portlet-info>
-      <title>Portlet Entity Browser</title>
-      <short-title>Portlet Entity Browser</short-title>
-      <keywords>applications,apps,entity,manager</keywords>
-    </portlet-info>
-  </portlet>
-  <portlet id="PortletEntityEditorPortlet">
-    <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-            <value>/WEB-INF/view/pemp/editor_view.vm</value>
-     </init-param>
-    <portlet-name>PortletEntityEditorPortlet</portlet-name>
-    <display-name>Portlet Entity Browser</display-name>
-    <description>Provides for editing of portlet enitites</description>
-    <portlet-class>org.apache.jetspeed.portlets.entityeditor.PortletEntityEditorPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <portlet-info>
-      <title>Portlet Entity Editor</title>
-      <short-title>Portlet Entity Editor</short-title>
-      <keywords>applications,apps,entity,manager</keywords>
-    </portlet-info>
-  </portlet>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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.
+-->
+<portlet-app id="pam" version="1.0">
+
+<portlet id="LocaleSelector">
+    <portlet-name>LocaleSelector</portlet-name>
+    <display-name>Locale Selector</display-name>
+    <description>Locale Selector is a portlet to select your preferred locale</description>
+    <portlet-class>org.apache.jetspeed.portlets.localeselector.LocaleSelectorPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <supported-locale>ja</supported-locale>
+    <resource-bundle>org.apache.jetspeed.portlets.localeselector.resources.LocaleSelectorResources</resource-bundle>
+    <portlet-info>
+      <title>Locale Selector</title>
+      <short-title>This is a portlet to select your preferred locale</short-title>
+      <keywords>Locale,Language</keywords>
+    </portlet-info>
+</portlet>
+
+<portlet id="PortletApplicationBrowser">
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+			<value>/WEB-INF/view/pam-browser.jsp</value>
+     </init-param>   
+    <portlet-name>PortletApplicationBrowser</portlet-name>
+    <display-name>Portlet Application Browser</display-name>
+    <description>The PAM (Portlet Application Manager) Portlet Application Browser displays a list of portlet applications deployed to this portal. From here you can add, edit, and delete portlet applications.</description>
+    <portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationBrowser</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>    
+    <portlet-info>
+      <title>Portlet Application Browser</title>
+      <short-title>Apps</short-title>
+      <keywords>applications,apps,PAM</keywords>
+    </portlet-info>
+  </portlet>
+
+  <portlet id="PortletApplicationDetail">
+    <init-param>
+      <description>This parameter sets the template used in view mode.</description>
+      <name>ViewPage</name>
+      <value>//WEB-INF/view/pam-detail.jsp</value>
+    </init-param>   
+    <portlet-name>PortletApplicationDetail</portlet-name>
+    <display-name>Portlet Application Detail</display-name>
+    <description>The PAM (Portlet Application Manager) Portlet Application Detail displays a specific portlet application deployed to this portal. From here you can add, edit, and delete this portlet application.</description>
+    <portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationDetail</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>    
+    <portlet-info>
+      <title>Portlet Application Detail</title>
+      <short-title>PAD</short-title>
+      <keywords>applications,apps,PAM</keywords>
+    </portlet-info>
+  </portlet>
+<!--
+<portlet id="PortalSiteBrowser">
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+			<value>/WEB-INF/view/site-browser.jsp</value>
+     </init-param>   
+    <portlet-name>PortalSiteBrowser</portlet-name>
+    <display-name>Portal Site Browser</display-name>
+    <description>The Portal Site Browser displays a hierarchical view of the portal site. From here you can add, edit, and delete folders and pages.</description>
+    <portlet-class>org.apache.portals.bridges.jsf.FacesPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>Portal Site Browser</title>
+      <short-title>Site</short-title>
+      <keywords>admin,site</keywords>
+    </portlet-info>
+</portlet>
+-->
+<portlet id="PortalSiteBrowser">
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+			<value>/WEB-INF/view/site/site-browser.jsp</value>
+     </init-param>   
+    <portlet-name>PortalSiteBrowser</portlet-name>
+    <display-name>Portal Site Browser</display-name>
+    <description>The Portal Site Browser displays a hierarchical view of the portal site. From here you can add, edit, and delete folders and pages.</description>
+    <portlet-class>org.apache.jetspeed.portlets.site.SiteBrowserPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>Portal Site Browser</title>
+      <short-title>Site</short-title>
+      <keywords>admin,site</keywords>
+    </portlet-info>
+</portlet>
+
+<portlet id="PortalSiteDetail">
+	<init-param>
+		<name>spring-configuration</name>
+		<value>/WEB-INF/model/spring-portlet-configuration.xml</value>
+	</init-param>
+	<init-param>
+		<name>validator-configuration</name>
+		<value>/WEB-INF/model/validator-configuration.xml</value>
+	</init-param>	
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+			<value>folder-view</value>
+     </init-param>   
+    <portlet-name>PortalSiteDetail</portlet-name>
+    <display-name>Portal Site Detail</display-name>
+    <description>The Portal Site Detail portlet displays the details of a selected folder/page.  From here you can add, edit, and delete folders and pages.</description>
+    <portlet-class>org.apache.jetspeed.portlets.site.SiteDetailsPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+     <resource-bundle>org.apache.jetspeed.portlets.site.resources.SiteResources</resource-bundle>            	
+    <portlet-info>
+      <title>Portal Site Detail</title>
+      <short-title>Site</short-title>
+      <keywords>admin,site</keywords>
+    </portlet-info>
+	
+</portlet>
+
+<portlet id="ProfilerAdmin">
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+		<value>/WEB-INF/view/profiler-admin.jsp</value>
+     </init-param>   
+    <init-param>
+    	<description>This parameter sets the template used in help mode.</description>
+		<name>HelpPage</name>
+		<value>/WEB-INF/view/profiler-help.html</value>
+     </init-param>   
+    <portlet-name>ProfilerAdmin</portlet-name>
+    <display-name>Profiler Admin</display-name>
+    <description>The Profiler Admin is used to adminstrate profiling rules.</description>
+    <portlet-class>org.apache.jetspeed.portlets.profiler.ProfilerAdminPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>Profiler Admin</title>
+      <short-title>Profiler</short-title>
+      <keywords>admin,profiler</keywords>
+    </portlet-info>
+</portlet>
+
+<portlet id="JetspeedUserAdmin">
+    <init-param>
+        <description>This parameter sets the template used in view mode.</description>
+                <name>ViewPage</name>
+                        <value>/WEB-INF/view/user-admin.jsp</value>
+     </init-param>   
+    <portlet-name>JetspeedUserAdmin</portlet-name>
+    <display-name>User Administration</display-name>
+    <description>User Administration of portal users in the system.</description>
+    <portlet-class>org.apache.jetspeed.portlets.security.users.UserManagerPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>User Administration</title>
+      <short-title>Users</short-title>
+      <keywords>admin,security,users</keywords>
+    </portlet-info>
+</portlet>
+
+<portlet id="PortletSelector">
+    <init-param>
+    	<description>This parameter sets the template used in view mode.</description>
+		<name>ViewPage</name>
+			<value>/WEB-INF/view/selectors/portlet-selector.vm</value>
+     </init-param>   
+    <portlet-name>PortletSelector</portlet-name>
+    <display-name>Portlet Selector</display-name>
+    <description>Select one or more portlets from the customizer</description>
+    <portlet-class>org.apache.jetspeed.portlets.selector.PortletSelector</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <resource-bundle>org.apache.jetspeed.portlets.site.resources.SiteResources</resource-bundle>            
+    <portlet-preferences>
+      <preference>                            
+        <name>WindowSize</name>                    
+        <value>15</value>    
+      </preference>                               		    
+    </portlet-preferences>            
+    <portlet-info>
+      <title>Portlet Selector</title>
+      <short-title>Portlets</short-title>
+      <keywords>portlet,selector,customizer,chooser,add</keywords>
+    </portlet-info>
+</portlet>
+<portlet id="PortletEntityBrowserPortlet">
+    <init-param>
+        <description>This parameter sets the template used in view mode.</description>
+        <name>ViewPage</name>
+            <value>/WEB-INF/view/pemp/browser_view.vm</value>
+     </init-param>
+    <portlet-name>PortletEntityBrowserPortlet</portlet-name>
+    <display-name>Portlet Entity Browser</display-name>
+    <description>Provides for browsing portlet enitites</description>
+    <portlet-class>org.apache.jetspeed.portlets.entityeditor.PortletEntityBrowserPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <portlet-info>
+      <title>Portlet Entity Browser</title>
+      <short-title>Portlet Entity Browser</short-title>
+      <keywords>applications,apps,entity,manager</keywords>
+    </portlet-info>
+  </portlet>
+  <portlet id="PortletEntityEditorPortlet">
+    <init-param>
+        <description>This parameter sets the template used in view mode.</description>
+        <name>ViewPage</name>
+            <value>/WEB-INF/view/pemp/editor_view.vm</value>
+     </init-param>
+    <portlet-name>PortletEntityEditorPortlet</portlet-name>
+    <display-name>Portlet Entity Browser</display-name>
+    <description>Provides for editing of portlet enitites</description>
+    <portlet-class>org.apache.jetspeed.portlets.entityeditor.PortletEntityEditorPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <portlet-info>
+      <title>Portlet Entity Editor</title>
+      <short-title>Portlet Entity Editor</short-title>
+      <keywords>applications,apps,entity,manager</keywords>
+    </portlet-info>
+  </portlet>
 </portlet-app>

Propchange: portals/jetspeed-2/trunk/applications/pam/src/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/core-build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/core-build.xml?rev=291615&r1=291614&r2=291615&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/core-build.xml (original)
+++ portals/jetspeed-2/trunk/core-build.xml Mon Sep 26 05:44:45 2005
@@ -1,315 +1,315 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-  $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
--->
-<project
-	xmlns="http://maven.apache.org"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/maven-v3_0_0.xsd">
-	
-	<extend>project-info.xml</extend>
-    <dependencies>
-		<!-- SUN APIs -->
-	    <dependency>      
-	      <id>portlet-api</id>
-	      <version>${portlet.api.version}</version>
-		  <properties>
-	        <war.bundle>false</war.bundle>
-	      </properties>
-	    </dependency>
-	    <dependency>
-	      <id>servletapi</id>
-	      <version>${servlet.api.version}</version>
-		  <properties>
-	        <war.bundle>false</war.bundle>
-	      </properties>
-	    </dependency>  
-	    <dependency>
-	       <id>jta</id>
-	       <jar>jta1.0.1.jar</jar>
-		   <!-- Your container may already have this as a shared dependency -->
-		   <properties>
-	         <war.bundle>${jta.include}</war.bundle>
-	       </properties>
-	    </dependency>
-		
-		<!-- Your container should already have this as a shared dependency -->
-		<dependency>
-			<id>jdbc-se</id>
-			<jar>jdbc-se2.0.jar</jar>
-		</dependency>
-		
-		<!-- Pluto Container -->
-		<dependency>
-		  <id>pluto</id>
-		  <version>${pluto.version}</version>
-		  <type>jar</type>
-		  <properties>
-		    <war.bundle>false</war.bundle>
-		  </properties>
-		</dependency>
-		
-		<!-- Apache OJB persistence framework -->
-	    <dependency>
-		   <id>ojb:db-ojb</id>
-	       <version>1.0.3</version>
-	       <properties>
-	    	 <war.bundle>true</war.bundle>
-	       </properties>
-	    </dependency>
-		
-
-        <!-- Spring Framework and dependencies -->
-	    <dependency>
-	      <id>springframework:spring</id>
-	      <version>${spring.version}</version>
-	      <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>   
-	    <dependency>
-	      <id>cglib</id>
-	      <version>full-2.0.2</version>
-	      <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-	    <dependency>
-	      <id>aopalliance</id>
-	      <version>1.0</version>
-	      <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-		
-		<!-- jakarta commons and other misc. jakarta projects -->
-		<dependency>
-			<id>lucene</id>
-			<version>1.4.1</version>
-			<properties>
-	          <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>log4j</id>
-			<version>${log4j.version}</version>
-			<properties>
-	          <war.bundle>${log4j.include}</war.bundle>
-	        </properties>
-		</dependency>
-	    <dependency>
-	      <id>oro</id>
-	      <version>2.0.7</version>
-	      <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-		<dependency>
-			<id>regexp</id>
-			<version>1.2</version>
-			<properties>
-	          <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-		  <id>commons-configuration</id>
-		  <version>1.0</version>
-		  <properties>
-		     <war.bundle>true</war.bundle>
-		  </properties>
-		</dependency>
-	    <dependency>
-	      <id>commons-lang</id>
-	      <version>2.0</version>
-		  <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-		<dependency>
-            <id>commons-logging</id>
-            <version>${commons.logging.version}</version>
-            <type>jar</type>
-            <properties>
-                <war.bundle>${commons.logging.include}</war.bundle>
-            </properties>
-        </dependency>
-		<dependency>
-           <id>commons-io</id>
-           <version>0.1</version>
-		   <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-        </dependency>
-		<dependency>
-          <id>commons-httpclient</id>
-          <version>2.0</version>
-		  <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-        </dependency>
-		<dependency>
-			<id>commons-fileupload</id>
-			<version>1.0</version>
-			<properties>
-	          <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-	    <dependency>
-	      <id>commons-beanutils</id>
-	      <version>1.6.1</version>
-		  <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>	
-	    <dependency>
-	      <id>commons-collections</id>
-	      <version>3.0</version>
-		  <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-	    <dependency>
-	      <id>commons-pool</id>
-	      <version>1.2</version>
-		  <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-	    <dependency>
-	      <id>commons-dbcp</id>
-	      <version>1.2.1</version>
-		  <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-		<dependency>
-			<id>commons-digester</id>
-			<version>1.5</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>commons-codec</id>
-			<version>1.3</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		
-		<!-- Unit testing -->
-	    <dependency>
-		  <id>jmock</id>
-		   <version>SNAPSHOT</version>
-		   <properties>
-		     <war.bundle>false</war.bundle>
-		   </properties>
-		</dependency>
-		<dependency>
-			<id>mockrunner</id>
-			<version>0.2.7</version>
-			<properties>
-	          <war.bundle>false</war.bundle>
-	        </properties>
-		</dependency>
-	    <dependency>
-	      <id>junit</id>
-	      <version>3.8.1</version>
-		  <properties>
-	        <war.bundle>false</war.bundle>
-	      </properties>
-	    </dependency>      
-	
-		<!--XML Apis and manipulation -->
-	    <dependency>
-	      <id>castor</id>
-	      <version>0.9.4.3</version>
-	      <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-	    <dependency>
-	      <id>xml-apis</id>
-	      <version>2.0.2</version>
-	      <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-	    <dependency>
-	      <id>xerces</id>
-	      <version>2.3.0</version>
-	      <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-		<dependency>
-			<id>xalan</id>
-			<version>2.4.1</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-            <groupId>jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>1.0</version>
-			<properties>
-	          <war.bundle>true</war.bundle>
-	        </properties>
-        </dependency>
-		<dependency>
-		 <groupId>saxpath</groupId>		
-		  <artifactId>saxpath</artifactId>
-		  <version>1.0-FCS</version>
-		  <properties>
-	          <war.bundle>true</war.bundle>
-	       </properties>
-		</dependency>
-		  <dependency>
-		  <id>jaxen</id>
-		  <version>1.0-FCS-full</version>
-		  <properties>
-			<war.bundle>true</war.bundle>
-		  </properties>
-		</dependency>
-	    <dependency>
-	      <id>nekohtml</id>
-	      <version>0.9.3</version>
-	      <properties>
-	        <war.bundle>true</war.bundle>
-	      </properties>
-	    </dependency>
-		
-		<!-- Runtime testing apis -->
-	    <dependency>
-	      <id>tyrex</id>
-	      <version>1.0.1</version>
-		  <properties>
-	        <war.bundle>false</war.bundle>
-	      </properties>
-	    </dependency>
-		
-		<!-- Not required if using other database -->
-		<dependency>
-           <id>hsqldb</id>
-           <version>1.7.1</version>
-		   <properties>
-	          <war.bundle>${hsql.include}</war.bundle>
-	       </properties>		 
-        </dependency>		
-	 </dependencies>	
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+  $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
+-->
+<project
+	xmlns="http://maven.apache.org"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/maven-v3_0_0.xsd">
+	
+	<extend>project-info.xml</extend>
+    <dependencies>
+		<!-- SUN APIs -->
+	    <dependency>      
+	      <id>portlet-api</id>
+	      <version>${portlet.api.version}</version>
+		  <properties>
+	        <war.bundle>false</war.bundle>
+	      </properties>
+	    </dependency>
+	    <dependency>
+	      <id>servletapi</id>
+	      <version>${servlet.api.version}</version>
+		  <properties>
+	        <war.bundle>false</war.bundle>
+	      </properties>
+	    </dependency>  
+	    <dependency>
+	       <id>jta</id>
+	       <jar>jta1.0.1.jar</jar>
+		   <!-- Your container may already have this as a shared dependency -->
+		   <properties>
+	         <war.bundle>${jta.include}</war.bundle>
+	       </properties>
+	    </dependency>
+		
+		<!-- Your container should already have this as a shared dependency -->
+		<dependency>
+			<id>jdbc-se</id>
+			<jar>jdbc-se2.0.jar</jar>
+		</dependency>
+		
+		<!-- Pluto Container -->
+		<dependency>
+		  <id>pluto</id>
+		  <version>${pluto.version}</version>
+		  <type>jar</type>
+		  <properties>
+		    <war.bundle>false</war.bundle>
+		  </properties>
+		</dependency>
+		
+		<!-- Apache OJB persistence framework -->
+	    <dependency>
+		   <id>ojb:db-ojb</id>
+	       <version>1.0.3</version>
+	       <properties>
+	    	 <war.bundle>true</war.bundle>
+	       </properties>
+	    </dependency>
+		
+
+        <!-- Spring Framework and dependencies -->
+	    <dependency>
+	      <id>springframework:spring</id>
+	      <version>${spring.version}</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>   
+	    <dependency>
+	      <id>cglib</id>
+	      <version>full-2.0.2</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+	    <dependency>
+	      <id>aopalliance</id>
+	      <version>1.0</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+		
+		<!-- jakarta commons and other misc. jakarta projects -->
+		<dependency>
+			<id>lucene</id>
+			<version>1.4.1</version>
+			<properties>
+	          <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>log4j</id>
+			<version>${log4j.version}</version>
+			<properties>
+	          <war.bundle>${log4j.include}</war.bundle>
+	        </properties>
+		</dependency>
+	    <dependency>
+	      <id>oro</id>
+	      <version>2.0.7</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+		<dependency>
+			<id>regexp</id>
+			<version>1.2</version>
+			<properties>
+	          <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+		  <id>commons-configuration</id>
+		  <version>1.0</version>
+		  <properties>
+		     <war.bundle>true</war.bundle>
+		  </properties>
+		</dependency>
+	    <dependency>
+	      <id>commons-lang</id>
+	      <version>2.0</version>
+		  <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+		<dependency>
+            <id>commons-logging</id>
+            <version>${commons.logging.version}</version>
+            <type>jar</type>
+            <properties>
+                <war.bundle>${commons.logging.include}</war.bundle>
+            </properties>
+        </dependency>
+		<dependency>
+           <id>commons-io</id>
+           <version>0.1</version>
+		   <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+        </dependency>
+		<dependency>
+          <id>commons-httpclient</id>
+          <version>2.0</version>
+		  <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+        </dependency>
+		<dependency>
+			<id>commons-fileupload</id>
+			<version>1.0</version>
+			<properties>
+	          <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+	    <dependency>
+	      <id>commons-beanutils</id>
+	      <version>1.6.1</version>
+		  <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>	
+	    <dependency>
+	      <id>commons-collections</id>
+	      <version>3.0</version>
+		  <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+	    <dependency>
+	      <id>commons-pool</id>
+	      <version>1.2</version>
+		  <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+	    <dependency>
+	      <id>commons-dbcp</id>
+	      <version>1.2.1</version>
+		  <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+		<dependency>
+			<id>commons-digester</id>
+			<version>1.5</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>commons-codec</id>
+			<version>1.3</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		
+		<!-- Unit testing -->
+	    <dependency>
+		  <id>jmock</id>
+		   <version>SNAPSHOT</version>
+		   <properties>
+		     <war.bundle>false</war.bundle>
+		   </properties>
+		</dependency>
+		<dependency>
+			<id>mockrunner</id>
+			<version>0.2.7</version>
+			<properties>
+	          <war.bundle>false</war.bundle>
+	        </properties>
+		</dependency>
+	    <dependency>
+	      <id>junit</id>
+	      <version>3.8.1</version>
+		  <properties>
+	        <war.bundle>false</war.bundle>
+	      </properties>
+	    </dependency>      
+	
+		<!--XML Apis and manipulation -->
+	    <dependency>
+	      <id>castor</id>
+	      <version>0.9.4.3</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+	    <dependency>
+	      <id>xml-apis</id>
+	      <version>2.0.2</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+	    <dependency>
+	      <id>xerces</id>
+	      <version>2.3.0</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+		<dependency>
+			<id>xalan</id>
+			<version>2.4.1</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+            <groupId>jdom</groupId>
+            <artifactId>jdom</artifactId>
+            <version>1.0</version>
+			<properties>
+	          <war.bundle>true</war.bundle>
+	        </properties>
+        </dependency>
+		<dependency>
+		 <groupId>saxpath</groupId>		
+		  <artifactId>saxpath</artifactId>
+		  <version>1.0-FCS</version>
+		  <properties>
+	          <war.bundle>true</war.bundle>
+	       </properties>
+		</dependency>
+		  <dependency>
+		  <id>jaxen</id>
+		  <version>1.0-FCS-full</version>
+		  <properties>
+			<war.bundle>true</war.bundle>
+		  </properties>
+		</dependency>
+	    <dependency>
+	      <id>nekohtml</id>
+	      <version>0.9.3</version>
+	      <properties>
+	        <war.bundle>true</war.bundle>
+	      </properties>
+	    </dependency>
+		
+		<!-- Runtime testing apis -->
+	    <dependency>
+	      <id>tyrex</id>
+	      <version>1.0.1</version>
+		  <properties>
+	        <war.bundle>false</war.bundle>
+	      </properties>
+	    </dependency>
+		
+		<!-- Not required if using other database -->
+		<dependency>
+           <id>hsqldb</id>
+           <version>1.7.1</version>
+		   <properties>
+	          <war.bundle>${hsql.include}</war.bundle>
+	       </properties>		 
+        </dependency>		
+	 </dependencies>	
 </project>

Propchange: portals/jetspeed-2/trunk/core-build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/jetspeed-components.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-components.xml?rev=291615&r1=291614&r2=291615&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-components.xml (original)
+++ portals/jetspeed-2/trunk/jetspeed-components.xml Mon Sep 26 05:44:45 2005
@@ -1,286 +1,286 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-  $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
--->
-<project>
-    <extend>core-build.xml</extend>
-	<dependencies>
-		<dependency>
-			<id>jetspeed-cm</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>content-server</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed-components</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed-deploy-tools</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed-rdbms</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed-prefs</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed-search</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed-security</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed-registry</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-id-generator</id>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-file-cache</id>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-api</id>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>false</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-commons</id>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>false</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-locator</id>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-capability</id>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-profiler</id>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-page-manager</id>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed-portal-site</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed2:jetspeed-portlet-factory</id>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed-sso</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>jetspeed-header-resource</id>
-			<groupId>jetspeed2</groupId>
-			<version>
-				${jetspeed.version}
-			</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-
-        <!-- taglib stuff -->
-		<dependency>
-			<id>jstl</id>
-			<version>1.0.6</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>taglibs:standard</id>
-			<version>1.0.6</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>taglibs:request</id>
-			<version>1.0.1</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		
-		<!-- Velocity dependencies -->
-		<dependency>
-			<id>velocity</id>
-			<version>1.4</version>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		<dependency>
-			<id>velocity-tools</id>
-			<version>1.1</version>
-			<url>http://jakarta.apache.org/velocity</url>
-			<properties>
-	           <war.bundle>true</war.bundle>
-	        </properties>
-		</dependency>
-		 
-        <!-- Portals Bridges Apis -->
-		<dependency>
-			<id>portals-bridges:portals-bridges-common</id>
-			<version>
-				${portals.bridges.common.version}
-			</version>
-			<properties>
-				<war.bundle>false</war.bundle>
-			</properties>
-		</dependency>
-		<dependency>
-			<id>portals-bridges-velocity</id>
-			<groupId>portals-bridges</groupId>
-			<version>
-				${portals.bridges.velocity.version}
-			</version>
-			<properties>
-				<war.bundle>true</war.bundle>
-			</properties>
-		</dependency>
-	</dependencies>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+  $Id: project.xml 189937 2005-06-10 10:51:53Z ate $
+-->
+<project>
+    <extend>core-build.xml</extend>
+	<dependencies>
+		<dependency>
+			<id>jetspeed-cm</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>content-server</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed-components</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed-deploy-tools</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed-rdbms</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed-prefs</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed-search</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed-security</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed-registry</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed2:jetspeed-id-generator</id>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed2:jetspeed-file-cache</id>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed2:jetspeed-api</id>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>false</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed2:jetspeed-commons</id>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>false</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed2:jetspeed-locator</id>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed2:jetspeed-capability</id>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed2:jetspeed-profiler</id>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed2:jetspeed-page-manager</id>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed-portal-site</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed2:jetspeed-portlet-factory</id>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed-sso</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>jetspeed-header-resource</id>
+			<groupId>jetspeed2</groupId>
+			<version>
+				${jetspeed.version}
+			</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+
+        <!-- taglib stuff -->
+		<dependency>
+			<id>jstl</id>
+			<version>1.0.6</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>taglibs:standard</id>
+			<version>1.0.6</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>taglibs:request</id>
+			<version>1.0.1</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		
+		<!-- Velocity dependencies -->
+		<dependency>
+			<id>velocity</id>
+			<version>1.4</version>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		<dependency>
+			<id>velocity-tools</id>
+			<version>1.1</version>
+			<url>http://jakarta.apache.org/velocity</url>
+			<properties>
+	           <war.bundle>true</war.bundle>
+	        </properties>
+		</dependency>
+		 
+        <!-- Portals Bridges Apis -->
+		<dependency>
+			<id>portals-bridges:portals-bridges-common</id>
+			<version>
+				${portals.bridges.common.version}
+			</version>
+			<properties>
+				<war.bundle>false</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<id>portals-bridges-velocity</id>
+			<groupId>portals-bridges</groupId>
+			<version>
+				${portals.bridges.velocity.version}
+			</version>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+	</dependencies>
+
+</project>

Propchange: portals/jetspeed-2/trunk/jetspeed-components.xml
------------------------------------------------------------------------------
    svn:eol-style = native



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