jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r933253 - in /jackrabbit/branches/2.1: ./ jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ jackrabbit-spi-commons/src/main/java/org/apache/ja...
Date Mon, 12 Apr 2010 14:21:06 GMT
Author: jukka
Date: Mon Apr 12 14:21:06 2010
New Revision: 933253

URL: http://svn.apache.org/viewvc?rev=933253&view=rev
Log:
2.1: Merged revisions 933213 and 933216 (typos and JCR-2457)

Modified:
    jackrabbit/branches/2.1/   (props changed)
    jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java
    jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
    jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java
    jackrabbit/branches/2.1/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/PathBuilder.java
    jackrabbit/branches/2.1/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java

Propchange: jackrabbit/branches/2.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 12 14:21:06 2010
@@ -2,4 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:931121,931479,931483-931484,931504,931609,931613,931838,931919,932318-932319,933144,933197,933203
+/jackrabbit/trunk:931121,931479,931483-931484,931504,931609,931613,931838,931919,932318-932319,933144,933197,933203,933213,933216

Modified: jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java?rev=933253&r1=933252&r2=933253&view=diff
==============================================================================
--- jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java
(original)
+++ jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java
Mon Apr 12 14:21:06 2010
@@ -67,7 +67,7 @@ abstract class HierarchyEntryImpl implem
     protected NodeEntryImpl parent;
 
     /**
-     * The item state factory to create the the item state.
+     * The item state factory to create the item state.
      */
     protected final EntryFactory factory;
 

Modified: jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java?rev=933253&r1=933252&r2=933253&view=diff
==============================================================================
--- jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
(original)
+++ jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
Mon Apr 12 14:21:06 2010
@@ -1620,7 +1620,7 @@ public class NodeEntryImpl extends Hiera
     //--------------------------------------------------------< inner class >---
     /**
      * Upon move or reorder of this entry the original hierarchy information is
-     * store in the RevertInfo for later operation undo and in order to be able
+     * stored in the RevertInfo for later operation undo and in order to be able
      * to build the workspace id / path.
      */
     private class RevertInfo {

Modified: jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java?rev=933253&r1=933252&r2=933253&view=diff
==============================================================================
--- jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java
(original)
+++ jackrabbit/branches/2.1/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java
Mon Apr 12 14:21:06 2010
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * <code>RemoveVersion</code>...
+ * <code>RemoveActivity</code>...
  */
 public class RemoveActivity extends Remove {
 

Modified: jackrabbit/branches/2.1/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/PathBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.1/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/PathBuilder.java?rev=933253&r1=933252&r2=933253&view=diff
==============================================================================
--- jackrabbit/branches/2.1/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/PathBuilder.java
(original)
+++ jackrabbit/branches/2.1/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/name/PathBuilder.java
Mon Apr 12 14:21:06 2010
@@ -48,7 +48,7 @@ public final class PathBuilder {
     /**
      * Creates a new PathBuilder to create a Path using the
      * {@link PathFactoryImpl default PathFactory}. See
-     * {@link PathBuilder#PathBuilder(PathFactory)} for a constructor explicitely
+     * {@link PathBuilder#PathBuilder(PathFactory)} for a constructor explicitly
      * specifying the factory to use.
      */
     public PathBuilder() {

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=933253&r1=933252&r2=933253&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
Mon Apr 12 14:21:06 2010
@@ -22,6 +22,7 @@ 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;
@@ -36,8 +37,10 @@ import org.apache.jackrabbit.commons.Jcr
 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;
@@ -122,14 +125,30 @@ public class Main {
         } else if (command.hasOption("license")) {
             copyToOutput("/META-INF/LICENSE.txt");
         } else if (command.hasOption("cli")) {
-            System.setProperty("logback.configurationFile", "logback-cli.xml");
+            Logger logger = Logger.getRootLogger();
+            logger.addAppender(new ConsoleAppender(new PatternLayout("%p %m%n")));
+            logger.setLevel(Level.WARN);
 
-            Context context = new ContextBase();
             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("-------------------------------");



Mime
View raw message