jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r991157 [2/2] - in /jackrabbit/branches/2.1: ./ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/predicate/ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/query/qom/ jackrabbit-standalone/src/main/java/...
Date Tue, 31 Aug 2010 11:06:53 GMT
Modified: jackrabbit/branches/2.1/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java?rev=991157&r1=991156&r2=991157&view=diff
==============================================================================
--- jackrabbit/branches/2.1/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
(original)
+++ jackrabbit/branches/2.1/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
Tue Aug 31 11:06:52 2010
@@ -1,321 +1,321 @@
-/*
- * 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.
- */
-package org.apache.jackrabbit.standalone;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-
-import org.apache.commons.chain.Context;
-import org.apache.commons.chain.impl.ContextBase;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.io.IOUtils;
-import org.apache.jackrabbit.commons.JcrUtils;
-import org.apache.jackrabbit.core.RepositoryCopier;
-import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.apache.jackrabbit.servlet.jackrabbit.JackrabbitRepositoryServlet;
-import org.apache.jackrabbit.standalone.cli.CommandException;
-import org.apache.jackrabbit.standalone.cli.CommandHelper;
-import org.apache.jackrabbit.standalone.cli.JcrClient;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.FileAppender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.NCSARequestLog;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.bio.SocketConnector;
-import org.mortbay.jetty.handler.RequestLogHandler;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.webapp.WebAppContext;
-
-/**
- *
- */
-public class Main {
-
-    /**
-     * @param args
-     */
-    public static void main(String[] args) throws Exception {
-        new Main(args).run();
-    }
-
-    private final Options options = new Options();
-
-    private final CommandLine command;
-
-    private final RequestLogHandler accessLog = new RequestLogHandler();
-
-    private final WebAppContext webapp = new WebAppContext();
-
-    private final Connector connector = new SocketConnector();
-
-    private final Server server = new Server();
-
-    private Main(String[] args) throws ParseException {
-        options.addOption("?", "help", false, "print this message");
-        options.addOption("n", "notice", false, "print copyright notices");
-        options.addOption("l", "license", false, "print license information");
-        options.addOption(
-                "b", "backup", false, "create a backup of the repository");
-        options.addOption(
-                "i", "cli", true, "command line access to a remote repository");
-
-        options.addOption("q", "quiet", false, "disable console output");
-        options.addOption("d", "debug", false, "enable debug logging");
-
-        options.addOption("h", "host", true, "IP address of the HTTP server");
-        options.addOption("p", "port", true, "TCP port of the HTTP server (8080)");
-        options.addOption("f", "file", true, "location of this jar file");
-        options.addOption("r", "repo", true, "repository directory (jackrabbit)");
-        options.addOption("c", "conf", true, "repository configuration file");
-        options.addOption(
-                "R", "backup-repo", true,
-                "backup repository directory (jackrabbit-backupN)");
-        options.addOption(
-                "C", "backup-conf", true,
-                "backup repository configuration file");
-
-        command = new GnuParser().parse(options, args);
-    }
-
-    public void run() throws Exception {
-        String defaultFile = "jackrabbit-standalone.jar";
-        URL location =
-            Main.class.getProtectionDomain().getCodeSource().getLocation();
-        if (location != null && "file".equals(location.getProtocol())) {
-            File file = new File(location.getPath());
-            if (file.isFile()) {
-                defaultFile = location.getPath();
-            }
-        }
-        File file = new File(command.getOptionValue("file", defaultFile));
-
-        if (command.hasOption("help")) {
-            HelpFormatter formatter = new HelpFormatter();
-            formatter.printHelp("java -jar " + file.getName(), options, true);
-        } else if (command.hasOption("notice")) {
-            copyToOutput("/META-INF/NOTICE.txt");
-        } else if (command.hasOption("license")) {
-            copyToOutput("/META-INF/LICENSE.txt");
-        } else if (command.hasOption("cli")) {
+/*
+ * 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.
+ */
+package org.apache.jackrabbit.standalone;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.chain.Context;
+import org.apache.commons.chain.impl.ContextBase;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.io.IOUtils;
+import org.apache.jackrabbit.commons.JcrUtils;
+import org.apache.jackrabbit.core.RepositoryCopier;
+import org.apache.jackrabbit.core.config.RepositoryConfig;
+import org.apache.jackrabbit.servlet.jackrabbit.JackrabbitRepositoryServlet;
+import org.apache.jackrabbit.standalone.cli.CommandException;
+import org.apache.jackrabbit.standalone.cli.CommandHelper;
+import org.apache.jackrabbit.standalone.cli.JcrClient;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.FileAppender;
+import org.apache.log4j.Layout;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.NCSARequestLog;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.bio.SocketConnector;
+import org.mortbay.jetty.handler.RequestLogHandler;
+import org.mortbay.jetty.servlet.ServletHolder;
+import org.mortbay.jetty.webapp.WebAppContext;
+
+/**
+ *
+ */
+public class Main {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) throws Exception {
+        new Main(args).run();
+    }
+
+    private final Options options = new Options();
+
+    private final CommandLine command;
+
+    private final RequestLogHandler accessLog = new RequestLogHandler();
+
+    private final WebAppContext webapp = new WebAppContext();
+
+    private final Connector connector = new SocketConnector();
+
+    private final Server server = new Server();
+
+    private Main(String[] args) throws ParseException {
+        options.addOption("?", "help", false, "print this message");
+        options.addOption("n", "notice", false, "print copyright notices");
+        options.addOption("l", "license", false, "print license information");
+        options.addOption(
+                "b", "backup", false, "create a backup of the repository");
+        options.addOption(
+                "i", "cli", true, "command line access to a remote repository");
+
+        options.addOption("q", "quiet", false, "disable console output");
+        options.addOption("d", "debug", false, "enable debug logging");
+
+        options.addOption("h", "host", true, "IP address of the HTTP server");
+        options.addOption("p", "port", true, "TCP port of the HTTP server (8080)");
+        options.addOption("f", "file", true, "location of this jar file");
+        options.addOption("r", "repo", true, "repository directory (jackrabbit)");
+        options.addOption("c", "conf", true, "repository configuration file");
+        options.addOption(
+                "R", "backup-repo", true,
+                "backup repository directory (jackrabbit-backupN)");
+        options.addOption(
+                "C", "backup-conf", true,
+                "backup repository configuration file");
+
+        command = new GnuParser().parse(options, args);
+    }
+
+    public void run() throws Exception {
+        String defaultFile = "jackrabbit-standalone.jar";
+        URL location =
+            Main.class.getProtectionDomain().getCodeSource().getLocation();
+        if (location != null && "file".equals(location.getProtocol())) {
+            File file = new File(location.getPath());
+            if (file.isFile()) {
+                defaultFile = location.getPath();
+            }
+        }
+        File file = new File(command.getOptionValue("file", defaultFile));
+
+        if (command.hasOption("help")) {
+            HelpFormatter formatter = new HelpFormatter();
+            formatter.printHelp("java -jar " + file.getName(), options, true);
+        } else if (command.hasOption("notice")) {
+            copyToOutput("/META-INF/NOTICE.txt");
+        } else if (command.hasOption("license")) {
+            copyToOutput("/META-INF/LICENSE.txt");
+        } else if (command.hasOption("cli")) {
             Logger logger = Logger.getRootLogger();
             logger.addAppender(new ConsoleAppender(new PatternLayout("%p %m%n")));
-            logger.setLevel(Level.WARN);
-
-            String uri = command.getOptionValue("cli");
-            Repository repository = JcrUtils.getRepository(uri);
-
-            Context context = new ContextBase();
-            CommandHelper.setRepository(context, repository, uri);
-            try {
-                Session session = repository.login();
-                CommandHelper.setSession(context, session);
-                CommandHelper.setCurrentNode(context, session.getRootNode());
-            } catch (RepositoryException ignore) {
-                // anonymous login not possible
-            }
-
-            new JcrClient(context).runInteractive();
-
-            try {
-                CommandHelper.getSession(context).logout();
-            } catch (CommandException ignore) {
-                // already logged out
-            }
-        } else {
-            message("Welcome to Apache Jackrabbit!");
-            message("-------------------------------");
-
-            File repository =
-                new File(command.getOptionValue("repo", "jackrabbit"));
-            message("Using repository directory " + repository);
-            repository.mkdirs();
-            File tmp = new File(repository, "tmp");
-            tmp.mkdir();
-            File log = new File(repository, "log");
-            log.mkdir();
-
-            message("Writing log messages to " + log);
-            prepareServerLog(log);
-
-            if (command.hasOption("backup")) {
-                backup(repository);
-            } else {
-                message("Starting the server...");
-                prepareWebapp(file, repository, tmp);
-                accessLog.setHandler(webapp);
-                prepareAccessLog(log);
-                server.setHandler(accessLog);
-                prepareConnector();
-                server.addConnector(connector);
-                prepareShutdown();
-
-                try {
-                    server.start();
-
-                    String host = connector.getHost();
-                    if (host == null) {
-                        host = "localhost";
-                    }
-                    message("Apache Jackrabbit is now running at "
-                            +"http://" + host + ":" + connector.getPort() + "/");
-                } catch (Throwable t) {
-                    System.err.println(
-                            "Unable to start the server: " + t.getMessage());
-                    System.exit(1);
-                }
-            }
-        }
-    }
-
-    private void backup(File sourceDir) throws Exception {
-        RepositoryConfig source;
-        if (command.hasOption("conf")) {
-            source = RepositoryConfig.create(
-                    new File(command.getOptionValue("conf")), sourceDir);
-        } else {
-            source = RepositoryConfig.create(sourceDir);
-        }
-
-        File targetDir;
-        if (command.hasOption("backup-repo")) {
-            targetDir = new File(command.getOptionValue("backup-repo"));
-        } else {
-            int i = 1;
-            do {
-                targetDir = new File("jackrabbit-backup" + i++);
-            } while (targetDir.exists());
-        }
-
-        RepositoryConfig target;
-        if (command.hasOption("backup-conf")) {
-            target = RepositoryConfig.install(
-                    new File(command.getOptionValue("backup-conf")), targetDir);
-        } else {
-            target = RepositoryConfig.install(targetDir);
-        }
-
-        message("Creating a repository copy in " + targetDir);
-        RepositoryCopier.copy(source, target);
-        message("The repository has been successfully copied.");
-    }
-
-    private void prepareServerLog(File log)
-            throws IOException {
-        Layout layout =
-            new PatternLayout("%d{dd.MM.yyyy HH:mm:ss} *%-5p* %c{1}: %m%n");
-
-        Logger jackrabbitLog = Logger.getRootLogger();
-        jackrabbitLog.addAppender(new FileAppender(
-                layout, new File(log, "jackrabbit.log").getPath()));
-
-        Logger jettyLog = Logger.getLogger("org.mortbay.log");
-        jettyLog.addAppender(new FileAppender(
-                layout, new File(log, "jetty.log").getPath()));
-        jettyLog.setAdditivity(false);
-
-        if (command.hasOption("debug")) {
-            jackrabbitLog.setLevel(Level.DEBUG);
-            jettyLog.setLevel(Level.DEBUG);
-        } else {
-            jackrabbitLog.setLevel(Level.INFO);
-            jettyLog.setLevel(Level.INFO);
-        }
-
-        System.setProperty(
-                "derby.stream.error.file",
-                new File(log, "derby.log").getPath());
-    }
-
-    private void prepareAccessLog(File log) {
-        NCSARequestLog ncsa = new NCSARequestLog(
-                new File(log, "access.log.yyyy_mm_dd").getPath());
-        ncsa.setFilenameDateFormat("yyyy-MM-dd");
-        accessLog.setRequestLog(ncsa);
-    }
-
-    private void prepareWebapp(File file, File repository, File tmp) {
-        webapp.setContextPath("/");
-        webapp.setWar(file.getPath());
-        webapp.setExtractWAR(false);
-        webapp.setTempDirectory(tmp);
-
-        ServletHolder servlet =
-            new ServletHolder(JackrabbitRepositoryServlet.class);
-        servlet.setInitOrder(1);
-        servlet.setInitParameter("repository.home", repository.getPath());
-        String conf = command.getOptionValue("conf");
-        if (conf != null) {
-            servlet.setInitParameter("repository.config", conf);
-        }
-        webapp.addServlet(servlet, "/repository.properties");
-    }
-
-    private void prepareConnector() {
-        String port = command.getOptionValue("port", "8080");
-        connector.setPort(Integer.parseInt(port));
-        String host = command.getOptionValue("host");
-        if (host != null) {
-            connector.setHost(host);
-        }
-    }
-
-    private void prepareShutdown() {
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            public void run() {
-                try {
-                    message("Shutting down the server...");
-                    server.stop();
-                    server.join();
-                    message("-------------------------------");
-                    message("Goodbye from Apache Jackrabbit!");
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-    }
-
-    private void message(String message) {
-        if (!command.hasOption("quiet")) {
-            System.out.println(message);
-        }
-    }
-
-    private void copyToOutput(String resource) throws IOException {
-        InputStream stream = Main.class.getResourceAsStream(resource);
-        try {
-            IOUtils.copy(stream, System.out);
-        } finally {
-            stream.close();
-        }
-    }
-
-}
+            logger.setLevel(Level.WARN);
+
+            String uri = command.getOptionValue("cli");
+            Repository repository = JcrUtils.getRepository(uri);
+
+            Context context = new ContextBase();
+            CommandHelper.setRepository(context, repository, uri);
+            try {
+                Session session = repository.login();
+                CommandHelper.setSession(context, session);
+                CommandHelper.setCurrentNode(context, session.getRootNode());
+            } catch (RepositoryException ignore) {
+                // anonymous login not possible
+            }
+
+            new JcrClient(context).runInteractive();
+
+            try {
+                CommandHelper.getSession(context).logout();
+            } catch (CommandException ignore) {
+                // already logged out
+            }
+        } else {
+            message("Welcome to Apache Jackrabbit!");
+            message("-------------------------------");
+
+            File repository =
+                new File(command.getOptionValue("repo", "jackrabbit"));
+            message("Using repository directory " + repository);
+            repository.mkdirs();
+            File tmp = new File(repository, "tmp");
+            tmp.mkdir();
+            File log = new File(repository, "log");
+            log.mkdir();
+
+            message("Writing log messages to " + log);
+            prepareServerLog(log);
+
+            if (command.hasOption("backup")) {
+                backup(repository);
+            } else {
+                message("Starting the server...");
+                prepareWebapp(file, repository, tmp);
+                accessLog.setHandler(webapp);
+                prepareAccessLog(log);
+                server.setHandler(accessLog);
+                prepareConnector();
+                server.addConnector(connector);
+                prepareShutdown();
+
+                try {
+                    server.start();
+
+                    String host = connector.getHost();
+                    if (host == null) {
+                        host = "localhost";
+                    }
+                    message("Apache Jackrabbit is now running at "
+                            +"http://" + host + ":" + connector.getPort() + "/");
+                } catch (Throwable t) {
+                    System.err.println(
+                            "Unable to start the server: " + t.getMessage());
+                    System.exit(1);
+                }
+            }
+        }
+    }
+
+    private void backup(File sourceDir) throws Exception {
+        RepositoryConfig source;
+        if (command.hasOption("conf")) {
+            source = RepositoryConfig.create(
+                    new File(command.getOptionValue("conf")), sourceDir);
+        } else {
+            source = RepositoryConfig.create(sourceDir);
+        }
+
+        File targetDir;
+        if (command.hasOption("backup-repo")) {
+            targetDir = new File(command.getOptionValue("backup-repo"));
+        } else {
+            int i = 1;
+            do {
+                targetDir = new File("jackrabbit-backup" + i++);
+            } while (targetDir.exists());
+        }
+
+        RepositoryConfig target;
+        if (command.hasOption("backup-conf")) {
+            target = RepositoryConfig.install(
+                    new File(command.getOptionValue("backup-conf")), targetDir);
+        } else {
+            target = RepositoryConfig.install(targetDir);
+        }
+
+        message("Creating a repository copy in " + targetDir);
+        RepositoryCopier.copy(source, target);
+        message("The repository has been successfully copied.");
+    }
+
+    private void prepareServerLog(File log)
+            throws IOException {
+        Layout layout =
+            new PatternLayout("%d{dd.MM.yyyy HH:mm:ss} *%-5p* %c{1}: %m%n");
+
+        Logger jackrabbitLog = Logger.getRootLogger();
+        jackrabbitLog.addAppender(new FileAppender(
+                layout, new File(log, "jackrabbit.log").getPath()));
+
+        Logger jettyLog = Logger.getLogger("org.mortbay.log");
+        jettyLog.addAppender(new FileAppender(
+                layout, new File(log, "jetty.log").getPath()));
+        jettyLog.setAdditivity(false);
+
+        if (command.hasOption("debug")) {
+            jackrabbitLog.setLevel(Level.DEBUG);
+            jettyLog.setLevel(Level.DEBUG);
+        } else {
+            jackrabbitLog.setLevel(Level.INFO);
+            jettyLog.setLevel(Level.INFO);
+        }
+
+        System.setProperty(
+                "derby.stream.error.file",
+                new File(log, "derby.log").getPath());
+    }
+
+    private void prepareAccessLog(File log) {
+        NCSARequestLog ncsa = new NCSARequestLog(
+                new File(log, "access.log.yyyy_mm_dd").getPath());
+        ncsa.setFilenameDateFormat("yyyy-MM-dd");
+        accessLog.setRequestLog(ncsa);
+    }
+
+    private void prepareWebapp(File file, File repository, File tmp) {
+        webapp.setContextPath("/");
+        webapp.setWar(file.getPath());
+        webapp.setExtractWAR(false);
+        webapp.setTempDirectory(tmp);
+
+        ServletHolder servlet =
+            new ServletHolder(JackrabbitRepositoryServlet.class);
+        servlet.setInitOrder(1);
+        servlet.setInitParameter("repository.home", repository.getPath());
+        String conf = command.getOptionValue("conf");
+        if (conf != null) {
+            servlet.setInitParameter("repository.config", conf);
+        }
+        webapp.addServlet(servlet, "/repository.properties");
+    }
+
+    private void prepareConnector() {
+        String port = command.getOptionValue("port", "8080");
+        connector.setPort(Integer.parseInt(port));
+        String host = command.getOptionValue("host");
+        if (host != null) {
+            connector.setHost(host);
+        }
+    }
+
+    private void prepareShutdown() {
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            public void run() {
+                try {
+                    message("Shutting down the server...");
+                    server.stop();
+                    server.join();
+                    message("-------------------------------");
+                    message("Goodbye from Apache Jackrabbit!");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    private void message(String message) {
+        if (!command.hasOption("quiet")) {
+            System.out.println(message);
+        }
+    }
+
+    private void copyToOutput(String resource) throws IOException {
+        InputStream stream = Main.class.getResourceAsStream(resource);
+        try {
+            IOUtils.copy(stream, System.out);
+        } finally {
+            stream.close();
+        }
+    }
+
+}

Propchange: jackrabbit/branches/2.1/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jackrabbit/branches/2.1/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp?rev=991157&r1=991156&r2=991157&view=diff
==============================================================================
--- jackrabbit/branches/2.1/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp (original)
+++ jackrabbit/branches/2.1/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp Tue Aug 31
11:06:52 2010
@@ -1,85 +1,85 @@
-<%@ page import="org.apache.jackrabbit.j2ee.SimpleWebdavServlet,
-                 java.net.URI"
-%><%--
-  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="org.apache.jackrabbit.util.Text"%><%
-request.setAttribute("title", "Standard WebDAV Server");
-
-URI uri = new URI(request.getRequestURL().toString());
-String href =
-    uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort()
-    + request.getContextPath()
-    + SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext())
-    + "/default/";
-href = Text.encodeIllegalXMLCharacters(href);
-%><jsp:include page="header.jsp"/>
-
-<p>
-  The default WebDAV server (aka: Simple Server) is a
-  <a href="http://www.ietf.org/rfc/rfc2518.txt">DAV 1,2</a> and
-  <a href="http://www.ietf.org/rfc/rfc3253.txt">DeltaV</a>
-  compliant WebDAV  server implementation. It offers a file-based view to
-  the JCR repository, suitable  for everybody looking for standard WebDAV
-  functionality. Essentially, the contents of the underlying content
-  repository are exposed as a hierarchical collection of files and folders.
-<p>
-
-<h3>Access the content repository</h3>
-<p>
-  Use the following URL to access the content repository in your WebDAV client:
-</p>
-<ul>
-  <li><a href="<%= href %>"><%= href %></a></li>
-</ul>
-<p>
-  The server asks for authentication, but by default any username and password
-  is accepted. You can modify this security policy in the repository
-  configuration file.
-</p>
-<p>
-  To access other workspace than the default one, replace the last part of
-  the URL (<code>/default/</code>) with the name of another workspace.
-</p>
-<p>
-  You can also <a href="search.jsp">search</a> the default workspace
-  <a href="populate.jsp">populate</a> it with example content from the
-  Internet.
-</p>
-
-<h3>File system access</h3>
-<p>
-  Many operating systems, including Windows and Mac OS X, allow you to
-  "mount" a WebDAV server as a shared network disk. You can use the above
-  URL to make the default workspace available as such a network disk, after
-  which you can use normal file system tools to copy files and folders to
-  and from the content repository.
-</p>
-
-<h3>Supported WebDAV functionality</h3>
-<ul>
-<li><a href="http://www.ietf.org/rfc/rfc2518.txt">RFC 2518</a> (WebDAV
1,2)</li>
-<li><a href="http://www.ietf.org/rfc/rfc3253.txt">RFC 3253</a> (DeltaV)</li>
-<li>Experimental: <a href="http://greenbytes.de/tech/webdav/draft-ietf-webdav-bind-latest.html">draft-ietf-webdav-bind</a>
(WebDAV BIND)</li>
-</ul> 
-
-<h3>Configuration</h3>
-<ul>
-    <li>Context path: <%= Text.encodeIllegalXMLCharacters(request.getContextPath())
%></li>
-    <li>Resource path prefix: <%= Text.encodeIllegalXMLCharacters(SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext()))
%></li>
-    <li>Servlet configuration: see <i>/WEB-INF/web.xml</i></li>
-    <li>WebDAV specific resource configuration: see <i>/WEB-INF/config.xml</i></li>
-</ul>
-<jsp:include page="footer.jsp"/>
+<%@ page import="org.apache.jackrabbit.j2ee.SimpleWebdavServlet,
+                 java.net.URI"
+%><%--
+  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="org.apache.jackrabbit.util.Text"%><%
+request.setAttribute("title", "Standard WebDAV Server");
+
+URI uri = new URI(request.getRequestURL().toString());
+String href =
+    uri.getScheme() + "://" + uri.getHost() + ":" + uri.getPort()
+    + request.getContextPath()
+    + SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext())
+    + "/default/";
+href = Text.encodeIllegalXMLCharacters(href);
+%><jsp:include page="header.jsp"/>
+
+<p>
+  The default WebDAV server (aka: Simple Server) is a
+  <a href="http://www.ietf.org/rfc/rfc2518.txt">DAV 1,2</a> and
+  <a href="http://www.ietf.org/rfc/rfc3253.txt">DeltaV</a>
+  compliant WebDAV  server implementation. It offers a file-based view to
+  the JCR repository, suitable  for everybody looking for standard WebDAV
+  functionality. Essentially, the contents of the underlying content
+  repository are exposed as a hierarchical collection of files and folders.
+<p>
+
+<h3>Access the content repository</h3>
+<p>
+  Use the following URL to access the content repository in your WebDAV client:
+</p>
+<ul>
+  <li><a href="<%= href %>"><%= href %></a></li>
+</ul>
+<p>
+  The server asks for authentication, but by default any username and password
+  is accepted. You can modify this security policy in the repository
+  configuration file.
+</p>
+<p>
+  To access other workspace than the default one, replace the last part of
+  the URL (<code>/default/</code>) with the name of another workspace.
+</p>
+<p>
+  You can also <a href="search.jsp">search</a> the default workspace
+  <a href="populate.jsp">populate</a> it with example content from the
+  Internet.
+</p>
+
+<h3>File system access</h3>
+<p>
+  Many operating systems, including Windows and Mac OS X, allow you to
+  "mount" a WebDAV server as a shared network disk. You can use the above
+  URL to make the default workspace available as such a network disk, after
+  which you can use normal file system tools to copy files and folders to
+  and from the content repository.
+</p>
+
+<h3>Supported WebDAV functionality</h3>
+<ul>
+<li><a href="http://www.ietf.org/rfc/rfc2518.txt">RFC 2518</a> (WebDAV
1,2)</li>
+<li><a href="http://www.ietf.org/rfc/rfc3253.txt">RFC 3253</a> (DeltaV)</li>
+<li>Experimental: <a href="http://greenbytes.de/tech/webdav/draft-ietf-webdav-bind-latest.html">draft-ietf-webdav-bind</a>
(WebDAV BIND)</li>
+</ul> 
+
+<h3>Configuration</h3>
+<ul>
+    <li>Context path: <%= Text.encodeIllegalXMLCharacters(request.getContextPath())
%></li>
+    <li>Resource path prefix: <%= Text.encodeIllegalXMLCharacters(SimpleWebdavServlet.getPathPrefix(pageContext.getServletContext()))
%></li>
+    <li>Servlet configuration: see <i>/WEB-INF/web.xml</i></li>
+    <li>WebDAV specific resource configuration: see <i>/WEB-INF/config.xml</i></li>
+</ul>
+<jsp:include page="footer.jsp"/>

Propchange: jackrabbit/branches/2.1/jackrabbit-webapp/src/main/webapp/webdav-simple.jsp
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message