jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r608591 - in /jackrabbit/trunk/jackrabbit-webapp/src/main: java/org/apache/jackrabbit/j2ee/ webapp/ webapp/bootstrap/ webapp/error/
Date Thu, 03 Jan 2008 18:45:33 GMT
Author: jukka
Date: Thu Jan  3 10:45:31 2008
New Revision: 608591

URL: http://svn.apache.org/viewvc?rev=608591&view=rev
Log:
JCR-1287: jackrabbit-webapp facelift
    - Improved text on welcome page
    - Improved text on repository setup wizard
    - Facelifted also the setup wizard and error pages

Added:
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/error.jsp
      - copied, changed from r608419, jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/error.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/exists.jsp
      - copied, changed from r608419, jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/exists.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp
      - copied, changed from r608419, jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/missing.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/notexists.jsp
      - copied, changed from r608419, jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/notexists.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/reconfigure.jsp
      - copied, changed from r608419, jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/reconfigure.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/running.jsp
      - copied, changed from r608419, jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/running.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/success.jsp
      - copied, changed from r608419, jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/success.html
Removed:
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/error.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/exists.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/missing.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/notexists.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/reconfigure.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/running.html
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/success.html
Modified:
    jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/error/classpath.jsp
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/welcome.jsp

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java?rev=608591&r1=608590&r2=608591&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
(original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
Thu Jan  3 10:45:31 2008
@@ -642,9 +642,9 @@
     protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
         if (repository == null) {
-            redirect(req, resp, "/bootstrap/missing.html");
+            redirect(req, resp, "/bootstrap/missing.jsp");
         } else {
-            redirect(req, resp, "/bootstrap/running.html");
+            redirect(req, resp, "/bootstrap/running.jsp");
         }
     }
 
@@ -654,7 +654,7 @@
     protected void doPost(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
         if (repository != null) {
-            redirect(req, resp, "/bootstrap/reconfigure.html");
+            redirect(req, resp, "/bootstrap/reconfigure.jsp");
         } else {
             int rc = new Installer(bootstrapConfigFile,
                     getServletContext()).installRepository(req);
@@ -663,25 +663,25 @@
                     // restart rep
                     restart();
                     if (repository == null) {
-                        redirect(req, resp, "/bootstrap/error.html");
+                        redirect(req, resp, "/bootstrap/error.jsp");
                     } else {
-                        redirect(req, resp, "/bootstrap/success.html");
+                        redirect(req, resp, "/bootstrap/success.jsp");
                     }
                     break;
                 case Installer.C_INVALID_INPUT:
-                    redirect(req, resp, "/bootstrap/missing.html");
+                    redirect(req, resp, "/bootstrap/missing.jsp");
                     break;
                 case Installer.C_CONFIG_EXISTS:
                 case Installer.C_BOOTSTRAP_EXISTS:
                 case Installer.C_HOME_EXISTS:
-                    redirect(req, resp, "/bootstrap/exists.html");
+                    redirect(req, resp, "/bootstrap/exists.jsp");
                     break;
                 case Installer. C_HOME_MISSING:
                 case Installer.C_CONFIG_MISSING:
-                    redirect(req, resp, "/bootstrap/notexists.html");
+                    redirect(req, resp, "/bootstrap/notexists.jsp");
                     break;
                 case Installer.C_INSTALL_ERROR:
-                    redirect(req, resp, "/bootstrap/error.html");
+                    redirect(req, resp, "/bootstrap/error.jsp");
                     break;
             }
         }

Copied: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/error.jsp (from r608419,
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/error.html)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/error.jsp?p2=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/error.jsp&p1=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/error.html&r1=608419&r2=608591&rev=608591&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/error.html (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/error.jsp Thu Jan  3 10:45:31
2008
@@ -1,30 +1,23 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.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
+<%--
+  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
+      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.
-  -->
-<html>
-<head>
-  <title>JCR Repository - Error</title>
-</head>
-<body>
-<b>Some error occured during setup.</b>
-<p/>
-See the log files for details.
-<p/>
-<a href="../admin">back</a>
-</body>
-</html>
\ No newline at end of file
+  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.
+--%><%
+request.setAttribute("title", "Content Repository Error");
+%><jsp:include page="../header.jsp"/>
+<p>
+  Some error occurred during setup. See the log files for details.
+</p>
+<p><a href="<%= request.getContextPath() %>/admin">back</a></p>
+<jsp:include page="../footer.jsp"/>

Copied: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/exists.jsp (from r608419,
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/exists.html)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/exists.jsp?p2=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/exists.jsp&p1=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/exists.html&r1=608419&r2=608591&rev=608591&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/exists.html (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/exists.jsp Thu Jan  3 10:45:31
2008
@@ -1,33 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.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
+<%--
+  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
+      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.
-  -->
-<html>
-<head>
-  <title>JCR Repository - Already exists</title>
-</head>
-<body>
-<b>The repository home directory or configuration already exists.</b>
-<p/>
-You have choosen to create a <b>new</b> repository but the specified home
-directory or the configfile already exist.
-<p/>
+  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.
+--%><%
+request.setAttribute("title", "Content Repository Exists");
+%><jsp:include page="../header.jsp"/>
+<p>The repository home directory or configuration already exists.</p>
+<p>
+You have chosen to create a <b>new</b> repository but the specified home
+directory or the configuration file already exist.
+</p>
+<p>
 Please specify a correct location or choose to reuse an existing repository.
-<p/>
-<a href="../admin">back</a>
-</body>
-</html>
\ No newline at end of file
+</p>
+<p><a href="<%= request.getContextPath() %>/admin">back</a></p>
+<jsp:include page="../footer.jsp"/>

Copied: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp (from r608419,
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/missing.html)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp?p2=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp&p1=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/missing.html&r1=608419&r2=608591&rev=608591&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/missing.html (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/missing.jsp Thu Jan  3 10:45:31
2008
@@ -1,49 +1,70 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.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
+<%--
+  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
+      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.
-  -->
-<html>
-<head>
-  <title>JCR Repository - Setup</title>
-</head>
-<body>
-<b>Your repository is not properly configured yet.</b>
-<p/>
-Please choose one of the following:<br>
-<hr size="1"/>
-<form action="../admin/" method="POST">
-    <input type="hidden" name="mode" value="new"/>
-    <table>
-        <tr><td colspan="2"><b>Create a new Repository</b></td></tr>
-        <tr><td>Repository Home:</td><td><input size="40" type="text"
name="repository_home" value="jackrabbit" /></td></tr>
-        <tr><td>&nbsp;</td><td><br><input type="submit"
value="create"></td></tr>
-    </table>
+  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.
+--%><%
+request.setAttribute("title", "Content Repository Setup");
+%><jsp:include page="../header.jsp"/>
+<p>
+  Your content repository is not properly configured yet. Please use
+  the forms below to setup the content repository.
+</p>
+<p>
+  Alternatively, you can directly modify the settings in the
+  <code>WEB-INF/web.xml</code> deployment descriptor and redeploy this
+  web application.
+</p>
+
+<h3>Create a new content repository</h3>
+<form action="<%= request.getContextPath() %>/admin" method="POST">
+  <input type="hidden" name="mode" value="new"/>
+  <p>
+    Use this form to create a new content repository in the given directory.
+    The directory is created by this web application and should not already
+    exist. The repository is created using a default configuration file.
+  </p>
+  <p>
+    <label>
+      Repository home directory:
+      <input size="40" type="text" name="repository_home" value="jackrabbit">
+    </label>
+  </p>
+  <p><input type="submit" value="Create Content Repository"></p>
 </form>
 
-<br>
-<br>
-<hr size="1"/>
-<form action="../admin/" method="POST">
-    <input type="hidden" name="mode" value="existing"/>
-    <table>
-        <tr><td colspan="2"><b>Use an existing one</b></td></tr>
-        <tr><td>Repository Home:</td><td><input size="40" type="text"
name="repository_home" value="jackrabbit" /></td></tr>
-        <tr><td>&nbsp;</td><td><br><input type="submit"
value="submit"></td></tr>
-    </table>
+<h3>Use an existing content repository</h3>
+<form action="<%= request.getContextPath() %>/admin" method="POST">
+  <input type="hidden" name="mode" value="existing"/>
+  <p>
+    Use this form to access an existing content repository in the given
+    directory. The repository configuration file should be available as
+    <code>repository.xml</code> within the given directory.
+  </p>
+  <p>
+    Note that the repository can not be concurrently accessed by multiple
+    applications. You must use WebDAV or RMI through this web application
+    if you want to access the repository remotely. Other web applications
+    running in the same servlet container can access the repository locally
+    using JNDI.
+  </p>
+  <p>
+    <label>
+      Repository home directory:
+      <input size="40" type="text" name="repository_home" value="jackrabbit">
+    </label>
+  </p>
+  <p><input type="submit" value="Access Content Repository"></p>
 </form>
-</body>
-</html>
\ No newline at end of file
+
+<jsp:include page="../footer.jsp"/>

Copied: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/notexists.jsp (from r608419,
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/notexists.html)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/notexists.jsp?p2=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/notexists.jsp&p1=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/notexists.html&r1=608419&r2=608591&rev=608591&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/notexists.html (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/notexists.jsp Thu Jan  3
10:45:31 2008
@@ -1,33 +1,28 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.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
+<%--
+  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
+      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.
-  -->
-<html>
-<head>
-  <title>JCR Repository - Not exists</title>
-</head>
-<body>
-<b>The repository home directory or configuration do not exists.</b>
-<p/>
-You have choosen to <b>reuse</b> an existing repository but the specified home
-directory or the configfile do not exist.
-<p/>
+  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.
+--%><%
+request.setAttribute("title", "Content Repository Not Found");
+%><jsp:include page="../header.jsp"/>
+<p>The repository home directory or configuration do not exists.</p>
+<p>
+You have chosen to <b>reuse</b> an existing repository but the specified home
+directory or the configuration file do not exist.
+</p>
+<p>
 Please specify a correct location or choose to create a new repository.
-<p/>
-<a href="../admin">back</a>
-</body>
-</html>
\ No newline at end of file
+</p>
+<p><a href="<%= request.getContextPath() %>/admin">back</a></p>
+<jsp:include page="../footer.jsp"/>

Copied: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/reconfigure.jsp (from
r608419, jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/reconfigure.html)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/reconfigure.jsp?p2=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/reconfigure.jsp&p1=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/reconfigure.html&r1=608419&r2=608591&rev=608591&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/reconfigure.html (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/reconfigure.jsp Thu Jan 
3 10:45:31 2008
@@ -1,31 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.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
+<%--
+  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
+      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.
-  -->
-<html>
-<head>
-  <title>JCR Repository - Error</title>
-</head>
-<body>
-<b>Your repository is already properly configured an running.</b>
-<p/>
+  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.
+--%><%
+request.setAttribute("title", "Content Repository Already Running");
+%><jsp:include page="../header.jsp"/>
+<p>Your repository is already properly configured an running.</p>
+<p>
 Your changes were discarded. To reconfigure or reinstall the repository modify
 the respective configuration files or remove them.
-<p/>
-<a href="../">home</a>
-</body>
-</html>
\ No newline at end of file
+</p>
+<p><a href="<%= request.getContextPath() %>/">home</a></p>
+<jsp:include page="../footer.jsp"/>

Copied: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/running.jsp (from r608419,
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/running.html)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/running.jsp?p2=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/running.jsp&p1=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/running.html&r1=608419&r2=608591&rev=608591&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/running.html (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/running.jsp Thu Jan  3 10:45:31
2008
@@ -1,31 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.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
+<%--
+  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
+      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.
-  -->
-<html>
-<head>
-  <title>JCR Repository - Running</title>
-</head>
-<body>
-<b>Your repository is properly configured an running.</b>
-<p/>
+  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.
+--%><%
+request.setAttribute("title", "Content Repository Ready");
+%><jsp:include page="../header.jsp"/>
+<p>Your repository is properly configured an running.</p>
+<p>
 To reconfigure or reinstall the repository modify the respective configuration
 files or remove them.
-<p/>
-<a href="../">home</a>
-</body>
-</html>
\ No newline at end of file
+</p>
+<p><a href="<%= request.getContextPath() %>/">home</a></p>
+<jsp:include page="../footer.jsp"/>

Copied: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/success.jsp (from r608419,
jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/success.html)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/success.jsp?p2=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/success.jsp&p1=jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/success.html&r1=608419&r2=608591&rev=608591&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/success.html (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/bootstrap/success.jsp Thu Jan  3 10:45:31
2008
@@ -1,31 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.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
+<%--
+  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
+      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.
-  -->
-<html>
-<head>
-  <title>JCR Repository - Success</title>
-</head>
-<body>
-<b>Your repository is now properly configured an running.</b>
-<p/>
+  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.
+--%><%
+request.setAttribute("title", "Content Repository Ready");
+%><jsp:include page="../header.jsp"/>
+<p>Your repository is now properly configured an running.</p>
+<p>
 To reconfigure or reinstall the repository modify the respective configuration
 files or remove them.
-<p/>
-<a href="../">home</a>
-</body>
-</html>
\ No newline at end of file
+<p>
+<p><a href="<%= request.getContextPath() %>/">home</a></p>
+<jsp:include page="../footer.jsp"/>

Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/error/classpath.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/error/classpath.jsp?rev=608591&r1=608590&r2=608591&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/error/classpath.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/error/classpath.jsp Thu Jan  3 10:45:31
2008
@@ -1,42 +1,24 @@
 <%--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
+  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
+      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"
-         contentType="text/html; charset=UTF-8"
-         pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-          "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Error: JCR API not found</title>
-<link rel="shortcut icon" href="<%= request.getContextPath() %>/images/favicon.ico"
type="image/vnd.microsoft.icon">
-<style type="text/css" media="all">
-      @import url("<%= request.getContextPath() %>/css/default.css");
-</style>
-</head>
-<body>
-<div id="bodyColumn">
-<a href="http://jackrabbit.apache.org"><img src="<%= request.getContextPath()
%>/images/jackrabbitlogo.gif" alt="" /></a><br>
-<h1>Error: JCR API not found</h1>
+  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.
+--%><%
+request.setAttribute("title", "JCR API Not Found");
+%><jsp:include page="../header.jsp"/>
 <p>
 The <code>javax.jcr.Repository</code> interface from the JCR API could not
 be loaded. To resolve this issue, you need to make the jcr-1.0.jar available
 in the shared classpath of the servlet container.
 </p>
-</div>
-</body>
-</html>
+<jsp:include page="../footer.jsp"/>

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=608591&r1=608590&r2=608591&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/welcome.jsp (original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/welcome.jsp Thu Jan  3 10:45:31 2008
@@ -24,26 +24,30 @@
 try {
     rep = RepositoryAccessServlet.getRepository(pageContext.getServletContext());
 } catch (Throwable e) {
-    %>Error while accessing the repository: <font color="red"><%= e.getMessage()
%></font><br><%
-    %>Check the configuration or use the <a href="admin/">easy setup</a> wizard.<%
-    return;
+    log("Error accesing the repository", e);
+    %><jsp:forward page="bootstrap/missing.jsp"/><%
 }
 
 request.setAttribute("title", "Apache Jackrabbit WebDAV Server");
 %><jsp:include page="header.jsp"/>
 <p>
-  Welcome to the Apache Jackrabbit WebDAV Server. 
-It currently provides 2 WebDAV servlets that allow distinct views to the JCR 
-repository:
+  Welcome to the Apache Jackrabbit WebDAV Server. This web application
+  contains a JCR content repository and makes it available to both remote
+  and local clients.
+</p>
+<p>
+  This application proves the following two WebDAV "views" to the content
+  in the JCR content repository.
 </p>
 <ul>
-<li><a href="webdav-simple.jsp">Standard WebDAV Server</a></li>
-<li><a href="webdav-jcr.jsp">JCR WebDAV Server</a></li>
+<li><a href="webdav-simple.jsp">Standard WebDAV</a></li>
+<li><a href="webdav-jcr.jsp">JCR WebDAV</a></li>
 </ul>
 <p>
-  See The
-  <a href="http://jackrabbit.apache.org/doc/components/jcr-server.html">Jackrabbit
Jcr-Server</a> 
-component for further information.</p>
+  Other web applications running in the same servlet container can access
+  the content repository through JNDI, and remote clients can use either
+  WebDAV or the standard JCR API through the <code>jackrabbit-jcr-rmi</code>
+  component for accessing content in the repository.
 </p>
 
 <h3>About Apache Jackrabbit</h3>



Mime
View raw message