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 [28/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/security/sso/sites-details.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/sites-details.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/sites-details.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/sites-details.vm Fri Dec 12 05:05:25 2008
@@ -1,127 +1,127 @@
-#*
+#*
 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.
-*#
-
-#**
-
-@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: sites-details.vm 348264 2005-11-22 22:06:45Z taylor $
-
-*#
-
-## set ($pipeline = $renderResponse.createRenderURL())
-## set ($pipeline = "$pipeline?pipeline=portlet-pipeline&entity=$chooser.Id")
-
-<script>
-function openWindow(pipeline)
-{	
-    var vWinUsers = window.open(pipeline, 'UserPicker', 'status=no,resizable=yes,width=200,height=250,scrollbars=yes');
-    vWinUsers.opener = self;
-	vWinUsers.focus();
-}
-</script>
-
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-
-#if ($statusMsg)
-#parse ('/WEB-INF/view/status-include.vm')
-#end
-
-#if ($currentSite)
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <tr>
-    <td width='12' class="portlet-section-header"></td>      
-    #foreach ($column in $title)
-	  #set ($columnLink = $renderResponse.createRenderURL())
-	  $columnLink.setParameter("js_dbcolumn",$column)
-      <td align='center' class="portlet-section-header" width="40%" nowrap>
-        $column
-      </td>
-    #end
-    <td width='24' class="portlet-section-header">&nbsp;</td>    
-    <td class=""></td>        
-  </tr>
-  #foreach ( $principal in $table )
-  <tr>
-    #if ($velocityCount % 2 == 0)
-       #set($rowstyle = "portlet-section-body")
-    #else
-       #set($rowstyle = "portlet-section-alternate")
-    #end    
-     #if ($currentP == $principal)
-       <td class="$rowstyle" nowrap width='12'>
-         <img src="/j2-admin/images/selected.gif" width="7" height="12" border="0" vspace="2"/>
-       </td>
-	 #else
-       <td class="$rowstyle" nowrap width='12'>
-         &nbsp;
-       </td>      
-	 #end   	 
-      <td class="$rowstyle" nowrap width="25%">
-        #set ($action = $renderResponse.createActionURL())
-        $action.setParameter('ssoPrincipal', $principal.PortalPrincipalName)
-        <div align="center">$principal.PortalPrincipalName</div>
-      </td>
-      <td class="$rowstyle" nowrap width="25%">
-        <div align="center">$principal.RemotePrincipalName</div>
-      </td>      
-       <td class="$rowstyle" nowrap width='24' align='center'>
-         <a href="javascript:YesNoPopup('$MESSAGES.getString('confirmToDeleteRemote')','$MESSAGES.getString('confirmDelete')','securityform','ssoDelete','$principal.PortalPrincipalName','YesNoReturnMethod()');">
-           <img src="/j2-admin/images/waste_bin.gif" width="20" height="15" border="0"/>            
-         </a>
-       </td>      
-    <td class="">&nbsp;</td>               
-   </tr>
-  #end
-</table>
-<br/>
-<form name='securityform' action="$renderResponse.createActionURL()" method="post">
-<input type='hidden' name='principal.type' value='user'/>
-<input name='ssoDelete' type='hidden' value=''/>
-<table>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('portalPrincipal')&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="text" name="portal.principal" size="30" value="$!currentP" class="portlet-form-field-label">
-	 <a href="javascript:openWindow('$userChooser');">
-        <img title="Select a User"
-             name="assigneeImage" 
-             src="/j2-admin/images/user-chooser.gif" hspace=0 height=16 width=16 border=0 align=absmiddle></a>      
-	 <a href="javascript:openWindow('$groupChooser');">
-        <img title="Select a Group"
-             name="assigneeImage" 
-             src="/j2-admin/images/group-chooser.gif" hspace=0 height=16 width=16 border=0 align=absmiddle></a>                   
-    </td>      
-    </td>
-  </tr>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('remotePrincipal')&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="text" name="remote.principal" size="30" value="$!currentR" class="portlet-form-field-label">
-  </tr>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('remoteCredential')&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="password" name="remote.credential" size="30" value="$!remoteCredential" class="portlet-form-field-label">      
-    </td>
-  </tr>  
-</table>
-<br/>
-<input name='sso.add' type="submit" value="$MESSAGES.getString('add')" class="portlet-form-button"/>
-<input name='sso.refresh' class="portlet-form-button" type="submit" value="$MESSAGES.getString('refresh')" />
-</form>	      
-#end
-
+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.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id: sites-details.vm 348264 2005-11-22 22:06:45Z taylor $
+
+*#
+
+## set ($pipeline = $renderResponse.createRenderURL())
+## set ($pipeline = "$pipeline?pipeline=portlet-pipeline&entity=$chooser.Id")
+
+<script>
+function openWindow(pipeline)
+{	
+    var vWinUsers = window.open(pipeline, 'UserPicker', 'status=no,resizable=yes,width=200,height=250,scrollbars=yes');
+    vWinUsers.opener = self;
+	vWinUsers.focus();
+}
+</script>
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+
+#if ($statusMsg)
+#parse ('/WEB-INF/view/status-include.vm')
+#end
+
+#if ($currentSite)
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <tr>
+    <td width='12' class="portlet-section-header"></td>      
+    #foreach ($column in $title)
+	  #set ($columnLink = $renderResponse.createRenderURL())
+	  $columnLink.setParameter("js_dbcolumn",$column)
+      <td align='center' class="portlet-section-header" width="40%" nowrap>
+        $column
+      </td>
+    #end
+    <td width='24' class="portlet-section-header">&nbsp;</td>    
+    <td class=""></td>        
+  </tr>
+  #foreach ( $principal in $table )
+  <tr>
+    #if ($velocityCount % 2 == 0)
+       #set($rowstyle = "portlet-section-body")
+    #else
+       #set($rowstyle = "portlet-section-alternate")
+    #end    
+     #if ($currentP == $principal)
+       <td class="$rowstyle" nowrap width='12'>
+         <img src="/j2-admin/images/selected.gif" width="7" height="12" border="0" vspace="2"/>
+       </td>
+	 #else
+       <td class="$rowstyle" nowrap width='12'>
+         &nbsp;
+       </td>      
+	 #end   	 
+      <td class="$rowstyle" nowrap width="25%">
+        #set ($action = $renderResponse.createActionURL())
+        $action.setParameter('ssoPrincipal', $principal.PortalPrincipalName)
+        <div align="center">$principal.PortalPrincipalName</div>
+      </td>
+      <td class="$rowstyle" nowrap width="25%">
+        <div align="center">$principal.RemotePrincipalName</div>
+      </td>      
+       <td class="$rowstyle" nowrap width='24' align='center'>
+         <a href="javascript:YesNoPopup('$MESSAGES.getString('confirmToDeleteRemote')','$MESSAGES.getString('confirmDelete')','securityform','ssoDelete','$principal.PortalPrincipalName','YesNoReturnMethod()');">
+           <img src="/j2-admin/images/waste_bin.gif" width="20" height="15" border="0"/>            
+         </a>
+       </td>      
+    <td class="">&nbsp;</td>               
+   </tr>
+  #end
+</table>
+<br/>
+<form name='securityform' action="$renderResponse.createActionURL()" method="post">
+<input type='hidden' name='principal.type' value='user'/>
+<input name='ssoDelete' type='hidden' value=''/>
+<table>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('portalPrincipal')&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="text" name="portal.principal" size="30" value="$!currentP" class="portlet-form-field-label">
+	 <a href="javascript:openWindow('$userChooser');">
+        <img title="Select a User"
+             name="assigneeImage" 
+             src="/j2-admin/images/user-chooser.gif" hspace=0 height=16 width=16 border=0 align=absmiddle></a>      
+	 <a href="javascript:openWindow('$groupChooser');">
+        <img title="Select a Group"
+             name="assigneeImage" 
+             src="/j2-admin/images/group-chooser.gif" hspace=0 height=16 width=16 border=0 align=absmiddle></a>                   
+    </td>      
+    </td>
+  </tr>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('remotePrincipal')&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="text" name="remote.principal" size="30" value="$!currentR" class="portlet-form-field-label">
+  </tr>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('remoteCredential')&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="password" name="remote.credential" size="30" value="$!remoteCredential" class="portlet-form-field-label">      
+    </td>
+  </tr>  
+</table>
+<br/>
+<input name='sso.add' type="submit" value="$MESSAGES.getString('add')" class="portlet-form-button"/>
+<input name='sso.refresh' class="portlet-form-button" type="submit" value="$MESSAGES.getString('refresh')" />
+</form>	      
+#end
+

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/sites-details.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/sites-view.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/sites-view.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/sites-view.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/sso/sites-view.vm Fri Dec 12 05:05:25 2008
@@ -1,122 +1,122 @@
-#*
+#*
 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.
-*#
-
-#**
-
-@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: sites-view.vm 348264 2005-11-22 22:06:45Z taylor $
-
-*#
-
-<script language='JavaScript' src='/j2-admin/scripts/jetspeed-security.js'></script>
-
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-
-#if ($statusMsg)
-#parse ('/WEB-INF/view/status-include.vm')
-#end
-
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <tr>
-    <td width='12' class="portlet-section-header"></td>      
-    #set ($column = $title.get(1))
-	#set ($columnLink = $renderResponse.createRenderURL())
-	$columnLink.setParameter("js_dbcolumn",$column)
-    <td align='center' class="portlet-section-header" width="75%" nowrap>
-      $column
-    </td>
-    <td width='24' class="portlet-section-header">&nbsp;</td>    
-    <td class=""></td>        
-  </tr>
-  #foreach ( $ssoItem in $table )
-  <tr>
-     #set ($ssoName = $ssoItem.get(1))
-     #set ($ssoUrl = $ssoItem.get(0))
-    #if ($velocityCount % 2 == 0)
-       #set($rowstyle = "portlet-section-body")
-    #else
-       #set($rowstyle = "portlet-section-alternate")
-    #end  
-
-   #if ($ssoName == $currentName)
-   <td class="$rowstyle" nowrap width='12'>
-     <img src="/j2-admin/images/selected.gif" />
-   </td>	 	
-   #else
-   <td class="$rowstyle" nowrap width='12'>
-     &nbsp;
-   </td>             
-   #end
-     
-      <td class="$rowstyle" nowrap width="40%">
-        #set ($action = $renderResponse.createActionURL())
-        $action.setParameter('ssoSite', $ssoUrl)
-        <div align="center"><a href='$action'>$ssoName</a></div>
-      </td>
-       <td class="$rowstyle" nowrap width='24' align='center'>
-         <a href="javascript:YesNoPopup('$MESSAGES.getString('confirmtodeletesite')','$MESSAGES.getString('confirmdelete')','ssoForm','ssoDelete','$ssoUrl','YesNoReturnMethod()');">
-           <img src="/j2-admin/images/waste_bin.gif" width="20" height="14" border="0"/>            
-         </a>
-       </td>      
-    <td class="">&nbsp;</td>               
-   </tr>
-  #end
-</table>
-<br/>
-<form name='ssoForm' action="$renderResponse.createActionURL()" method="post">
-<table>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('sitename')&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="text" name="site.name" size="40" value="$!currentName" class="portlet-form-field-label">
-    </td>
-  </tr>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('siteurl')&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="text" name="site.url" size="40" value="$!currentUrl" class="portlet-form-field-label">
-    </td>
-  </tr>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('realm')&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="text" name="site.realm" size="40" value="$!currentRealm" class="portlet-form-field-label">
-    </td>
-  </tr>
-  <tr  align="right">
-  <td colspan="2" nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('form_authentication_info')&nbsp;</td>
-  </tr>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('form_field_id')&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="text" name="site.form_field_ID" size="40" value="$!currentFFID" class="portlet-form-field-label">
-    </td>
-  </tr>
-  <tr colspan="2" align="right">
-    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('form_field_PWD')&nbsp;</td>
-    <td class="portlet-section-body" align="left">
-      <input type="text" name="site.form_field_PWD" size="40" value="$!currentFFPWD" class="portlet-form-field-label">
-    </td>
-  </tr>
-</table>
-<br/>
-<input name='ssoDelete' type='hidden' value=''/>
-<input name='sso.save' type="submit" value="$MESSAGES.getString('save')" class="portlet-form-button"/>
-<input name='sso.refresh' class="portlet-form-button" type="submit" value="$MESSAGES.getString('refresh')" />
-<input name='sso.new' class="portlet-form-button" type="submit" value="$MESSAGES.getString('new')" />
-</form>	      
-
+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.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id: sites-view.vm 348264 2005-11-22 22:06:45Z taylor $
+
+*#
+
+<script language='JavaScript' src='/j2-admin/scripts/jetspeed-security.js'></script>
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+
+#if ($statusMsg)
+#parse ('/WEB-INF/view/status-include.vm')
+#end
+
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <tr>
+    <td width='12' class="portlet-section-header"></td>      
+    #set ($column = $title.get(1))
+	#set ($columnLink = $renderResponse.createRenderURL())
+	$columnLink.setParameter("js_dbcolumn",$column)
+    <td align='center' class="portlet-section-header" width="75%" nowrap>
+      $column
+    </td>
+    <td width='24' class="portlet-section-header">&nbsp;</td>    
+    <td class=""></td>        
+  </tr>
+  #foreach ( $ssoItem in $table )
+  <tr>
+     #set ($ssoName = $ssoItem.get(1))
+     #set ($ssoUrl = $ssoItem.get(0))
+    #if ($velocityCount % 2 == 0)
+       #set($rowstyle = "portlet-section-body")
+    #else
+       #set($rowstyle = "portlet-section-alternate")
+    #end  
+
+   #if ($ssoName == $currentName)
+   <td class="$rowstyle" nowrap width='12'>
+     <img src="/j2-admin/images/selected.gif" />
+   </td>	 	
+   #else
+   <td class="$rowstyle" nowrap width='12'>
+     &nbsp;
+   </td>             
+   #end
+     
+      <td class="$rowstyle" nowrap width="40%">
+        #set ($action = $renderResponse.createActionURL())
+        $action.setParameter('ssoSite', $ssoUrl)
+        <div align="center"><a href='$action'>$ssoName</a></div>
+      </td>
+       <td class="$rowstyle" nowrap width='24' align='center'>
+         <a href="javascript:YesNoPopup('$MESSAGES.getString('confirmtodeletesite')','$MESSAGES.getString('confirmdelete')','ssoForm','ssoDelete','$ssoUrl','YesNoReturnMethod()');">
+           <img src="/j2-admin/images/waste_bin.gif" width="20" height="14" border="0"/>            
+         </a>
+       </td>      
+    <td class="">&nbsp;</td>               
+   </tr>
+  #end
+</table>
+<br/>
+<form name='ssoForm' action="$renderResponse.createActionURL()" method="post">
+<table>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('sitename')&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="text" name="site.name" size="40" value="$!currentName" class="portlet-form-field-label">
+    </td>
+  </tr>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('siteurl')&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="text" name="site.url" size="40" value="$!currentUrl" class="portlet-form-field-label">
+    </td>
+  </tr>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('realm')&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="text" name="site.realm" size="40" value="$!currentRealm" class="portlet-form-field-label">
+    </td>
+  </tr>
+  <tr  align="right">
+  <td colspan="2" nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('form_authentication_info')&nbsp;</td>
+  </tr>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('form_field_id')&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="text" name="site.form_field_ID" size="40" value="$!currentFFID" class="portlet-form-field-label">
+    </td>
+  </tr>
+  <tr colspan="2" align="right">
+    <td nowrap class="portlet-section-alternate" align="right">$MESSAGES.getString('form_field_PWD')&nbsp;</td>
+    <td class="portlet-section-body" align="left">
+      <input type="text" name="site.form_field_PWD" size="40" value="$!currentFFPWD" class="portlet-form-field-label">
+    </td>
+  </tr>
+</table>
+<br/>
+<input name='ssoDelete' type='hidden' value=''/>
+<input name='sso.save' type="submit" value="$MESSAGES.getString('save')" class="portlet-form-button"/>
+<input name='sso.refresh' class="portlet-form-button" type="submit" value="$MESSAGES.getString('refresh')" />
+<input name='sso.new' class="portlet-form-button" type="submit" value="$MESSAGES.getString('new')" />
+</form>	      
+

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

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/group-chooser.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/group-chooser.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/group-chooser.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/group-chooser.vm Fri Dec 12 05:05:25 2008
@@ -1,70 +1,70 @@
-#*
+#*
 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.
-*#
-
-#**
-
-@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: sites-details.vm,v 1.2 2005/01/04 23:16:54 taylor Exp $
-
-*#
-
-<script language="JavaScript" type="text/javascript">
-    <!--
-    function select(value)
-    {
-        var openerForm = opener.document.forms['securityform'];
-        var openerEl = openerForm.elements['portal.principal'];
-        var openerType = openerForm.elements['principal.type'];        
-        openerEl.value = value;
-        openerType.value = 'group';
-        window.close();
-    }
-	function rowHover(row)
-	{
-	    row.oldClassName = row.className;
-	    row.className = 'jetdbLight';
-	    row.onmouseout = function()
-	    {
-	        this.className = this.oldClassName;
-	    }
-	}    
-    //-->
-</script>
-
-
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <tr>
-    #foreach ($column in $title)
-	  #set ($columnLink = $renderResponse.createRenderURL())
-	  $columnLink.setParameter("js_dbcolumn",$column)
-##      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap onClick="window.location.href='$columnLink'">
-      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap>
-        $column
-      </td>
-    #end
-  </tr>
-  #foreach ( $group in $table )
-  <tr>
-      #set ($rowstyle = "jetdbOdd")
-      <td class="$rowstyle" nowrap width="25%" onclick="select('$group');" onmouseover="rowHover(this)">
-        <div align="center">$group</div>
-      </td>
-   </tr>
-  #end
-</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.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id: sites-details.vm,v 1.2 2005/01/04 23:16:54 taylor Exp $
+
+*#
+
+<script language="JavaScript" type="text/javascript">
+    <!--
+    function select(value)
+    {
+        var openerForm = opener.document.forms['securityform'];
+        var openerEl = openerForm.elements['portal.principal'];
+        var openerType = openerForm.elements['principal.type'];        
+        openerEl.value = value;
+        openerType.value = 'group';
+        window.close();
+    }
+	function rowHover(row)
+	{
+	    row.oldClassName = row.className;
+	    row.className = 'jetdbLight';
+	    row.onmouseout = function()
+	    {
+	        this.className = this.oldClassName;
+	    }
+	}    
+    //-->
+</script>
+
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <tr>
+    #foreach ($column in $title)
+	  #set ($columnLink = $renderResponse.createRenderURL())
+	  $columnLink.setParameter("js_dbcolumn",$column)
+##      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap onClick="window.location.href='$columnLink'">
+      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap>
+        $column
+      </td>
+    #end
+  </tr>
+  #foreach ( $group in $table )
+  <tr>
+      #set ($rowstyle = "jetdbOdd")
+      <td class="$rowstyle" nowrap width="25%" onclick="select('$group');" onmouseover="rowHover(this)">
+        <div align="center">$group</div>
+      </td>
+   </tr>
+  #end
+</table>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/group-chooser.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/role-chooser.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/role-chooser.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/role-chooser.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/role-chooser.vm Fri Dec 12 05:05:25 2008
@@ -1,70 +1,70 @@
-#*
+#*
 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.
-*#
-
-#**
-
-@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: sites-details.vm,v 1.2 2005/01/04 23:16:54 taylor Exp $
-
-*#
-
-<script language="JavaScript" type="text/javascript">
-    <!--
-    function select(value)
-    {
-        var openerForm = opener.document.forms['securityform'];
-        var openerEl = openerForm.elements['portal.principal'];
-        var openerType = openerForm.elements['principal.type'];        
-        openerEl.value = value;
-        openerType.value = 'role';
-        window.close();
-    }
-	function rowHover(row)
-	{
-	    row.oldClassName = row.className;
-	    row.className = 'jetdbLight';
-	    row.onmouseout = function()
-	    {
-	        this.className = this.oldClassName;
-	    }
-	}    
-    //-->
-</script>
-
-
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <tr>
-    #foreach ($column in $title)
-	  #set ($columnLink = $renderResponse.createRenderURL())
-	  $columnLink.setParameter("js_dbcolumn",$column)
-##      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap onClick="window.location.href='$columnLink'">
-      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap>
-        $column
-      </td>
-    #end
-  </tr>
-  #foreach ( $role in $table )
-  <tr>
-      #set ($rowstyle = "jetdbOdd")
-      <td class="$rowstyle" nowrap width="25%" onclick="select('$role');" onmouseover="rowHover(this)">
-        <div align="center">$role</div>
-      </td>
-   </tr>
-  #end
-</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.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id: sites-details.vm,v 1.2 2005/01/04 23:16:54 taylor Exp $
+
+*#
+
+<script language="JavaScript" type="text/javascript">
+    <!--
+    function select(value)
+    {
+        var openerForm = opener.document.forms['securityform'];
+        var openerEl = openerForm.elements['portal.principal'];
+        var openerType = openerForm.elements['principal.type'];        
+        openerEl.value = value;
+        openerType.value = 'role';
+        window.close();
+    }
+	function rowHover(row)
+	{
+	    row.oldClassName = row.className;
+	    row.className = 'jetdbLight';
+	    row.onmouseout = function()
+	    {
+	        this.className = this.oldClassName;
+	    }
+	}    
+    //-->
+</script>
+
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <tr>
+    #foreach ($column in $title)
+	  #set ($columnLink = $renderResponse.createRenderURL())
+	  $columnLink.setParameter("js_dbcolumn",$column)
+##      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap onClick="window.location.href='$columnLink'">
+      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap>
+        $column
+      </td>
+    #end
+  </tr>
+  #foreach ( $role in $table )
+  <tr>
+      #set ($rowstyle = "jetdbOdd")
+      <td class="$rowstyle" nowrap width="25%" onclick="select('$role');" onmouseover="rowHover(this)">
+        <div align="center">$role</div>
+      </td>
+   </tr>
+  #end
+</table>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/role-chooser.vm
------------------------------------------------------------------------------
    svn:eol-style = native

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

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-browser.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-chooser.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-chooser.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-chooser.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-chooser.vm Fri Dec 12 05:05:25 2008
@@ -1,70 +1,70 @@
-#*
+#*
 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.
-*#
-
-#**
-
-@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: sites-details.vm,v 1.2 2005/01/04 23:16:54 taylor Exp $
-
-*#
-
-<script language="JavaScript" type="text/javascript">
-    <!--
-    function select(value)
-    {
-        var openerForm = opener.document.forms['securityform'];
-        var openerEl = openerForm.elements['portal.principal'];
-        var openerType = openerForm.elements['principal.type'];        
-        openerEl.value = value;
-        openerType.value = 'user';
-        window.close();
-    }
-	function rowHover(row)
-	{
-	    row.oldClassName = row.className;
-	    row.className = 'jetdbLight';
-	    row.onmouseout = function()
-	    {
-	        this.className = this.oldClassName;
-	    }
-	}    
-    //-->
-</script>
-
-
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <tr>
-    #foreach ($column in $title)
-	  #set ($columnLink = $renderResponse.createRenderURL())
-	  $columnLink.setParameter("js_dbcolumn",$column)
-##      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap onClick="window.location.href='$columnLink'">
-      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap>
-        $column
-      </td>
-    #end
-  </tr>
-  #foreach ( $user in $table )
-  <tr>
-      #set ($rowstyle = "jetdbOdd")
-      <td class="$rowstyle" nowrap width="25%" onclick="select('$user');" onmouseover="rowHover(this)">
-        <div align="center">$user</div>
-      </td>
-   </tr>
-  #end
-</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.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id: sites-details.vm,v 1.2 2005/01/04 23:16:54 taylor Exp $
+
+*#
+
+<script language="JavaScript" type="text/javascript">
+    <!--
+    function select(value)
+    {
+        var openerForm = opener.document.forms['securityform'];
+        var openerEl = openerForm.elements['portal.principal'];
+        var openerType = openerForm.elements['principal.type'];        
+        openerEl.value = value;
+        openerType.value = 'user';
+        window.close();
+    }
+	function rowHover(row)
+	{
+	    row.oldClassName = row.className;
+	    row.className = 'jetdbLight';
+	    row.onmouseout = function()
+	    {
+	        this.className = this.oldClassName;
+	    }
+	}    
+    //-->
+</script>
+
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <tr>
+    #foreach ($column in $title)
+	  #set ($columnLink = $renderResponse.createRenderURL())
+	  $columnLink.setParameter("js_dbcolumn",$column)
+##      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap onClick="window.location.href='$columnLink'">
+      <td align='center' class="jetdbHeadNoLink" width="40%" nowrap>
+        $column
+      </td>
+    #end
+  </tr>
+  #foreach ( $user in $table )
+  <tr>
+      #set ($rowstyle = "jetdbOdd")
+      <td class="$rowstyle" nowrap width="25%" onclick="select('$user');" onmouseover="rowHover(this)">
+        <div align="center">$user</div>
+      </td>
+   </tr>
+  #end
+</table>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-chooser.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-details-edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-details.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-multi-chooser.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-multi-chooser.vm?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-multi-chooser.vm (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-multi-chooser.vm Fri Dec 12 05:05:25 2008
@@ -1,94 +1,94 @@
-#*
+#*
 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.
-*#
-
-#**
-
-@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: user-multi-chooser.vm 348264 2005-11-22 22:06:45Z taylor $
-
-*#
-
-<script language="JavaScript" type="text/javascript">
-    <!--
-    function select(value)
-    {
-        var openerForm = opener.document.forms['securityform'];
-        var openerEl = openerForm.elements['users'];
-        window.close();
-    }
-	function rowHover(row)
-	{
-	    row.oldClassName = row.className;
-	    row.className = 'jetdbLight';
-	    row.onmouseout = function()
-	    {
-	        this.className = this.oldClassName;
-	    }
-	}    
-	function sendChecks(form)
-	{
-		var result = "";
-		for(var i = 0; i < form.length; i++)
-		{
-		   var e = form.elements[i];
-		   if (e.type == "checkbox")
-		   {
-		       if (e.checked == true)
-		       {
-		       	   result = result + "," + e.name;
-		       }
-		   }
-		}
-        var openerForm = opener.document.forms['securityform'];
-        var openerEl = openerForm.elements['users'];
-        openerEl.value = result;
-        window.close();
-        openerForm.submit();		
-	}
-    //-->
-</script>
-
-
-#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-<form name='userform' onSubmit='sendChecks(this)'/>
-<table cellpadding=0 cellspacing=1 border=0 width='100%' >
-  <tr>
-    #foreach ($column in $title)    
-      <td align='center' class="jetdbHeadNoLink" width="90%" nowrap>
-        $column
-      </td>
-      <th class="jetdbHeadNoLink" width="10"></th>     
-    #end
-  </tr>
-  #foreach ( $user in $table )
-  <tr>
-    #if ($velocityCount % 2 == 0)
-       #set($rowstyle = "jetdbEven")
-    #else
-       #set($rowstyle = "jetdbOdd")
-    #end   
-      <td class="$rowstyle" nowrap width="90%" onmouseover="rowHover(this)">
-        <div align="center">$user</div>
-      </td>
-	  <td class="$rowstyle" width="10">
-  	    <input type="checkbox" name="box_$user"/>
-	  </td>      
-   </tr>
-  #end
-</table>
- <input type="submit" name="add.users" value="Add Users" class="jetdbButton"  />
+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.
+*#
+
+#**
+
+@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+@version $Id: user-multi-chooser.vm 348264 2005-11-22 22:06:45Z taylor $
+
+*#
+
+<script language="JavaScript" type="text/javascript">
+    <!--
+    function select(value)
+    {
+        var openerForm = opener.document.forms['securityform'];
+        var openerEl = openerForm.elements['users'];
+        window.close();
+    }
+	function rowHover(row)
+	{
+	    row.oldClassName = row.className;
+	    row.className = 'jetdbLight';
+	    row.onmouseout = function()
+	    {
+	        this.className = this.oldClassName;
+	    }
+	}    
+	function sendChecks(form)
+	{
+		var result = "";
+		for(var i = 0; i < form.length; i++)
+		{
+		   var e = form.elements[i];
+		   if (e.type == "checkbox")
+		   {
+		       if (e.checked == true)
+		       {
+		       	   result = result + "," + e.name;
+		       }
+		   }
+		}
+        var openerForm = opener.document.forms['securityform'];
+        var openerEl = openerForm.elements['users'];
+        openerEl.value = result;
+        window.close();
+        openerForm.submit();		
+	}
+    //-->
+</script>
+
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+<form name='userform' onSubmit='sendChecks(this)'/>
+<table cellpadding=0 cellspacing=1 border=0 width='100%' >
+  <tr>
+    #foreach ($column in $title)    
+      <td align='center' class="jetdbHeadNoLink" width="90%" nowrap>
+        $column
+      </td>
+      <th class="jetdbHeadNoLink" width="10"></th>     
+    #end
+  </tr>
+  #foreach ( $user in $table )
+  <tr>
+    #if ($velocityCount % 2 == 0)
+       #set($rowstyle = "jetdbEven")
+    #else
+       #set($rowstyle = "jetdbOdd")
+    #end   
+      <td class="$rowstyle" nowrap width="90%" onmouseover="rowHover(this)">
+        <div align="center">$user</div>
+      </td>
+	  <td class="$rowstyle" width="10">
+  	    <input type="checkbox" name="box_$user"/>
+	  </td>      
+   </tr>
+  #end
+</table>
+ <input type="submit" name="add.users" value="Add Users" class="jetdbButton"  />
 </form>
\ No newline at end of file

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/security/users/user-multi-chooser.vm
------------------------------------------------------------------------------
    svn:eol-style = native

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

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/context/applicationContext.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/context/applicationContext.xml?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/context/applicationContext.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/context/applicationContext.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,39 +15,39 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "../dtd/spring-beans.dtd">
-
-<beans>
-
-	<!-- Message source for this context, loaded from localized "messages_xx" files -->
-	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-		<property name="basenames">
-			<list>
-				<value>messages</value>
-			</list>
-		</property>										
-	</bean>
-
-	<!-- Default View Resolver -->
-	
-    <bean id="resourceBundleViewResolver" class="org.springframework.web.servlet.view.ResourceBundleViewResolver">
-        <property name="order"><value>0</value></property>
-        <property name="basename"><value>views</value></property>
-    </bean>
-    
-    <bean id="velocityConfig" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
-        <property name="resourceLoaderPath"><value>/WEB-INF/view/</value></property>
-    </bean>
-
-	<!-- Abstract Default Exception Handler Bean -->
-    <bean id="defaultExceptionHandlerTemplate" class="org.springframework.web.portlet.handler.SimpleMappingExceptionResolver" abstract="true">
-		<property name="defaultErrorView" value="defError"/>
-		<property name="exceptionMappings">
-			<props>
-				<prop key="javax.portlet.PortletSecurityException">notAuthorized</prop>
-				<prop key="javax.portlet.UnavailableException">notAvailable</prop>
-			</props>
-		</property>
-	</bean>
-
-</beans>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "../dtd/spring-beans.dtd">
+
+<beans>
+
+	<!-- Message source for this context, loaded from localized "messages_xx" files -->
+	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="basenames">
+			<list>
+				<value>messages</value>
+			</list>
+		</property>										
+	</bean>
+
+	<!-- Default View Resolver -->
+	
+    <bean id="resourceBundleViewResolver" class="org.springframework.web.servlet.view.ResourceBundleViewResolver">
+        <property name="order"><value>0</value></property>
+        <property name="basename"><value>views</value></property>
+    </bean>
+    
+    <bean id="velocityConfig" class="org.springframework.web.servlet.view.velocity.VelocityConfigurer">
+        <property name="resourceLoaderPath"><value>/WEB-INF/view/</value></property>
+    </bean>
+
+	<!-- Abstract Default Exception Handler Bean -->
+    <bean id="defaultExceptionHandlerTemplate" class="org.springframework.web.portlet.handler.SimpleMappingExceptionResolver" abstract="true">
+		<property name="defaultErrorView" value="defError"/>
+		<property name="exceptionMappings">
+			<props>
+				<prop key="javax.portlet.PortletSecurityException">notAuthorized</prop>
+				<prop key="javax.portlet.UnavailableException">notAvailable</prop>
+			</props>
+		</property>
+	</bean>
+
+</beans>

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

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/context/portlet/constraints.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/context/portlet/constraints.xml?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/context/portlet/constraints.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/context/portlet/constraints.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,68 +15,68 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "../../dtd/spring-beans.dtd">
-<beans>
-
-	<!-- Property Configurer  -->
-	
-	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="locations">
-			<list>
-				<value>WEB-INF/springmvc/constraints.properties</value>
-			</list>
-		</property>
-	</bean>
-
-	<!-- Services -->
-	
-
-	<!-- Controllers -->
-
-	<bean id="SiteViewController" class="org.apache.jetspeed.portlets.security.constraints.ConstraintsViewController">
-<!--		<property name="test" value="Property Test" /> -->
-	</bean>
-		
-
-	<!-- Handler Mapping 
-	
-	<bean id="parameterMappingInterceptor" class="org.springframework.web.portlet.handler.ParameterMappingInterceptor"/>
-	
-	<bean id="portletModeParameterHandlerMapping" class="org.springframework.web.portlet.handler.PortletModeParameterHandlerMapping">
-        <property name="order" value="10"/>
-		<property name="interceptors">
-			<list>
-				<ref bean="parameterMappingInterceptor"/>
-			</list>
-		</property>
-		<property name="portletModeParameterMap">
-			<map>
-				<entry key="edit">
-					<map>
-						<entry key="editDomTree"><ref bean="domtreePrefsController"/></entry>
-						<entry key="newDomTree"><ref bean="domtreePrefsController"/></entry>
-						<entry key="deleteDomTree"><ref bean="domtreeDeleteController"/></entry>
-						<entry key="list"><ref bean="domtreePrefsListController"/></entry>
-					</map>
-				</entry>
-			</map>
-		</property>
-	</bean>
- -->        
-	
-	<bean id="portletModeHandlerMapping" class="org.springframework.web.portlet.handler.PortletModeHandlerMapping">
-		<property name="order" value="10"/>
-		<property name="portletModeMap">
-        	<map>
-            	<entry key="view"><ref bean="SiteViewController"/></entry>
-<!--                <entry key="edit"><ref bean="domtreePrefsListController"/></entry> -->
-            </map>
-        </property>
-    </bean>
-		
-
-	<!-- Exceptions Handler -->
-
-	<bean id="defaultExceptionHandler" parent="defaultExceptionHandlerTemplate"/>
-
-</beans>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "../../dtd/spring-beans.dtd">
+<beans>
+
+	<!-- Property Configurer  -->
+	
+	<bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="locations">
+			<list>
+				<value>WEB-INF/springmvc/constraints.properties</value>
+			</list>
+		</property>
+	</bean>
+
+	<!-- Services -->
+	
+
+	<!-- Controllers -->
+
+	<bean id="SiteViewController" class="org.apache.jetspeed.portlets.security.constraints.ConstraintsViewController">
+<!--		<property name="test" value="Property Test" /> -->
+	</bean>
+		
+
+	<!-- Handler Mapping 
+	
+	<bean id="parameterMappingInterceptor" class="org.springframework.web.portlet.handler.ParameterMappingInterceptor"/>
+	
+	<bean id="portletModeParameterHandlerMapping" class="org.springframework.web.portlet.handler.PortletModeParameterHandlerMapping">
+        <property name="order" value="10"/>
+		<property name="interceptors">
+			<list>
+				<ref bean="parameterMappingInterceptor"/>
+			</list>
+		</property>
+		<property name="portletModeParameterMap">
+			<map>
+				<entry key="edit">
+					<map>
+						<entry key="editDomTree"><ref bean="domtreePrefsController"/></entry>
+						<entry key="newDomTree"><ref bean="domtreePrefsController"/></entry>
+						<entry key="deleteDomTree"><ref bean="domtreeDeleteController"/></entry>
+						<entry key="list"><ref bean="domtreePrefsListController"/></entry>
+					</map>
+				</entry>
+			</map>
+		</property>
+	</bean>
+ -->        
+	
+	<bean id="portletModeHandlerMapping" class="org.springframework.web.portlet.handler.PortletModeHandlerMapping">
+		<property name="order" value="10"/>
+		<property name="portletModeMap">
+        	<map>
+            	<entry key="view"><ref bean="SiteViewController"/></entry>
+<!--                <entry key="edit"><ref bean="domtreePrefsListController"/></entry> -->
+            </map>
+        </property>
+    </bean>
+		
+
+	<!-- Exceptions Handler -->
+
+	<bean id="defaultExceptionHandler" parent="defaultExceptionHandlerTemplate"/>
+
+</beans>

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

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

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

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

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/html/include.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/html/include.jsp?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/html/include.jsp (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/html/include.jsp Fri Dec 12 05:05:25 2008
@@ -14,9 +14,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <%@ taglib prefix="html" tagdir="/WEB-INF/tags/html" %>
\ No newline at end of file

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

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/portlet.tld
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/portlet.tld?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/portlet.tld (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/portlet.tld Fri Dec 12 05:05:25 2008
@@ -1,106 +1,106 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<!-- 
 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
+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.
+-->
+<taglib>
+    <tlibversion>1.0</tlibversion>
+    <jspversion>1.1</jspversion>
+    <shortname>portlet</shortname>
+    <uri>http://java.sun.com/portlet</uri>
+    <tag>
+        <name>defineObjects</name>
+        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
+        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+    <tag>
+        <name>param</name>
+        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
+        <bodycontent>empty</bodycontent>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>actionURL</name>
+        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
+        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
+        <bodycontent>JSP</bodycontent>
+        <attribute>
+            <name>windowState</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>portletMode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>secure</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>renderURL</name>
+        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
+        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
+        <bodycontent>JSP</bodycontent>
+        <attribute>
+            <name>windowState</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>portletMode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>secure</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>namespace</name>
+        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
 </taglib>
\ No newline at end of file

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

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/spring.tld
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/spring.tld?rev=725991&r1=725990&r2=725991&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/spring.tld (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/spring.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,325 +15,325 @@
   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.1.2</tlib-version>
-
-	<jsp-version>1.2</jsp-version>
-
-	<short-name>Spring</short-name>
-
-	<uri>http://www.springframework.org/tags</uri>
-
-	<description>Spring Framework JSP Tag Library. Authors: Rod Johnson, Juergen Hoeller</description>
-
-
-	<tag>
-
-		<name>htmlEscape</name>
-		<tag-class>org.springframework.web.servlet.tags.HtmlEscapeTag</tag-class>
-		<body-content>JSP</body-content>
-
-		<description>
-			Sets default HTML escape value for the current page.
-			Overrides a "defaultHtmlEscape" context-param in web.xml, if any.
-		</description>
-
-		<attribute>
-			<name>defaultHtmlEscape</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-	</tag>
-
-
-	<tag>
-
-		<name>escapeBody</name>
-		<tag-class>org.springframework.web.servlet.tags.EscapeBodyTag</tag-class>
-		<body-content>JSP</body-content>
-
-		<description>
-			Escapes its enclosed body content, applying HTML escaping and/or JavaScript escaping.
-			The HTML escaping flag participates in a page-wide or application-wide setting
-			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
-		</description>
-
-		<attribute>
-			<name>htmlEscape</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>javaScriptEscape</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-	</tag>
-
-
-	<tag>
-
-		<name>message</name>
-		<tag-class>org.springframework.web.servlet.tags.MessageTag</tag-class>
-		<body-content>JSP</body-content>
-
-		<description>
-			Retrieves the message with the given code, or text if code isn't resolvable.
-			The HTML escaping flag participates in a page-wide or application-wide setting
-			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
-		</description>
-
-		<attribute>
-			<name>message</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>code</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>arguments</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>argumentSeparator</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>text</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>var</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>scope</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>htmlEscape</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>javaScriptEscape</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-	</tag>
-
-
-	<tag>
-
-		<name>theme</name>
-		<tag-class>org.springframework.web.servlet.tags.ThemeTag</tag-class>
-		<body-content>JSP</body-content>
-
-		<description>
-			Retrieves the theme message with the given code, or text if code isn't resolvable.
-			The HTML escaping flag participates in a page-wide or application-wide setting
-			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
-		</description>
-
-		<attribute>
-			<name>code</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>arguments</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>text</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>var</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>scope</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>htmlEscape</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>javaScriptEscape</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-	</tag>
-
-
-	<tag>
-
-		<name>hasBindErrors</name>
-		<tag-class>org.springframework.web.servlet.tags.BindErrorsTag</tag-class>
-		<body-content>JSP</body-content>
-
-		<description>
-			Provides Errors instance in case of bind errors.
-			The HTML escaping flag participates in a page-wide or application-wide setting
-			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
-		</description>
-
-		<variable>
-			<name-given>errors</name-given>
-			<variable-class>org.springframework.validation.Errors</variable-class>
-		</variable>
-
-		<attribute>
-			<name>name</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>htmlEscape</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-	</tag>
-
-
-	<tag>
-
-		<name>nestedPath</name>
-		<tag-class>org.springframework.web.servlet.tags.NestedPathTag</tag-class>
-		<body-content>JSP</body-content>
-
-		<description>
-			Sets a nested path to be used by the bind tag's path.
-		</description>
-
-		<variable>
-			<name-given>nestedPath</name-given>
-			<variable-class>java.lang.String</variable-class>
-		</variable>
-
-		<attribute>
-			<name>path</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-	</tag>
-
-
-	<tag>
-
-		<name>bind</name>
-		<tag-class>org.springframework.web.servlet.tags.BindTag</tag-class>
-		<body-content>JSP</body-content>
-
-		<description>
-			Provides BindStatus object for the given bind path.
-			The HTML escaping flag participates in a page-wide or application-wide setting
-			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
-		</description>
-
-		<variable>
-			<name-given>status</name-given>
-			<variable-class>org.springframework.web.servlet.support.BindStatus</variable-class>
-		</variable>
-
-		<attribute>
-			<name>path</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>ignoreNestedPath</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>htmlEscape</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-	</tag>
-
-
-	<tag>
-
-		<name>transform</name>
-		<tag-class>org.springframework.web.servlet.tags.TransformTag</tag-class>
-		<body-content>JSP</body-content>
-
-		<description>
-			Provides transformation of variables to Strings, using an appropriate
-			custom PropertyEditor from BindTag (can only be used inside BindTag).
-			The HTML escaping flag participates in a page-wide or application-wide setting
-			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
-		</description>
-
-		<attribute>
-			<name>value</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>var</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>scope</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-
-		<attribute>
-			<name>htmlEscape</name>
-			<required>false</required>
-			<rtexprvalue>true</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.1.2</tlib-version>
+
+	<jsp-version>1.2</jsp-version>
+
+	<short-name>Spring</short-name>
+
+	<uri>http://www.springframework.org/tags</uri>
+
+	<description>Spring Framework JSP Tag Library. Authors: Rod Johnson, Juergen Hoeller</description>
+
+
+	<tag>
+
+		<name>htmlEscape</name>
+		<tag-class>org.springframework.web.servlet.tags.HtmlEscapeTag</tag-class>
+		<body-content>JSP</body-content>
+
+		<description>
+			Sets default HTML escape value for the current page.
+			Overrides a "defaultHtmlEscape" context-param in web.xml, if any.
+		</description>
+
+		<attribute>
+			<name>defaultHtmlEscape</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+	</tag>
+
+
+	<tag>
+
+		<name>escapeBody</name>
+		<tag-class>org.springframework.web.servlet.tags.EscapeBodyTag</tag-class>
+		<body-content>JSP</body-content>
+
+		<description>
+			Escapes its enclosed body content, applying HTML escaping and/or JavaScript escaping.
+			The HTML escaping flag participates in a page-wide or application-wide setting
+			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+		</description>
+
+		<attribute>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>javaScriptEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+	</tag>
+
+
+	<tag>
+
+		<name>message</name>
+		<tag-class>org.springframework.web.servlet.tags.MessageTag</tag-class>
+		<body-content>JSP</body-content>
+
+		<description>
+			Retrieves the message with the given code, or text if code isn't resolvable.
+			The HTML escaping flag participates in a page-wide or application-wide setting
+			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+		</description>
+
+		<attribute>
+			<name>message</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>code</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>arguments</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>argumentSeparator</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>text</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>scope</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>javaScriptEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+	</tag>
+
+
+	<tag>
+
+		<name>theme</name>
+		<tag-class>org.springframework.web.servlet.tags.ThemeTag</tag-class>
+		<body-content>JSP</body-content>
+
+		<description>
+			Retrieves the theme message with the given code, or text if code isn't resolvable.
+			The HTML escaping flag participates in a page-wide or application-wide setting
+			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+		</description>
+
+		<attribute>
+			<name>code</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>arguments</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>text</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>scope</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>javaScriptEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+	</tag>
+
+
+	<tag>
+
+		<name>hasBindErrors</name>
+		<tag-class>org.springframework.web.servlet.tags.BindErrorsTag</tag-class>
+		<body-content>JSP</body-content>
+
+		<description>
+			Provides Errors instance in case of bind errors.
+			The HTML escaping flag participates in a page-wide or application-wide setting
+			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+		</description>
+
+		<variable>
+			<name-given>errors</name-given>
+			<variable-class>org.springframework.validation.Errors</variable-class>
+		</variable>
+
+		<attribute>
+			<name>name</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+	</tag>
+
+
+	<tag>
+
+		<name>nestedPath</name>
+		<tag-class>org.springframework.web.servlet.tags.NestedPathTag</tag-class>
+		<body-content>JSP</body-content>
+
+		<description>
+			Sets a nested path to be used by the bind tag's path.
+		</description>
+
+		<variable>
+			<name-given>nestedPath</name-given>
+			<variable-class>java.lang.String</variable-class>
+		</variable>
+
+		<attribute>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+	</tag>
+
+
+	<tag>
+
+		<name>bind</name>
+		<tag-class>org.springframework.web.servlet.tags.BindTag</tag-class>
+		<body-content>JSP</body-content>
+
+		<description>
+			Provides BindStatus object for the given bind path.
+			The HTML escaping flag participates in a page-wide or application-wide setting
+			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+		</description>
+
+		<variable>
+			<name-given>status</name-given>
+			<variable-class>org.springframework.web.servlet.support.BindStatus</variable-class>
+		</variable>
+
+		<attribute>
+			<name>path</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>ignoreNestedPath</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+	</tag>
+
+
+	<tag>
+
+		<name>transform</name>
+		<tag-class>org.springframework.web.servlet.tags.TransformTag</tag-class>
+		<body-content>JSP</body-content>
+
+		<description>
+			Provides transformation of variables to Strings, using an appropriate
+			custom PropertyEditor from BindTag (can only be used inside BindTag).
+			The HTML escaping flag participates in a page-wide or application-wide setting
+			(i.e. by HtmlEscapeTag or a "defaultHtmlEscape" context-param in web.xml).
+		</description>
+
+		<attribute>
+			<name>value</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>var</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>scope</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+		<attribute>
+			<name>htmlEscape</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+
+	</tag>
+
+</taglib>

Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/springmvc/tags/spring.tld
------------------------------------------------------------------------------
    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