svnno****@sourc*****
svnno****@sourc*****
2007年 12月 8日 (土) 06:44:58 JST
Revision: 747
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=747
Author: shinsuke
Date: 2007-12-08 06:44:58 +0900 (Sat, 08 Dec 2007)
Log Message:
-----------
moved login.jsp to files.
Modified Paths:
--------------
pal-portal/trunk/build.properties
Added Paths:
-----------
pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/html/
pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/html/login.jsp
Removed Paths:
-------------
pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp
-------------- next part --------------
Modified: pal-portal/trunk/build.properties
===================================================================
--- pal-portal/trunk/build.properties 2007-12-07 21:12:08 UTC (rev 746)
+++ pal-portal/trunk/build.properties 2007-12-07 21:44:58 UTC (rev 747)
@@ -177,7 +177,6 @@
layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml,\
src/webapp/WEB-INF/assembly/jetspeed-services.xml,\
src/webapp/WEB-INF/assembly/pipelines.xml,\
-src/webapp/WEB-INF/templates/login/html/login.jsp,\
src/webapp/WEB-INF/web.xml,\
src/webapp/decorations/portlet/decorator.vm,\
project.properties,\
Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/html/login.jsp
===================================================================
--- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/html/login.jsp 2007-12-07 21:12:08 UTC (rev 746)
+++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/html/login.jsp 2007-12-07 21:44:58 UTC (rev 747)
@@ -0,0 +1,73 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page language="java" import="org.apache.jetspeed.login.LoginConstants" session="true" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<fmt:setBundle basename="org.apache.jetspeed.login.resources.LoginViewResources" />
+<html>
+<head>
+<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/css/login.css"/>
+<link rel="shortcut icon" href="<%= request.getContextPath() %>/images/favicon.ico"/>
+<title><fmt:message key="login.page.title"/></title>
+</head>
+<body>
+<div id="header">
+ <div class="logo"><img src="<%= request.getContextPath() %>/images/login_logo.gif"/></div>
+ <div class="home">
+ <a href="<%= request.getContextPath() %>/portal"><fmt:message key="login.home.link"/></a>
+ </div>
+</div>
+<div id="main">
+ <div class="title"><fmt:message key="login.to.portal"/></div>
+ <form id="login" method="POST" action="<%= response.encodeURL("j_security_check") %>">
+<% if(session.getAttribute(LoginConstants.ERRORCODE) != null) {%>
+ <div class="errormessage">
+ <fmt:message key="login.invalid.id.or.password"/>
+ </div>
+<% } %>
+ <div class="data">
+ <div class="label"><fmt:message key="username.label"/></div>
+ <div class="input"><input type="text" name="j_username" size="30" /></div>
+ </div>
+ <div class="data">
+ <div class="label"><fmt:message key="password.label"/></div>
+ <div class="input"><input type="password" name="j_password" size="30"/></div>
+ </div>
+ <div class="action"><input type="submit" value="<fmt:message key="login.button"/>"/></div>
+ <div class="forgetpassword">
+ <a href="<%= request.getContextPath() %>/portal/forgot.psml"><fmt:message key="login.forget.your.password"/></a>
+ </div>
+ </form>
+</div>
+<div id="description">
+ <div class="signuptitle">
+ <fmt:message key="login.signup.title"/>
+ </div>
+ <div class="signupdesc">
+ <fmt:message key="login.signup.description"/>
+ </div>
+ <div class="signup">
+ <a href="<%= request.getContextPath() %>/portal/register.psml"><fmt:message key="login.signup.link"/></a>
+ </div>
+</div>
+<div id="footer">
+ <div class="copyright">
+ <fmt:message key="login.copyright"/>
+ </div>
+</div>
+</body>
+</html>
+
Property changes on: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/login/html/login.jsp
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp
===================================================================
--- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp 2007-12-07 21:12:08 UTC (rev 746)
+++ pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/login/html/login.jsp 2007-12-07 21:44:58 UTC (rev 747)
@@ -1,71 +0,0 @@
-Index: src/webapp/WEB-INF/templates/login/html/login.jsp
-===================================================================
---- src/webapp/WEB-INF/templates/login/html/login.jsp (リビジョン 539124)
-+++ src/webapp/WEB-INF/templates/login/html/login.jsp (作業コピー)
-@@ -17,15 +17,57 @@
- <%@ page language="java" import="org.apache.jetspeed.login.LoginConstants" session="true" %>
- <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
- <fmt:setBundle basename="org.apache.jetspeed.login.resources.LoginViewResources" />
--
- <html>
--<body onLoad='document.forms["login"].submit();'>
--<form id='login' method='POST' action='<%= response.encodeURL("j_security_check") %>'>
--<input type='hidden' name='j_username' value='<%= session.getAttribute(LoginConstants.USERNAME) %>'/>
--<input type='hidden' name='j_password' value='<%= session.getAttribute(LoginConstants.PASSWORD) %>'/>
--<noscript>
--<input type='submit' value="<fmt:message key="login.button"/>"/>
--</noscript>
--</form>
-+<head>
-+<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/css/login.css"/>
-+<link rel="shortcut icon" href="<%= request.getContextPath() %>/images/favicon.ico"/>
-+<title><fmt:message key="login.page.title"/></title>
-+</head>
-+<body>
-+<div id="header">
-+ <div class="logo"><img src="<%= request.getContextPath() %>/images/login_logo.gif"/></div>
-+ <div class="home">
-+ <a href="<%= request.getContextPath() %>/portal"><fmt:message key="login.home.link"/></a>
-+ </div>
-+</div>
-+<div id="main">
-+ <div class="title"><fmt:message key="login.to.portal"/></div>
-+ <form id="login" method="POST" action="<%= response.encodeURL("j_security_check") %>">
-+<% if(session.getAttribute(LoginConstants.ERRORCODE) != null) {%>
-+ <div class="errormessage">
-+ <fmt:message key="login.invalid.id.or.password"/>
-+ </div>
-+<% } %>
-+ <div class="data">
-+ <div class="label"><fmt:message key="username.label"/></div>
-+ <div class="input"><input type="text" name="j_username" size="30" /></div>
-+ </div>
-+ <div class="data">
-+ <div class="label"><fmt:message key="password.label"/></div>
-+ <div class="input"><input type="password" name="j_password" size="30"/></div>
-+ </div>
-+ <div class="action"><input type="submit" value="<fmt:message key="login.button"/>"/></div>
-+ <div class="forgetpassword">
-+ <a href="<%= request.getContextPath() %>/portal/forgot.psml"><fmt:message key="login.forget.your.password"/></a>
-+ </div>
-+ </form>
-+</div>
-+<div id="description">
-+ <div class="signuptitle">
-+ <fmt:message key="login.signup.title"/>
-+ </div>
-+ <div class="signupdesc">
-+ <fmt:message key="login.signup.description"/>
-+ </div>
-+ <div class="signup">
-+ <a href="<%= request.getContextPath() %>/portal/register.psml"><fmt:message key="login.signup.link"/></a>
-+ </div>
-+</div>
-+<div id="footer">
-+ <div class="copyright">
-+ <fmt:message key="login.copyright"/>
-+ </div>
-+</div>
- </body>
- </html>
-+