portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725991 [29/32] - in /portals/jetspeed-2/applications/j2-admin/trunk: src/main/java/ src/main/java/org/apache/jetspeed/portlets/ src/main/java/org/apache/jetspeed/portlets/admin/ src/main/java/org/apache/jetspeed/portlets/custom/ src/main/j...
Date Fri, 12 Dec 2008 13:05:40 GMT
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/sql.tld
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/sql.tld?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/sql.tld (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/sql.tld Fri Dec 12 05:05:25 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,215 +15,215 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE taglib
-  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-<taglib>
-  <tlib-version>1.0</tlib-version>
-  <jsp-version>1.2</jsp-version>
-  <short-name>sql</short-name>
-  <uri>http://java.sun.com/jstl/sql</uri>
-  <display-name>JSTL sql</display-name>
-  <description>JSTL 1.0 sql library</description>
-
-  <validator>
-    <validator-class>
-	org.apache.taglibs.standard.tlv.JstlSqlTLV
-    </validator-class>
-    <init-param>
-        <param-name>expressionAttributes</param-name>
-        <param-value>
-        transaction:dataSource
-        transaction:isolation
-        query:sql
-        query:dataSource
-        query:startRow
-        query:maxRows
-        update:sql
-        update:dataSource
-        param:value
-        dateParam:value
-        dateParam:type
-        setDataSource:dataSource
-        setDataSource:driver
-        setDataSource:url
-        setDataSource:user
-        setDataSource:password
-        </param-value>
-        <description>
-            Whitespace-separated list of colon-separated token pairs
-            describing tag:attribute combinations that accept expressions.
-            The validator uses this information to determine which
-            attributes need their syntax validated.
-        </description>
-     </init-param>
-  </validator>
-
-  <tag>
-    <name>transaction</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.sql.TransactionTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Provides nested database action elements with a shared Connection,
-        set up to execute all statements as one transaction.
-    </description>
-    <attribute>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>isolation</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>query</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.sql.QueryTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Executes the SQL query defined in its body or through the
-        sql attribute.
-    </description>
-    <attribute>
-        <name>var</name>
-        <required>true</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>sql</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>startRow</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>maxRows</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>update</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.sql.UpdateTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Executes the SQL update defined in its body or through the
-        sql attribute.
-    </description>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>sql</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>param</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.sql.ParamTag</tag-class>
-    <body-content>JSP</body-content>
-    <description>
-        Sets a parameter in an SQL statement to the specified value.
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>dateParam</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.sql.DateParamTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-        Sets a parameter in an SQL statement to the specified java.util.Date val
-ue.
-    </description>
-    <attribute>
-        <name>value</name>
-        <required>true</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>type</name>
-        <required>false</required>
-        <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>
-
-  <tag>
-    <name>setDataSource</name>
-    <tag-class>org.apache.taglibs.standard.tag.el.sql.SetDataSourceTag</tag-class>
-    <body-content>empty</body-content>
-    <description>
-        Creates a simple DataSource suitable only for prototyping.
-    </description>
-    <attribute>
-        <name>var</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>scope</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>dataSource</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>driver</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>url</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>user</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-    <attribute>
-        <name>password</name>
-        <required>false</required>
-        <rtexprvalue>false</rtexprvalue>
-    </attribute>
-  </tag>
-</taglib>
+<!DOCTYPE taglib
+  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<taglib>
+  <tlib-version>1.0</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>sql</short-name>
+  <uri>http://java.sun.com/jstl/sql</uri>
+  <display-name>JSTL sql</display-name>
+  <description>JSTL 1.0 sql library</description>
+
+  <validator>
+    <validator-class>
+	org.apache.taglibs.standard.tlv.JstlSqlTLV
+    </validator-class>
+    <init-param>
+        <param-name>expressionAttributes</param-name>
+        <param-value>
+        transaction:dataSource
+        transaction:isolation
+        query:sql
+        query:dataSource
+        query:startRow
+        query:maxRows
+        update:sql
+        update:dataSource
+        param:value
+        dateParam:value
+        dateParam:type
+        setDataSource:dataSource
+        setDataSource:driver
+        setDataSource:url
+        setDataSource:user
+        setDataSource:password
+        </param-value>
+        <description>
+            Whitespace-separated list of colon-separated token pairs
+            describing tag:attribute combinations that accept expressions.
+            The validator uses this information to determine which
+            attributes need their syntax validated.
+        </description>
+     </init-param>
+  </validator>
+
+  <tag>
+    <name>transaction</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.sql.TransactionTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Provides nested database action elements with a shared Connection,
+        set up to execute all statements as one transaction.
+    </description>
+    <attribute>
+        <name>dataSource</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>isolation</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>query</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.sql.QueryTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Executes the SQL query defined in its body or through the
+        sql attribute.
+    </description>
+    <attribute>
+        <name>var</name>
+        <required>true</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>sql</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>dataSource</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>startRow</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>maxRows</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>update</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.sql.UpdateTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Executes the SQL update defined in its body or through the
+        sql attribute.
+    </description>
+    <attribute>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>sql</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>dataSource</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>param</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.sql.ParamTag</tag-class>
+    <body-content>JSP</body-content>
+    <description>
+        Sets a parameter in an SQL statement to the specified value.
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>dateParam</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.sql.DateParamTag</tag-class>
+    <body-content>empty</body-content>
+    <description>
+        Sets a parameter in an SQL statement to the specified java.util.Date val
+ue.
+    </description>
+    <attribute>
+        <name>value</name>
+        <required>true</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>type</name>
+        <required>false</required>
+        <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+
+  <tag>
+    <name>setDataSource</name>
+    <tag-class>org.apache.taglibs.standard.tag.el.sql.SetDataSourceTag</tag-class>
+    <body-content>empty</body-content>
+    <description>
+        Creates a simple DataSource suitable only for prototyping.
+    </description>
+    <attribute>
+        <name>var</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>scope</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>dataSource</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>driver</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>url</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>user</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+    <attribute>
+        <name>password</name>
+        <required>false</required>
+        <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+</taglib>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/sql.tld
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/struts-config.xml?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/struts-config.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/struts-config.xml Fri Dec 12 05:05:25 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,20 +15,20 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
-                               "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
-<struts-config>
- <data-sources/>
- <form-beans>
-  <form-bean name="AddUserForm" type="org.apache.jetspeed.portlets.security.AddUserForm"/>
- </form-beans>
- <global-exceptions/>
- <global-forwards/>
- <action-mappings>
-  <action name="AddUserForm" path="/addUser" scope="request"
-   type="org.apache.jetspeed.portlets.security.AddUserAction" validate="false">
-   <forward name="editUser" path="/WEB-INF/security/user-mgt/addUser.jsp"/>
-  </action>
- </action-mappings>
- <controller/>
-</struts-config>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
+                               "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<struts-config>
+ <data-sources/>
+ <form-beans>
+  <form-bean name="AddUserForm" type="org.apache.jetspeed.portlets.security.AddUserForm"/>
+ </form-beans>
+ <global-exceptions/>
+ <global-forwards/>
+ <action-mappings>
+  <action name="AddUserForm" path="/addUser" scope="request"
+   type="org.apache.jetspeed.portlets.security.AddUserAction" validate="false">
+   <forward name="editUser" path="/WEB-INF/security/user-mgt/addUser.jsp"/>
+  </action>
+ </action-mappings>
+ <controller/>
+</struts-config>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/struts-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.html?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.html Fri Dec 12 05:05:25 2008
@@ -1,23 +1,23 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<wicket:panel>
-	<tr>
-		<span wicket:id="headers">
-			<th wicket:id="header" align='center' class="portlet-section-header" nowrap><span wicket:id="label">[header-label]</span></th>
-		</span>
-	</tr>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<wicket:panel>
+	<tr>
+		<span wicket:id="headers">
+			<th wicket:id="header" align='center' class="portlet-section-header" nowrap><span wicket:id="label">[header-label]</span></th>
+		</span>
+	</tr>
 </wicket:panel>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/HeadersToolbar.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html Fri Dec 12 05:05:25 2008
@@ -1,24 +1,24 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<wicket:panel>
-	<tr class="portlet-section-footer">
-		<td wicket:id="span" class="portlet-section-footer">
-			<div style="float: left;" class="navigatorLabel"><span wicket:id="navigatorLabel">[navigator-label]</span></div>
-			<div style="text-align: right;" class="navigator"><span wicket:id="navigator">[navigator]</span></div>
-		</td>
-	</tr>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<wicket:panel>
+	<tr class="portlet-section-footer">
+		<td wicket:id="span" class="portlet-section-footer">
+			<div style="float: left;" class="navigatorLabel"><span wicket:id="navigatorLabel">[navigator-label]</span></div>
+			<div style="text-align: right;" class="navigator"><span wicket:id="navigator">[navigator]</span></div>
+		</td>
+	</tr>
 </wicket:panel>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.html?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.html Fri Dec 12 05:05:25 2008
@@ -1,23 +1,23 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<wicket:panel>
-	<tr class="portlet-section-body">
-		<td wicket:id="td" class="portlet-section-body">
-			<span wicket:id="msg" class="norecords">[no records found message]</span>
-		</td>
-	</tr>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<wicket:panel>
+	<tr class="portlet-section-body">
+		<td wicket:id="td" class="portlet-section-body">
+			<span wicket:id="msg" class="norecords">[no records found message]</span>
+		</td>
+	</tr>
 </wicket:panel>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/templates/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.html
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/validation.xml?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/validation.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/validation.xml Fri Dec 12 05:05:25 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,60 +15,60 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-<!DOCTYPE form-validation PUBLIC
-          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN"
-          "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd">
-
-<form-validation>
-
-<!--
-     This is a blank Validator form file with a commented examples.
--->
-
-    <global>
-
-        <!-- An example global constant
-        <constant>
-            <constant-name>postalCode</constant-name>
-            <constant-value>^\d{5}\d*$</constant-value>
-        </constant>
-        end example-->
-
-    </global>
-
-    <!-- An example form
-    <formset>
-
-        <form name="logonForm">
-            <field
-                property="username"
-                depends="required">
-                    <arg0 key="logonForm.username"/>
-             </field>
-         <field
-            property="password"
-            depends="required,mask">
-            <arg0 key="logonForm.password"/>
-            <var>
-                <var-name>mask</var-name>
-                <var-value>^[0-9a-zA-Z]*$</var-value>
-            </var>
-         </field>
-        </form>
-
-    </formset>
-    end example form -->
-
-    <!-- An example formset for another locale
-    <formset language="fr">
-
-        <constant>
-            <constant-name>postalCode</constant-name>
-            <constant-value>^[0-9a-zA-Z]*$</constant-value>
-        </constant>
-
-   </formset>
-   -->
-
-</form-validation>
+
+<!DOCTYPE form-validation PUBLIC
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd">
+
+<form-validation>
+
+<!--
+     This is a blank Validator form file with a commented examples.
+-->
+
+    <global>
+
+        <!-- An example global constant
+        <constant>
+            <constant-name>postalCode</constant-name>
+            <constant-value>^\d{5}\d*$</constant-value>
+        </constant>
+        end example-->
+
+    </global>
+
+    <!-- An example form
+    <formset>
+
+        <form name="logonForm">
+            <field
+                property="username"
+                depends="required">
+                    <arg0 key="logonForm.username"/>
+             </field>
+         <field
+            property="password"
+            depends="required,mask">
+            <arg0 key="logonForm.password"/>
+            <var>
+                <var-name>mask</var-name>
+                <var-value>^[0-9a-zA-Z]*$</var-value>
+            </var>
+         </field>
+        </form>
+
+    </formset>
+    end example form -->
+
+    <!-- An example formset for another locale
+    <formset language="fr">
+
+        <constant>
+            <constant-name>postalCode</constant-name>
+            <constant-value>^[0-9a-zA-Z]*$</constant-value>
+        </constant>
+
+   </formset>
+   -->
+
+</form-validation>

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

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/toolbox.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/toolbox.xml?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/toolbox.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/toolbox.xml Fri Dec 12 05:05:25 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,5 +15,5 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<toolbox>
+<toolbox>
 </toolbox>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/toolbox.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/velocity-macros.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/velocity-macros.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/velocity-macros.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/velocity-macros.vm Fri Dec 12 05:05:25 2008
@@ -1,190 +1,190 @@
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-#macro (headerCell $body)
-  <th class="portlet-section-header">
-    <b>     
-        $body
-    </b>
-  </th>
-#end
-
-#macro (entryCell $body)
-  <td class='portlet-section-body'>    
-      $body &nbsp;    
-  </td>
-#end
-
-#macro (entryCell2 $body $count)
-#if (($count % 2) == 0)
-  <td class='portlet-section-body'>    
-#else
-  <td class='portlet-section-alternate'>    
-#end
-      $body &nbsp;    
-  </td>
-#end
-
-
-#macro (formField $label $value $size $id $MESSAGES $ERRORS)
-#if ($ERRORS)
-#set ($eflag = "$!ERRORS.get($id)")
-#else
-#set ($eflag = "")
-#end
-  <tr colspan="4" align="right">
-  #if ($!eflag == "")
-    <td width="5%" align="left">&nbsp;</td>
-  #else
-    <td width="5%" class="portlet-msg-error" align="left">&nbsp;</td>  
-  #end
-    <td nowrap class="portlet-section-alternate" align="right">$!MESSAGES.getString($label):&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input id="$!id" type="text" name="$!id" size="$!size" value="$!value" class="portlet-form-field-label">
-    </td>
-    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
-  </tr>
-#end
-
-#macro (readField $label $value $size $id $MESSAGES $ERRORS)
-#if ($ERRORS)
-#set ($eflag = "$!ERRORS.get($id)")
-#else
-#set ($eflag = "")
-#end
-  <tr colspan="4" align="right">
-  #if ($!eflag == "")
-    <td width="5%" align="left">&nbsp;</td>
-  #else
-    <td width="5%" class="portlet-msg-error" align="left">&nbsp;</td>  
-  #end
-    <td nowrap class="portlet-section-alternate" align="right">$!MESSAGES.getString($label):&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input id="$!id" disabled='true' type="text" name="$!id" size="$!size" value="$!value" class="portlet-form-field-label">
-    </td>
-    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
-  </tr>
-#end
-
-#macro (ErrorMessages $ERRORS)
-#if ($ERRORS)
-#if ($ERRORS.size() > 0)
-#foreach ($msg in $ERRORS)
-<div class="portlet-msg-error">
-$msg<br/>
-</div>
-#end
-<br/>
-#end
-#end
-#end
-
-#macro (Preference $prefs $name)
-#set ($pall = $prefs.get($name))
-#foreach ($x in $pall)
-#set ($extraction = $x)
-#end
-$extraction
-#end
-
-#macro (form4ColumnCell $label $value $size $id)
-  <tr colspan="4" align="right">
-    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
-    <td nowrap class="portlet-form-field-label" align="right">$!label:&nbsp;</td>
-    <td class="portlet-form-input-field" align="left">
-      <input id="$!id" type="text" name="$!id" size="$!size" value="$!value">
-    </td>
-    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
-  </tr>
-#end
-
-#macro (form4CheckBoxCell $label $value $id)
-   <tr colspan="4" align="right">
-    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
-    <td nowrap class="portlet-form-field-label" align="right">&nbsp;</td>
-    <td class="portlet-form-input-field" align="left">
-      <input type="checkbox" name="$id" #if ($value=="true") checked=1 #end>&nbsp;$label</input>
-    </td>
-    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
-    </tr>
-#end
-
-#macro(checkBox $name $checkedValue $uncheckedValue $currentValue $label) 
-    <script type="text/javascript"> 
-      function ${name}_listener(cb) 
-      { 
-         var valueElement = document.getElementById('${name}'); 
-         if(cb.checked) 
-         { 
-             valueElement.value = '$checkedValue'; 
-         } 
-         else 
-         { 
-            valueElement.value = '$uncheckedValue'; 
-         } 
- 
-      } 
-    </script> 
-    #if($currentValue == $checkedValue) 
-        #set($isChecked = true) 
-    #else 
-        #set($isChecked = false) 
-    #end     
-   <tr colspan="4" align="right">
-    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
-    <td nowrap class="portlet-form-field-label" align="right">&nbsp;</td>
-    <td class="portlet-form-input-field" align="left">
-      <input type="checkbox" name="${name}_checkBox" id="${name}_checkBox" value="-1" #if($isChecked)checked#end onClick="${name}_listener(this)">$!label</>
-      <input type="hidden" name="${name}" id="${name}" value="${currentValue}" />       
-    </td>
-    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
-    </tr>    
-#end
-
-#macro (OnePref $pf)
-#set ($pv = $pf.Value)
-#foreach ($x in $pv)
-#set ($extr = $x)
-#end
-$pf.Key $!extr
-#end
-
-#macro (prefField $key $values $size)
-#if ($ERRORS)
-#set ($eflag = "$!ERRORS.get($id)")
-#else
-#set ($eflag = "")
-#end
-#set ($pv = $pf.Value)
-#foreach ($x in $pv)
-#set ($extr = $x)
-#end
-#foreach ($x in $values)
-#set ($extr = $x)
-#end
-  <tr colspan="4" align="right">
-  #if ($!eflag == "")
-    <td width="5%" align="left">&nbsp;</td>
-  #else
-    <td width="5%" class="portlet-msg-error" align="left">&nbsp;</td>  
-  #end
-    <td nowrap class="portlet-section-alternate" align="right">$!key:&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input id="$!id" type="text" name="$!key" size="$!size" value="$!extr" class="portlet-form-field-label">
-    </td>
-    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
-  </tr>
-#end
+#*
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*#
+#macro (headerCell $body)
+  <th class="portlet-section-header">
+    <b>     
+        $body
+    </b>
+  </th>
+#end
+
+#macro (entryCell $body)
+  <td class='portlet-section-body'>    
+      $body &nbsp;    
+  </td>
+#end
+
+#macro (entryCell2 $body $count)
+#if (($count % 2) == 0)
+  <td class='portlet-section-body'>    
+#else
+  <td class='portlet-section-alternate'>    
+#end
+      $body &nbsp;    
+  </td>
+#end
+
+
+#macro (formField $label $value $size $id $MESSAGES $ERRORS)
+#if ($ERRORS)
+#set ($eflag = "$!ERRORS.get($id)")
+#else
+#set ($eflag = "")
+#end
+  <tr colspan="4" align="right">
+  #if ($!eflag == "")
+    <td width="5%" align="left">&nbsp;</td>
+  #else
+    <td width="5%" class="portlet-msg-error" align="left">&nbsp;</td>  
+  #end
+    <td nowrap class="portlet-section-alternate" align="right">$!MESSAGES.getString($label):&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input id="$!id" type="text" name="$!id" size="$!size" value="$!value" class="portlet-form-field-label">
+    </td>
+    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
+  </tr>
+#end
+
+#macro (readField $label $value $size $id $MESSAGES $ERRORS)
+#if ($ERRORS)
+#set ($eflag = "$!ERRORS.get($id)")
+#else
+#set ($eflag = "")
+#end
+  <tr colspan="4" align="right">
+  #if ($!eflag == "")
+    <td width="5%" align="left">&nbsp;</td>
+  #else
+    <td width="5%" class="portlet-msg-error" align="left">&nbsp;</td>  
+  #end
+    <td nowrap class="portlet-section-alternate" align="right">$!MESSAGES.getString($label):&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input id="$!id" disabled='true' type="text" name="$!id" size="$!size" value="$!value" class="portlet-form-field-label">
+    </td>
+    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
+  </tr>
+#end
+
+#macro (ErrorMessages $ERRORS)
+#if ($ERRORS)
+#if ($ERRORS.size() > 0)
+#foreach ($msg in $ERRORS)
+<div class="portlet-msg-error">
+$msg<br/>
+</div>
+#end
+<br/>
+#end
+#end
+#end
+
+#macro (Preference $prefs $name)
+#set ($pall = $prefs.get($name))
+#foreach ($x in $pall)
+#set ($extraction = $x)
+#end
+$extraction
+#end
+
+#macro (form4ColumnCell $label $value $size $id)
+  <tr colspan="4" align="right">
+    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
+    <td nowrap class="portlet-form-field-label" align="right">$!label:&nbsp;</td>
+    <td class="portlet-form-input-field" align="left">
+      <input id="$!id" type="text" name="$!id" size="$!size" value="$!value">
+    </td>
+    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
+  </tr>
+#end
+
+#macro (form4CheckBoxCell $label $value $id)
+   <tr colspan="4" align="right">
+    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
+    <td nowrap class="portlet-form-field-label" align="right">&nbsp;</td>
+    <td class="portlet-form-input-field" align="left">
+      <input type="checkbox" name="$id" #if ($value=="true") checked=1 #end>&nbsp;$label</input>
+    </td>
+    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
+    </tr>
+#end
+
+#macro(checkBox $name $checkedValue $uncheckedValue $currentValue $label) 
+    <script type="text/javascript"> 
+      function ${name}_listener(cb) 
+      { 
+         var valueElement = document.getElementById('${name}'); 
+         if(cb.checked) 
+         { 
+             valueElement.value = '$checkedValue'; 
+         } 
+         else 
+         { 
+            valueElement.value = '$uncheckedValue'; 
+         } 
+ 
+      } 
+    </script> 
+    #if($currentValue == $checkedValue) 
+        #set($isChecked = true) 
+    #else 
+        #set($isChecked = false) 
+    #end     
+   <tr colspan="4" align="right">
+    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
+    <td nowrap class="portlet-form-field-label" align="right">&nbsp;</td>
+    <td class="portlet-form-input-field" align="left">
+      <input type="checkbox" name="${name}_checkBox" id="${name}_checkBox" value="-1" #if($isChecked)checked#end onClick="${name}_listener(this)">$!label</>
+      <input type="hidden" name="${name}" id="${name}" value="${currentValue}" />       
+    </td>
+    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
+    </tr>    
+#end
+
+#macro (OnePref $pf)
+#set ($pv = $pf.Value)
+#foreach ($x in $pv)
+#set ($extr = $x)
+#end
+$pf.Key $!extr
+#end
+
+#macro (prefField $key $values $size)
+#if ($ERRORS)
+#set ($eflag = "$!ERRORS.get($id)")
+#else
+#set ($eflag = "")
+#end
+#set ($pv = $pf.Value)
+#foreach ($x in $pv)
+#set ($extr = $x)
+#end
+#foreach ($x in $values)
+#set ($extr = $x)
+#end
+  <tr colspan="4" align="right">
+  #if ($!eflag == "")
+    <td width="5%" align="left">&nbsp;</td>
+  #else
+    <td width="5%" class="portlet-msg-error" align="left">&nbsp;</td>  
+  #end
+    <td nowrap class="portlet-section-alternate" align="right">$!key:&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input id="$!id" type="text" name="$!key" size="$!size" value="$!extr" class="portlet-form-field-label">
+    </td>
+    <td width="5%" class="portlet-form-label" align="left">&nbsp;</td>
+  </tr>
+#end

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/velocity-macros.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/velocity.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/velocity.properties?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/velocity.properties (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/velocity.properties Fri Dec 12 05:05:25 2008
@@ -3,113 +3,113 @@
 # this work for additional information regarding copyright ownership.
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#----------------------------------------------------------------------------
-# These are the default properties for the
-# Velocity Runtime. These values are used when
-# Runtime.init() is called, and when Runtime.init(properties)
-# fails to find the specificed properties file.
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-# R U N T I M E  L O G  
-#----------------------------------------------------------------------------
-# This is the location of the Velocity Runtime log.
-#----------------------------------------------------------------------------
-
-runtime.log = velocity.log
-
-# use Commons Logging for routing Velocity message through our IsolatedLog4JLogger
-runtime.log.logsystem.class =org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
-# Log4J Category used (default is "velocity")
-runtime.log.logsystem.log4j.category = velocity
-
-#----------------------------------------------------------------------------
-# T E M P L A T E  E N C O D I N G
-#----------------------------------------------------------------------------
-
-template.encoding=8859_1
-
-#----------------------------------------------------------------------------
-# C O N T E N T  T Y P E  
-#----------------------------------------------------------------------------
-# This is the default content type for the VelocityServlet.
-#----------------------------------------------------------------------------
-
-default.contentType=text/html
-
-#----------------------------------------------------------------------------
-# F O R E A C H  P R O P E R T I E S
-#----------------------------------------------------------------------------
-# These properties control how the counter is accessed in the #foreach
-# directive. By default the reference $velocityCount will be available
-# in the body of the #foreach directive. The default starting value
-# for this reference is 1.
-#----------------------------------------------------------------------------
-
-counter.name = velocityCount
-counter.initial.value = 1
-
-#----------------------------------------------------------------------------
-# I N C L U D E  P R O P E R T I E S
-#----------------------------------------------------------------------------
-# These are the properties that governed the way #include'd content
-# is governed.
-#----------------------------------------------------------------------------
-
-include.path=.
-include.cache = false
-include.output.errormsg.start = <!-- include error : 
-include.output.errormsg.end   =  see error log -->
-
-#----------------------------------------------------------------------------
-# P A R S E  P R O P E R T I E S
-#----------------------------------------------------------------------------
-
-parse_directive.maxdepth = 10
-
-#----------------------------------------------------------------------------
-# T E M P L A T E  L O A D E R S
-#----------------------------------------------------------------------------
-# 
-# 
-#----------------------------------------------------------------------------
-
-template.loader.1.public.name = File
-template.loader.1.description = Velocity File Template Loader
-template.loader.1.class = org.apache.velocity.runtime.loader.FileTemplateLoader
-template.loader.1.template.path = .
-template.loader.1.cache = false
-template.loader.1.modificationCheckInterval = 2
-
-velocimacro.library.autoreload = true
-velocimacro.permissions.allow.inline.to.replace.global = true
-velocimacro.library = /WEB-INF/velocity/velocity-macros.vm
-
-#template.loader.2.public.name = URL
-#template.loader.2.description = Velocity URL Template Loader
-#template.loader.2.class = org.apache.velocity.runtime.loader.URLTemplateLoader
-#template.loader.2.template.path = http://localhost/templates/
-#template.loader.2.cache = false
-
-#----------------------------------------------------------------------------
-# E X T E R N A L  S E R V I C E  I N I T I A L I Z A T I O N
-#----------------------------------------------------------------------------
-# If this property is set to true then an external service will
-# set certain system properties and initialize the Velocity
-# Runtime. This method is used by Turbine to initialize the
-# Velocity Runtime for the TurbineVelocityService.
-#----------------------------------------------------------------------------
-
-external.init = false
-
-
+# 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.
+
+#----------------------------------------------------------------------------
+# These are the default properties for the
+# Velocity Runtime. These values are used when
+# Runtime.init() is called, and when Runtime.init(properties)
+# fails to find the specificed properties file.
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+# R U N T I M E  L O G  
+#----------------------------------------------------------------------------
+# This is the location of the Velocity Runtime log.
+#----------------------------------------------------------------------------
+
+runtime.log = velocity.log
+
+# use Commons Logging for routing Velocity message through our IsolatedLog4JLogger
+runtime.log.logsystem.class =org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem
+# Log4J Category used (default is "velocity")
+runtime.log.logsystem.log4j.category = velocity
+
+#----------------------------------------------------------------------------
+# T E M P L A T E  E N C O D I N G
+#----------------------------------------------------------------------------
+
+template.encoding=8859_1
+
+#----------------------------------------------------------------------------
+# C O N T E N T  T Y P E  
+#----------------------------------------------------------------------------
+# This is the default content type for the VelocityServlet.
+#----------------------------------------------------------------------------
+
+default.contentType=text/html
+
+#----------------------------------------------------------------------------
+# F O R E A C H  P R O P E R T I E S
+#----------------------------------------------------------------------------
+# These properties control how the counter is accessed in the #foreach
+# directive. By default the reference $velocityCount will be available
+# in the body of the #foreach directive. The default starting value
+# for this reference is 1.
+#----------------------------------------------------------------------------
+
+counter.name = velocityCount
+counter.initial.value = 1
+
+#----------------------------------------------------------------------------
+# I N C L U D E  P R O P E R T I E S
+#----------------------------------------------------------------------------
+# These are the properties that governed the way #include'd content
+# is governed.
+#----------------------------------------------------------------------------
+
+include.path=.
+include.cache = false
+include.output.errormsg.start = <!-- include error : 
+include.output.errormsg.end   =  see error log -->
+
+#----------------------------------------------------------------------------
+# P A R S E  P R O P E R T I E S
+#----------------------------------------------------------------------------
+
+parse_directive.maxdepth = 10
+
+#----------------------------------------------------------------------------
+# T E M P L A T E  L O A D E R S
+#----------------------------------------------------------------------------
+# 
+# 
+#----------------------------------------------------------------------------
+
+template.loader.1.public.name = File
+template.loader.1.description = Velocity File Template Loader
+template.loader.1.class = org.apache.velocity.runtime.loader.FileTemplateLoader
+template.loader.1.template.path = .
+template.loader.1.cache = false
+template.loader.1.modificationCheckInterval = 2
+
+velocimacro.library.autoreload = true
+velocimacro.permissions.allow.inline.to.replace.global = true
+velocimacro.library = /WEB-INF/velocity/velocity-macros.vm
+
+#template.loader.2.public.name = URL
+#template.loader.2.description = Velocity URL Template Loader
+#template.loader.2.class = org.apache.velocity.runtime.loader.URLTemplateLoader
+#template.loader.2.template.path = http://localhost/templates/
+#template.loader.2.cache = false
+
+#----------------------------------------------------------------------------
+# E X T E R N A L  S E R V I C E  I N I T I A L I Z A T I O N
+#----------------------------------------------------------------------------
+# If this property is set to true then an external service will
+# set certain system properties and initialize the Velocity
+# Runtime. This method is used by Turbine to initialize the
+# Velocity Runtime for the TurbineVelocityService.
+#----------------------------------------------------------------------------
+
+external.init = false
+
+

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/velocity/velocity.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/admin/importer-header.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/admin/importer-view.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/custom/config-mode.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/custom/config-mode.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/custom/config-mode.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/custom/config-mode.vm Fri Dec 12 05:05:25 2008
@@ -1,175 +1,175 @@
-#*
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*#
-
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#set($curPage = $renderRequest.getAttribute("org.apache.jetspeed.Page"))
-#set($curFrag = $renderRequest.getAttribute("org.apache.jetspeed.Fragment"))
-#set($constraintList = $curFrag.securityConstraints.securityConstraints)
-#set($constraintsRefList = $curFrag.securityConstraints.securityConstraintsRefs)
-#set($securityContraintRefList = $renderRequest.getAttribute("securityContraintRefList"))
-
-$renderResponse.setTitle($curFrag.getPortletContent().getTitle())
-
-#set($actionUrl = $renderResponse.createActionURL())     
-
-<br/>
-
-<div>
-  <table cellpadding="0" cellspacing="1" border="0">
-    <thead>
-      <tr>
-        <th align="center" class="portlet-section-header" nowrap>$MESSAGES.getString("customconfigmode.label.roles")</th>
-        <th align="center" class="portlet-section-header" nowrap>$MESSAGES.getString("customconfigmode.label.groups")</th>
-        <th align="center" class="portlet-section-header" nowrap>$MESSAGES.getString("customconfigmode.label.users")</th>
-        <th align="center" class="portlet-section-header" nowrap>$MESSAGES.getString("customconfigmode.label.permissions")</th>
-        <th align="center" class="portlet-section-header" nowrap>$MESSAGES.getString("customconfigmode.label.action")</th>
-      </tr>
-    </thead>
-    <tbody>
-    
-    #foreach ($constraint in $constraintList)
-      
-      #if ($velocityCount % 2 == 0)
-       #set($rowstyle = "portlet-section-body")
-      #else
-       #set($rowstyle = "portlet-section-alternate")
-      #end
-      
-      <tr>
-        <td class="$rowstyle">
-          $!{constraint.roles}
-        </td>
-        <td class="$rowstyle">
-          $!{constraint.groups}
-        </td>
-        <td class="$rowstyle">
-          $!{constraint.users}
-        </td>
-        <td class="$rowstyle">
-          $!{constraint.permissions}
-        </td>
-        <td class="$rowstyle">
-          <form method="POST" action="${actionUrl}">
-            <input type="hidden" name="action" value="removeConstraint">
-            <input type="hidden" name="path" value="${curPage.path}">
-            <input type="hidden" name="fragment" value="${curFrag.id}">
-            <input type="hidden" name="roles" value="$!{constraint.roles}">
-            <input type="hidden" name="groups" value="$!{constraint.groups}">
-            <input type="hidden" name="users" value="$!{constraint.users}">
-            <input type="hidden" name="permissions" value="$!{constraint.permissions}">
-            <input type="submit" value="$MESSAGES.getString("customconfigmode.label.remove")">
-          </form>
-        </td>
-      </tr>
-    #end
-      
-    </tbody>
-  </table>
-</div>
-
-<br/>
-
-<div>
-<form method="POST" action="${actionUrl}">
-  <table cellpadding="0" cellspacing="1" border="0">
-    <tbody>
-      <tr>
-        <td class="portlet-section-alternate" nowrap>$MESSAGES.getString("customconfigmode.label.constraintref")</td>
-        <td class="portlet-section-body" nowrap>
-          <input type="hidden" name="action" value="updateConstraintRefs">
-          <input type="hidden" name="path" value="${curPage.path}">
-          <input type="hidden" name="fragment" value="${curFrag.id}">
-          <select name="securityConstraintRef">
-            #if ($constraintsRefList)
-              <option value=""
-                #if ($constraintsRefList.isEmpty())
-                  selected
-                #end
-              >$MESSAGES.getString("customconfigmode.label.noconstraintref")</option>
-              #foreach ($securityContraintRef in $securityContraintRefList)
-                <option value="${securityContraintRef.name}"
-                  #if ($constraintsRefList.contains("${securityContraintRef.name}"))
-                    selected
-                  #end
-                >${securityContraintRef.name}</option>
-              #end
-            #else
-              <option value="" selected>$MESSAGES.getString("customconfigmode.label.noconstraintref")</option>
-              #foreach ($securityContraintRef in $securityContraintRefList)
-                <option value="${securityContraintRef.name}">${securityContraintRef.name}</option>
-              #end
-            #end
-          </select>
-          <input type="submit" value="$MESSAGES.getString("customconfigmode.label.save")">
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</form>
-</div>
-
-<br/>
-
-<div>
-  <form method="POST" action="${actionUrl}">
-  <table cellpadding="0" cellspacing="1" border="0">
-    <thead>
-      <tr>
-        <th align="center" class="portlet-section-header" nowrap colspan="2">$MESSAGES.getString("customconfigmode.label.newconstraint")</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td class="portlet-section-alternate" nowrap>$MESSAGES.getString("customconfigmode.label.roles")</td>
-        <td class="portlet-section-body" nowrap>
-          <input type="hidden" name="action" value="addConstraint">
-          <input type="hidden" name="path" value="${curPage.path}">
-          <input type="hidden" name="fragment" value="${curFrag.id}">
-          <input type="text" name="roles" value="" />
-        </td>
-      </tr>
-      <tr>
-        <td class="portlet-section-alternate" nowrap>$MESSAGES.getString("customconfigmode.label.groups")</td>
-        <td class="portlet-section-body" nowrap>
-          <input type="text" name="groups" value="" />
-        </td>
-      </tr>
-      <tr>
-        <td class="portlet-section-alternate" nowrap>$MESSAGES.getString("customconfigmode.label.users")</td>
-        <td class="portlet-section-body" nowrap>
-          <input type="text" name="users" value="" />
-        </td>
-      </tr>
-      <tr>
-        <td class="portlet-section-alternate" nowrap>$MESSAGES.getString("customconfigmode.label.permissions")</td>
-        <td class="portlet-section-body" nowrap>
-          <input type="checkbox" name="permissions" value="view" checked />$MESSAGES.getString("customconfigmode.label.view")
-        </td>
-      </tr>
-      <tr>
-        <td class="portlet-section-alternate" nowrap colspan="2">
-          <input type="submit" value="$MESSAGES.getString("customconfigmode.label.save")">
-          <input type="reset" value="$MESSAGES.getString("customconfigmode.label.cancel")">
-        </td>
-      </tr>
-      
-    </tbody>
-  </table>
-  </form>
-</div>
-
-<br/>
+#*
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*#
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set($curPage = $renderRequest.getAttribute("org.apache.jetspeed.Page"))
+#set($curFrag = $renderRequest.getAttribute("org.apache.jetspeed.Fragment"))
+#set($constraintList = $curFrag.securityConstraints.securityConstraints)
+#set($constraintsRefList = $curFrag.securityConstraints.securityConstraintsRefs)
+#set($securityContraintRefList = $renderRequest.getAttribute("securityContraintRefList"))
+
+$renderResponse.setTitle($curFrag.getPortletContent().getTitle())
+
+#set($actionUrl = $renderResponse.createActionURL())     
+
+<br/>
+
+<div>
+  <table cellpadding="0" cellspacing="1" border="0">
+    <thead>
+      <tr>
+        <th align="center" class="portlet-section-header" nowrap>$MESSAGES.getString("customconfigmode.label.roles")</th>
+        <th align="center" class="portlet-section-header" nowrap>$MESSAGES.getString("customconfigmode.label.groups")</th>
+        <th align="center" class="portlet-section-header" nowrap>$MESSAGES.getString("customconfigmode.label.users")</th>
+        <th align="center" class="portlet-section-header" nowrap>$MESSAGES.getString("customconfigmode.label.permissions")</th>
+        <th align="center" class="portlet-section-header" nowrap>$MESSAGES.getString("customconfigmode.label.action")</th>
+      </tr>
+    </thead>
+    <tbody>
+    
+    #foreach ($constraint in $constraintList)
+      
+      #if ($velocityCount % 2 == 0)
+       #set($rowstyle = "portlet-section-body")
+      #else
+       #set($rowstyle = "portlet-section-alternate")
+      #end
+      
+      <tr>
+        <td class="$rowstyle">
+          $!{constraint.roles}
+        </td>
+        <td class="$rowstyle">
+          $!{constraint.groups}
+        </td>
+        <td class="$rowstyle">
+          $!{constraint.users}
+        </td>
+        <td class="$rowstyle">
+          $!{constraint.permissions}
+        </td>
+        <td class="$rowstyle">
+          <form method="POST" action="${actionUrl}">
+            <input type="hidden" name="action" value="removeConstraint">
+            <input type="hidden" name="path" value="${curPage.path}">
+            <input type="hidden" name="fragment" value="${curFrag.id}">
+            <input type="hidden" name="roles" value="$!{constraint.roles}">
+            <input type="hidden" name="groups" value="$!{constraint.groups}">
+            <input type="hidden" name="users" value="$!{constraint.users}">
+            <input type="hidden" name="permissions" value="$!{constraint.permissions}">
+            <input type="submit" value="$MESSAGES.getString("customconfigmode.label.remove")">
+          </form>
+        </td>
+      </tr>
+    #end
+      
+    </tbody>
+  </table>
+</div>
+
+<br/>
+
+<div>
+<form method="POST" action="${actionUrl}">
+  <table cellpadding="0" cellspacing="1" border="0">
+    <tbody>
+      <tr>
+        <td class="portlet-section-alternate" nowrap>$MESSAGES.getString("customconfigmode.label.constraintref")</td>
+        <td class="portlet-section-body" nowrap>
+          <input type="hidden" name="action" value="updateConstraintRefs">
+          <input type="hidden" name="path" value="${curPage.path}">
+          <input type="hidden" name="fragment" value="${curFrag.id}">
+          <select name="securityConstraintRef">
+            #if ($constraintsRefList)
+              <option value=""
+                #if ($constraintsRefList.isEmpty())
+                  selected
+                #end
+              >$MESSAGES.getString("customconfigmode.label.noconstraintref")</option>
+              #foreach ($securityContraintRef in $securityContraintRefList)
+                <option value="${securityContraintRef.name}"
+                  #if ($constraintsRefList.contains("${securityContraintRef.name}"))
+                    selected
+                  #end
+                >${securityContraintRef.name}</option>
+              #end
+            #else
+              <option value="" selected>$MESSAGES.getString("customconfigmode.label.noconstraintref")</option>
+              #foreach ($securityContraintRef in $securityContraintRefList)
+                <option value="${securityContraintRef.name}">${securityContraintRef.name}</option>
+              #end
+            #end
+          </select>
+          <input type="submit" value="$MESSAGES.getString("customconfigmode.label.save")">
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</form>
+</div>
+
+<br/>
+
+<div>
+  <form method="POST" action="${actionUrl}">
+  <table cellpadding="0" cellspacing="1" border="0">
+    <thead>
+      <tr>
+        <th align="center" class="portlet-section-header" nowrap colspan="2">$MESSAGES.getString("customconfigmode.label.newconstraint")</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td class="portlet-section-alternate" nowrap>$MESSAGES.getString("customconfigmode.label.roles")</td>
+        <td class="portlet-section-body" nowrap>
+          <input type="hidden" name="action" value="addConstraint">
+          <input type="hidden" name="path" value="${curPage.path}">
+          <input type="hidden" name="fragment" value="${curFrag.id}">
+          <input type="text" name="roles" value="" />
+        </td>
+      </tr>
+      <tr>
+        <td class="portlet-section-alternate" nowrap>$MESSAGES.getString("customconfigmode.label.groups")</td>
+        <td class="portlet-section-body" nowrap>
+          <input type="text" name="groups" value="" />
+        </td>
+      </tr>
+      <tr>
+        <td class="portlet-section-alternate" nowrap>$MESSAGES.getString("customconfigmode.label.users")</td>
+        <td class="portlet-section-body" nowrap>
+          <input type="text" name="users" value="" />
+        </td>
+      </tr>
+      <tr>
+        <td class="portlet-section-alternate" nowrap>$MESSAGES.getString("customconfigmode.label.permissions")</td>
+        <td class="portlet-section-body" nowrap>
+          <input type="checkbox" name="permissions" value="view" checked />$MESSAGES.getString("customconfigmode.label.view")
+        </td>
+      </tr>
+      <tr>
+        <td class="portlet-section-alternate" nowrap colspan="2">
+          <input type="submit" value="$MESSAGES.getString("customconfigmode.label.save")">
+          <input type="reset" value="$MESSAGES.getString("customconfigmode.label.cancel")">
+        </td>
+      </tr>
+      
+    </tbody>
+  </table>
+  </form>
+</div>
+
+<br/>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/custom/config-mode.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/datetime.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/edit-prefs.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/edit-prefs.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/edit-prefs.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/edit-prefs.vm Fri Dec 12 05:05:25 2008
@@ -1,4 +1,4 @@
-
+
 #*
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,15 +15,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 *#
-<h2 class="portlet-section-header">Edit Preferences</h2>
-
-<form action="$renderResponse.createActionURL()" method="post">
-<table>
-#foreach ($pref in $prefs)
-#prefField($pref.Key $pref.Value "40")
-#end
-</table>
-<input type="submit" name="Save" value="Save" />
-</form>
-
-
+<h2 class="portlet-section-header">Edit Preferences</h2>
+
+<form action="$renderResponse.createActionURL()" method="post">
+<table>
+#foreach ($pref in $prefs)
+#prefField($pref.Key $pref.Value "40")
+#end
+</table>
+<input type="submit" name="Save" value="Save" />
+</form>
+
+

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/edit-prefs.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/errors-include.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/errors-include.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/errors-include.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/errors-include.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/errors-include.vm Fri Dec 12 05:05:25 2008
@@ -1,24 +1,24 @@
-#*
+#*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-<br/>
-<table width="100%" cellpadding="0" cellspacing="0" border="0">
-#foreach ($errorMsg in $errorMessages )
-<tr>
-  <td class="portlet-msg-error">$errorMsg</td>
-</tr>
-</table>
+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.
+*#
+<br/>
+<table width="100%" cellpadding="0" cellspacing="0" border="0">
+#foreach ($errorMsg in $errorMessages )
+<tr>
+  <td class="portlet-msg-error">$errorMsg</td>
+</tr>
+</table>
 #end
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/errors-include.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/info/about.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/info/developers.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/info/welcome.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/locale-list.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/metadata-detail.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/metadata-detail.jsp?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/metadata-detail.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/metadata-detail.jsp Fri Dec 12 05:05:25 2008
@@ -1,79 +1,79 @@
-<%--
+<%--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<form name="Edit_Metatdata_Form" action="<c:out value="${edit_metadata_link}"/>" method="post">
-	<input type="hidden" name="portlet_action" value=""/>
-	<table>
-		<tr>
-			<th class="portlet-section-header">&nbsp;</th>
-			<th class="portlet-section-header"><fmt:message key="pam.details.name"/></th>
-			<th class="portlet-section-header"><fmt:message key="pam.details.locale"/></th>
-			<th class="portlet-section-header"><fmt:message key="pam.details.value"/></th>
-		</tr>
-	<c:forEach var="field" items="${md.fields}">
-		<tr>
-			<td class="portlet-section-body">
-				<input type="checkbox" name="metadata_id" value="<c:out value="${field.name}"/>"/>
-			</td>
-			<td class="portlet-section-body">	
-				<c:out value="${field.name}"/>
-			</td>
-			<td align="center" class="portlet-section-body">
-				<c:out value="${field.locale}"/> 
-				
-			</td>
-			<td class="portlet-section-body">
-				<%--TODO:  value needs to escaped, or use textarea--%>
-				<input type="text" name="<c:out value="${field.name}"/>:value" value="<c:out value="${field.value}"/>" size="50"/>
-			</td>
-		</tr>
-	</c:forEach>
-	</table>
-			
-	<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = '<c:out value="${action_prefix}"/>edit_metadata'" class="portlet-form-button"/>
-	<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = '<c:out value="${action_prefix}"/>remove_metadata'" class="portlet-form-button"/>
-</form>
-		
-<form action="<c:out value="${edit_metadata_link}"/>" method="post">
-	<input type="hidden" name="portlet_action" value="<c:out value="${action_prefix}"/>add_metadata"/>
-	<div>
-		<table>
-			<tr>
-				<td class="portlet-section-alternate">
-					<span class="portlet-form-label"><fmt:message key="pam.details.name"/></span>
-				</td>
-				<td class="portlet-section-body">
-					<input type="text" name="name" value="" class="portlet-form-field-label"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="portlet-section-alternate">
-					<span class="portlet-form-label"><fmt:message key="pam.details.value"/></span>
-				</td>
-				<td class="portlet-section-body">
-					<input type="text" name="value" value="" class="portlet-form-field-label"/>
-				</td>
-			</tr>
-			<tr>
-				<td class="portlet-section-alternate">
-					<span class="portlet-form-label"><fmt:message key="pam.details.locale"/></span>
-				</td>
-				<td class="portlet-section-body">
-					<input type="text" name="locale" value="" class="portlet-form-field-label"/>
-				</td>
-			</tr>
-		</table>
-	</div>
-	<input type="submit" value="<fmt:message key="pam.details.add_metadata"/>"  class="portlet-form-button"/>
+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.
+--%>
+<form name="Edit_Metatdata_Form" action="<c:out value="${edit_metadata_link}"/>" method="post">
+	<input type="hidden" name="portlet_action" value=""/>
+	<table>
+		<tr>
+			<th class="portlet-section-header">&nbsp;</th>
+			<th class="portlet-section-header"><fmt:message key="pam.details.name"/></th>
+			<th class="portlet-section-header"><fmt:message key="pam.details.locale"/></th>
+			<th class="portlet-section-header"><fmt:message key="pam.details.value"/></th>
+		</tr>
+	<c:forEach var="field" items="${md.fields}">
+		<tr>
+			<td class="portlet-section-body">
+				<input type="checkbox" name="metadata_id" value="<c:out value="${field.name}"/>"/>
+			</td>
+			<td class="portlet-section-body">	
+				<c:out value="${field.name}"/>
+			</td>
+			<td align="center" class="portlet-section-body">
+				<c:out value="${field.locale}"/> 
+				
+			</td>
+			<td class="portlet-section-body">
+				<%--TODO:  value needs to escaped, or use textarea--%>
+				<input type="text" name="<c:out value="${field.name}"/>:value" value="<c:out value="${field.value}"/>" size="50"/>
+			</td>
+		</tr>
+	</c:forEach>
+	</table>
+			
+	<input type="submit" value="<fmt:message key="pam.details.edit"/>" onClick="this.form.portlet_action.value = '<c:out value="${action_prefix}"/>edit_metadata'" class="portlet-form-button"/>
+	<input type="submit" value="<fmt:message key="pam.details.remove"/>" onClick="this.form.portlet_action.value = '<c:out value="${action_prefix}"/>remove_metadata'" class="portlet-form-button"/>
+</form>
+		
+<form action="<c:out value="${edit_metadata_link}"/>" method="post">
+	<input type="hidden" name="portlet_action" value="<c:out value="${action_prefix}"/>add_metadata"/>
+	<div>
+		<table>
+			<tr>
+				<td class="portlet-section-alternate">
+					<span class="portlet-form-label"><fmt:message key="pam.details.name"/></span>
+				</td>
+				<td class="portlet-section-body">
+					<input type="text" name="name" value="" class="portlet-form-field-label"/>
+				</td>
+			</tr>
+			<tr>
+				<td class="portlet-section-alternate">
+					<span class="portlet-form-label"><fmt:message key="pam.details.value"/></span>
+				</td>
+				<td class="portlet-section-body">
+					<input type="text" name="value" value="" class="portlet-form-field-label"/>
+				</td>
+			</tr>
+			<tr>
+				<td class="portlet-section-alternate">
+					<span class="portlet-form-label"><fmt:message key="pam.details.locale"/></span>
+				</td>
+				<td class="portlet-section-body">
+					<input type="text" name="locale" value="" class="portlet-form-field-label"/>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<input type="submit" value="<fmt:message key="pam.details.add_metadata"/>"  class="portlet-form-button"/>
 </form>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/metadata-detail.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/palm.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/pam-browser.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/view/pam-detail.jsp
------------------------------------------------------------------------------
    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


Mime
View raw message