jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r698593 - in /jackrabbit/trunk/jackrabbit-webapp/src/main/webapp: about.jsp header.jsp welcome.jsp
Date Wed, 24 Sep 2008 14:37:55 GMT
Author: jukka
Date: Wed Sep 24 07:37:55 2008
New Revision: 698593

URL: http://svn.apache.org/viewvc?rev=698593&view=rev
Log:
JCR-1630: Missing third party notices and license info

Added an About Apache Jackrabbit page that displays also copyright and licensing information.

Added:
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/about.jsp   (with props)
Modified:
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/header.jsp
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/welcome.jsp

Added: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/about.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/about.jsp?rev=698593&view=auto
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/about.jsp (added)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/about.jsp Wed Sep 24 07:37:55 2008
@@ -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 import="java.io.InputStream,
+                    java.io.InputStreamReader,
+                    java.io.Reader"%><%!
+
+    /**
+     * Escapes and outputs the contents of a given (UTF-8) text resource.
+     * TODO: There should be an easier way to do this!
+     *
+     * @param path path of the resource to output
+     * @param out the JSP output writer
+     * @throws Exception if something goes wrong
+     */
+    private void output(String path, JspWriter out) throws Exception {
+        InputStream input = getServletContext().getResourceAsStream(path);
+        try {
+            Reader reader = new InputStreamReader(input, "UTF-8");
+            for (int ch = reader.read(); ch != -1; ch = reader.read()) {
+                if (ch == '<') {
+                    out.write("&lt;");
+                } else if (ch == '>') {
+                    out.write("&gt;");
+                } else if (ch == '&') {
+                    out.write("&amp;");
+                } else {
+                    out.write((char) ch);
+                }
+            }
+        } finally {
+            input.close();
+        }
+    }
+
+%><% request.setAttribute("title", "About Apache Jackrabbit");
+%><jsp:include page="header.jsp"/>
+<p>
+  <a href="http://jackrabbit.apache.org/">Apache Jackrabbit</a> is a fully
+  conforming implementation of the Content Repository for Java Technology API
+  (JCR). A content repository is a hierarchical content store with support for
+  structured and unstructured content, full text search, versioning,
+  transactions, observation, and more. Typical applications that use content
+  repositories include content management, document management, and records
+  management systems.
+</p>
+<p>
+  Version 1.0 of the JCR API was specified by the
+  <a href="http://jcp.org/en/jsr/detail?id=170">Java Specification Request 170</a>
+  (JSR 170) and work on the JCR version 2.0 has begun in
+  <a href="http://jcp.org/en/jsr/detail?id=170">JSR 283</a>.
+</p>
+<p>
+  Apache Jackrabbit is a project of the
+  <a href="http://www.apache.org/">Apache Software Foundation</a>. 
+</p>
+<h2>Copyright Notice</h2>
+<pre><% output("/META-INF/NOTICE.txt", out); %></pre>
+<h2>License Information</h2>
+<pre><% output("/META-INF/LICENSE.txt", out); %></pre>
+<jsp:include page="footer.jsp"/>

Propchange: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/about.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/header.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/header.jsp?rev=698593&r1=698592&r2=698593&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/header.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/header.jsp Wed Sep 24 07:37:55 2008
@@ -52,6 +52,7 @@
               <li><a href="<%= request.getContextPath() %>/remote.jsp">Remote
access</a></li>
               <li><a href="<%= request.getContextPath() %>/local.jsp">Local
access</a></li>
               <li><a href="<%= request.getContextPath() %>/troubleshooting.jsp">Troubleshooting</a></li>
+              <li><a href="<%= request.getContextPath() %>/about.jsp">About
Jackrabbit</a></li>
             </ul>
           </li>
           <li>Default workspace

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/welcome.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/welcome.jsp?rev=698593&r1=698592&r2=698593&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/welcome.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/welcome.jsp Wed Sep 24 07:37:55 2008
@@ -50,25 +50,8 @@
   <li><a href="remote.jsp">Remote repository access</a></li>
   <li><a href="local.jsp">Local repository access</a></li>
 </ul>
-
-<h3>About Apache Jackrabbit</h3>
 <p>
-  <a href="http://jackrabbit.apache.org/">Apache Jackrabbit</a> is a fully
-  conforming implementation of the Content Repository for Java Technology API
-  (JCR). A content repository is a hierarchical content store with support for
-  structured and unstructured content, full text search, versioning,
-  transactions, observation, and more. Typical applications that use content
-  repositories include content management, document management, and records
-  management systems.
-</p>
-<p>
-  Version 1.0 of the JCR API was specified by the
-  <a href="http://jcp.org/en/jsr/detail?id=170">Java Specification Request 170</a>
-  (JSR 170) and work on the JCR version 2.0 has begun in
-  <a href="http://jcp.org/en/jsr/detail?id=170">JSR 283</a>.
-</p>
-<p>
-  Apache Jackrabbit is a project of the
-  <a href="http://www.apache.org/">Apache Software Foundation</a>. 
+  For more information, including copyright and licensing details, visit the
+  <a href="about.jsp">About Apache Jackrabbit</a> page.
 </p>
 <jsp:include page="footer.jsp"/>



Mime
View raw message