From commits-return-5027-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Thu Jan 03 18:46:01 2008 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 77193 invoked from network); 3 Jan 2008 18:46:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jan 2008 18:46:01 -0000 Received: (qmail 42535 invoked by uid 500); 3 Jan 2008 18:45:50 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 42455 invoked by uid 500); 3 Jan 2008 18:45:50 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 42446 invoked by uid 99); 3 Jan 2008 18:45:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2008 10:45:50 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jan 2008 18:45:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4C72F1A9832; Thu, 3 Jan 2008 10:45:35 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080103184535.4C72F1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - - - - - JCR Repository - Error - - -Some error occured during setup. -

-See the log files for details. -

-back - - \ 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"); +%> +

+ Some error occurred during setup. See the log files for details. +

+

back

+ 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 @@ - - - - - JCR Repository - Already exists - - -The repository home directory or configuration already exists. -

-You have choosen to create a new repository but the specified home -directory or the configfile already exist. -

+ 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"); +%> +

The repository home directory or configuration already exists.

+

+You have chosen to create a new repository but the specified home +directory or the configuration file already exist. +

+

Please specify a correct location or choose to reuse an existing repository. -

-back - - \ No newline at end of file +

+

back

+ 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 @@ - - - - - JCR Repository - Setup - - -Your repository is not properly configured yet. -

-Please choose one of the following:
-

-
- - - - - -
Create a new Repository
Repository Home:
 
+ 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"); +%> +

+ Your content repository is not properly configured yet. Please use + the forms below to setup the content repository. +

+

+ Alternatively, you can directly modify the settings in the + WEB-INF/web.xml deployment descriptor and redeploy this + web application. +

+ +

Create a new content repository

+ + +

+ 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. +

+

+ +

+

-
-
-
-
- - - - - -
Use an existing one
Repository Home:
 
+

Use an existing content repository

+ + +

+ Use this form to access an existing content repository in the given + directory. The repository configuration file should be available as + repository.xml within the given directory. +

+

+ 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. +

+

+ +

+

- - \ No newline at end of file + + 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 @@ - - - - - JCR Repository - Not exists - - -The repository home directory or configuration do not exists. -

-You have choosen to reuse an existing repository but the specified home -directory or the configfile do not exist. -

+ 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"); +%> +

The repository home directory or configuration do not exists.

+

+You have chosen to reuse an existing repository but the specified home +directory or the configuration file do not exist. +

+

Please specify a correct location or choose to create a new repository. -

-back - - \ No newline at end of file +

+

back

+ 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 @@ - - - - - JCR Repository - Error - - -Your repository is already properly configured an running. -

+ 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"); +%> +

Your repository is already properly configured an running.

+

Your changes were discarded. To reconfigure or reinstall the repository modify the respective configuration files or remove them. -

-home - - \ No newline at end of file +

+

home

+ 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 @@ - - - - - JCR Repository - Running - - -Your repository is properly configured an running. -

+ 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"); +%> +

Your repository is properly configured an running.

+

To reconfigure or reinstall the repository modify the respective configuration files or remove them. -

-home - - \ No newline at end of file +

+

home

+ 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 @@ - - - - - JCR Repository - Success - - -Your repository is now properly configured an running. -

+ 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"); +%> +

Your repository is now properly configured an running.

+

To reconfigure or reinstall the repository modify the respective configuration files or remove them. -

-home - - \ No newline at end of file +

+

home

+ 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"%> - - - - -Error: JCR API not found - - - - -
-
-

Error: JCR API not found

+ 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"); +%>

The javax.jcr.Repository 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.

-
- - + 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: <%= e.getMessage() %>
<% - %>Check the configuration or use the easy setup wizard.<% - return; + log("Error accesing the repository", e); + %><% } request.setAttribute("title", "Apache Jackrabbit WebDAV Server"); %>

- 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. +

+

+ This application proves the following two WebDAV "views" to the content + in the JCR content repository.

- See The - Jackrabbit Jcr-Server -component for further information.

+ 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 jackrabbit-jcr-rmi + component for accessing content in the repository.

About Apache Jackrabbit