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/08/29 14:09:12 UTC

svn commit: r264121 [4/6] - in /portals/jetspeed-2/branches/SummersOfCode-2005: app-servers/security/jboss/ app-servers/security/jboss/src/java/META-INF/ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org...

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/deployment/deploy/security-app/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/deployment/deploy/security-app/WEB-INF/web.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/deployment/deploy/security-app/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/deployment/deploy/security-app/WEB-INF/web.xml Mon Aug 29 05:04:38 2005
@@ -1,31 +1,31 @@
-<?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.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-  <display-name>Jetspeed Container Application</display-name>
-  <description>MVC Servlet for Jetspeed Portlet Applications</description>
-
-
-  <!-- The Usual Welcome File List -->
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-
-
-
-</web-app>
+<?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.
+-->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+                         "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+  <display-name>Jetspeed Container Application</display-name>
+  <description>MVC Servlet for Jetspeed Portlet Applications</description>
+
+
+  <!-- The Usual Welcome File List -->
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+
+
+
+</web-app>

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/deployment/deploy/security-app/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/jetspeed-portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/jetspeed-portlet.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/jetspeed-portlet.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/jetspeed-portlet.xml Mon Aug 29 05:04:38 2005
@@ -1,97 +1,97 @@
-<?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="HW_App" 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>Title 1</dc:title>
-    <dc:title xml:lang="en">Eng Title</dc:title>
-    <dc:title xml:lang="fr">Fr Title</dc:title>
-    <dc:subject xml:lang="es">Título en español</dc:subject>
-    <dc:creator>Default Jeremy Ford</dc:creator>
-    <dc:coverage>Default Coverage</dc:coverage>
-    <dc:contributor>Default Contributor</dc:contributor>
-    <dc:description>Default Description</dc:description>
-    <dc:format>Default Format</dc:format>
-    <dc:identifer>Default Identifier</dc:identifer>
-    <dc:language>Default Language</dc:language>
-    <dc:publisher>Default Publisher</dc:publisher>
-    <dc:relation>Default Relation</dc:relation>
-    <dc:right>Default Right</dc:right>
-    <dc:source>Default Source</dc:source>
-    <dc:type>Default Type</dc:type>
-    <js:metadata name="my_metadata" xml:lang="en">English My_Metadata</js:metadata>
-        
-    <portlet>
-        <portlet-name>HelloWorld Portlet</portlet-name>
-        <dc:title>HelloWorldTitle</dc:title>
-        <dc:title xml:lang="en">HP Eng Title</dc:title>
-        <dc:title xml:lang="fr">HP Fr Title</dc:title>
-        <dc:title xml:lang="es">Título en español 'Hola, mundo'</dc:title>
-    </portlet>
-    
-    <portlet>
-        <portlet-name>Display the Portlet Request Information</portlet-name>
-        <dc:subject xml:lang="es">HP Spanish Subject</dc:subject>
-        <dc:subject xml:lang="es">HP Spanish Subject</dc:subject>
-        <dc:subject xml:lang="es">HP Spanish Subject</dc:subject>
-        <dc:subject xml:lang="es">HP Spanish Subject</dc:subject>
-        <dc:subject xml:lang="es">HP Spanish Subject</dc:subject>
-    </portlet>
-    
-    <portlet>
-        <portlet-name>PortletThatDoesNotExist</portlet-name>
-        <js:metadata name="field1" xml:lang="en">Value 1</js:metadata>
-        <js:metadata name="field1" xml:lang="en">Value 2</js:metadata>
-        <js:metadata name="field1" xml:lang="en">Value 3</js:metadata>
-        <js:metadata name="field2" xml:lang="en">Value 1</js:metadata>
-        <js:metadata name="field2" xml:lang="en">Value 2</js:metadata>
-    </portlet>
-    
-    <portlet>
-        <portlet-name>Pick a number game</portlet-name>
-        <dc:creator>Scott</dc:creator>
-        <dc:creator>DST</dc:creator>
-        <dc:creator>DLS</dc:creator>
-        <dc:creator>Jeremy</dc:creator>
-    </portlet>
-    
-    <portlet>
-        <portlet-name>Attribute Scope Demo</portlet-name>
-        <js:metadata name="field1" xml:lang="en">Value 1</js:metadata>
-        <js:metadata name="field1" xml:lang="en">Value 2</js:metadata>
-        <js:metadata name="field1" xml:lang="en">Value 3</js:metadata>
-        <js:metadata name="field2" xml:lang="en">Value 1</js:metadata>
-        <js:metadata name="field2" xml:lang="en">Value 2</js:metadata>
-    </portlet>
-    
-    <js:user-attribute-ref>
-		<js:name>user-name-given</js:name>
-		<js:name-link>user.name.given</js:name-link>
-  	</js:user-attribute-ref>
-  	<js:user-attribute-ref>
-		<js:name>user-name-family</js:name>
-		<js:name-link>user.name.family</js:name-link>
-  	</js:user-attribute-ref>
-
-    <js:services>
-    	<js:service name='PortletRegistryComponent' />
-    	<js:service name='PortletEntityAccessComponent'/>		
-    </js:services>
-
-</portlet-app>
+<?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="HW_App" 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>Title 1</dc:title>
+    <dc:title xml:lang="en">Eng Title</dc:title>
+    <dc:title xml:lang="fr">Fr Title</dc:title>
+    <dc:subject xml:lang="es">Título en español</dc:subject>
+    <dc:creator>Default Jeremy Ford</dc:creator>
+    <dc:coverage>Default Coverage</dc:coverage>
+    <dc:contributor>Default Contributor</dc:contributor>
+    <dc:description>Default Description</dc:description>
+    <dc:format>Default Format</dc:format>
+    <dc:identifer>Default Identifier</dc:identifer>
+    <dc:language>Default Language</dc:language>
+    <dc:publisher>Default Publisher</dc:publisher>
+    <dc:relation>Default Relation</dc:relation>
+    <dc:right>Default Right</dc:right>
+    <dc:source>Default Source</dc:source>
+    <dc:type>Default Type</dc:type>
+    <js:metadata name="my_metadata" xml:lang="en">English My_Metadata</js:metadata>
+        
+    <portlet>
+        <portlet-name>HelloWorld Portlet</portlet-name>
+        <dc:title>HelloWorldTitle</dc:title>
+        <dc:title xml:lang="en">HP Eng Title</dc:title>
+        <dc:title xml:lang="fr">HP Fr Title</dc:title>
+        <dc:title xml:lang="es">Título en español 'Hola, mundo'</dc:title>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>Display the Portlet Request Information</portlet-name>
+        <dc:subject xml:lang="es">HP Spanish Subject</dc:subject>
+        <dc:subject xml:lang="es">HP Spanish Subject</dc:subject>
+        <dc:subject xml:lang="es">HP Spanish Subject</dc:subject>
+        <dc:subject xml:lang="es">HP Spanish Subject</dc:subject>
+        <dc:subject xml:lang="es">HP Spanish Subject</dc:subject>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>PortletThatDoesNotExist</portlet-name>
+        <js:metadata name="field1" xml:lang="en">Value 1</js:metadata>
+        <js:metadata name="field1" xml:lang="en">Value 2</js:metadata>
+        <js:metadata name="field1" xml:lang="en">Value 3</js:metadata>
+        <js:metadata name="field2" xml:lang="en">Value 1</js:metadata>
+        <js:metadata name="field2" xml:lang="en">Value 2</js:metadata>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>Pick a number game</portlet-name>
+        <dc:creator>Scott</dc:creator>
+        <dc:creator>DST</dc:creator>
+        <dc:creator>DLS</dc:creator>
+        <dc:creator>Jeremy</dc:creator>
+    </portlet>
+    
+    <portlet>
+        <portlet-name>Attribute Scope Demo</portlet-name>
+        <js:metadata name="field1" xml:lang="en">Value 1</js:metadata>
+        <js:metadata name="field1" xml:lang="en">Value 2</js:metadata>
+        <js:metadata name="field1" xml:lang="en">Value 3</js:metadata>
+        <js:metadata name="field2" xml:lang="en">Value 1</js:metadata>
+        <js:metadata name="field2" xml:lang="en">Value 2</js:metadata>
+    </portlet>
+    
+    <js:user-attribute-ref>
+		<js:name>user-name-given</js:name>
+		<js:name-link>user.name.given</js:name-link>
+  	</js:user-attribute-ref>
+  	<js:user-attribute-ref>
+		<js:name>user-name-family</js:name>
+		<js:name-link>user.name.family</js:name-link>
+  	</js:user-attribute-ref>
+
+    <js:services>
+    	<js:service name='PortletRegistryComponent' />
+    	<js:service name='PortletEntityAccessComponent'/>		
+    </js:services>
+
+</portlet-app>

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/jetspeed-portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/layout-portlets/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/layout-portlets/portlet.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/layout-portlets/portlet.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/layout-portlets/portlet.xml Mon Aug 29 05:04:38 2005
@@ -1,77 +1,77 @@
-<?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="jetspeed" version="1.0">
-    <portlet id="TwoColumns">
-    <portlet-name>TwoColumns</portlet-name>
-    <display-name>Two Columns Layout</display-name>
-    <init-param>
-      <name>ViewPage</name>
-      <value>/WEB-INF/layout/columns.jsp</value>
-    </init-param>
-    <init-param>
-      <name>columns</name>
-      <value>2</value>
-    </init-param>
-    <init-param>
-      <name>sizes</name>
-      <value>50%,50%</value>
-    </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>TwoColumns</title>
-      <short-title>TwoColumns</short-title>
-    </portlet-info>
-</portlet>
-
-<portlet id="VelocityTwoColumns">
-    <portlet-name>VelocityTwoColumns</portlet-name>
-    <display-name>Two Columns Layout Using Velocity</display-name>
-    <init-param>
-      <name>ViewPage</name>
-      <value>columns</value>
-    </init-param>
-    <init-param>
-      <name>MaxPage</name>
-      <value>maximized</value>
-    </init-param>
-    <init-param>
-      <name>columns</name>
-      <value>2</value>
-    </init-param>
-    <init-param>
-      <name>sizes</name>
-      <value>50%,50%</value>
-    </init-param>
-    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>VelocityTwoColumns</title>
-      <short-title>TwoColumns</short-title>
-    </portlet-info>
-</portlet>
-
-</portlet-app>
-
+<?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="jetspeed" version="1.0">
+    <portlet id="TwoColumns">
+    <portlet-name>TwoColumns</portlet-name>
+    <display-name>Two Columns Layout</display-name>
+    <init-param>
+      <name>ViewPage</name>
+      <value>/WEB-INF/layout/columns.jsp</value>
+    </init-param>
+    <init-param>
+      <name>columns</name>
+      <value>2</value>
+    </init-param>
+    <init-param>
+      <name>sizes</name>
+      <value>50%,50%</value>
+    </init-param>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>TwoColumns</title>
+      <short-title>TwoColumns</short-title>
+    </portlet-info>
+</portlet>
+
+<portlet id="VelocityTwoColumns">
+    <portlet-name>VelocityTwoColumns</portlet-name>
+    <display-name>Two Columns Layout Using Velocity</display-name>
+    <init-param>
+      <name>ViewPage</name>
+      <value>columns</value>
+    </init-param>
+    <init-param>
+      <name>MaxPage</name>
+      <value>maximized</value>
+    </init-param>
+    <init-param>
+      <name>columns</name>
+      <value>2</value>
+    </init-param>
+    <init-param>
+      <name>sizes</name>
+      <value>50%,50%</value>
+    </init-param>
+    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>VelocityTwoColumns</title>
+      <short-title>TwoColumns</short-title>
+    </portlet-info>
+</portlet>
+
+</portlet-app>
+

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/layout-portlets/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/portlet2.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/portlet2.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/portlet2.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/portlet2.xml Mon Aug 29 05:04:38 2005
@@ -1,213 +1,213 @@
-<?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="HW_App" version="1.0">
-  <portlet id="HelloPortlet">
-    <init-param>
-			<description>test init param</description>
-			<name>hello</name>
-			<value>Hello Portlet</value>
-     </init-param>   
-    <portlet-name>HelloPortlet</portlet-name>
-    <display-name>HelloWorld Portlet Wrapper</display-name>
-    <description>This is the hello world of portlets, it doesn't do much</description>
-    <portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</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>HelloWorldTitle</title>
-      <short-title>This is the short title</short-title>
-      <keywords>Test</keywords>
-    </portlet-info>
-  </portlet>
-  
-   <portlet id="JMXPortlet">
-      
-    <portlet-name>JMXPortlet</portlet-name>
-    <display-name>JMX Registry Access portlet</display-name>
-    <portlet-class>org.apache.jetspeed.demo.jmx.JMXPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>JMX Portal Console</title>
-      <short-title>JMX Portlet Console</short-title>
-      <keywords>JMX</keywords>
-    </portlet-info>
-  </portlet>
-  
-  <portlet id="PreferencePortlet">      
-    <portlet-name>PreferencePortlet</portlet-name>
-    <display-name>PreferencePortlet</display-name>
-    <portlet-class>org.apache.jetspeed.demo.preferences.PreferencePortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>Preference Test</title>
-      <short-title>Preference Test</short-title>
-      <keywords>Preferences</keywords>
-    </portlet-info>
-    <portlet-preferences>
-    	 <preference>
-    	 	 <name>pref1</name>
-    	 	 <value>Hello</value>
-    	 	 <value>Hello2</value>
-    	  </preference>
-    </portlet-preferences>
-  </portlet>
- 
-  <portlet id="DisplayRequestPortlet">
-    <init-param> 
-	    <name>HelpPage</name>
-	    <value>/WEB-INF/demo/simple/DisplayRequestHelp.jsp</value>
-    </init-param> 
-    <init-param> 
-	    <name>ViewPage</name>
-  	  <value>/WEB-INF/demo/simple/DisplayRequest.jsp</value>
-    </init-param> 
-    <portlet-name>DisplayRequestPortlet</portlet-name>
-    <display-name>DisplayRequest Portlet Wrapper</display-name>
-    <portlet-class>org.apache.jetspeed.portlet.ServletPortlet</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>Display the Portlet Request Information</title>
-      <short-title>Portlet Request Information</short-title>
-    </portlet-info>
-  </portlet>
- 
-  <portlet id="PickANumberPortlet">
-    <portlet-name>PickANumberPortlet</portlet-name>
-    <display-name>Pick a number game</display-name>
-    <portlet-class>org.apache.jetspeed.demo.simple.PickANumberServlet</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>Pick a Number</title>
-    </portlet-info>
-  </portlet>
-  
-  <portlet id="AttributeScopePortlet">
-    <portlet-name>AttributeScopePortlet</portlet-name>
-    <display-name>Attribute Scope Demo</display-name>
-    <portlet-class>org.apache.jetspeed.demo.simple.AttributeScopeServlet</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>Attribute Scope Demo Portlet</title>
-    </portlet-info>
-  </portlet>
-
-  <portlet id="CustomerList">
-    <init-param> 
-	  <name>ViewPage</name>
-  	  <value>/WEB-INF/demo/customerInfo/Page1.jsp</value>
-    </init-param> 
-    <portlet-name>CustomerList</portlet-name>
-    <display-name>Customer List</display-name>
-    <portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>Customer List</title>
-      <short-title>Customer List</short-title>
-    </portlet-info>
-  </portlet>
-
-  <portlet id="CustomerInfo">
-    <init-param> 
-	  <name>ViewPage</name>
-  	  <value>/WEB-INF/demo/customerInfo/Page2.jsp</value>
-    </init-param> 
-    <portlet-name>CustomerInfo</portlet-name>
-    <display-name>Customer Information</display-name>
-    <portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>Customer Information</title>
-      <short-title>Customer Info</short-title>
-    </portlet-info>
-  </portlet>
-
-  <portlet id="CustomerDetail">
-    <init-param> 
-	  <name>ViewPage</name>
-  	  <value>/WEB-INF/demo/customerInfo/Page3.jsp</value>
-    </init-param> 
-    <portlet-name>CustomerDetail</portlet-name>
-    <display-name>Customer Detail</display-name>
-    <portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <portlet-info>
-      <title>Customer Detail</title>
-      <short-title>Customer Detail</short-title>
-    </portlet-info>
-  </portlet>
-
-  <portlet id="LoginPortlet">
-    <init-param> 
-	    <name>ViewPage</name>
-  	  <value>/WEB-INF/demo/simple/Login.jsp</value>
-    </init-param> 
-    <portlet-name>LoginPortlet</portlet-name>
-    <display-name>LoginRequest Portlet Wrapper</display-name>
-    <portlet-class>org.apache.jetspeed.portlet.ServletPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-   </supports>
-    <portlet-info>
-      <title>Login/Logout  Request Information</title>
-      <short-title>Portlet Request Information</short-title>
-    </portlet-info>
-  </portlet>
-
-</portlet-app>
-
+<?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="HW_App" version="1.0">
+  <portlet id="HelloPortlet">
+    <init-param>
+			<description>test init param</description>
+			<name>hello</name>
+			<value>Hello Portlet</value>
+     </init-param>   
+    <portlet-name>HelloPortlet</portlet-name>
+    <display-name>HelloWorld Portlet Wrapper</display-name>
+    <description>This is the hello world of portlets, it doesn't do much</description>
+    <portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</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>HelloWorldTitle</title>
+      <short-title>This is the short title</short-title>
+      <keywords>Test</keywords>
+    </portlet-info>
+  </portlet>
+  
+   <portlet id="JMXPortlet">
+      
+    <portlet-name>JMXPortlet</portlet-name>
+    <display-name>JMX Registry Access portlet</display-name>
+    <portlet-class>org.apache.jetspeed.demo.jmx.JMXPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>JMX Portal Console</title>
+      <short-title>JMX Portlet Console</short-title>
+      <keywords>JMX</keywords>
+    </portlet-info>
+  </portlet>
+  
+  <portlet id="PreferencePortlet">      
+    <portlet-name>PreferencePortlet</portlet-name>
+    <display-name>PreferencePortlet</display-name>
+    <portlet-class>org.apache.jetspeed.demo.preferences.PreferencePortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>Preference Test</title>
+      <short-title>Preference Test</short-title>
+      <keywords>Preferences</keywords>
+    </portlet-info>
+    <portlet-preferences>
+    	 <preference>
+    	 	 <name>pref1</name>
+    	 	 <value>Hello</value>
+    	 	 <value>Hello2</value>
+    	  </preference>
+    </portlet-preferences>
+  </portlet>
+ 
+  <portlet id="DisplayRequestPortlet">
+    <init-param> 
+	    <name>HelpPage</name>
+	    <value>/WEB-INF/demo/simple/DisplayRequestHelp.jsp</value>
+    </init-param> 
+    <init-param> 
+	    <name>ViewPage</name>
+  	  <value>/WEB-INF/demo/simple/DisplayRequest.jsp</value>
+    </init-param> 
+    <portlet-name>DisplayRequestPortlet</portlet-name>
+    <display-name>DisplayRequest Portlet Wrapper</display-name>
+    <portlet-class>org.apache.jetspeed.portlet.ServletPortlet</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>Display the Portlet Request Information</title>
+      <short-title>Portlet Request Information</short-title>
+    </portlet-info>
+  </portlet>
+ 
+  <portlet id="PickANumberPortlet">
+    <portlet-name>PickANumberPortlet</portlet-name>
+    <display-name>Pick a number game</display-name>
+    <portlet-class>org.apache.jetspeed.demo.simple.PickANumberServlet</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>Pick a Number</title>
+    </portlet-info>
+  </portlet>
+  
+  <portlet id="AttributeScopePortlet">
+    <portlet-name>AttributeScopePortlet</portlet-name>
+    <display-name>Attribute Scope Demo</display-name>
+    <portlet-class>org.apache.jetspeed.demo.simple.AttributeScopeServlet</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>Attribute Scope Demo Portlet</title>
+    </portlet-info>
+  </portlet>
+
+  <portlet id="CustomerList">
+    <init-param> 
+	  <name>ViewPage</name>
+  	  <value>/WEB-INF/demo/customerInfo/Page1.jsp</value>
+    </init-param> 
+    <portlet-name>CustomerList</portlet-name>
+    <display-name>Customer List</display-name>
+    <portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>Customer List</title>
+      <short-title>Customer List</short-title>
+    </portlet-info>
+  </portlet>
+
+  <portlet id="CustomerInfo">
+    <init-param> 
+	  <name>ViewPage</name>
+  	  <value>/WEB-INF/demo/customerInfo/Page2.jsp</value>
+    </init-param> 
+    <portlet-name>CustomerInfo</portlet-name>
+    <display-name>Customer Information</display-name>
+    <portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>Customer Information</title>
+      <short-title>Customer Info</short-title>
+    </portlet-info>
+  </portlet>
+
+  <portlet id="CustomerDetail">
+    <init-param> 
+	  <name>ViewPage</name>
+  	  <value>/WEB-INF/demo/customerInfo/Page3.jsp</value>
+    </init-param> 
+    <portlet-name>CustomerDetail</portlet-name>
+    <display-name>Customer Detail</display-name>
+    <portlet-class>org.apache.jetspeed.demo.customerInfo.CustomerPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <portlet-info>
+      <title>Customer Detail</title>
+      <short-title>Customer Detail</short-title>
+    </portlet-info>
+  </portlet>
+
+  <portlet id="LoginPortlet">
+    <init-param> 
+	    <name>ViewPage</name>
+  	  <value>/WEB-INF/demo/simple/Login.jsp</value>
+    </init-param> 
+    <portlet-name>LoginPortlet</portlet-name>
+    <display-name>LoginRequest Portlet Wrapper</display-name>
+    <portlet-class>org.apache.jetspeed.portlet.ServletPortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+   </supports>
+    <portlet-info>
+      <title>Login/Logout  Request Information</title>
+      <short-title>Portlet Request Information</short-title>
+    </portlet-info>
+  </portlet>
+
+</portlet-app>
+

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/portlet2.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/security-roles/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/security-roles/portlet.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/security-roles/portlet.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/security-roles/portlet.xml Mon Aug 29 05:04:38 2005
@@ -1,61 +1,61 @@
-<?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="TestSecurityRoles" version="1.0">
- <portlet id="TestPortlet">
-    <portlet-name>TestPortlet</portlet-name>
-    <portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
-    <display-name xml:lang="en">HelloWorld Portlet Wrapper</display-name>
-    <description xml:lang="en">This is a desciption of the HelloWorld portlet</description>
-    <expiration-cache>-1</expiration-cache>
-    <supports id="Minimal support">
-      <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>HelloWorldTitle</title>
-      <short-title>This is the short title</short-title>
-      <keywords>Test,David</keywords>
-    </portlet-info>
-    <portlet-preferences>
-      <preference>
-        <name>time-server</name>
-        <value>http://timeserver.myco.com</value>
-        <value>http://timeserver.foo.com</value>
-        <read-only>false</read-only>
-      </preference>
-      <preference>
-        <name>port</name>
-        <value>404</value>
-        <read-only>true</read-only>
-      </preference>
-    </portlet-preferences>
-    <security-role-ref>
-        <description xml:lang="en">This is the admin role</description>
-        <role-name>admin</role-name>
-        <role-link>users.admin</role-link>
-    </security-role-ref>
-    <security-role-ref>
-        <description xml:lang="en">This is the manager role</description>
-        <role-name>users.manager</role-name>
-    </security-role-ref>
-  </portlet>
-
- </portlet-app>
-
-
+<?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="TestSecurityRoles" version="1.0">
+ <portlet id="TestPortlet">
+    <portlet-name>TestPortlet</portlet-name>
+    <portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
+    <display-name xml:lang="en">HelloWorld Portlet Wrapper</display-name>
+    <description xml:lang="en">This is a desciption of the HelloWorld portlet</description>
+    <expiration-cache>-1</expiration-cache>
+    <supports id="Minimal support">
+      <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>HelloWorldTitle</title>
+      <short-title>This is the short title</short-title>
+      <keywords>Test,David</keywords>
+    </portlet-info>
+    <portlet-preferences>
+      <preference>
+        <name>time-server</name>
+        <value>http://timeserver.myco.com</value>
+        <value>http://timeserver.foo.com</value>
+        <read-only>false</read-only>
+      </preference>
+      <preference>
+        <name>port</name>
+        <value>404</value>
+        <read-only>true</read-only>
+      </preference>
+    </portlet-preferences>
+    <security-role-ref>
+        <description xml:lang="en">This is the admin role</description>
+        <role-name>admin</role-name>
+        <role-link>users.admin</role-link>
+    </security-role-ref>
+    <security-role-ref>
+        <description xml:lang="en">This is the manager role</description>
+        <role-name>users.manager</role-name>
+    </security-role-ref>
+  </portlet>
+
+ </portlet-app>
+
+

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/security-roles/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/security-roles/web.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/security-roles/web.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/security-roles/web.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/security-roles/web.xml Mon Aug 29 05:04:38 2005
@@ -1,59 +1,59 @@
-<?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.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-                         "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-<web-app>
-  <display-name>Jetspeed Container Application</display-name>
-  <description>MVC Servlet for Jetspeed Portlet Applications</description>
-  <servlet>
-    <servlet-name>JetspeedContainer</servlet-name>
-    <display-name>Jetspeed Container</display-name>
-    <description>MVC Servlet for Jetspeed Portlet Applications</description>
-    <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-       <servlet-name>
-          JetspeedContainer
-       </servlet-name>
-       <url-pattern>
-         /portal/*
-       </url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-       <servlet-name>
-          JetspeedContainer
-       </servlet-name>
-       <url-pattern>
-         /container/*
-       </url-pattern>
-    </servlet-mapping>
-
-  <!-- The Usual Welcome File List -->
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-
-  <!-- Security roles used by this web application -->
-  <security-role>
-    <description>
-      The users.admin role
-    </description>
-    <role-name>users.admin</role-name>
-  </security-role>
-
-</web-app>
+<?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.
+-->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
+                         "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
+<web-app>
+  <display-name>Jetspeed Container Application</display-name>
+  <description>MVC Servlet for Jetspeed Portlet Applications</description>
+  <servlet>
+    <servlet-name>JetspeedContainer</servlet-name>
+    <display-name>Jetspeed Container</display-name>
+    <description>MVC Servlet for Jetspeed Portlet Applications</description>
+    <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+       <servlet-name>
+          JetspeedContainer
+       </servlet-name>
+       <url-pattern>
+         /portal/*
+       </url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+       <servlet-name>
+          JetspeedContainer
+       </servlet-name>
+       <url-pattern>
+         /container/*
+       </url-pattern>
+    </servlet-mapping>
+
+  <!-- The Usual Welcome File List -->
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+
+  <!-- Security roles used by this web application -->
+  <security-role>
+    <description>
+      The users.admin role
+    </description>
+    <role-name>users.admin</role-name>
+  </security-role>
+
+</web-app>

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/security-roles/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/web.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/web.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/web.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/web.xml Mon Aug 29 05:04:38 2005
@@ -1,51 +1,51 @@
-<?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.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-                         "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
-<web-app>
-  <display-name>Jetspeed Container Application</display-name>
-  <description>MVC Servlet for Jetspeed Portlet Applications</description>
-  <servlet>
-    <servlet-name>JetspeedContainer</servlet-name>
-    <display-name>Jetspeed Container</display-name>
-    <description>MVC Servlet for Jetspeed Portlet Applications</description>
-    <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-       <servlet-name>
-          JetspeedContainer
-       </servlet-name>
-       <url-pattern>
-         /portal/*
-       </url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-       <servlet-name>
-          JetspeedContainer
-       </servlet-name>
-       <url-pattern>
-         /container/*
-       </url-pattern>
-    </servlet-mapping>    
-
-  <!-- The Usual Welcome File List -->
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
+<?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.
+-->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
+                         "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
+<web-app>
+  <display-name>Jetspeed Container Application</display-name>
+  <description>MVC Servlet for Jetspeed Portlet Applications</description>
+  <servlet>
+    <servlet-name>JetspeedContainer</servlet-name>
+    <display-name>Jetspeed Container</display-name>
+    <description>MVC Servlet for Jetspeed Portlet Applications</description>
+    <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+       <servlet-name>
+          JetspeedContainer
+       </servlet-name>
+       <url-pattern>
+         /portal/*
+       </url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+       <servlet-name>
+          JetspeedContainer
+       </servlet-name>
+       <url-pattern>
+         /container/*
+       </url-pattern>
+    </servlet-mapping>    
+
+  <!-- The Usual Welcome File List -->
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+
+</web-app>

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/webapp/WEB-INF/portlet.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/webapp/WEB-INF/portlet.xml Mon Aug 29 05:04:38 2005
@@ -1,61 +1,61 @@
-<?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="TestSecurityRoles" version="1.0">
- <portlet id="TestPortlet">
-    <portlet-name>TestPortlet</portlet-name>
-    <portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
-    <display-name xml:lang="en">HelloWorld Portlet Wrapper</display-name>
-    <description xml:lang="en">This is a desciption of the HelloWorld portlet</description>
-    <expiration-cache>-1</expiration-cache>
-    <supports id="Minimal support">
-      <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>HelloWorldTitle</title>
-      <short-title>This is the short title</short-title>
-      <keywords>Test,David</keywords>
-    </portlet-info>
-    <portlet-preferences>
-      <preference>
-        <name>time-server</name>
-        <value>http://timeserver.myco.com</value>
-        <value>http://timeserver.foo.com</value>
-        <read-only>false</read-only>
-      </preference>
-      <preference>
-        <name>port</name>
-        <value>404</value>
-        <read-only>true</read-only>
-      </preference>
-    </portlet-preferences>
-    <security-role-ref>
-        <description xml:lang="en">This is the admin role</description>
-        <role-name>admin</role-name>
-        <role-link>users.admin</role-link>
-    </security-role-ref>
-    <security-role-ref>
-        <description xml:lang="en">This is the manager role</description>
-        <role-name>users.manager</role-name>
-    </security-role-ref>
-  </portlet>
-
- </portlet-app>
-
-
+<?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="TestSecurityRoles" version="1.0">
+ <portlet id="TestPortlet">
+    <portlet-name>TestPortlet</portlet-name>
+    <portlet-class>org.apache.jetspeed.portlet.helloworld.HelloWorld</portlet-class>
+    <display-name xml:lang="en">HelloWorld Portlet Wrapper</display-name>
+    <description xml:lang="en">This is a desciption of the HelloWorld portlet</description>
+    <expiration-cache>-1</expiration-cache>
+    <supports id="Minimal support">
+      <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>HelloWorldTitle</title>
+      <short-title>This is the short title</short-title>
+      <keywords>Test,David</keywords>
+    </portlet-info>
+    <portlet-preferences>
+      <preference>
+        <name>time-server</name>
+        <value>http://timeserver.myco.com</value>
+        <value>http://timeserver.foo.com</value>
+        <read-only>false</read-only>
+      </preference>
+      <preference>
+        <name>port</name>
+        <value>404</value>
+        <read-only>true</read-only>
+      </preference>
+    </portlet-preferences>
+    <security-role-ref>
+        <description xml:lang="en">This is the admin role</description>
+        <role-name>admin</role-name>
+        <role-link>users.admin</role-link>
+    </security-role-ref>
+    <security-role-ref>
+        <description xml:lang="en">This is the manager role</description>
+        <role-name>users.manager</role-name>
+    </security-role-ref>
+  </portlet>
+
+ </portlet-app>
+
+

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/webapp/WEB-INF/web.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/webapp/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/webapp/WEB-INF/web.xml Mon Aug 29 05:04:38 2005
@@ -1,37 +1,37 @@
-<?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.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-  <display-name>Jetspeed Container Application</display-name>
-  <description>MVC Servlet for Jetspeed Portlet Applications</description>
-
-
-  <!-- The Usual Welcome File List -->
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-
-  <!-- Security roles used by this web application -->
-  <security-role>
-    <description>
-      The users.admin role
-    </description>
-    <role-name>users.admin</role-name>
-  </security-role>
-
-</web-app>
+<?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.
+-->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+                         "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+  <display-name>Jetspeed Container Application</display-name>
+  <description>MVC Servlet for Jetspeed Portlet Applications</description>
+
+
+  <!-- The Usual Welcome File List -->
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+
+  <!-- Security roles used by this web application -->
+  <security-role>
+    <description>
+      The users.admin role
+    </description>
+    <role-name>users.admin</role-name>
+  </security-role>
+
+</web-app>

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/test/testdata/deploy/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/xdocs/navigation.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/xdocs/navigation.xml Mon Aug 29 05:04:38 2005
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    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.
--->
-<project>
-    <body>
-        <links>
-            <item name="Jetspeed 2" href="../../index.html" />
-            <!-- Cannot access ${pom.id}... Hard coding pdf name. -->
-            <item name="PDF Documentation" href="/jetspeed-portal.pdf" img="../../images/pdf.gif" />
-        </links>
-    </body>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+<project>
+    <body>
+        <links>
+            <item name="Jetspeed 2" href="../../index.html" />
+            <!-- Cannot access ${pom.id}... Hard coding pdf name. -->
+            <item name="PDF Documentation" href="/jetspeed-portal.pdf" img="../../images/pdf.gif" />
+        </links>
+    </body>
+</project>

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/portal/xdocs/navigation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/prefs/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/prefs/xdocs/index.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/prefs/xdocs/index.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/prefs/xdocs/index.xml Mon Aug 29 05:04:38 2005
@@ -1,115 +1,115 @@
-<?xml version="1.0" ?>
-<!--
-    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.
--->
-<document>
-    <properties>
-        <title>Jetspeed 2 Preferences</title>
-    </properties>
-    <body>
-        <section name="Preferences Overview">
-            <p>
-                The
-                <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/prefs/Preferences.html">java.util.prefs.Preferences API</a>
-                provides a generic mechanism for storing user and system preferences, as well as configuration data. Jetspeed 2 relies on this API to provide a
-                wide ranging of functionality to higher level services. Some of the Jetspeed components leveraging the
-                <code>java.util.prefs.Preferences</code>
-                API are:
-                <ul>
-                    <li>
-                        Portlet Preferences: Portlet preferences are stored in the system preferences tree. The following path structure is used to establish
-                        the location of a given portlet preference in the preferences tree:
-                        <code>/portlet_application/${Portlet Application Name}/portlets/${Portlet Name}/preferences/${Preference Name}/values</code>
-                        . The preferences values are stored under the
-                        <code>values</code>
-                        node as a map of key/values.
-                    </li>
-                    <li>
-                        User Attributes: User attributes are stored in the user preferences tree as follow. The following path structure is used to stored a
-                        user's attributes:
-                        <code>/user/${User Name}/userinfo</code>
-                        . The user attributes are stored as a preferences key/values map under the userinfo node.
-                    </li>
-                    <li>
-                        Roles and groups hierarchy: Documentation on how roles and groups hierarchy use the
-                        <code>Preferences</code>
-                        model can be found in the
-                        <a href="/multiproject/jetspeed-security/hierarchy.html#Leveraging_Preferences_to_Manage_Hierarchies">security section</a>
-                        of the documentation.
-                    </li>
-                </ul>
-            </p>
-        </section>
-        <section name="Preferences Implementation Overview">
-            <p>
-                Jetspeed 2
-                <code>Preferences</code>
-                implementation leverages the following classes:
-            </p>
-            <p>
-                <img src="images/preferences-c.gif" border="0" />
-            </p>
-            <table>
-                <tr>
-                    <th>Class</th>
-                    <th>Description</th>
-                </tr>
-                <tr>
-                    <td>
-                        <code>PreferencesFactoryImpl</code>
-                    </td>
-                    <td>
-                        Implements the <code>java.util.prefs.PreferencesFactory</code> that generates 
-                        <code>Preferences</code> objects.  The <code>PreferencesFactoryImpl</code> is 
-                        configured through spring assembly (<code>prefs.xml</code>) to use a 
-                        <code>PreferencesProvider</code> that encapsalutes the backing store implementation.
-
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <code>PreferencesImpl</code>
-                    </td>
-                    <td>
-                        Extends the <code>java.util.prefs.AbstractPreferences</code> and implements the SPI by
-                        leveraging the <code>PreferencesProvider</code> API.  Jetspeed <code>Preferences</code>
-                        implementation can be configured to validate that preferences map key/values are created
-                        for predefined keys.  A <code>PropertyManager</code> enforces the checks if enabled.
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <code>PreferencesProvider</code>
-                    </td>
-                    <td>
-                        Encapsulates the preferences implementation again a specific backing store.  In Jetspeed 2, the
-                        default implementation is provided by 
-                        <code>org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider</code>
-                    </td>
-                </tr>
-            </table>
-            <subsection name="Preferences Database Schema">
-                <p>
-                    The following database schema is being used in Jetspeed 2 to store <code>Preferences</code> 
-                    in a relational database model.
-                </p>
-                <p>
-                    <img src="images/preferences-schema.gif" border="0"/>
-                </p>
-            </subsection>    
-        </section>
-    </body>
-</document>
-
+<?xml version="1.0" ?>
+<!--
+    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.
+-->
+<document>
+    <properties>
+        <title>Jetspeed 2 Preferences</title>
+    </properties>
+    <body>
+        <section name="Preferences Overview">
+            <p>
+                The
+                <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/prefs/Preferences.html">java.util.prefs.Preferences API</a>
+                provides a generic mechanism for storing user and system preferences, as well as configuration data. Jetspeed 2 relies on this API to provide a
+                wide ranging of functionality to higher level services. Some of the Jetspeed components leveraging the
+                <code>java.util.prefs.Preferences</code>
+                API are:
+                <ul>
+                    <li>
+                        Portlet Preferences: Portlet preferences are stored in the system preferences tree. The following path structure is used to establish
+                        the location of a given portlet preference in the preferences tree:
+                        <code>/portlet_application/${Portlet Application Name}/portlets/${Portlet Name}/preferences/${Preference Name}/values</code>
+                        . The preferences values are stored under the
+                        <code>values</code>
+                        node as a map of key/values.
+                    </li>
+                    <li>
+                        User Attributes: User attributes are stored in the user preferences tree as follow. The following path structure is used to stored a
+                        user's attributes:
+                        <code>/user/${User Name}/userinfo</code>
+                        . The user attributes are stored as a preferences key/values map under the userinfo node.
+                    </li>
+                    <li>
+                        Roles and groups hierarchy: Documentation on how roles and groups hierarchy use the
+                        <code>Preferences</code>
+                        model can be found in the
+                        <a href="/multiproject/jetspeed-security/hierarchy.html#Leveraging_Preferences_to_Manage_Hierarchies">security section</a>
+                        of the documentation.
+                    </li>
+                </ul>
+            </p>
+        </section>
+        <section name="Preferences Implementation Overview">
+            <p>
+                Jetspeed 2
+                <code>Preferences</code>
+                implementation leverages the following classes:
+            </p>
+            <p>
+                <img src="images/preferences-c.gif" border="0" />
+            </p>
+            <table>
+                <tr>
+                    <th>Class</th>
+                    <th>Description</th>
+                </tr>
+                <tr>
+                    <td>
+                        <code>PreferencesFactoryImpl</code>
+                    </td>
+                    <td>
+                        Implements the <code>java.util.prefs.PreferencesFactory</code> that generates 
+                        <code>Preferences</code> objects.  The <code>PreferencesFactoryImpl</code> is 
+                        configured through spring assembly (<code>prefs.xml</code>) to use a 
+                        <code>PreferencesProvider</code> that encapsalutes the backing store implementation.
+
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <code>PreferencesImpl</code>
+                    </td>
+                    <td>
+                        Extends the <code>java.util.prefs.AbstractPreferences</code> and implements the SPI by
+                        leveraging the <code>PreferencesProvider</code> API.  Jetspeed <code>Preferences</code>
+                        implementation can be configured to validate that preferences map key/values are created
+                        for predefined keys.  A <code>PropertyManager</code> enforces the checks if enabled.
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <code>PreferencesProvider</code>
+                    </td>
+                    <td>
+                        Encapsulates the preferences implementation again a specific backing store.  In Jetspeed 2, the
+                        default implementation is provided by 
+                        <code>org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider</code>
+                    </td>
+                </tr>
+            </table>
+            <subsection name="Preferences Database Schema">
+                <p>
+                    The following database schema is being used in Jetspeed 2 to store <code>Preferences</code> 
+                    in a relational database model.
+                </p>
+                <p>
+                    <img src="images/preferences-schema.gif" border="0"/>
+                </p>
+            </subsection>    
+        </section>
+    </body>
+</document>
+

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/prefs/xdocs/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml Mon Aug 29 05:04:38 2005
@@ -1,180 +1,180 @@
-<!--
-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.
--->
-<!--
-   - P R O F I L I N G  R U L E
--->	
- <descriptor-repository version="1.0">
-   <class-descriptor class="org.apache.jetspeed.profiler.rules.impl.AbstractProfilingRule">
-      <extent-class class-ref="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule" />
-      <extent-class class-ref="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule" />
-   </class-descriptor>
-          
-<class-descriptor
-    class="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule"
-    table="PROFILING_RULE"
->     
-    <field-descriptor
-     name="id"
-     column="RULE_ID"
-     jdbc-type="VARCHAR"
-     primarykey="true"
-     autoincrement="false"         
-    />
-    <field-descriptor
-     name="ojbConcreteClass"
-     column="CLASS_NAME"
-     jdbc-type="VARCHAR"
-    />
-    <field-descriptor
-     name="title"
-     column="TITLE"
-     jdbc-type="VARCHAR"
-    />    
-      <collection-descriptor
-         name="criteria"
-         element-class-ref="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" 
-         auto-delete="object"
-         auto-update = "object"
-         auto-retrieve = "true"
-       >
-       <inverse-foreignkey field-ref="ruleId"/>
-      </collection-descriptor>
-
-
-</class-descriptor>
-
-<class-descriptor
-    class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule"
-    table="PROFILING_RULE"
->     
-    <field-descriptor
-     name="id"
-     column="RULE_ID"
-     jdbc-type="VARCHAR"
-     primarykey="true"
-     autoincrement="false"         
-    />
-    <field-descriptor
-     name="ojbConcreteClass"
-     column="CLASS_NAME"
-     jdbc-type="VARCHAR"
-    />
-    <field-descriptor
-     name="title"
-     column="TITLE"
-     jdbc-type="VARCHAR"
-    />    
-    <collection-descriptor
-         name="criteria"
-         element-class-ref="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" 
-         auto-retrieve="true"
-    >
-    <inverse-foreignkey field-ref="ruleId"/>
-    </collection-descriptor>
-</class-descriptor>
-
-<!--
-   - R U L E  C R I T E R I O N
--->	
-
-<class-descriptor
-    class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl"
-    table="RULE_CRITERION"
->     
-    <field-descriptor
-     name="id"
-     column="CRITERION_ID"
-     jdbc-type="VARCHAR"
-     primarykey="true"
-     autoincrement="true"         
-    />
-    <field-descriptor
-     name="ruleId"
-     column="RULE_ID"
-     jdbc-type="VARCHAR"
-    />
-    <field-descriptor
-     name="fallbackOrder"
-     column="FALLBACK_ORDER"
-     jdbc-type="INTEGER"
-    />    
-    <field-descriptor
-     name="type"
-     column="REQUEST_TYPE"
-     jdbc-type="VARCHAR"
-    />    
-    <field-descriptor
-     name="name"
-     column="NAME"
-     jdbc-type="VARCHAR"
-    />    
-    <field-descriptor
-     name="value"
-     column="COLUMN_VALUE"
-     jdbc-type="VARCHAR"
-    />    
-    <field-descriptor 
-        name="fallbackType" 
-        jdbc-type="INTEGER"
-        column="FALLBACK_TYPE" 
-    />
-
-</class-descriptor>
-
-<!--
-   - P R I N C I P A L  R U L E
--->	
-
-<class-descriptor
-    class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl"
-    table="PRINCIPAL_RULE_ASSOC"
->     
-    <field-descriptor
-     name="principalName"
-     column="PRINCIPAL_NAME"
-     jdbc-type="VARCHAR"
-     primarykey="true"
-     autoincrement="false"           
-    />
-    <field-descriptor
-     name="locatorName"
-     column="LOCATOR_NAME"
-     jdbc-type="VARCHAR"
-     primarykey="true"
-     autoincrement="false"           
-    />    
-    <field-descriptor
-     name="ruleId"
-     column="RULE_ID"
-     jdbc-type="VARCHAR"
-    />
-    <reference-descriptor 
-      name="profilingRule" 
-      class-ref="org.apache.jetspeed.profiler.rules.impl.AbstractProfilingRule" 
-      auto-delete="false"  
-      auto-retrieve="true"  
-      >
-     <foreignkey field-ref="ruleId"/>
-    </reference-descriptor>
-
-</class-descriptor>
-
-</descriptor-repository>
-
-   
-      
-      
+<!--
+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.
+-->
+<!--
+   - P R O F I L I N G  R U L E
+-->	
+ <descriptor-repository version="1.0">
+   <class-descriptor class="org.apache.jetspeed.profiler.rules.impl.AbstractProfilingRule">
+      <extent-class class-ref="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule" />
+      <extent-class class-ref="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule" />
+   </class-descriptor>
+          
+<class-descriptor
+    class="org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule"
+    table="PROFILING_RULE"
+>     
+    <field-descriptor
+     name="id"
+     column="RULE_ID"
+     jdbc-type="VARCHAR"
+     primarykey="true"
+     autoincrement="false"         
+    />
+    <field-descriptor
+     name="ojbConcreteClass"
+     column="CLASS_NAME"
+     jdbc-type="VARCHAR"
+    />
+    <field-descriptor
+     name="title"
+     column="TITLE"
+     jdbc-type="VARCHAR"
+    />    
+      <collection-descriptor
+         name="criteria"
+         element-class-ref="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" 
+         auto-delete="object"
+         auto-update = "object"
+         auto-retrieve = "true"
+       >
+       <inverse-foreignkey field-ref="ruleId"/>
+      </collection-descriptor>
+
+
+</class-descriptor>
+
+<class-descriptor
+    class="org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule"
+    table="PROFILING_RULE"
+>     
+    <field-descriptor
+     name="id"
+     column="RULE_ID"
+     jdbc-type="VARCHAR"
+     primarykey="true"
+     autoincrement="false"         
+    />
+    <field-descriptor
+     name="ojbConcreteClass"
+     column="CLASS_NAME"
+     jdbc-type="VARCHAR"
+    />
+    <field-descriptor
+     name="title"
+     column="TITLE"
+     jdbc-type="VARCHAR"
+    />    
+    <collection-descriptor
+         name="criteria"
+         element-class-ref="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl" 
+         auto-retrieve="true"
+    >
+    <inverse-foreignkey field-ref="ruleId"/>
+    </collection-descriptor>
+</class-descriptor>
+
+<!--
+   - R U L E  C R I T E R I O N
+-->	
+
+<class-descriptor
+    class="org.apache.jetspeed.profiler.rules.impl.RuleCriterionImpl"
+    table="RULE_CRITERION"
+>     
+    <field-descriptor
+     name="id"
+     column="CRITERION_ID"
+     jdbc-type="VARCHAR"
+     primarykey="true"
+     autoincrement="true"         
+    />
+    <field-descriptor
+     name="ruleId"
+     column="RULE_ID"
+     jdbc-type="VARCHAR"
+    />
+    <field-descriptor
+     name="fallbackOrder"
+     column="FALLBACK_ORDER"
+     jdbc-type="INTEGER"
+    />    
+    <field-descriptor
+     name="type"
+     column="REQUEST_TYPE"
+     jdbc-type="VARCHAR"
+    />    
+    <field-descriptor
+     name="name"
+     column="NAME"
+     jdbc-type="VARCHAR"
+    />    
+    <field-descriptor
+     name="value"
+     column="COLUMN_VALUE"
+     jdbc-type="VARCHAR"
+    />    
+    <field-descriptor 
+        name="fallbackType" 
+        jdbc-type="INTEGER"
+        column="FALLBACK_TYPE" 
+    />
+
+</class-descriptor>
+
+<!--
+   - P R I N C I P A L  R U L E
+-->	
+
+<class-descriptor
+    class="org.apache.jetspeed.profiler.rules.impl.PrincipalRuleImpl"
+    table="PRINCIPAL_RULE_ASSOC"
+>     
+    <field-descriptor
+     name="principalName"
+     column="PRINCIPAL_NAME"
+     jdbc-type="VARCHAR"
+     primarykey="true"
+     autoincrement="false"           
+    />
+    <field-descriptor
+     name="locatorName"
+     column="LOCATOR_NAME"
+     jdbc-type="VARCHAR"
+     primarykey="true"
+     autoincrement="false"           
+    />    
+    <field-descriptor
+     name="ruleId"
+     column="RULE_ID"
+     jdbc-type="VARCHAR"
+    />
+    <reference-descriptor 
+      name="profilingRule" 
+      class-ref="org.apache.jetspeed.profiler.rules.impl.AbstractProfilingRule" 
+      auto-delete="false"  
+      auto-retrieve="true"  
+      >
+     <foreignkey field-ref="ruleId"/>
+    </reference-descriptor>
+
+</class-descriptor>
+
+</descriptor-repository>
+
+   
+      
+      
   

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/profiler/src/java/JETSPEED-INF/ojb/profiler_repository.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/rewriter/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/rewriter/xdocs/navigation.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/rewriter/xdocs/navigation.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/rewriter/xdocs/navigation.xml Mon Aug 29 05:04:38 2005
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    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.
--->
-<project>
-    <body>
-        <links>
-            <item name="Jetspeed 2" href="../../index.html" />
-            <!-- Cannot access ${pom.id}... Hard coding pdf name. -->
-            <item name="PDF Documentation" href="/jetspeed-rewriter.pdf" img="../../images/pdf.gif" />
-        </links>
-        <menu name="Misc.">
-            <item name="Tasks" href="tasks.html" />
-        </menu>
-    </body>
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+<project>
+    <body>
+        <links>
+            <item name="Jetspeed 2" href="../../index.html" />
+            <!-- Cannot access ${pom.id}... Hard coding pdf name. -->
+            <item name="PDF Documentation" href="/jetspeed-rewriter.pdf" img="../../images/pdf.gif" />
+        </links>
+        <menu name="Misc.">
+            <item name="Tasks" href="tasks.html" />
+        </menu>
+    </body>
+</project>

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/rewriter/xdocs/navigation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/branches/SummersOfCode-2005/components/rewriter/xdocs/tasks.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/SummersOfCode-2005/components/rewriter/xdocs/tasks.xml?rev=264121&r1=264120&r2=264121&view=diff
==============================================================================
--- portals/jetspeed-2/branches/SummersOfCode-2005/components/rewriter/xdocs/tasks.xml (original)
+++ portals/jetspeed-2/branches/SummersOfCode-2005/components/rewriter/xdocs/tasks.xml Mon Aug 29 05:04:38 2005
@@ -1,36 +1,36 @@
-<?xml version="1.0" ?>
-<!--
-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.
--->
-<document>
-  <properties>
-    <title>Tasks</title>
-  </properties>
-  <body>
-    <section name="Tasks">
-      <p>
-        Currently this is just a listing of tasks.
-      </p>
-      <p>
-        <ul>
-<li>
-  Remove unused classes.
-</li>
-        </ul>
-      </p>
-    </section>
-  </body>
-</document>
-
+<?xml version="1.0" ?>
+<!--
+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.
+-->
+<document>
+  <properties>
+    <title>Tasks</title>
+  </properties>
+  <body>
+    <section name="Tasks">
+      <p>
+        Currently this is just a listing of tasks.
+      </p>
+      <p>
+        <ul>
+<li>
+  Remove unused classes.
+</li>
+        </ul>
+      </p>
+    </section>
+  </body>
+</document>
+

Propchange: portals/jetspeed-2/branches/SummersOfCode-2005/components/rewriter/xdocs/tasks.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