From c230ba6a387359e5ace4f721e37a672dca03cb86 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 12 Aug 2013 09:18:17 +0200 Subject: [PATCH 01/33] Set version to 1.2.7-SNAPSHOT --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 78 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 75 insertions(+), 75 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index af5934289..277d19c78 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,13 +2,13 @@ crsh.parent org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.cli jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index 04f6c38f8..f718a211a 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,13 +2,13 @@ crsh.parent org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.distrib jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index 0a285723c..cf607600b 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,13 +22,13 @@ crsh.doc org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.doc.cookbook jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index b443db494..1817cc12d 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.doc pom - 1.2.6 + 1.2.7-SNAPSHOT CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index c6567b387..217927027 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,13 +22,13 @@ crsh.doc org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.doc.reference jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index 170d857d9..7c071cc03 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.jcr.core jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index 6321d949f..fb2bc270d 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index a1574bd11..89c8336a6 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index 5b83c2285..7c96d3538 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.jcr pom - 1.2.6 + 1.2.7-SNAPSHOT CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index 101de474d..95b9e47b3 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,13 +2,13 @@ crsh.plugins org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.plugins.crowd jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index 5ea3095ef..8429576d0 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.plugins pom - 1.2.6 + 1.2.7-SNAPSHOT CRaSH plugins parent diff --git a/pom.xml b/pom.xml index dfb7b3d05..036283c85 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.6 + 1.2.7-SNAPSHOT CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -103,12 +103,12 @@ org.crsh crsh.cli - 1.2.6 + 1.2.7-SNAPSHOT org.crsh crsh.cli - 1.2.6 + 1.2.7-SNAPSHOT sources @@ -116,25 +116,25 @@ org.crsh crsh.shell.core - 1.2.6 + 1.2.7-SNAPSHOT jar org.crsh crsh.shell.core - 1.2.6 + 1.2.7-SNAPSHOT test-jar org.crsh crsh.shell.core - 1.2.6 + 1.2.7-SNAPSHOT sources org.crsh crsh.shell.core - 1.2.6 + 1.2.7-SNAPSHOT standalone @@ -142,18 +142,18 @@ org.crsh crsh.shell.telnet - 1.2.6 + 1.2.7-SNAPSHOT org.crsh crsh.shell.telnet - 1.2.6 + 1.2.7-SNAPSHOT sources org.crsh crsh.shell.telnet - 1.2.6 + 1.2.7-SNAPSHOT standalone @@ -161,18 +161,18 @@ org.crsh crsh.shell.ssh - 1.2.6 + 1.2.7-SNAPSHOT org.crsh crsh.shell.ssh - 1.2.6 + 1.2.7-SNAPSHOT sources org.crsh crsh.shell.ssh - 1.2.6 + 1.2.7-SNAPSHOT standalone @@ -180,12 +180,12 @@ org.crsh crsh.shell.embed.spring - 1.2.6 + 1.2.7-SNAPSHOT org.crsh crsh.shell.embed.spring - 1.2.6 + 1.2.7-SNAPSHOT sources @@ -193,32 +193,32 @@ org.crsh crsh.shell.packaging - 1.2.6 + 1.2.7-SNAPSHOT org.crsh crsh.shell.packaging - 1.2.6 + 1.2.7-SNAPSHOT war org.crsh crsh.shell.packaging - 1.2.6 + 1.2.7-SNAPSHOT war spring org.crsh crsh.shell.packaging - 1.2.6 + 1.2.7-SNAPSHOT zip mule-app org.crsh crsh.shell.packaging - 1.2.6 + 1.2.7-SNAPSHOT tar.gz @@ -226,37 +226,37 @@ org.crsh crsh.jcr.core - 1.2.6 + 1.2.7-SNAPSHOT jar org.crsh crsh.jcr.core - 1.2.6 + 1.2.7-SNAPSHOT war org.crsh crsh.jcr.core - 1.2.6 + 1.2.7-SNAPSHOT javadoc org.crsh crsh.jcr.core - 1.2.6 + 1.2.7-SNAPSHOT test-jar org.crsh crsh.jcr.core - 1.2.6 + 1.2.7-SNAPSHOT sources org.crsh crsh.jcr.core - 1.2.6 + 1.2.7-SNAPSHOT standalone @@ -264,19 +264,19 @@ org.crsh crsh.jcr.exo - 1.2.6 + 1.2.7-SNAPSHOT jar org.crsh crsh.jcr.exo - 1.2.6 + 1.2.7-SNAPSHOT war org.crsh crsh.jcr.exo - 1.2.6 + 1.2.7-SNAPSHOT sources @@ -284,19 +284,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.6 + 1.2.7-SNAPSHOT jar org.crsh crsh.jcr.jackrabbit - 1.2.6 + 1.2.7-SNAPSHOT war org.crsh crsh.jcr.jackrabbit - 1.2.6 + 1.2.7-SNAPSHOT sources @@ -304,13 +304,13 @@ org.crsh crsh.plugins.crowd - 1.2.6 + 1.2.7-SNAPSHOT jar org.crsh crsh.plugins.crowd - 1.2.6 + 1.2.7-SNAPSHOT sources @@ -318,20 +318,20 @@ org.crsh crsh.doc.reference - 1.2.6 + 1.2.7-SNAPSHOT pdf org.crsh crsh.doc.reference - 1.2.6 + 1.2.7-SNAPSHOT html zip org.crsh crsh.doc.reference - 1.2.6 + 1.2.7-SNAPSHOT javadoc @@ -339,13 +339,13 @@ org.crsh crsh.doc.cookbook - 1.2.6 + 1.2.7-SNAPSHOT pdf org.crsh crsh.doc.cookbook - 1.2.6 + 1.2.7-SNAPSHOT html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index f5c51f141..065ac9720 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,13 +2,13 @@ crsh.shell org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.shell.core jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 646f5eaf4..f26f4544a 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,13 +3,13 @@ crsh.shell org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.shell.embed pom - 1.2.6 + 1.2.7-SNAPSHOT CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index f980fbcfe..d0bd7abe4 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,13 +2,13 @@ crsh.shell.embed org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.shell.embed.spring jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index 67d2e6153..e19196dbd 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,13 +2,13 @@ crsh.shell org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.shell.packaging jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index fa7244234..351d0c315 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.shell pom - 1.2.6 + 1.2.7-SNAPSHOT CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index d473ba922..90dcd71e8 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,13 +2,13 @@ crsh.shell org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.shell.ssh jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index 92499fd54..ed83e6068 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,13 +2,13 @@ crsh.shell org.crsh - 1.2.6 + 1.2.7-SNAPSHOT 4.0.0 org.crsh crsh.shell.telnet jar - 1.2.6 + 1.2.7-SNAPSHOT CRaSH telnet The CRaSH telner module From f42a317beb38daa45b7329f92d15f1f2cb9b2c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Delhom=C3=A9nie?= Date: Wed, 29 May 2013 07:39:21 +0200 Subject: [PATCH 02/33] Display the prompt message before waiting for input --- .../src/main/java/org/crsh/processor/term/ProcessContext.java | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/core/src/main/java/org/crsh/processor/term/ProcessContext.java b/shell/core/src/main/java/org/crsh/processor/term/ProcessContext.java index ed9270493..8d2e40473 100644 --- a/shell/core/src/main/java/org/crsh/processor/term/ProcessContext.java +++ b/shell/core/src/main/java/org/crsh/processor/term/ProcessContext.java @@ -70,6 +70,7 @@ public String getProperty(String name) { public String readLine(String msg, boolean echo) { try { processor.term.provide(Text.create(msg)); + processor.term.flush(); } catch (IOException e) { return null; From 2ab16087d34a0c8c1fcac4ede5da76861add9ff5 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 12 Aug 2013 09:08:01 +0200 Subject: [PATCH 03/33] CRASH-139 : Capital letters not allowed for Option value --- .../org/crsh/cli/descriptor/OptionDescriptor.java | 1 + .../java/org/crsh/cli/impl/CommandInfoTestCase.java | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/cli/src/main/java/org/crsh/cli/descriptor/OptionDescriptor.java b/cli/src/main/java/org/crsh/cli/descriptor/OptionDescriptor.java index 9368c1141..63136c45c 100644 --- a/cli/src/main/java/org/crsh/cli/descriptor/OptionDescriptor.java +++ b/cli/src/main/java/org/crsh/cli/descriptor/OptionDescriptor.java @@ -64,6 +64,7 @@ public class OptionDescriptor extends ParameterDescriptor { static { for (char c = 'a';c <= 'z';c++) { A.set(c); + A.set(c + 'A' - 'a'); } B.or(A); B.set('-'); diff --git a/cli/src/test/java/org/crsh/cli/impl/CommandInfoTestCase.java b/cli/src/test/java/org/crsh/cli/impl/CommandInfoTestCase.java index 9286c23a9..b181469a8 100644 --- a/cli/src/test/java/org/crsh/cli/impl/CommandInfoTestCase.java +++ b/cli/src/test/java/org/crsh/cli/impl/CommandInfoTestCase.java @@ -72,6 +72,17 @@ class A { assertEquals(Arrays.asList("i"),i.getNames()); } + public void testOptionWithUpperCase() throws IntrospectionException { + class A { + @Option(names = "I") + private int i; + } + CommandDescriptor ai = CommandFactory.DEFAULT.create(A.class); + assertEquals(1,ai.getOptions().size()); + OptionDescriptor i = ai.getOption("-I"); + assertEquals(Arrays.asList("I"),i.getNames()); + } + public void testArgument1() throws IntrospectionException { class A { @Argument() From 5c65cc53549455ca969bcd21c0602e795548cda4 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Fri, 7 Jun 2013 19:09:19 +0200 Subject: [PATCH 04/33] Make close properly work in a pipe --- .../main/java/org/crsh/command/CRaSHCommand.java | 5 +++-- .../java/org/crsh/command/ClassDispatcher.java | 5 ++++- .../java/org/crsh/command/CommandContext.java | 4 +++- .../org/crsh/command/InnerInvocationContext.java | 4 ++++ .../org/crsh/command/InvocationContextImpl.java | 4 ++++ .../java/org/crsh/command/PipeCommandProxy.java | 2 +- .../core/src/main/java/org/crsh/io/Producer.java | 3 ++- .../java/org/crsh/shell/impl/command/Pipe.java | 2 +- .../org/crsh/shell/impl/command/PipeFilter.java | 10 +++++----- .../org/crsh/shell/impl/command/PipeLine.java | 2 +- .../main/java/org/crsh/text/ui/EvalElement.java | 4 ++++ .../src/test/java/org/crsh/shell/Commands.java | 16 ++++++++++++++++ .../test/java/org/crsh/shell/PipeTestCase.java | 15 ++++++++++++++- .../org/crsh/shell/TestInvocationContext.java | 4 ++++ 14 files changed, 66 insertions(+), 14 deletions(-) diff --git a/shell/core/src/main/java/org/crsh/command/CRaSHCommand.java b/shell/core/src/main/java/org/crsh/command/CRaSHCommand.java index 0881c23d0..18accf3c8 100644 --- a/shell/core/src/main/java/org/crsh/command/CRaSHCommand.java +++ b/shell/core/src/main/java/org/crsh/command/CRaSHCommand.java @@ -280,9 +280,10 @@ public void provide(Object element) throws IOException { public void flush() throws IOException { peekContext().flush(); } - public void close() { + public void close() throws IOException { CRaSHCommand.this.unmatched = null; - popContext(); + InvocationContext context = popContext(); + context.close(); } }; } else { diff --git a/shell/core/src/main/java/org/crsh/command/ClassDispatcher.java b/shell/core/src/main/java/org/crsh/command/ClassDispatcher.java index 66d47c30c..2dac341d5 100644 --- a/shell/core/src/main/java/org/crsh/command/ClassDispatcher.java +++ b/shell/core/src/main/java/org/crsh/command/ClassDispatcher.java @@ -24,6 +24,7 @@ import groovy.lang.MissingPropertyException; import org.codehaus.groovy.runtime.InvokerInvocationException; import org.crsh.io.Consumer; +import org.crsh.util.Safe; import java.io.IOException; import java.util.ArrayList; @@ -83,7 +84,6 @@ Object dispatch(String methodName, Object[] arguments) { // try { pipe.fire(); - pipe.close(); return null; } catch (ScriptException e) { @@ -94,6 +94,9 @@ Object dispatch(String methodName, Object[] arguments) { throw e; } } + finally { + Safe.close(pipe); + } } private PipeCommandProxy resolvePipe(String name, Object[] args, boolean piped) { diff --git a/shell/core/src/main/java/org/crsh/command/CommandContext.java b/shell/core/src/main/java/org/crsh/command/CommandContext.java index 72c0002b2..1ae71e5e5 100644 --- a/shell/core/src/main/java/org/crsh/command/CommandContext.java +++ b/shell/core/src/main/java/org/crsh/command/CommandContext.java @@ -20,12 +20,14 @@ import org.crsh.shell.InteractionContext; +import java.io.Closeable; + /** * The command context provides the services for invoking a command. * * @author Julien Viet */ -public interface CommandContext

extends InteractionContext

, RuntimeContext { +public interface CommandContext

extends InteractionContext

, RuntimeContext, Closeable { boolean isPiped(); diff --git a/shell/core/src/main/java/org/crsh/command/InnerInvocationContext.java b/shell/core/src/main/java/org/crsh/command/InnerInvocationContext.java index a2a93f153..8ae16d5da 100644 --- a/shell/core/src/main/java/org/crsh/command/InnerInvocationContext.java +++ b/shell/core/src/main/java/org/crsh/command/InnerInvocationContext.java @@ -123,6 +123,10 @@ public void flush() throws IOException { consumer.flush(); } + public void close() throws IOException { + // Nothing to do + } + public Map getSession() { return outter.getSession(); } diff --git a/shell/core/src/main/java/org/crsh/command/InvocationContextImpl.java b/shell/core/src/main/java/org/crsh/command/InvocationContextImpl.java index a37908b78..081cf02c1 100644 --- a/shell/core/src/main/java/org/crsh/command/InvocationContextImpl.java +++ b/shell/core/src/main/java/org/crsh/command/InvocationContextImpl.java @@ -121,6 +121,10 @@ public void flush() throws IOException { commandContext.flush(); } + public void close() throws IOException { + commandContext.close(); + } + public Map getSession() { return commandContext.getSession(); } diff --git a/shell/core/src/main/java/org/crsh/command/PipeCommandProxy.java b/shell/core/src/main/java/org/crsh/command/PipeCommandProxy.java index 10369c445..0d0daf9a3 100644 --- a/shell/core/src/main/java/org/crsh/command/PipeCommandProxy.java +++ b/shell/core/src/main/java/org/crsh/command/PipeCommandProxy.java @@ -70,7 +70,7 @@ public void flush() throws ScriptException, IOException { } } - public void close() throws ScriptException { + public void close() throws ScriptException, IOException { delegate.close(); if (next != null && next instanceof PipeCommand) { ((PipeCommand)next).close(); diff --git a/shell/core/src/main/java/org/crsh/io/Producer.java b/shell/core/src/main/java/org/crsh/io/Producer.java index 9a7b5d94c..add7dee1d 100644 --- a/shell/core/src/main/java/org/crsh/io/Producer.java +++ b/shell/core/src/main/java/org/crsh/io/Producer.java @@ -20,6 +20,7 @@ package org.crsh.io; import java.io.Closeable; +import java.io.IOException; /** * A producer that produces elements in a specific consumer. @@ -46,6 +47,6 @@ public interface Producer> extends Closeable { /** * Close the producer. */ - void close(); + void close() throws IOException; } diff --git a/shell/core/src/main/java/org/crsh/shell/impl/command/Pipe.java b/shell/core/src/main/java/org/crsh/shell/impl/command/Pipe.java index 6d406f2ab..e7c3b1c7d 100644 --- a/shell/core/src/main/java/org/crsh/shell/impl/command/Pipe.java +++ b/shell/core/src/main/java/org/crsh/shell/impl/command/Pipe.java @@ -99,7 +99,7 @@ public void flush() throws IOException { command.flush(); } - public void close() throws ScriptException { + public void close() throws ScriptException, IOException { command.close(); } } diff --git a/shell/core/src/main/java/org/crsh/shell/impl/command/PipeFilter.java b/shell/core/src/main/java/org/crsh/shell/impl/command/PipeFilter.java index a0104a804..bfea7e015 100644 --- a/shell/core/src/main/java/org/crsh/shell/impl/command/PipeFilter.java +++ b/shell/core/src/main/java/org/crsh/shell/impl/command/PipeFilter.java @@ -107,7 +107,7 @@ public void open(CommandContext

consumer) { } public void close() { - Safe.close((Closeable)context); + Safe.close(context); } } @@ -158,8 +158,8 @@ public void flush() throws ScriptException, IOException { ca.flush(); } - public void close() throws ScriptException { - ((Pipe)context).close(); + public void close() throws ScriptException, IOException { + context.close(); } } @@ -194,8 +194,8 @@ public void flush() throws IOException { context.flush(); } - public void close() { - ((Pipe)context).close(); + public void close() throws IOException { + context.close(); } } } diff --git a/shell/core/src/main/java/org/crsh/shell/impl/command/PipeLine.java b/shell/core/src/main/java/org/crsh/shell/impl/command/PipeLine.java index 86da45dab..f4d4fd863 100644 --- a/shell/core/src/main/java/org/crsh/shell/impl/command/PipeLine.java +++ b/shell/core/src/main/java/org/crsh/shell/impl/command/PipeLine.java @@ -105,7 +105,7 @@ public void flush() throws IOException { current.flush(); } - public void close() { + public void close() throws IOException { current.close(); } } diff --git a/shell/core/src/main/java/org/crsh/text/ui/EvalElement.java b/shell/core/src/main/java/org/crsh/text/ui/EvalElement.java index 3ad1b0571..2c09e53f7 100644 --- a/shell/core/src/main/java/org/crsh/text/ui/EvalElement.java +++ b/shell/core/src/main/java/org/crsh/text/ui/EvalElement.java @@ -143,6 +143,10 @@ public void flush() throws IOException { renderers.add(i); } } + + public void close() throws IOException { + // Nothing to do, except maybe release resources (and also prevent to do any other operation) + } }; if (cmd instanceof CRaSHCommand) { diff --git a/shell/core/src/test/java/org/crsh/shell/Commands.java b/shell/core/src/test/java/org/crsh/shell/Commands.java index bd3e808b0..411eab129 100644 --- a/shell/core/src/test/java/org/crsh/shell/Commands.java +++ b/shell/core/src/test/java/org/crsh/shell/Commands.java @@ -169,6 +169,22 @@ public void provide(String element) throws ScriptException, IOException { } } + public static class IsClosed extends CRaSHCommand { + + /** . */ + public static final AtomicInteger closed = new AtomicInteger(); + + @Command + public org.crsh.command.PipeCommand main() { + return new PipeCommand() { + @Override + public void close() throws ScriptException { + closed.incrementAndGet(); + } + }; + } + } + public static class IsPiped extends CRaSHCommand { @Command public org.crsh.command.PipeCommand main() { diff --git a/shell/core/src/test/java/org/crsh/shell/PipeTestCase.java b/shell/core/src/test/java/org/crsh/shell/PipeTestCase.java index 6cd0a2d42..c9d7d4b8d 100644 --- a/shell/core/src/test/java/org/crsh/shell/PipeTestCase.java +++ b/shell/core/src/test/java/org/crsh/shell/PipeTestCase.java @@ -19,7 +19,6 @@ package org.crsh.shell; -import org.codehaus.groovy.tools.shell.Command; import org.crsh.command.ScriptException; import org.crsh.text.ChunkBuffer; @@ -28,6 +27,20 @@ public class PipeTestCase extends AbstractCommandTestCase { + public void testClose() { + lifeCycle.bind("closed", Commands.IsClosed.class); + + // + Commands.IsClosed.closed.set(0); + assertEquals("", assertOk("closed")); + assertEquals(1, Commands.IsClosed.closed.get()); + + // + Commands.IsClosed.closed.set(0); + assertEquals("", assertOk("echo abc | closed")); + assertEquals(1, Commands.IsClosed.closed.get()); + } + public void testIsPiped() { lifeCycle.bind("piped", Commands.IsPiped.class); lifeCycle.bind("produce_command", Commands.ProduceString.class); diff --git a/shell/core/src/test/java/org/crsh/shell/TestInvocationContext.java b/shell/core/src/test/java/org/crsh/shell/TestInvocationContext.java index c51f8eff4..779bee2d9 100644 --- a/shell/core/src/test/java/org/crsh/shell/TestInvocationContext.java +++ b/shell/core/src/test/java/org/crsh/shell/TestInvocationContext.java @@ -109,6 +109,10 @@ public void flush() throws IOException { producer.flush(); } + public void close() throws IOException { + // + } + public CommandInvoker resolve(String s) throws ScriptException, IOException { throw new UnsupportedOperationException(); } From 431e91c799a6d3dae3e7965359e2586c0d9b89a8 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Tue, 9 Jul 2013 14:59:13 +0200 Subject: [PATCH 05/33] Remove garbage files --- distrib/META-INF/MANIFEST.MF | 4 - .../main/izpack/crash/crash/crash.properties | 19 ---- distrib/src/main/izpack/crash/web.xml | 35 ------ distrib/src/main/izpack/doc/index.html | 10 -- distrib/src/main/izpack/install.xml | 105 ------------------ distrib/src/main/izpack/userInputSpec.xml | 77 ------------- 6 files changed, 250 deletions(-) delete mode 100644 distrib/META-INF/MANIFEST.MF delete mode 100644 distrib/src/main/izpack/crash/crash/crash.properties delete mode 100644 distrib/src/main/izpack/crash/web.xml delete mode 100644 distrib/src/main/izpack/doc/index.html delete mode 100644 distrib/src/main/izpack/install.xml delete mode 100644 distrib/src/main/izpack/userInputSpec.xml diff --git a/distrib/META-INF/MANIFEST.MF b/distrib/META-INF/MANIFEST.MF deleted file mode 100644 index 35289c8ad..000000000 --- a/distrib/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -Archiver-Version: Plexus Archiver -Created-By: 20.6-b01-415 (Apple Inc.) - diff --git a/distrib/src/main/izpack/crash/crash/crash.properties b/distrib/src/main/izpack/crash/crash/crash.properties deleted file mode 100644 index fd771bcf8..000000000 --- a/distrib/src/main/izpack/crash/crash/crash.properties +++ /dev/null @@ -1,19 +0,0 @@ -# VFS configuration -crash.vfs.refresh_period=1 - -# SSH configuration -crash.ssh.port=${crash.ssh.port} -#crash.ssh.keypath=/path/to/the/key/file - -# Telnet configuration -crash.telnet.port=${crash.telnet.port} - -# Authentication plugin configuration -crash.auth=${crash.auth} - -# Simple authentication plugin configuration -crash.auth.simple.username=${crash.auth.simple.username} -crash.auth.simple.password=${crash.auth.simple.password} - -# Jaas authentication plugin configuration -crash.auth.jaas.domain=${crash.auth.jaas.domain} diff --git a/distrib/src/main/izpack/crash/web.xml b/distrib/src/main/izpack/crash/web.xml deleted file mode 100644 index 0e8781897..000000000 --- a/distrib/src/main/izpack/crash/web.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - CRaSH - - - org.crsh.plugin.WebPluginLifeCycle - - - - doc/index.html - - - diff --git a/distrib/src/main/izpack/doc/index.html b/distrib/src/main/izpack/doc/index.html deleted file mode 100644 index dd5e3ee80..000000000 --- a/distrib/src/main/izpack/doc/index.html +++ /dev/null @@ -1,10 +0,0 @@ - - - -

- - diff --git a/distrib/src/main/izpack/install.xml b/distrib/src/main/izpack/install.xml deleted file mode 100644 index 2a2874d66..000000000 --- a/distrib/src/main/izpack/install.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - crash - @version@ - http://crsh.googlecode.com - - no - no - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The required CRaSH files. - - - - - - - Bundle the Groovy library with CRaSH. This is not required when the runtime provides this library already. - - - - - - Provides Telnet access to CRaSH. - - - - - - Provides SSH access to CRaSH. - - - - - - Bundle the Bouncy Castle libraries with CRaSH required for SSH support. This is not required when the runtime provides this library already. - - - - - - Bundle the CRaSH JCR extension. - - - - - - Bundle the CRaSH JCR eXo driver. - - - - - - Bundle the CRaSH JCR Jackrabbit driver. - - - - - - Bundle the CRaSH JCR documentation. - - - - - - - diff --git a/distrib/src/main/izpack/userInputSpec.xml b/distrib/src/main/izpack/userInputSpec.xml deleted file mode 100644 index 60b93be83..000000000 --- a/distrib/src/main/izpack/userInputSpec.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From c0e4b6607cfdda5c6f117753d138750a733963d9 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Thu, 11 Jul 2013 08:36:50 +0200 Subject: [PATCH 06/33] CRASH-138: -h switch does not work for pipe commands --- .../java/org/crsh/command/CRaSHCommand.java | 149 +++++++----------- .../java/org/crsh/shell/HelpTestCase.java | 29 ++++ 2 files changed, 88 insertions(+), 90 deletions(-) create mode 100644 shell/core/src/test/java/org/crsh/shell/HelpTestCase.java diff --git a/shell/core/src/main/java/org/crsh/command/CRaSHCommand.java b/shell/core/src/main/java/org/crsh/command/CRaSHCommand.java index 18accf3c8..87469e98c 100644 --- a/shell/core/src/main/java/org/crsh/command/CRaSHCommand.java +++ b/shell/core/src/main/java/org/crsh/command/CRaSHCommand.java @@ -234,119 +234,88 @@ public final void execute(String s) throws ScriptException, IOException { final Class _producedType = producedType; // - if (consumedType == Void.class) { + return new CommandInvoker() { - return new CommandInvoker() { + /** . */ + PipeCommand real; - public Class getProducedType() { - return _producedType; - } + public Class getProducedType() { + return _producedType; + } - public Class getConsumedType() { - return _consumedType; - } + public Class getConsumedType() { + return _consumedType; + } - public void open(final CommandContext consumer) { - - // - pushContext(new InvocationContextImpl(consumer)); - CRaSHCommand.this.unmatched = match.getRest(); - final Resolver resolver = new Resolver() { - public T resolve(Class type) { - if (type.equals(InvocationContext.class)) { - return type.cast(peekContext()); - } else { - return null; - } - } - }; + public void open(final CommandContext consumer) { - // - Object o; - try { - o = invoker.invoke(resolver, CRaSHCommand.this); - } catch (org.crsh.cli.SyntaxException e) { - throw new org.crsh.command.SyntaxException(e.getMessage()); - } catch (InvocationException e) { - throw toScript(e.getCause()); - } - if (o != null) { - peekContext().getWriter().print(o); + // + final InvocationContextImpl invocationContext = new InvocationContextImpl(consumer); + final Resolver resolver = new Resolver() { + public T resolve(Class type) { + if (type.equals(InvocationContext.class)) { + return type.cast(invocationContext); + } else { + return null; + } } - } - public void provide(Object element) throws IOException { - // We just drop the elements - } - public void flush() throws IOException { - peekContext().flush(); - } - public void close() throws IOException { - CRaSHCommand.this.unmatched = null; - InvocationContext context = popContext(); - context.close(); - } - }; - } else { - return new CommandInvoker() { + }; - /** . */ - PipeCommand real; + // Push context + pushContext(invocationContext); - public Class getProducedType() { - return _producedType; - } + // Set the unmatched part + CRaSHCommand.this.unmatched = match.getRest(); - public Class getConsumedType() { - return _consumedType; + // + Object ret; + try { + ret = invoker.invoke(resolver, CRaSHCommand.this); + } + catch (org.crsh.cli.SyntaxException e) { + throw new org.crsh.command.SyntaxException(e.getMessage()); + } catch (InvocationException e) { + throw toScript(e.getCause()); } - public void open(final CommandContext consumer) { - - // - final InvocationContextImpl invocationContext = new InvocationContextImpl(consumer); - - // - pushContext(invocationContext); - CRaSHCommand.this.unmatched = match.getRest(); - final Resolver resolver = new Resolver() { - public T resolve(Class type) { - if (type.equals(InvocationContext.class)) { - return type.cast(invocationContext); - } else { - return null; - } - } - }; - try { - real = (PipeCommand)invoker.invoke(resolver, CRaSHCommand.this); - } - catch (org.crsh.cli.SyntaxException e) { - throw new org.crsh.command.SyntaxException(e.getMessage()); - } catch (InvocationException e) { - throw toScript(e.getCause()); - } - - // + // It's a pipe command + if (ret instanceof PipeCommand) { + real = (PipeCommand)ret; real.doOpen(invocationContext); + } else { + if (ret != null) { + peekContext().getWriter().print(ret); + } } - - public void provide(Object element) throws IOException { + } + public void provide(Object element) throws IOException { + if (real != null) { real.provide(element); + } else { + // We just drop the elements } - - public void flush() throws IOException { + } + public void flush() throws IOException { + if (real != null) { real.flush(); + } else { + peekContext().flush(); } - - public void close() { + } + public void close() throws IOException { + if (real != null) { try { real.close(); } finally { popContext(); } + } else { + InvocationContext context = popContext(); + context.close(); } - }; - } + CRaSHCommand.this.unmatched = null; + } + }; } } diff --git a/shell/core/src/test/java/org/crsh/shell/HelpTestCase.java b/shell/core/src/test/java/org/crsh/shell/HelpTestCase.java new file mode 100644 index 000000000..c9e63775d --- /dev/null +++ b/shell/core/src/test/java/org/crsh/shell/HelpTestCase.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2012 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.crsh.shell; + +/** @author Julien Viet */ +public class HelpTestCase extends AbstractCommandTestCase { + + public void testPiped() { + lifeCycle.bind("piped", Commands.IsPiped.class); + String resp = assertOk("piped -h"); + assertTrue(resp.contains("usage")); + } +} From 253c23dfb2a8231d25f57025967fa035171974ab Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Thu, 11 Jul 2013 09:10:49 +0200 Subject: [PATCH 07/33] Minor pom cleanup Conflicts: plugins/mail/pom.xml --- cli/pom.xml | 1 - distrib/pom.xml | 1 - doc/cookbook/pom.xml | 1 - doc/pom.xml | 1 - doc/reference/pom.xml | 1 - plugins/crowd/pom.xml | 4 +--- shell/core/pom.xml | 1 - shell/embed/pom.xml | 1 - shell/embed/spring/pom.xml | 23 ----------------------- shell/packaging/pom.xml | 1 - shell/ssh/pom.xml | 2 -- shell/telnet/pom.xml | 1 - 12 files changed, 1 insertion(+), 37 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 277d19c78..3c9eba0bc 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.cli jar 1.2.7-SNAPSHOT diff --git a/distrib/pom.xml b/distrib/pom.xml index f718a211a..09d5d3491 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -5,7 +5,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.distrib jar 1.2.7-SNAPSHOT diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index cf607600b..144f6ef90 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -25,7 +25,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.doc.cookbook jar 1.2.7-SNAPSHOT diff --git a/doc/pom.xml b/doc/pom.xml index 1817cc12d..2fc4d0464 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -6,7 +6,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.doc pom 1.2.7-SNAPSHOT diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index 217927027..c44c0f6cf 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -25,7 +25,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.doc.reference jar 1.2.7-SNAPSHOT diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index 95b9e47b3..cc298de6b 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -5,7 +5,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.plugins.crowd jar 1.2.7-SNAPSHOT @@ -15,9 +14,8 @@ - ${project.groupId} + org.crsh crsh.shell.core - ${project.version} com.atlassian.crowd diff --git a/shell/core/pom.xml b/shell/core/pom.xml index 065ac9720..46db06ec7 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -5,7 +5,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.shell.core jar 1.2.7-SNAPSHOT diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index f26f4544a..6f7328b45 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -6,7 +6,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.shell.embed pom 1.2.7-SNAPSHOT diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index d0bd7abe4..c3720d37f 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -5,7 +5,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.shell.embed.spring jar 1.2.7-SNAPSHOT @@ -30,14 +29,6 @@ org.springframework spring-core - org.springframework @@ -51,26 +42,12 @@ org.springframework spring-beans - org.crsh crsh.shell.telnet test - org.crsh crsh.shell.core diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index e19196dbd..fd4a92779 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -5,7 +5,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.shell.packaging jar 1.2.7-SNAPSHOT diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index 90dcd71e8..ced70a164 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -5,7 +5,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.shell.ssh jar 1.2.7-SNAPSHOT @@ -22,7 +21,6 @@ - org.apache.sshd sshd-core diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index ed83e6068..bfe3e5988 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -5,7 +5,6 @@ 1.2.7-SNAPSHOT 4.0.0 - org.crsh crsh.shell.telnet jar 1.2.7-SNAPSHOT From c80e91f5e8e5e2df912bfab9a0e23ca5eaba0c0d Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 12 Aug 2013 09:24:11 +0200 Subject: [PATCH 08/33] [maven-release-plugin] prepare release 1.2.7 --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 78 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 75 insertions(+), 75 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 3c9eba0bc..488438adb 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.cli jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index 09d5d3491..fde66d71d 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.distrib jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index 144f6ef90..be8c94924 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.doc.cookbook jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index 2fc4d0464..f575ba8eb 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,12 +3,12 @@ crsh.parent org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.doc pom - 1.2.7-SNAPSHOT + 1.2.7 CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index c44c0f6cf..03d44a51e 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.doc.reference jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index 7c071cc03..7294617a0 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 org.crsh crsh.jcr.core jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index fb2bc270d..1e0ae0d38 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index 89c8336a6..c4f0f595a 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index 7c96d3538..89cc81b85 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 org.crsh crsh.jcr pom - 1.2.7-SNAPSHOT + 1.2.7 CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index cc298de6b..6ba8866f4 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,12 +2,12 @@ crsh.plugins org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.plugins.crowd jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index 8429576d0..cfbbe6ad0 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 org.crsh crsh.plugins pom - 1.2.7-SNAPSHOT + 1.2.7 CRaSH plugins parent diff --git a/pom.xml b/pom.xml index 036283c85..551a06844 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.7-SNAPSHOT + 1.2.7 CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -103,12 +103,12 @@ org.crsh crsh.cli - 1.2.7-SNAPSHOT + 1.2.7 org.crsh crsh.cli - 1.2.7-SNAPSHOT + 1.2.7 sources @@ -116,25 +116,25 @@ org.crsh crsh.shell.core - 1.2.7-SNAPSHOT + 1.2.7 jar org.crsh crsh.shell.core - 1.2.7-SNAPSHOT + 1.2.7 test-jar org.crsh crsh.shell.core - 1.2.7-SNAPSHOT + 1.2.7 sources org.crsh crsh.shell.core - 1.2.7-SNAPSHOT + 1.2.7 standalone @@ -142,18 +142,18 @@ org.crsh crsh.shell.telnet - 1.2.7-SNAPSHOT + 1.2.7 org.crsh crsh.shell.telnet - 1.2.7-SNAPSHOT + 1.2.7 sources org.crsh crsh.shell.telnet - 1.2.7-SNAPSHOT + 1.2.7 standalone @@ -161,18 +161,18 @@ org.crsh crsh.shell.ssh - 1.2.7-SNAPSHOT + 1.2.7 org.crsh crsh.shell.ssh - 1.2.7-SNAPSHOT + 1.2.7 sources org.crsh crsh.shell.ssh - 1.2.7-SNAPSHOT + 1.2.7 standalone @@ -180,12 +180,12 @@ org.crsh crsh.shell.embed.spring - 1.2.7-SNAPSHOT + 1.2.7 org.crsh crsh.shell.embed.spring - 1.2.7-SNAPSHOT + 1.2.7 sources @@ -193,32 +193,32 @@ org.crsh crsh.shell.packaging - 1.2.7-SNAPSHOT + 1.2.7 org.crsh crsh.shell.packaging - 1.2.7-SNAPSHOT + 1.2.7 war org.crsh crsh.shell.packaging - 1.2.7-SNAPSHOT + 1.2.7 war spring org.crsh crsh.shell.packaging - 1.2.7-SNAPSHOT + 1.2.7 zip mule-app org.crsh crsh.shell.packaging - 1.2.7-SNAPSHOT + 1.2.7 tar.gz @@ -226,37 +226,37 @@ org.crsh crsh.jcr.core - 1.2.7-SNAPSHOT + 1.2.7 jar org.crsh crsh.jcr.core - 1.2.7-SNAPSHOT + 1.2.7 war org.crsh crsh.jcr.core - 1.2.7-SNAPSHOT + 1.2.7 javadoc org.crsh crsh.jcr.core - 1.2.7-SNAPSHOT + 1.2.7 test-jar org.crsh crsh.jcr.core - 1.2.7-SNAPSHOT + 1.2.7 sources org.crsh crsh.jcr.core - 1.2.7-SNAPSHOT + 1.2.7 standalone @@ -264,19 +264,19 @@ org.crsh crsh.jcr.exo - 1.2.7-SNAPSHOT + 1.2.7 jar org.crsh crsh.jcr.exo - 1.2.7-SNAPSHOT + 1.2.7 war org.crsh crsh.jcr.exo - 1.2.7-SNAPSHOT + 1.2.7 sources @@ -284,19 +284,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.7-SNAPSHOT + 1.2.7 jar org.crsh crsh.jcr.jackrabbit - 1.2.7-SNAPSHOT + 1.2.7 war org.crsh crsh.jcr.jackrabbit - 1.2.7-SNAPSHOT + 1.2.7 sources @@ -304,13 +304,13 @@ org.crsh crsh.plugins.crowd - 1.2.7-SNAPSHOT + 1.2.7 jar org.crsh crsh.plugins.crowd - 1.2.7-SNAPSHOT + 1.2.7 sources @@ -318,20 +318,20 @@ org.crsh crsh.doc.reference - 1.2.7-SNAPSHOT + 1.2.7 pdf org.crsh crsh.doc.reference - 1.2.7-SNAPSHOT + 1.2.7 html zip org.crsh crsh.doc.reference - 1.2.7-SNAPSHOT + 1.2.7 javadoc @@ -339,13 +339,13 @@ org.crsh crsh.doc.cookbook - 1.2.7-SNAPSHOT + 1.2.7 pdf org.crsh crsh.doc.cookbook - 1.2.7-SNAPSHOT + 1.2.7 html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index 46db06ec7..4ffabe3e4 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.shell.core jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 6f7328b45..7aaa60a23 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,12 +3,12 @@ crsh.shell org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.shell.embed pom - 1.2.7-SNAPSHOT + 1.2.7 CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index c3720d37f..ce9dc214e 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,12 +2,12 @@ crsh.shell.embed org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.shell.embed.spring jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index fd4a92779..d7af3f8d3 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.shell.packaging jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index 351d0c315..be10e1e2d 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 org.crsh crsh.shell pom - 1.2.7-SNAPSHOT + 1.2.7 CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index ced70a164..2d0038180 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.shell.ssh jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index bfe3e5988..b77a73d94 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 crsh.shell.telnet jar - 1.2.7-SNAPSHOT + 1.2.7 CRaSH telnet The CRaSH telner module From 7d0d1314c0f81f940e8d76d14c567186b5cfb56c Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 12 Aug 2013 09:24:12 +0200 Subject: [PATCH 09/33] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 78 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 75 insertions(+), 75 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 488438adb..48405002c 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.cli jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index fde66d71d..0053889c5 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.distrib jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index be8c94924..432631107 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.doc.cookbook jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index f575ba8eb..0f72e4888 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,12 +3,12 @@ crsh.parent org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.doc pom - 1.2.7 + 1.2.8-SNAPSHOT CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index 03d44a51e..f36d64933 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.doc.reference jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index 7294617a0..2ff7f5bac 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 org.crsh crsh.jcr.core jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index 1e0ae0d38..3c5113bf8 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index c4f0f595a..6afb1b14f 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index 89cc81b85..d156f6a95 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 org.crsh crsh.jcr pom - 1.2.7 + 1.2.8-SNAPSHOT CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index 6ba8866f4..9707626d1 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,12 +2,12 @@ crsh.plugins org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.plugins.crowd jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index cfbbe6ad0..97f5cc265 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 org.crsh crsh.plugins pom - 1.2.7 + 1.2.8-SNAPSHOT CRaSH plugins parent diff --git a/pom.xml b/pom.xml index 551a06844..8f290a601 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.7 + 1.2.8-SNAPSHOT CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -103,12 +103,12 @@ org.crsh crsh.cli - 1.2.7 + 1.2.8-SNAPSHOT org.crsh crsh.cli - 1.2.7 + 1.2.8-SNAPSHOT sources @@ -116,25 +116,25 @@ org.crsh crsh.shell.core - 1.2.7 + 1.2.8-SNAPSHOT jar org.crsh crsh.shell.core - 1.2.7 + 1.2.8-SNAPSHOT test-jar org.crsh crsh.shell.core - 1.2.7 + 1.2.8-SNAPSHOT sources org.crsh crsh.shell.core - 1.2.7 + 1.2.8-SNAPSHOT standalone @@ -142,18 +142,18 @@ org.crsh crsh.shell.telnet - 1.2.7 + 1.2.8-SNAPSHOT org.crsh crsh.shell.telnet - 1.2.7 + 1.2.8-SNAPSHOT sources org.crsh crsh.shell.telnet - 1.2.7 + 1.2.8-SNAPSHOT standalone @@ -161,18 +161,18 @@ org.crsh crsh.shell.ssh - 1.2.7 + 1.2.8-SNAPSHOT org.crsh crsh.shell.ssh - 1.2.7 + 1.2.8-SNAPSHOT sources org.crsh crsh.shell.ssh - 1.2.7 + 1.2.8-SNAPSHOT standalone @@ -180,12 +180,12 @@ org.crsh crsh.shell.embed.spring - 1.2.7 + 1.2.8-SNAPSHOT org.crsh crsh.shell.embed.spring - 1.2.7 + 1.2.8-SNAPSHOT sources @@ -193,32 +193,32 @@ org.crsh crsh.shell.packaging - 1.2.7 + 1.2.8-SNAPSHOT org.crsh crsh.shell.packaging - 1.2.7 + 1.2.8-SNAPSHOT war org.crsh crsh.shell.packaging - 1.2.7 + 1.2.8-SNAPSHOT war spring org.crsh crsh.shell.packaging - 1.2.7 + 1.2.8-SNAPSHOT zip mule-app org.crsh crsh.shell.packaging - 1.2.7 + 1.2.8-SNAPSHOT tar.gz @@ -226,37 +226,37 @@ org.crsh crsh.jcr.core - 1.2.7 + 1.2.8-SNAPSHOT jar org.crsh crsh.jcr.core - 1.2.7 + 1.2.8-SNAPSHOT war org.crsh crsh.jcr.core - 1.2.7 + 1.2.8-SNAPSHOT javadoc org.crsh crsh.jcr.core - 1.2.7 + 1.2.8-SNAPSHOT test-jar org.crsh crsh.jcr.core - 1.2.7 + 1.2.8-SNAPSHOT sources org.crsh crsh.jcr.core - 1.2.7 + 1.2.8-SNAPSHOT standalone @@ -264,19 +264,19 @@ org.crsh crsh.jcr.exo - 1.2.7 + 1.2.8-SNAPSHOT jar org.crsh crsh.jcr.exo - 1.2.7 + 1.2.8-SNAPSHOT war org.crsh crsh.jcr.exo - 1.2.7 + 1.2.8-SNAPSHOT sources @@ -284,19 +284,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.7 + 1.2.8-SNAPSHOT jar org.crsh crsh.jcr.jackrabbit - 1.2.7 + 1.2.8-SNAPSHOT war org.crsh crsh.jcr.jackrabbit - 1.2.7 + 1.2.8-SNAPSHOT sources @@ -304,13 +304,13 @@ org.crsh crsh.plugins.crowd - 1.2.7 + 1.2.8-SNAPSHOT jar org.crsh crsh.plugins.crowd - 1.2.7 + 1.2.8-SNAPSHOT sources @@ -318,20 +318,20 @@ org.crsh crsh.doc.reference - 1.2.7 + 1.2.8-SNAPSHOT pdf org.crsh crsh.doc.reference - 1.2.7 + 1.2.8-SNAPSHOT html zip org.crsh crsh.doc.reference - 1.2.7 + 1.2.8-SNAPSHOT javadoc @@ -339,13 +339,13 @@ org.crsh crsh.doc.cookbook - 1.2.7 + 1.2.8-SNAPSHOT pdf org.crsh crsh.doc.cookbook - 1.2.7 + 1.2.8-SNAPSHOT html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index 4ffabe3e4..ae80d1f27 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.shell.core jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 7aaa60a23..355e3959d 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,12 +3,12 @@ crsh.shell org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.shell.embed pom - 1.2.7 + 1.2.8-SNAPSHOT CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index ce9dc214e..c523d738e 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,12 +2,12 @@ crsh.shell.embed org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.shell.embed.spring jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index d7af3f8d3..1abb8a426 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.shell.packaging jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index be10e1e2d..1fe307cce 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 org.crsh crsh.shell pom - 1.2.7 + 1.2.8-SNAPSHOT CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index 2d0038180..ff454e940 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.shell.ssh jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index b77a73d94..d8568368b 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.7 + 1.2.8-SNAPSHOT 4.0.0 crsh.shell.telnet jar - 1.2.7 + 1.2.8-SNAPSHOT CRaSH telnet The CRaSH telner module From 5422c8c45208c54edf6611450750a729a8fc9978 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Sat, 7 Sep 2013 22:39:06 +0200 Subject: [PATCH 10/33] CRASH-147 : Fix freezing dashboard or thread top --- .../src/main/java/org/crsh/text/formatter/ThreadRenderable.java | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/core/src/main/java/org/crsh/text/formatter/ThreadRenderable.java b/shell/core/src/main/java/org/crsh/text/formatter/ThreadRenderable.java index ba5fe51e6..f0efb8ca7 100644 --- a/shell/core/src/main/java/org/crsh/text/formatter/ThreadRenderable.java +++ b/shell/core/src/main/java/org/crsh/text/formatter/ThreadRenderable.java @@ -79,6 +79,7 @@ public Renderer renderer(Iterator stream) { Thread.sleep(100); } catch (InterruptedException e) { + Thread.currentThread().interrupt(); } // Resample From a935bfafc5403492330bace915edb6354e11aa02 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Fri, 11 Oct 2013 23:35:59 +0200 Subject: [PATCH 11/33] CRASH-151 : Groovyshell permgen leak --- .../src/main/java/org/crsh/shell/impl/command/CRaSHSession.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/core/src/main/java/org/crsh/shell/impl/command/CRaSHSession.java b/shell/core/src/main/java/org/crsh/shell/impl/command/CRaSHSession.java index dc4d73c14..0d6e8e208 100644 --- a/shell/core/src/main/java/org/crsh/shell/impl/command/CRaSHSession.java +++ b/shell/core/src/main/java/org/crsh/shell/impl/command/CRaSHSession.java @@ -148,7 +148,7 @@ private String eval(String name, String def) { ClassLoader previous = setCRaSHLoader(); try { GroovyShell shell = getGroovyShell(); - Object ret = shell.evaluate("return " + name + ";"); + Object ret = shell.getContext().getVariable(name); if (ret instanceof Closure) { log.log(Level.FINEST, "Invoking " + name + " closure"); Closure c = (Closure)ret; From c20e888daeb8d77858ea1b95ab7cdcabef7b9653 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 14 Oct 2013 12:17:58 +0200 Subject: [PATCH 12/33] Remove izpack profile --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f290a601..20b9261d9 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ false - -Prelease,izpack,sign-artifacts + -Prelease,sign-artifacts false true From 63ea1976d3a4515ab7a596b673b1946a96a80df8 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 14 Oct 2013 12:34:26 +0200 Subject: [PATCH 13/33] [maven-release-plugin] prepare release 1.2.8 --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 78 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 75 insertions(+), 75 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 48405002c..1d9e7389c 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.cli jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index 0053889c5..bec355406 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.distrib jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index 432631107..aa3f20084 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.doc.cookbook jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index 0f72e4888..dc81781fc 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,12 +3,12 @@ crsh.parent org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.doc pom - 1.2.8-SNAPSHOT + 1.2.8 CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index f36d64933..d510f9107 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.doc.reference jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index 2ff7f5bac..ac05c24f5 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 org.crsh crsh.jcr.core jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index 3c5113bf8..a1bcdbe4a 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index 6afb1b14f..0d18b6629 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index d156f6a95..c6da718fb 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 org.crsh crsh.jcr pom - 1.2.8-SNAPSHOT + 1.2.8 CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index 9707626d1..2f35f5465 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,12 +2,12 @@ crsh.plugins org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.plugins.crowd jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index 97f5cc265..0eaa59388 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 org.crsh crsh.plugins pom - 1.2.8-SNAPSHOT + 1.2.8 CRaSH plugins parent diff --git a/pom.xml b/pom.xml index 20b9261d9..dc5c99416 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.8-SNAPSHOT + 1.2.8 CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -103,12 +103,12 @@ org.crsh crsh.cli - 1.2.8-SNAPSHOT + 1.2.8 org.crsh crsh.cli - 1.2.8-SNAPSHOT + 1.2.8 sources @@ -116,25 +116,25 @@ org.crsh crsh.shell.core - 1.2.8-SNAPSHOT + 1.2.8 jar org.crsh crsh.shell.core - 1.2.8-SNAPSHOT + 1.2.8 test-jar org.crsh crsh.shell.core - 1.2.8-SNAPSHOT + 1.2.8 sources org.crsh crsh.shell.core - 1.2.8-SNAPSHOT + 1.2.8 standalone @@ -142,18 +142,18 @@ org.crsh crsh.shell.telnet - 1.2.8-SNAPSHOT + 1.2.8 org.crsh crsh.shell.telnet - 1.2.8-SNAPSHOT + 1.2.8 sources org.crsh crsh.shell.telnet - 1.2.8-SNAPSHOT + 1.2.8 standalone @@ -161,18 +161,18 @@ org.crsh crsh.shell.ssh - 1.2.8-SNAPSHOT + 1.2.8 org.crsh crsh.shell.ssh - 1.2.8-SNAPSHOT + 1.2.8 sources org.crsh crsh.shell.ssh - 1.2.8-SNAPSHOT + 1.2.8 standalone @@ -180,12 +180,12 @@ org.crsh crsh.shell.embed.spring - 1.2.8-SNAPSHOT + 1.2.8 org.crsh crsh.shell.embed.spring - 1.2.8-SNAPSHOT + 1.2.8 sources @@ -193,32 +193,32 @@ org.crsh crsh.shell.packaging - 1.2.8-SNAPSHOT + 1.2.8 org.crsh crsh.shell.packaging - 1.2.8-SNAPSHOT + 1.2.8 war org.crsh crsh.shell.packaging - 1.2.8-SNAPSHOT + 1.2.8 war spring org.crsh crsh.shell.packaging - 1.2.8-SNAPSHOT + 1.2.8 zip mule-app org.crsh crsh.shell.packaging - 1.2.8-SNAPSHOT + 1.2.8 tar.gz @@ -226,37 +226,37 @@ org.crsh crsh.jcr.core - 1.2.8-SNAPSHOT + 1.2.8 jar org.crsh crsh.jcr.core - 1.2.8-SNAPSHOT + 1.2.8 war org.crsh crsh.jcr.core - 1.2.8-SNAPSHOT + 1.2.8 javadoc org.crsh crsh.jcr.core - 1.2.8-SNAPSHOT + 1.2.8 test-jar org.crsh crsh.jcr.core - 1.2.8-SNAPSHOT + 1.2.8 sources org.crsh crsh.jcr.core - 1.2.8-SNAPSHOT + 1.2.8 standalone @@ -264,19 +264,19 @@ org.crsh crsh.jcr.exo - 1.2.8-SNAPSHOT + 1.2.8 jar org.crsh crsh.jcr.exo - 1.2.8-SNAPSHOT + 1.2.8 war org.crsh crsh.jcr.exo - 1.2.8-SNAPSHOT + 1.2.8 sources @@ -284,19 +284,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.8-SNAPSHOT + 1.2.8 jar org.crsh crsh.jcr.jackrabbit - 1.2.8-SNAPSHOT + 1.2.8 war org.crsh crsh.jcr.jackrabbit - 1.2.8-SNAPSHOT + 1.2.8 sources @@ -304,13 +304,13 @@ org.crsh crsh.plugins.crowd - 1.2.8-SNAPSHOT + 1.2.8 jar org.crsh crsh.plugins.crowd - 1.2.8-SNAPSHOT + 1.2.8 sources @@ -318,20 +318,20 @@ org.crsh crsh.doc.reference - 1.2.8-SNAPSHOT + 1.2.8 pdf org.crsh crsh.doc.reference - 1.2.8-SNAPSHOT + 1.2.8 html zip org.crsh crsh.doc.reference - 1.2.8-SNAPSHOT + 1.2.8 javadoc @@ -339,13 +339,13 @@ org.crsh crsh.doc.cookbook - 1.2.8-SNAPSHOT + 1.2.8 pdf org.crsh crsh.doc.cookbook - 1.2.8-SNAPSHOT + 1.2.8 html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index ae80d1f27..48eb388f6 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.shell.core jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 355e3959d..202e13b10 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,12 +3,12 @@ crsh.shell org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.shell.embed pom - 1.2.8-SNAPSHOT + 1.2.8 CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index c523d738e..0443b4c4c 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,12 +2,12 @@ crsh.shell.embed org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.shell.embed.spring jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index 1abb8a426..c64e7a66a 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.shell.packaging jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index 1fe307cce..6f56b4299 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 org.crsh crsh.shell pom - 1.2.8-SNAPSHOT + 1.2.8 CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index ff454e940..c08bb2e65 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.shell.ssh jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index d8568368b..c507d7479 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.8-SNAPSHOT + 1.2.8 4.0.0 crsh.shell.telnet jar - 1.2.8-SNAPSHOT + 1.2.8 CRaSH telnet The CRaSH telner module From d1328f47baf181353a7302e3a6764dcf3b95af82 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 14 Oct 2013 12:34:27 +0200 Subject: [PATCH 14/33] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 78 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 75 insertions(+), 75 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 1d9e7389c..2746be925 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.cli jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index bec355406..4e1bc612e 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.distrib jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index aa3f20084..be82b4ff1 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.doc.cookbook jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index dc81781fc..b582069d4 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,12 +3,12 @@ crsh.parent org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.doc pom - 1.2.8 + 1.2.9-SNAPSHOT CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index d510f9107..8871f56a9 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.doc.reference jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index ac05c24f5..7abcea43d 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 org.crsh crsh.jcr.core jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index a1bcdbe4a..27aa0a8dd 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index 0d18b6629..6661b9caf 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index c6da718fb..7244806d9 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 org.crsh crsh.jcr pom - 1.2.8 + 1.2.9-SNAPSHOT CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index 2f35f5465..e1c3f55aa 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,12 +2,12 @@ crsh.plugins org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.plugins.crowd jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index 0eaa59388..662452c35 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 org.crsh crsh.plugins pom - 1.2.8 + 1.2.9-SNAPSHOT CRaSH plugins parent diff --git a/pom.xml b/pom.xml index dc5c99416..86e54c928 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.8 + 1.2.9-SNAPSHOT CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -103,12 +103,12 @@ org.crsh crsh.cli - 1.2.8 + 1.2.9-SNAPSHOT org.crsh crsh.cli - 1.2.8 + 1.2.9-SNAPSHOT sources @@ -116,25 +116,25 @@ org.crsh crsh.shell.core - 1.2.8 + 1.2.9-SNAPSHOT jar org.crsh crsh.shell.core - 1.2.8 + 1.2.9-SNAPSHOT test-jar org.crsh crsh.shell.core - 1.2.8 + 1.2.9-SNAPSHOT sources org.crsh crsh.shell.core - 1.2.8 + 1.2.9-SNAPSHOT standalone @@ -142,18 +142,18 @@ org.crsh crsh.shell.telnet - 1.2.8 + 1.2.9-SNAPSHOT org.crsh crsh.shell.telnet - 1.2.8 + 1.2.9-SNAPSHOT sources org.crsh crsh.shell.telnet - 1.2.8 + 1.2.9-SNAPSHOT standalone @@ -161,18 +161,18 @@ org.crsh crsh.shell.ssh - 1.2.8 + 1.2.9-SNAPSHOT org.crsh crsh.shell.ssh - 1.2.8 + 1.2.9-SNAPSHOT sources org.crsh crsh.shell.ssh - 1.2.8 + 1.2.9-SNAPSHOT standalone @@ -180,12 +180,12 @@ org.crsh crsh.shell.embed.spring - 1.2.8 + 1.2.9-SNAPSHOT org.crsh crsh.shell.embed.spring - 1.2.8 + 1.2.9-SNAPSHOT sources @@ -193,32 +193,32 @@ org.crsh crsh.shell.packaging - 1.2.8 + 1.2.9-SNAPSHOT org.crsh crsh.shell.packaging - 1.2.8 + 1.2.9-SNAPSHOT war org.crsh crsh.shell.packaging - 1.2.8 + 1.2.9-SNAPSHOT war spring org.crsh crsh.shell.packaging - 1.2.8 + 1.2.9-SNAPSHOT zip mule-app org.crsh crsh.shell.packaging - 1.2.8 + 1.2.9-SNAPSHOT tar.gz @@ -226,37 +226,37 @@ org.crsh crsh.jcr.core - 1.2.8 + 1.2.9-SNAPSHOT jar org.crsh crsh.jcr.core - 1.2.8 + 1.2.9-SNAPSHOT war org.crsh crsh.jcr.core - 1.2.8 + 1.2.9-SNAPSHOT javadoc org.crsh crsh.jcr.core - 1.2.8 + 1.2.9-SNAPSHOT test-jar org.crsh crsh.jcr.core - 1.2.8 + 1.2.9-SNAPSHOT sources org.crsh crsh.jcr.core - 1.2.8 + 1.2.9-SNAPSHOT standalone @@ -264,19 +264,19 @@ org.crsh crsh.jcr.exo - 1.2.8 + 1.2.9-SNAPSHOT jar org.crsh crsh.jcr.exo - 1.2.8 + 1.2.9-SNAPSHOT war org.crsh crsh.jcr.exo - 1.2.8 + 1.2.9-SNAPSHOT sources @@ -284,19 +284,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.8 + 1.2.9-SNAPSHOT jar org.crsh crsh.jcr.jackrabbit - 1.2.8 + 1.2.9-SNAPSHOT war org.crsh crsh.jcr.jackrabbit - 1.2.8 + 1.2.9-SNAPSHOT sources @@ -304,13 +304,13 @@ org.crsh crsh.plugins.crowd - 1.2.8 + 1.2.9-SNAPSHOT jar org.crsh crsh.plugins.crowd - 1.2.8 + 1.2.9-SNAPSHOT sources @@ -318,20 +318,20 @@ org.crsh crsh.doc.reference - 1.2.8 + 1.2.9-SNAPSHOT pdf org.crsh crsh.doc.reference - 1.2.8 + 1.2.9-SNAPSHOT html zip org.crsh crsh.doc.reference - 1.2.8 + 1.2.9-SNAPSHOT javadoc @@ -339,13 +339,13 @@ org.crsh crsh.doc.cookbook - 1.2.8 + 1.2.9-SNAPSHOT pdf org.crsh crsh.doc.cookbook - 1.2.8 + 1.2.9-SNAPSHOT html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index 48eb388f6..2864ded10 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.shell.core jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 202e13b10..5262bfc80 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,12 +3,12 @@ crsh.shell org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.shell.embed pom - 1.2.8 + 1.2.9-SNAPSHOT CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index 0443b4c4c..28d929ee3 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,12 +2,12 @@ crsh.shell.embed org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.shell.embed.spring jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index c64e7a66a..fdbbf3c23 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.shell.packaging jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index 6f56b4299..8ab3a35a9 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 org.crsh crsh.shell pom - 1.2.8 + 1.2.9-SNAPSHOT CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index c08bb2e65..2ce627492 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.shell.ssh jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index c507d7479..f3cda57be 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.8 + 1.2.9-SNAPSHOT 4.0.0 crsh.shell.telnet jar - 1.2.8 + 1.2.9-SNAPSHOT CRaSH telnet The CRaSH telner module From a78f433085cda10882d6648486389d2e56d21076 Mon Sep 17 00:00:00 2001 From: Or Cohen Date: Fri, 1 Nov 2013 15:29:38 +0200 Subject: [PATCH 15/33] SSH: Fix usage of ssh.keypath for hostkey serverKey resource wasn't being set when ssh.keypath property was used. This made the plugin basically ignore a key that is being set from a property. --- shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java b/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java index 0ff8c96a0..17f82d3e1 100644 --- a/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java +++ b/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java @@ -97,8 +97,11 @@ public void init() { if (f.exists() && f.isFile()) { try { serverKeyURL = f.toURI().toURL(); + serverKey = new Resource(serverKeyURL); } catch (MalformedURLException e) { log.log(Level.FINE, "Ignoring invalid server key " + serverKeyPath, e); + } catch (IOException e) { + log.log(Level.FINE, "Could not load ssh key from " + serverKeyURL, e); } } else { log.log(Level.FINE, "Ignoring invalid server key path " + serverKeyPath); From 269f87942dfcfeadd06d94281ae7b483ec657bbb Mon Sep 17 00:00:00 2001 From: NKame Date: Wed, 6 Nov 2013 11:24:20 +0100 Subject: [PATCH 16/33] Instructions for running the CRaSH shell inside Eclipse --- doc/cookbook/src/main/wikbook/en/en-US/FAQ.wiki | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/cookbook/src/main/wikbook/en/en-US/FAQ.wiki b/doc/cookbook/src/main/wikbook/en/en-US/FAQ.wiki index cca038246..900eb3cdf 100644 --- a/doc/cookbook/src/main/wikbook/en/en-US/FAQ.wiki +++ b/doc/cookbook/src/main/wikbook/en/en-US/FAQ.wiki @@ -68,4 +68,16 @@ Remoting issue They will be in ##$CRASH_HOME/cmd/base## directory. You have to launch CRaSH once in standalone mode. +== I try to run CRaSH in Eclipse and it terminates immediately == + +CRaSH uses jline to handle keyboard input, and it's bypassing the Java API to read the key events. +Somewhere in the process there is a mismatch with the input handling in the Console view of Eclipse, and +CRaSH terminates without any reported error. You have to force jline to use a pure Java +handling of the keyboard events by adding the following JVM parameter in the Launch Configuration: + +{{screen}} +-Djline.terminal=jline.UnsupportedTerminal +{{/screen}} + +You will notice that the caret is not positioned correctly after submitting a command. From 5a5e30164ff64b1ea6fe2a68fd340527ef8b9a19 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 9 Jan 2014 14:36:05 +0100 Subject: [PATCH 17/33] Add exit status to ERROR when the shell process finishes with a response different than ShellResponse.OK --- .../main/java/org/crsh/ssh/term/inline/SSHInlineCommand.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/ssh/src/main/java/org/crsh/ssh/term/inline/SSHInlineCommand.java b/shell/ssh/src/main/java/org/crsh/ssh/term/inline/SSHInlineCommand.java index 3f395acf6..428e9c769 100644 --- a/shell/ssh/src/main/java/org/crsh/ssh/term/inline/SSHInlineCommand.java +++ b/shell/ssh/src/main/java/org/crsh/ssh/term/inline/SSHInlineCommand.java @@ -91,6 +91,8 @@ public String getName() { } else { String errorMsg; + // Set the exit status to Error + exitStatus = ERROR; if (response != null) { errorMsg = "Error during command execution : " + response.getMessage(); } From 8daec6cae83c4b5d773ee113a315c5e4f0fe8a5b Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 12 Aug 2013 15:15:45 +0200 Subject: [PATCH 18/33] CRASH-166 : Multiline term input --- .../crsh/processor/jline/JLineProcessor.java | 30 ++++++++--- .../crsh/processor/term/ProcessContext.java | 2 +- .../org/crsh/processor/term/Processor.java | 54 +++++++++++++------ .../processor/term/ProcessorTestCase.java | 34 ++++++++++++ 4 files changed, 94 insertions(+), 26 deletions(-) diff --git a/shell/core/src/main/java/org/crsh/processor/jline/JLineProcessor.java b/shell/core/src/main/java/org/crsh/processor/jline/JLineProcessor.java index 098196c08..719154332 100644 --- a/shell/core/src/main/java/org/crsh/processor/jline/JLineProcessor.java +++ b/shell/core/src/main/java/org/crsh/processor/jline/JLineProcessor.java @@ -66,21 +66,35 @@ public void run() { loop(); } - private void loop() { + private String readLine() { + StringBuilder buffer = new StringBuilder(); + String prompt = getPrompt(); + writer.println(); + writer.flush(); while (true) { - String prompt = getPrompt(); - String line; try { - writer.println(); - writer.flush(); - if ((line = reader.readLine(prompt)) == null) { - break; + String chunk; + if ((chunk = reader.readLine(prompt)) == null) { + return null; + } + if (chunk.length() > 0 && chunk.charAt(chunk.length() - 1) == '\\') { + prompt = "> "; + buffer.append(chunk, 0, chunk.length() - 1); + } else { + buffer.append(chunk); + return buffer.toString(); } } catch (IOException e) { // What should we do other than that ? - break; + return null; } + } + } + + private void loop() { + while (true) { + String line = readLine(); // ShellProcess process = shell.createProcess(line); diff --git a/shell/core/src/main/java/org/crsh/processor/term/ProcessContext.java b/shell/core/src/main/java/org/crsh/processor/term/ProcessContext.java index 8d2e40473..95efa40c6 100644 --- a/shell/core/src/main/java/org/crsh/processor/term/ProcessContext.java +++ b/shell/core/src/main/java/org/crsh/processor/term/ProcessContext.java @@ -138,7 +138,7 @@ public void end(ShellResponse response) { switch (processor.status) { case PROCESSING: if (response instanceof ShellResponse.Close) { - runnable = processor.CLOSE; + runnable = processor.CLOSE_TASK; processor.status = Status.CLOSED; } else if (response instanceof ShellResponse.Cancelled) { runnable = Processor.NOOP; diff --git a/shell/core/src/main/java/org/crsh/processor/term/Processor.java b/shell/core/src/main/java/org/crsh/processor/term/Processor.java index bb8d12fd2..bd7df8f41 100644 --- a/shell/core/src/main/java/org/crsh/processor/term/Processor.java +++ b/shell/core/src/main/java/org/crsh/processor/term/Processor.java @@ -42,6 +42,9 @@ public final class Processor implements Runnable, Consumer { + /** . */ + private static final Text CONTINUE_PROMPT = Text.create("> "); + /** . */ static final Runnable NOOP = new Runnable() { public void run() { @@ -49,21 +52,21 @@ public void run() { }; /** . */ - final Runnable WRITE_PROMPT = new Runnable() { + final Runnable WRITE_PROMPT_TASK = new Runnable() { public void run() { writePromptFlush(); } }; /** . */ - final Runnable CLOSE = new Runnable() { + final Runnable CLOSE_TASK = new Runnable() { public void run() { close(); } }; /** . */ - private final Runnable READ_TERM = new Runnable() { + private final Runnable READ_TERM_TASK = new Runnable() { public void run() { readTerm(); } @@ -96,6 +99,9 @@ public void run() { /** . */ private final CloseableList listeners; + /** . */ + private final StringBuffer lineBuffer = new StringBuffer(); + public Processor(Term term, Shell shell) { this.term = term; this.shell = shell; @@ -154,7 +160,7 @@ boolean iterate() throws InterruptedException, IOException { } case PROCESSING: case CANCELLING: - runnable = READ_TERM; + runnable = READ_TERM_TASK; break; case CLOSED: return false; @@ -170,7 +176,6 @@ boolean iterate() throws InterruptedException, IOException { return true; } - // We assume this is called under lock synchronization ProcessContext peekProcess() { while (true) { synchronized (lock) { @@ -181,13 +186,27 @@ ProcessContext peekProcess() { complete(((TermEvent.Complete)event).getLine()); } else { String line = ((TermEvent.ReadLine)event).getLine().toString(); - if (line.length() > 0) { - term.addToHistory(line); + if (line.endsWith("\\")) { + lineBuffer.append(line, 0, line.length() - 1); + try { + term.provide(CONTINUE_PROMPT); + term.flush(); + } + catch (IOException e) { + e.printStackTrace(); + } + } else { + lineBuffer.append(line); + String command = lineBuffer.toString(); + lineBuffer.setLength(0); + if (command.length() > 0) { + term.addToHistory(command); + } + ShellProcess process = shell.createProcess(command); + current = new ProcessContext(this, process); + status = Status.PROCESSING; + return current; } - ShellProcess process = shell.createProcess(line); - current = new ProcessContext(this, process); - status = Status.PROCESSING; - return current; } } else { break; @@ -203,13 +222,14 @@ ProcessContext peekProcess() { /** . */ private final Object termLock = new Object(); - private boolean reading = false; + /** . */ + private boolean termReading = false; void readTerm() { // synchronized (termLock) { - if (reading) { + if (termReading) { try { termLock.wait(); return; @@ -218,7 +238,7 @@ void readTerm() { throw new AssertionError(e); } } else { - reading = true; + termReading = true; } } @@ -241,7 +261,7 @@ public void run() { }; } else if (status == Status.AVAILABLE) { - runnable = WRITE_PROMPT; + runnable = WRITE_PROMPT_TASK; } else { runnable = NOOP; } @@ -258,7 +278,7 @@ public void run() { } }; } else if (status != Status.CLOSED) { - runnable = CLOSE; + runnable = CLOSE_TASK; } else { runnable = NOOP; } @@ -279,7 +299,7 @@ public void run() { } finally { synchronized (termLock) { - reading = false; + termReading = false; termLock.notifyAll(); } } diff --git a/shell/core/src/test/java/org/crsh/processor/term/ProcessorTestCase.java b/shell/core/src/test/java/org/crsh/processor/term/ProcessorTestCase.java index f483888cc..1b0a3ca6e 100644 --- a/shell/core/src/test/java/org/crsh/processor/term/ProcessorTestCase.java +++ b/shell/core/src/test/java/org/crsh/processor/term/ProcessorTestCase.java @@ -28,6 +28,7 @@ import org.crsh.cli.impl.Delimiter; import org.crsh.cli.spi.Completion; import org.crsh.shell.Shell; +import org.crsh.shell.ShellProcess; import org.crsh.shell.ShellProcessContext; import org.crsh.shell.ShellResponse; import org.crsh.term.console.ConsoleTerm; @@ -35,6 +36,8 @@ import org.crsh.text.CLS; import java.io.IOException; +import java.util.Collections; +import java.util.LinkedList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -251,6 +254,37 @@ public CompletionMatch complete(String prefix) { controller.connector.assertChars("ba").assertFlush(); } + public void testMultiLine() throws Exception { + final LinkedList requests = new LinkedList(); + final CountDownLatch latch = new CountDownLatch(1); + Controller controller = create(new BaseShell(BaseProcessFactory.ECHO) { + @Override + public ShellProcess createProcess(String request) { + return new BaseProcess(request) { + @Override + protected ShellResponse execute(String request) { + requests.add(request); + latch.countDown(); + return super.execute(request); + } + }; + } + }); + controller.assertStart(); + + // + controller.connector.append("a\\\r\n"); + controller.connector.assertChars("a").assertFlush(); + controller.connector.assertChars("\\").assertFlush(); + controller.connector.assertCRLF().assertFlush().assertChars("> ").assertFlush(); + assertEquals(Collections.emptyList(), requests); + controller.connector.append("b\r\n"); + controller.connector.assertChars("b").assertFlush(); + controller.connector.assertCRLF().assertFlush(); + latch.await(5, TimeUnit.SECONDS); + assertEquals(Collections.singletonList("ab"), requests); + } + public void testCLS() throws Exception { Controller controller = create(new BaseShell(new BaseProcessFactory() { @Override From c15e9bbdf654b520f4028e14ac9e6302412a56f8 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Wed, 6 Nov 2013 21:56:15 +0100 Subject: [PATCH 19/33] CRASH-167 : Fix jdbc command issue with latest JDBC --- .../resources/crash/commands/base/jdbc.groovy | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/shell/core/src/main/resources/crash/commands/base/jdbc.groovy b/shell/core/src/main/resources/crash/commands/base/jdbc.groovy index ec0788faf..ed11f4b0a 100644 --- a/shell/core/src/main/resources/crash/commands/base/jdbc.groovy +++ b/shell/core/src/main/resources/crash/commands/base/jdbc.groovy @@ -77,13 +77,19 @@ class jdbc implements Completer{ // We use this trick to work around the fact that the DriverManager#getConnection will not // use the thread context classloader because of the nasty DriverManager#getCallerClassLoader method - def getConnection = DriverManager.class.getDeclaredMethod("getConnection", String.class, Properties.class, ClassLoader.class) - if (!getConnection.accessible) - getConnection.accessible = true - - // try { - connection = getConnection.invoke(null, connectionString, props, Thread.currentThread().getContextClassLoader()); + try { + def getConnection = DriverManager.class.getDeclaredMethod("getConnection", String.class, Properties.class, ClassLoader.class); + getConnection.setAccessible(true); + connection = getConnection.invoke(null, connectionString, props, Thread.currentThread().getContextClassLoader()); + } + catch (NoSuchMethodException ignore) { + // JDK8 does not have this method instead it has the same method but with Class as last argument + // that we must invoke with null + def getConnection = DriverManager.class.getDeclaredMethod("getConnection", String.class, Properties.class, Class.class); + getConnection.setAccessible(true); + connection = getConnection.invoke(null, connectionString, props, null); + } } catch (InvocationTargetException ite) { throw ite.cause; From 395f1b5d29b8621c4ef124021f4f9f882d640e90 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 27 Mar 2014 09:30:15 +0100 Subject: [PATCH 20/33] Added crash.ssh.idle-timeout property to set custom idle timeout of the underlying SSH server Added crash.ssh.auth-timeout property to set custom authentication timeout of the underlying SSH server --- .../src/main/java/org/crsh/ssh/SSHPlugin.java | 24 ++++++++++++-- .../java/org/crsh/ssh/term/SSHLifeCycle.java | 33 ++++++++++++++++++- .../test/java/org/crsh/ssh/SSHTestCase.java | 2 ++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java b/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java index 17f82d3e1..65cc84cba 100644 --- a/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java +++ b/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java @@ -43,7 +43,14 @@ public class SSHPlugin extends CRaSHPlugin { /** The SSH server key path. */ public static final PropertyDescriptor SSH_SERVER_KEYPATH = PropertyDescriptor.create("ssh.keypath", (String)null, "The path to the key file"); - /** . */ + /** The SSH server idle timeout. */ + public static final PropertyDescriptor SSH_SERVER_IDLE_TIMEOUT = PropertyDescriptor.create("ssh.idle-timeout", 10 * 60 * 1000, "The idle-timeout for ssh sessions"); + + /** The SSH server authentication timeout. */ + public static final PropertyDescriptor SSH_SERVER_AUTH_TIMEOUT = PropertyDescriptor.create("ssh.auth-timeout", 10 * 60 * 1000, "The authentication timeout for ssh sessions"); + + + /** . */ private SSHLifeCycle lifeCycle; @Override @@ -53,7 +60,7 @@ public SSHPlugin getImplementation() { @Override protected Iterable> createConfigurationCapabilities() { - return Arrays.>asList(SSH_PORT, SSH_SERVER_KEYPATH, AuthenticationPlugin.AUTH); + return Arrays.>asList(SSH_PORT, SSH_SERVER_KEYPATH, SSH_SERVER_IDLE_TIMEOUT, SSH_SERVER_AUTH_TIMEOUT, AuthenticationPlugin.AUTH); } @Override @@ -67,6 +74,17 @@ public void init() { return; } + Integer idleTimeout = getContext().getProperty(SSH_SERVER_IDLE_TIMEOUT); + if (idleTimeout == null) { + log.log(Level.INFO, "Could not boot SSHD due to missing required idle timeout configuration"); + return; + } + Integer authTimeout = getContext().getProperty(SSH_SERVER_AUTH_TIMEOUT); + if (authTimeout == null) { + log.log(Level.INFO, "Could not boot SSHD due to missing required authentication timeout configuration"); + return; + } + // Resource serverKey = null; @@ -131,6 +149,8 @@ public void init() { SSHLifeCycle lifeCycle = new SSHLifeCycle(getContext(), authPlugin); lifeCycle.setPort(port); lifeCycle.setKey(serverKey); + lifeCycle.setAuthTimeout(authTimeout); + lifeCycle.setIdleTimeout(idleTimeout); lifeCycle.init(); // diff --git a/shell/ssh/src/main/java/org/crsh/ssh/term/SSHLifeCycle.java b/shell/ssh/src/main/java/org/crsh/ssh/term/SSHLifeCycle.java index 453993bee..1eeffa217 100644 --- a/shell/ssh/src/main/java/org/crsh/ssh/term/SSHLifeCycle.java +++ b/shell/ssh/src/main/java/org/crsh/ssh/term/SSHLifeCycle.java @@ -22,9 +22,11 @@ import org.apache.sshd.common.Session; import org.apache.sshd.server.PasswordAuthenticator; import org.apache.sshd.server.PublickeyAuthenticator; +import org.apache.sshd.server.ServerFactoryManager; import org.apache.sshd.server.session.ServerSession; import org.crsh.plugin.PluginContext; import org.crsh.auth.AuthenticationPlugin; +import org.crsh.ssh.SSHPlugin; import org.crsh.ssh.term.scp.SCPCommandFactory; import org.crsh.term.TermLifeCycle; import org.crsh.term.spi.TermIOHandler; @@ -54,7 +56,15 @@ public class SSHLifeCycle extends TermLifeCycle { /** . */ private int port; + + /** . */ + private int idleTimeout; + /** . */ + private int authTimeout; + + + /** . */ private Resource key; /** . */ @@ -78,7 +88,23 @@ public void setPort(int port) { this.port = port; } - /** + public int getIdleTimeout() { + return idleTimeout; + } + + public void setIdleTimeout(int idleTimeout) { + this.idleTimeout = idleTimeout; + } + + public int getAuthTimeout() { + return authTimeout; + } + + public void setAuthTimeout(int authTimeout) { + this.authTimeout = authTimeout; + } + + /** * Returns the local part after the ssh server has been succesfully bound or null. This is useful when * the port is chosen at random by the system. * @@ -106,6 +132,11 @@ protected void doInit() { // SshServer server = SshServer.setUpDefaultServer(); server.setPort(port); + + server.getProperties().put(ServerFactoryManager.IDLE_TIMEOUT, String.valueOf(this.idleTimeout)); + server.getProperties().put(ServerFactoryManager.AUTH_TIMEOUT, String.valueOf(this.authTimeout)); + + server.setShellFactory(new CRaSHCommandFactory(handler)); server.setCommandFactory(new SCPCommandFactory(getContext())); server.setKeyPairProvider(new URLKeyPairProvider(key)); diff --git a/shell/ssh/src/test/java/org/crsh/ssh/SSHTestCase.java b/shell/ssh/src/test/java/org/crsh/ssh/SSHTestCase.java index 9dd1a2f78..e1f25e4b2 100644 --- a/shell/ssh/src/test/java/org/crsh/ssh/SSHTestCase.java +++ b/shell/ssh/src/test/java/org/crsh/ssh/SSHTestCase.java @@ -59,6 +59,8 @@ public void setUp() throws Exception { // TestPluginLifeCycle lifeCycle = new TestPluginLifeCycle(new SSHPlugin(), handler, auth); lifeCycle.setProperty(SSHPlugin.SSH_PORT, port); + lifeCycle.setProperty(SSHPlugin.SSH_SERVER_IDLE_TIMEOUT, 10 * 60 * 1000); + lifeCycle.setProperty(SSHPlugin.SSH_SERVER_AUTH_TIMEOUT, 10 * 60 * 1000); lifeCycle.setProperty(AuthenticationPlugin.AUTH, auth.getName()); lifeCycle.setProperty(SimpleAuthenticationPlugin.SIMPLE_USERNAME, "root"); lifeCycle.setProperty(SimpleAuthenticationPlugin.SIMPLE_PASSWORD, ""); From 3b36bb020cc49338d35666dd95cd494f425d2b7b Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 27 Mar 2014 14:21:34 +0100 Subject: [PATCH 21/33] crash.ssh.idle-timeout and crash.ssh.auth-timeout optional --- shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java b/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java index 65cc84cba..b6784af1d 100644 --- a/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java +++ b/shell/ssh/src/main/java/org/crsh/ssh/SSHPlugin.java @@ -44,10 +44,12 @@ public class SSHPlugin extends CRaSHPlugin { public static final PropertyDescriptor SSH_SERVER_KEYPATH = PropertyDescriptor.create("ssh.keypath", (String)null, "The path to the key file"); /** The SSH server idle timeout. */ - public static final PropertyDescriptor SSH_SERVER_IDLE_TIMEOUT = PropertyDescriptor.create("ssh.idle-timeout", 10 * 60 * 1000, "The idle-timeout for ssh sessions"); + private static final int SSH_SERVER_IDLE_DEFAULT_TIMEOUT = 10 * 60 * 1000; + public static final PropertyDescriptor SSH_SERVER_IDLE_TIMEOUT = PropertyDescriptor.create("ssh.idle-timeout", SSH_SERVER_IDLE_DEFAULT_TIMEOUT, "The idle-timeout for ssh sessions"); /** The SSH server authentication timeout. */ - public static final PropertyDescriptor SSH_SERVER_AUTH_TIMEOUT = PropertyDescriptor.create("ssh.auth-timeout", 10 * 60 * 1000, "The authentication timeout for ssh sessions"); + private static final int SSH_SERVER_AUTH_DEFAULT_TIMEOUT = 10 * 60 * 1000; + public static final PropertyDescriptor SSH_SERVER_AUTH_TIMEOUT = PropertyDescriptor.create("ssh.auth-timeout", SSH_SERVER_AUTH_DEFAULT_TIMEOUT, "The authentication timeout for ssh sessions"); /** . */ @@ -76,13 +78,11 @@ public void init() { Integer idleTimeout = getContext().getProperty(SSH_SERVER_IDLE_TIMEOUT); if (idleTimeout == null) { - log.log(Level.INFO, "Could not boot SSHD due to missing required idle timeout configuration"); - return; + idleTimeout = SSH_SERVER_IDLE_DEFAULT_TIMEOUT; } Integer authTimeout = getContext().getProperty(SSH_SERVER_AUTH_TIMEOUT); if (authTimeout == null) { - log.log(Level.INFO, "Could not boot SSHD due to missing required authentication timeout configuration"); - return; + authTimeout = SSH_SERVER_AUTH_DEFAULT_TIMEOUT; } // From a99acf74c55ffa67cb53c88592149f1972c298a5 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Sat, 29 Mar 2014 10:53:20 +0100 Subject: [PATCH 22/33] CRASH-155 : cmd not scanned on windows platform in standalonemode --- shell/packaging/src/main/packaging/bin/crash.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/packaging/src/main/packaging/bin/crash.bat b/shell/packaging/src/main/packaging/bin/crash.bat index 8658727f2..a8930763d 100644 --- a/shell/packaging/src/main/packaging/bin/crash.bat +++ b/shell/packaging/src/main/packaging/bin/crash.bat @@ -40,7 +40,7 @@ if not exist "%CRASH_HOME%\tmp" mkdir %CRASH_HOME%\tmp REM start the application with all parameters. Add tools.jar to the bootclasspath, otherwise it cannot be found REM echo "java -Xbootclasspath/a:%TOOLS_JAR% -classpath %CLASSPATH% %CRASH_DEBUG_OPTS% -Djava.util.logging.config.file=%CRASH_HOME%\conf\logging.properties org.crsh.cli.impl.bootstrap.Main --conf %CRASH_HOME%\conf --cmd %CRASH_HOME%\cmd %CMD_LINE_ARGS%" -java -Xbootclasspath/a:"%TOOLS_JAR%" -classpath "%CLASSPATH%" %CRASH_DEBUG_OPTS% -Djava.util.logging.config.file="%CRASH_HOME%\conf\logging.properties" org.crsh.cli.impl.bootstrap.Main -jar "%CRASH_HOME%\bin\%JARNAME%" --conf "%CRASH_HOME%\conf" --cmd "%CRASH_HOME%\cmd" %CMD_LINE_ARGS% +java -Xbootclasspath/a:"%TOOLS_JAR%" -classpath "%CLASSPATH%" %CRASH_DEBUG_OPTS% -Djava.util.logging.config.file="%CRASH_HOME%\conf\logging.properties" org.crsh.cli.impl.bootstrap.Main --conf "%CRASH_HOME%\conf" --cmd "%CRASH_HOME%\cmd" %CMD_LINE_ARGS% set ERROR_CODE=%ERRORLEVEL% endlocal & set ERROR_CODE=%ERROR_CODE% From b8687ec18b825463c5822fd11d274c3541c693b4 Mon Sep 17 00:00:00 2001 From: guy Date: Sat, 29 Mar 2014 21:49:31 +0100 Subject: [PATCH 23/33] Added documentation for SSH server timeout parameters --- .../src/main/wikbook/en/en-US/configuration.wiki | 11 +++++++++++ doc/reference/src/main/wikbook/en/en-US/running.wiki | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/doc/reference/src/main/wikbook/en/en-US/configuration.wiki b/doc/reference/src/main/wikbook/en/en-US/configuration.wiki index 8ff1153e7..d8e901d83 100644 --- a/doc/reference/src/main/wikbook/en/en-US/configuration.wiki +++ b/doc/reference/src/main/wikbook/en/en-US/configuration.wiki @@ -48,6 +48,17 @@ crash.ssh.port=2000 crash.telnet.port=5000 {{/code}} +== Changing SSH authentication and idle timeouts == + +Default authentication and idle timeout of the SSH server are set to 10 minutes (600'000 ms). Both timeouts can be configured in milliseconds with the //crash.ssh.auth-timeout// and //crash.ssh.idle-timeout// parameters in the //crash.properties// file + +{{code}} +# SSH configuration 5 minutes = 5 * 60 * 1000 = 300'000 +crash.ssh.auth-timeout=300000 +crash.ssh.idle-timeout=300000 +{{/code}} + + == Removing telnet or SSH access == * to remove the telnet access, remove the jar file in the //WEB-INF/lib/crsh.shell.telnet-$[crash.version].jar// . diff --git a/doc/reference/src/main/wikbook/en/en-US/running.wiki b/doc/reference/src/main/wikbook/en/en-US/running.wiki index 3d9b5fe29..0408bb2d4 100644 --- a/doc/reference/src/main/wikbook/en/en-US/running.wiki +++ b/doc/reference/src/main/wikbook/en/en-US/running.wiki @@ -185,6 +185,11 @@ Here is an example of embedding crash: 2000 + + 300000 + 300000 + + 5000 From 7c07afff4cea7f3acab49ecb6ba7c159bc349c58 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Sun, 30 Mar 2014 15:23:59 +0200 Subject: [PATCH 24/33] Update release plugin to 2.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 86e54c928..986e2fb87 100644 --- a/pom.xml +++ b/pom.xml @@ -554,7 +554,7 @@ org.apache.maven.plugins maven-release-plugin - 2.1 + 2.5 org.apache.maven.plugins From 24fb091823c81c5f53cc8b1ea0408f3ce08e5fbb Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Sun, 30 Mar 2014 15:28:02 +0200 Subject: [PATCH 25/33] [maven-release-plugin] prepare release 1.2.9 --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 79 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 76 insertions(+), 75 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 2746be925..6644206ad 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.cli jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index 4e1bc612e..7af500e29 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.distrib jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index be82b4ff1..f632935e5 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.doc.cookbook jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index b582069d4..f2fda1eed 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,12 +3,12 @@ crsh.parent org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.doc pom - 1.2.9-SNAPSHOT + 1.2.9 CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index 8871f56a9..7a2868fc6 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.doc.reference jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index 7abcea43d..0f9427526 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 org.crsh crsh.jcr.core jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index 27aa0a8dd..8730b1353 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index 6661b9caf..c29701d22 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index 7244806d9..7e2c295b3 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 org.crsh crsh.jcr pom - 1.2.9-SNAPSHOT + 1.2.9 CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index e1c3f55aa..b30a9b7ab 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,12 +2,12 @@ crsh.plugins org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.plugins.crowd jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index 662452c35..9176be56c 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 org.crsh crsh.plugins pom - 1.2.9-SNAPSHOT + 1.2.9 CRaSH plugins parent diff --git a/pom.xml b/pom.xml index 986e2fb87..1ce7676bc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.9-SNAPSHOT + 1.2.9 CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -25,6 +25,7 @@ scm:git:git://github.com/crashub/crash.git scm:git:ssh://git@github.com/crashub/crash.git http://www.crashub.org + 1.2.9 @@ -103,12 +104,12 @@ org.crsh crsh.cli - 1.2.9-SNAPSHOT + 1.2.9 org.crsh crsh.cli - 1.2.9-SNAPSHOT + 1.2.9 sources @@ -116,25 +117,25 @@ org.crsh crsh.shell.core - 1.2.9-SNAPSHOT + 1.2.9 jar org.crsh crsh.shell.core - 1.2.9-SNAPSHOT + 1.2.9 test-jar org.crsh crsh.shell.core - 1.2.9-SNAPSHOT + 1.2.9 sources org.crsh crsh.shell.core - 1.2.9-SNAPSHOT + 1.2.9 standalone @@ -142,18 +143,18 @@ org.crsh crsh.shell.telnet - 1.2.9-SNAPSHOT + 1.2.9 org.crsh crsh.shell.telnet - 1.2.9-SNAPSHOT + 1.2.9 sources org.crsh crsh.shell.telnet - 1.2.9-SNAPSHOT + 1.2.9 standalone @@ -161,18 +162,18 @@ org.crsh crsh.shell.ssh - 1.2.9-SNAPSHOT + 1.2.9 org.crsh crsh.shell.ssh - 1.2.9-SNAPSHOT + 1.2.9 sources org.crsh crsh.shell.ssh - 1.2.9-SNAPSHOT + 1.2.9 standalone @@ -180,12 +181,12 @@ org.crsh crsh.shell.embed.spring - 1.2.9-SNAPSHOT + 1.2.9 org.crsh crsh.shell.embed.spring - 1.2.9-SNAPSHOT + 1.2.9 sources @@ -193,32 +194,32 @@ org.crsh crsh.shell.packaging - 1.2.9-SNAPSHOT + 1.2.9 org.crsh crsh.shell.packaging - 1.2.9-SNAPSHOT + 1.2.9 war org.crsh crsh.shell.packaging - 1.2.9-SNAPSHOT + 1.2.9 war spring org.crsh crsh.shell.packaging - 1.2.9-SNAPSHOT + 1.2.9 zip mule-app org.crsh crsh.shell.packaging - 1.2.9-SNAPSHOT + 1.2.9 tar.gz @@ -226,37 +227,37 @@ org.crsh crsh.jcr.core - 1.2.9-SNAPSHOT + 1.2.9 jar org.crsh crsh.jcr.core - 1.2.9-SNAPSHOT + 1.2.9 war org.crsh crsh.jcr.core - 1.2.9-SNAPSHOT + 1.2.9 javadoc org.crsh crsh.jcr.core - 1.2.9-SNAPSHOT + 1.2.9 test-jar org.crsh crsh.jcr.core - 1.2.9-SNAPSHOT + 1.2.9 sources org.crsh crsh.jcr.core - 1.2.9-SNAPSHOT + 1.2.9 standalone @@ -264,19 +265,19 @@ org.crsh crsh.jcr.exo - 1.2.9-SNAPSHOT + 1.2.9 jar org.crsh crsh.jcr.exo - 1.2.9-SNAPSHOT + 1.2.9 war org.crsh crsh.jcr.exo - 1.2.9-SNAPSHOT + 1.2.9 sources @@ -284,19 +285,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.9-SNAPSHOT + 1.2.9 jar org.crsh crsh.jcr.jackrabbit - 1.2.9-SNAPSHOT + 1.2.9 war org.crsh crsh.jcr.jackrabbit - 1.2.9-SNAPSHOT + 1.2.9 sources @@ -304,13 +305,13 @@ org.crsh crsh.plugins.crowd - 1.2.9-SNAPSHOT + 1.2.9 jar org.crsh crsh.plugins.crowd - 1.2.9-SNAPSHOT + 1.2.9 sources @@ -318,20 +319,20 @@ org.crsh crsh.doc.reference - 1.2.9-SNAPSHOT + 1.2.9 pdf org.crsh crsh.doc.reference - 1.2.9-SNAPSHOT + 1.2.9 html zip org.crsh crsh.doc.reference - 1.2.9-SNAPSHOT + 1.2.9 javadoc @@ -339,13 +340,13 @@ org.crsh crsh.doc.cookbook - 1.2.9-SNAPSHOT + 1.2.9 pdf org.crsh crsh.doc.cookbook - 1.2.9-SNAPSHOT + 1.2.9 html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index 2864ded10..590d63c46 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.shell.core jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 5262bfc80..733669b35 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,12 +3,12 @@ crsh.shell org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.shell.embed pom - 1.2.9-SNAPSHOT + 1.2.9 CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index 28d929ee3..15a8f6a6e 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,12 +2,12 @@ crsh.shell.embed org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.shell.embed.spring jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index fdbbf3c23..1f742b73e 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.shell.packaging jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index 8ab3a35a9..05f290c9c 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 org.crsh crsh.shell pom - 1.2.9-SNAPSHOT + 1.2.9 CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index 2ce627492..7a38acc5f 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.shell.ssh jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index f3cda57be..7a6a604e3 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.9-SNAPSHOT + 1.2.9 4.0.0 crsh.shell.telnet jar - 1.2.9-SNAPSHOT + 1.2.9 CRaSH telnet The CRaSH telner module From 38a4aa874d249e0147f0ed277268ef5afc9409e1 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Sun, 30 Mar 2014 15:28:02 +0200 Subject: [PATCH 26/33] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 80 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 76 insertions(+), 76 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 6644206ad..67e0b120d 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.cli jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index 7af500e29..9fa82da80 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.distrib jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index f632935e5..796f60496 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.doc.cookbook jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index f2fda1eed..9d3457235 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,12 +3,12 @@ crsh.parent org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.doc pom - 1.2.9 + 1.2.10-SNAPSHOT CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index 7a2868fc6..e78e4ea90 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.doc.reference jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index 0f9427526..6be69b005 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 org.crsh crsh.jcr.core jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index 8730b1353..a117f3973 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index c29701d22..0a42eb52f 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index 7e2c295b3..843b3e7e3 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 org.crsh crsh.jcr pom - 1.2.9 + 1.2.10-SNAPSHOT CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index b30a9b7ab..1685ed05a 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,12 +2,12 @@ crsh.plugins org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.plugins.crowd jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index 9176be56c..02aae4bf1 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 org.crsh crsh.plugins pom - 1.2.9 + 1.2.10-SNAPSHOT CRaSH plugins parent diff --git a/pom.xml b/pom.xml index 1ce7676bc..65366c8dc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.9 + 1.2.10-SNAPSHOT CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -25,7 +25,7 @@ scm:git:git://github.com/crashub/crash.git scm:git:ssh://git@github.com/crashub/crash.git http://www.crashub.org - 1.2.9 + HEAD @@ -104,12 +104,12 @@ org.crsh crsh.cli - 1.2.9 + 1.2.10-SNAPSHOT org.crsh crsh.cli - 1.2.9 + 1.2.10-SNAPSHOT sources @@ -117,25 +117,25 @@ org.crsh crsh.shell.core - 1.2.9 + 1.2.10-SNAPSHOT jar org.crsh crsh.shell.core - 1.2.9 + 1.2.10-SNAPSHOT test-jar org.crsh crsh.shell.core - 1.2.9 + 1.2.10-SNAPSHOT sources org.crsh crsh.shell.core - 1.2.9 + 1.2.10-SNAPSHOT standalone @@ -143,18 +143,18 @@ org.crsh crsh.shell.telnet - 1.2.9 + 1.2.10-SNAPSHOT org.crsh crsh.shell.telnet - 1.2.9 + 1.2.10-SNAPSHOT sources org.crsh crsh.shell.telnet - 1.2.9 + 1.2.10-SNAPSHOT standalone @@ -162,18 +162,18 @@ org.crsh crsh.shell.ssh - 1.2.9 + 1.2.10-SNAPSHOT org.crsh crsh.shell.ssh - 1.2.9 + 1.2.10-SNAPSHOT sources org.crsh crsh.shell.ssh - 1.2.9 + 1.2.10-SNAPSHOT standalone @@ -181,12 +181,12 @@ org.crsh crsh.shell.embed.spring - 1.2.9 + 1.2.10-SNAPSHOT org.crsh crsh.shell.embed.spring - 1.2.9 + 1.2.10-SNAPSHOT sources @@ -194,32 +194,32 @@ org.crsh crsh.shell.packaging - 1.2.9 + 1.2.10-SNAPSHOT org.crsh crsh.shell.packaging - 1.2.9 + 1.2.10-SNAPSHOT war org.crsh crsh.shell.packaging - 1.2.9 + 1.2.10-SNAPSHOT war spring org.crsh crsh.shell.packaging - 1.2.9 + 1.2.10-SNAPSHOT zip mule-app org.crsh crsh.shell.packaging - 1.2.9 + 1.2.10-SNAPSHOT tar.gz @@ -227,37 +227,37 @@ org.crsh crsh.jcr.core - 1.2.9 + 1.2.10-SNAPSHOT jar org.crsh crsh.jcr.core - 1.2.9 + 1.2.10-SNAPSHOT war org.crsh crsh.jcr.core - 1.2.9 + 1.2.10-SNAPSHOT javadoc org.crsh crsh.jcr.core - 1.2.9 + 1.2.10-SNAPSHOT test-jar org.crsh crsh.jcr.core - 1.2.9 + 1.2.10-SNAPSHOT sources org.crsh crsh.jcr.core - 1.2.9 + 1.2.10-SNAPSHOT standalone @@ -265,19 +265,19 @@ org.crsh crsh.jcr.exo - 1.2.9 + 1.2.10-SNAPSHOT jar org.crsh crsh.jcr.exo - 1.2.9 + 1.2.10-SNAPSHOT war org.crsh crsh.jcr.exo - 1.2.9 + 1.2.10-SNAPSHOT sources @@ -285,19 +285,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.9 + 1.2.10-SNAPSHOT jar org.crsh crsh.jcr.jackrabbit - 1.2.9 + 1.2.10-SNAPSHOT war org.crsh crsh.jcr.jackrabbit - 1.2.9 + 1.2.10-SNAPSHOT sources @@ -305,13 +305,13 @@ org.crsh crsh.plugins.crowd - 1.2.9 + 1.2.10-SNAPSHOT jar org.crsh crsh.plugins.crowd - 1.2.9 + 1.2.10-SNAPSHOT sources @@ -319,20 +319,20 @@ org.crsh crsh.doc.reference - 1.2.9 + 1.2.10-SNAPSHOT pdf org.crsh crsh.doc.reference - 1.2.9 + 1.2.10-SNAPSHOT html zip org.crsh crsh.doc.reference - 1.2.9 + 1.2.10-SNAPSHOT javadoc @@ -340,13 +340,13 @@ org.crsh crsh.doc.cookbook - 1.2.9 + 1.2.10-SNAPSHOT pdf org.crsh crsh.doc.cookbook - 1.2.9 + 1.2.10-SNAPSHOT html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index 590d63c46..a3018ff2e 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.shell.core jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 733669b35..340210b7d 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,12 +3,12 @@ crsh.shell org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.shell.embed pom - 1.2.9 + 1.2.10-SNAPSHOT CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index 15a8f6a6e..fed73ba0e 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,12 +2,12 @@ crsh.shell.embed org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.shell.embed.spring jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index 1f742b73e..01ab663d8 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.shell.packaging jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index 05f290c9c..880338c3e 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 org.crsh crsh.shell pom - 1.2.9 + 1.2.10-SNAPSHOT CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index 7a38acc5f..90da46309 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.shell.ssh jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index 7a6a604e3..4efb82014 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.9 + 1.2.10-SNAPSHOT 4.0.0 crsh.shell.telnet jar - 1.2.9 + 1.2.10-SNAPSHOT CRaSH telnet The CRaSH telner module From 49751ca6a3008b0416d41b59f7a0723c11bbf3e7 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Tue, 3 Jun 2014 17:58:34 +0200 Subject: [PATCH 27/33] CRASH-205: Provide a zip distribution --- distrib/src/main/assembly/packaging.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distrib/src/main/assembly/packaging.xml b/distrib/src/main/assembly/packaging.xml index d8c775618..50772b287 100644 --- a/distrib/src/main/assembly/packaging.xml +++ b/distrib/src/main/assembly/packaging.xml @@ -23,6 +23,7 @@ packaging tar.gz + zip crash-${project.version} @@ -41,4 +42,4 @@ - \ No newline at end of file + From 533bf6903121dfae1db41d1e71f6c68cee30a189 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Tue, 3 Jun 2014 18:05:54 +0200 Subject: [PATCH 28/33] [maven-release-plugin] prepare release 1.2.10 --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 80 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 76 insertions(+), 76 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 67e0b120d..a80658c49 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.cli jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index 9fa82da80..1f31e420b 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.distrib jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index 796f60496..0c509e6ca 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.doc.cookbook jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index 9d3457235..0b19a6060 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,12 +3,12 @@ crsh.parent org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.doc pom - 1.2.10-SNAPSHOT + 1.2.10 CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index e78e4ea90..862e50f18 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.doc.reference jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index 6be69b005..2515fc46b 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 org.crsh crsh.jcr.core jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index a117f3973..3a746020e 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index 0a42eb52f..390a2b247 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index 843b3e7e3..65ffae272 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 org.crsh crsh.jcr pom - 1.2.10-SNAPSHOT + 1.2.10 CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index 1685ed05a..f8c9b7f37 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,12 +2,12 @@ crsh.plugins org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.plugins.crowd jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index 02aae4bf1..73c511daa 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 org.crsh crsh.plugins pom - 1.2.10-SNAPSHOT + 1.2.10 CRaSH plugins parent diff --git a/pom.xml b/pom.xml index 65366c8dc..083760973 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.10-SNAPSHOT + 1.2.10 CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -25,7 +25,7 @@ scm:git:git://github.com/crashub/crash.git scm:git:ssh://git@github.com/crashub/crash.git http://www.crashub.org - HEAD + 1.2.10 @@ -104,12 +104,12 @@ org.crsh crsh.cli - 1.2.10-SNAPSHOT + 1.2.10 org.crsh crsh.cli - 1.2.10-SNAPSHOT + 1.2.10 sources @@ -117,25 +117,25 @@ org.crsh crsh.shell.core - 1.2.10-SNAPSHOT + 1.2.10 jar org.crsh crsh.shell.core - 1.2.10-SNAPSHOT + 1.2.10 test-jar org.crsh crsh.shell.core - 1.2.10-SNAPSHOT + 1.2.10 sources org.crsh crsh.shell.core - 1.2.10-SNAPSHOT + 1.2.10 standalone @@ -143,18 +143,18 @@ org.crsh crsh.shell.telnet - 1.2.10-SNAPSHOT + 1.2.10 org.crsh crsh.shell.telnet - 1.2.10-SNAPSHOT + 1.2.10 sources org.crsh crsh.shell.telnet - 1.2.10-SNAPSHOT + 1.2.10 standalone @@ -162,18 +162,18 @@ org.crsh crsh.shell.ssh - 1.2.10-SNAPSHOT + 1.2.10 org.crsh crsh.shell.ssh - 1.2.10-SNAPSHOT + 1.2.10 sources org.crsh crsh.shell.ssh - 1.2.10-SNAPSHOT + 1.2.10 standalone @@ -181,12 +181,12 @@ org.crsh crsh.shell.embed.spring - 1.2.10-SNAPSHOT + 1.2.10 org.crsh crsh.shell.embed.spring - 1.2.10-SNAPSHOT + 1.2.10 sources @@ -194,32 +194,32 @@ org.crsh crsh.shell.packaging - 1.2.10-SNAPSHOT + 1.2.10 org.crsh crsh.shell.packaging - 1.2.10-SNAPSHOT + 1.2.10 war org.crsh crsh.shell.packaging - 1.2.10-SNAPSHOT + 1.2.10 war spring org.crsh crsh.shell.packaging - 1.2.10-SNAPSHOT + 1.2.10 zip mule-app org.crsh crsh.shell.packaging - 1.2.10-SNAPSHOT + 1.2.10 tar.gz @@ -227,37 +227,37 @@ org.crsh crsh.jcr.core - 1.2.10-SNAPSHOT + 1.2.10 jar org.crsh crsh.jcr.core - 1.2.10-SNAPSHOT + 1.2.10 war org.crsh crsh.jcr.core - 1.2.10-SNAPSHOT + 1.2.10 javadoc org.crsh crsh.jcr.core - 1.2.10-SNAPSHOT + 1.2.10 test-jar org.crsh crsh.jcr.core - 1.2.10-SNAPSHOT + 1.2.10 sources org.crsh crsh.jcr.core - 1.2.10-SNAPSHOT + 1.2.10 standalone @@ -265,19 +265,19 @@ org.crsh crsh.jcr.exo - 1.2.10-SNAPSHOT + 1.2.10 jar org.crsh crsh.jcr.exo - 1.2.10-SNAPSHOT + 1.2.10 war org.crsh crsh.jcr.exo - 1.2.10-SNAPSHOT + 1.2.10 sources @@ -285,19 +285,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.10-SNAPSHOT + 1.2.10 jar org.crsh crsh.jcr.jackrabbit - 1.2.10-SNAPSHOT + 1.2.10 war org.crsh crsh.jcr.jackrabbit - 1.2.10-SNAPSHOT + 1.2.10 sources @@ -305,13 +305,13 @@ org.crsh crsh.plugins.crowd - 1.2.10-SNAPSHOT + 1.2.10 jar org.crsh crsh.plugins.crowd - 1.2.10-SNAPSHOT + 1.2.10 sources @@ -319,20 +319,20 @@ org.crsh crsh.doc.reference - 1.2.10-SNAPSHOT + 1.2.10 pdf org.crsh crsh.doc.reference - 1.2.10-SNAPSHOT + 1.2.10 html zip org.crsh crsh.doc.reference - 1.2.10-SNAPSHOT + 1.2.10 javadoc @@ -340,13 +340,13 @@ org.crsh crsh.doc.cookbook - 1.2.10-SNAPSHOT + 1.2.10 pdf org.crsh crsh.doc.cookbook - 1.2.10-SNAPSHOT + 1.2.10 html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index a3018ff2e..592d6e0a4 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.shell.core jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 340210b7d..70c0ff936 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,12 +3,12 @@ crsh.shell org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.shell.embed pom - 1.2.10-SNAPSHOT + 1.2.10 CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index fed73ba0e..5830341c1 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,12 +2,12 @@ crsh.shell.embed org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.shell.embed.spring jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index 01ab663d8..fc208ed8b 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.shell.packaging jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index 880338c3e..5f1406922 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 org.crsh crsh.shell pom - 1.2.10-SNAPSHOT + 1.2.10 CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index 90da46309..da230a78f 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.shell.ssh jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index 4efb82014..30234fd9b 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.10-SNAPSHOT + 1.2.10 4.0.0 crsh.shell.telnet jar - 1.2.10-SNAPSHOT + 1.2.10 CRaSH telnet The CRaSH telner module From 10ac07aaf2a4a5f9d81168123a178b010779f549 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Tue, 3 Jun 2014 18:05:54 +0200 Subject: [PATCH 29/33] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 80 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 76 insertions(+), 76 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index a80658c49..85052879f 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.cli jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index 1f31e420b..b95bb6210 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.distrib jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index 0c509e6ca..a5a85d3a0 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.doc.cookbook jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index 0b19a6060..5e04785e1 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,12 +3,12 @@ crsh.parent org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.doc pom - 1.2.10 + 1.2.11-SNAPSHOT CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index 862e50f18..aa230cbbd 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.doc.reference jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index 2515fc46b..72157881f 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 org.crsh crsh.jcr.core jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index 3a746020e..92f347263 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index 390a2b247..d97ecd97b 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index 65ffae272..b3fc4ccd1 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 org.crsh crsh.jcr pom - 1.2.10 + 1.2.11-SNAPSHOT CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index f8c9b7f37..903618c77 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,12 +2,12 @@ crsh.plugins org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.plugins.crowd jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index 73c511daa..c463b04af 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 org.crsh crsh.plugins pom - 1.2.10 + 1.2.11-SNAPSHOT CRaSH plugins parent diff --git a/pom.xml b/pom.xml index 083760973..fb7ca7644 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.10 + 1.2.11-SNAPSHOT CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -25,7 +25,7 @@ scm:git:git://github.com/crashub/crash.git scm:git:ssh://git@github.com/crashub/crash.git http://www.crashub.org - 1.2.10 + HEAD @@ -104,12 +104,12 @@ org.crsh crsh.cli - 1.2.10 + 1.2.11-SNAPSHOT org.crsh crsh.cli - 1.2.10 + 1.2.11-SNAPSHOT sources @@ -117,25 +117,25 @@ org.crsh crsh.shell.core - 1.2.10 + 1.2.11-SNAPSHOT jar org.crsh crsh.shell.core - 1.2.10 + 1.2.11-SNAPSHOT test-jar org.crsh crsh.shell.core - 1.2.10 + 1.2.11-SNAPSHOT sources org.crsh crsh.shell.core - 1.2.10 + 1.2.11-SNAPSHOT standalone @@ -143,18 +143,18 @@ org.crsh crsh.shell.telnet - 1.2.10 + 1.2.11-SNAPSHOT org.crsh crsh.shell.telnet - 1.2.10 + 1.2.11-SNAPSHOT sources org.crsh crsh.shell.telnet - 1.2.10 + 1.2.11-SNAPSHOT standalone @@ -162,18 +162,18 @@ org.crsh crsh.shell.ssh - 1.2.10 + 1.2.11-SNAPSHOT org.crsh crsh.shell.ssh - 1.2.10 + 1.2.11-SNAPSHOT sources org.crsh crsh.shell.ssh - 1.2.10 + 1.2.11-SNAPSHOT standalone @@ -181,12 +181,12 @@ org.crsh crsh.shell.embed.spring - 1.2.10 + 1.2.11-SNAPSHOT org.crsh crsh.shell.embed.spring - 1.2.10 + 1.2.11-SNAPSHOT sources @@ -194,32 +194,32 @@ org.crsh crsh.shell.packaging - 1.2.10 + 1.2.11-SNAPSHOT org.crsh crsh.shell.packaging - 1.2.10 + 1.2.11-SNAPSHOT war org.crsh crsh.shell.packaging - 1.2.10 + 1.2.11-SNAPSHOT war spring org.crsh crsh.shell.packaging - 1.2.10 + 1.2.11-SNAPSHOT zip mule-app org.crsh crsh.shell.packaging - 1.2.10 + 1.2.11-SNAPSHOT tar.gz @@ -227,37 +227,37 @@ org.crsh crsh.jcr.core - 1.2.10 + 1.2.11-SNAPSHOT jar org.crsh crsh.jcr.core - 1.2.10 + 1.2.11-SNAPSHOT war org.crsh crsh.jcr.core - 1.2.10 + 1.2.11-SNAPSHOT javadoc org.crsh crsh.jcr.core - 1.2.10 + 1.2.11-SNAPSHOT test-jar org.crsh crsh.jcr.core - 1.2.10 + 1.2.11-SNAPSHOT sources org.crsh crsh.jcr.core - 1.2.10 + 1.2.11-SNAPSHOT standalone @@ -265,19 +265,19 @@ org.crsh crsh.jcr.exo - 1.2.10 + 1.2.11-SNAPSHOT jar org.crsh crsh.jcr.exo - 1.2.10 + 1.2.11-SNAPSHOT war org.crsh crsh.jcr.exo - 1.2.10 + 1.2.11-SNAPSHOT sources @@ -285,19 +285,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.10 + 1.2.11-SNAPSHOT jar org.crsh crsh.jcr.jackrabbit - 1.2.10 + 1.2.11-SNAPSHOT war org.crsh crsh.jcr.jackrabbit - 1.2.10 + 1.2.11-SNAPSHOT sources @@ -305,13 +305,13 @@ org.crsh crsh.plugins.crowd - 1.2.10 + 1.2.11-SNAPSHOT jar org.crsh crsh.plugins.crowd - 1.2.10 + 1.2.11-SNAPSHOT sources @@ -319,20 +319,20 @@ org.crsh crsh.doc.reference - 1.2.10 + 1.2.11-SNAPSHOT pdf org.crsh crsh.doc.reference - 1.2.10 + 1.2.11-SNAPSHOT html zip org.crsh crsh.doc.reference - 1.2.10 + 1.2.11-SNAPSHOT javadoc @@ -340,13 +340,13 @@ org.crsh crsh.doc.cookbook - 1.2.10 + 1.2.11-SNAPSHOT pdf org.crsh crsh.doc.cookbook - 1.2.10 + 1.2.11-SNAPSHOT html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index 592d6e0a4..35120a7d1 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.shell.core jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 70c0ff936..0c87bb774 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,12 +3,12 @@ crsh.shell org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.shell.embed pom - 1.2.10 + 1.2.11-SNAPSHOT CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index 5830341c1..b1e6308ea 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,12 +2,12 @@ crsh.shell.embed org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.shell.embed.spring jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index fc208ed8b..db3d9496c 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.shell.packaging jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index 5f1406922..ccbf934cb 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 org.crsh crsh.shell pom - 1.2.10 + 1.2.11-SNAPSHOT CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index da230a78f..1b9bb680f 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.shell.ssh jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index 30234fd9b..141f0f0c4 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.10 + 1.2.11-SNAPSHOT 4.0.0 crsh.shell.telnet jar - 1.2.10 + 1.2.11-SNAPSHOT CRaSH telnet The CRaSH telner module From c2d7593105cedc64584eea195a2fba45f92c458e Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Wed, 4 Jun 2014 09:55:00 +0200 Subject: [PATCH 30/33] CRASH-208: Provide dedicated "gvm" zip that contains only the standalone distribution --- distrib/pom.xml | 12 +++++++ distrib/src/main/assembly/gvm.xml | 44 +++++++++++++++++++++++++ distrib/src/main/assembly/packaging.xml | 1 - 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 distrib/src/main/assembly/gvm.xml diff --git a/distrib/pom.xml b/distrib/pom.xml index b95bb6210..8442e1e42 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -197,6 +197,18 @@ + + make-gvm + package + + single + + + + src/main/assembly/gvm.xml + + + diff --git a/distrib/src/main/assembly/gvm.xml b/distrib/src/main/assembly/gvm.xml new file mode 100644 index 000000000..ff522294f --- /dev/null +++ b/distrib/src/main/assembly/gvm.xml @@ -0,0 +1,44 @@ + + + + gvm + + zip + + + crash-${project.version} + + + src/main/assembly/distrib.xml + + + + + / + true + + org.crsh:crsh.shell.packaging:tar.gz + + + + + diff --git a/distrib/src/main/assembly/packaging.xml b/distrib/src/main/assembly/packaging.xml index 50772b287..e92b82b63 100644 --- a/distrib/src/main/assembly/packaging.xml +++ b/distrib/src/main/assembly/packaging.xml @@ -23,7 +23,6 @@ packaging tar.gz - zip crash-${project.version} From 31a28d25f8e35258590206ffe9d6eca35523f701 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Wed, 4 Jun 2014 09:59:41 +0200 Subject: [PATCH 31/33] [maven-release-plugin] prepare release 1.2.11 --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 80 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 76 insertions(+), 76 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 85052879f..f4e4f1319 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.cli jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index 8442e1e42..daee64ed1 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.distrib jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index a5a85d3a0..1cb9b9ccd 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.doc.cookbook jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index 5e04785e1..f7ab775d9 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,12 +3,12 @@ crsh.parent org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.doc pom - 1.2.11-SNAPSHOT + 1.2.11 CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index aa230cbbd..d11b9d8fb 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.doc.reference jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index 72157881f..ef478ac26 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 org.crsh crsh.jcr.core jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index 92f347263..314d371ab 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index d97ecd97b..8a9ff003a 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index b3fc4ccd1..5adec2693 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 org.crsh crsh.jcr pom - 1.2.11-SNAPSHOT + 1.2.11 CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index 903618c77..0e6dd3fd3 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,12 +2,12 @@ crsh.plugins org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.plugins.crowd jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index c463b04af..5db6a1955 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 org.crsh crsh.plugins pom - 1.2.11-SNAPSHOT + 1.2.11 CRaSH plugins parent diff --git a/pom.xml b/pom.xml index fb7ca7644..8fa9bc994 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.11-SNAPSHOT + 1.2.11 CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -25,7 +25,7 @@ scm:git:git://github.com/crashub/crash.git scm:git:ssh://git@github.com/crashub/crash.git http://www.crashub.org - HEAD + 1.2.11 @@ -104,12 +104,12 @@ org.crsh crsh.cli - 1.2.11-SNAPSHOT + 1.2.11 org.crsh crsh.cli - 1.2.11-SNAPSHOT + 1.2.11 sources @@ -117,25 +117,25 @@ org.crsh crsh.shell.core - 1.2.11-SNAPSHOT + 1.2.11 jar org.crsh crsh.shell.core - 1.2.11-SNAPSHOT + 1.2.11 test-jar org.crsh crsh.shell.core - 1.2.11-SNAPSHOT + 1.2.11 sources org.crsh crsh.shell.core - 1.2.11-SNAPSHOT + 1.2.11 standalone @@ -143,18 +143,18 @@ org.crsh crsh.shell.telnet - 1.2.11-SNAPSHOT + 1.2.11 org.crsh crsh.shell.telnet - 1.2.11-SNAPSHOT + 1.2.11 sources org.crsh crsh.shell.telnet - 1.2.11-SNAPSHOT + 1.2.11 standalone @@ -162,18 +162,18 @@ org.crsh crsh.shell.ssh - 1.2.11-SNAPSHOT + 1.2.11 org.crsh crsh.shell.ssh - 1.2.11-SNAPSHOT + 1.2.11 sources org.crsh crsh.shell.ssh - 1.2.11-SNAPSHOT + 1.2.11 standalone @@ -181,12 +181,12 @@ org.crsh crsh.shell.embed.spring - 1.2.11-SNAPSHOT + 1.2.11 org.crsh crsh.shell.embed.spring - 1.2.11-SNAPSHOT + 1.2.11 sources @@ -194,32 +194,32 @@ org.crsh crsh.shell.packaging - 1.2.11-SNAPSHOT + 1.2.11 org.crsh crsh.shell.packaging - 1.2.11-SNAPSHOT + 1.2.11 war org.crsh crsh.shell.packaging - 1.2.11-SNAPSHOT + 1.2.11 war spring org.crsh crsh.shell.packaging - 1.2.11-SNAPSHOT + 1.2.11 zip mule-app org.crsh crsh.shell.packaging - 1.2.11-SNAPSHOT + 1.2.11 tar.gz @@ -227,37 +227,37 @@ org.crsh crsh.jcr.core - 1.2.11-SNAPSHOT + 1.2.11 jar org.crsh crsh.jcr.core - 1.2.11-SNAPSHOT + 1.2.11 war org.crsh crsh.jcr.core - 1.2.11-SNAPSHOT + 1.2.11 javadoc org.crsh crsh.jcr.core - 1.2.11-SNAPSHOT + 1.2.11 test-jar org.crsh crsh.jcr.core - 1.2.11-SNAPSHOT + 1.2.11 sources org.crsh crsh.jcr.core - 1.2.11-SNAPSHOT + 1.2.11 standalone @@ -265,19 +265,19 @@ org.crsh crsh.jcr.exo - 1.2.11-SNAPSHOT + 1.2.11 jar org.crsh crsh.jcr.exo - 1.2.11-SNAPSHOT + 1.2.11 war org.crsh crsh.jcr.exo - 1.2.11-SNAPSHOT + 1.2.11 sources @@ -285,19 +285,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.11-SNAPSHOT + 1.2.11 jar org.crsh crsh.jcr.jackrabbit - 1.2.11-SNAPSHOT + 1.2.11 war org.crsh crsh.jcr.jackrabbit - 1.2.11-SNAPSHOT + 1.2.11 sources @@ -305,13 +305,13 @@ org.crsh crsh.plugins.crowd - 1.2.11-SNAPSHOT + 1.2.11 jar org.crsh crsh.plugins.crowd - 1.2.11-SNAPSHOT + 1.2.11 sources @@ -319,20 +319,20 @@ org.crsh crsh.doc.reference - 1.2.11-SNAPSHOT + 1.2.11 pdf org.crsh crsh.doc.reference - 1.2.11-SNAPSHOT + 1.2.11 html zip org.crsh crsh.doc.reference - 1.2.11-SNAPSHOT + 1.2.11 javadoc @@ -340,13 +340,13 @@ org.crsh crsh.doc.cookbook - 1.2.11-SNAPSHOT + 1.2.11 pdf org.crsh crsh.doc.cookbook - 1.2.11-SNAPSHOT + 1.2.11 html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index 35120a7d1..af4897628 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.shell.core jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 0c87bb774..159f7529c 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,12 +3,12 @@ crsh.shell org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.shell.embed pom - 1.2.11-SNAPSHOT + 1.2.11 CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index b1e6308ea..395562c93 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,12 +2,12 @@ crsh.shell.embed org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.shell.embed.spring jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index db3d9496c..52a14d23b 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.shell.packaging jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index ccbf934cb..09048de2e 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 org.crsh crsh.shell pom - 1.2.11-SNAPSHOT + 1.2.11 CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index 1b9bb680f..39e0c7242 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.shell.ssh jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index 141f0f0c4..01ea4b46b 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.11-SNAPSHOT + 1.2.11 4.0.0 crsh.shell.telnet jar - 1.2.11-SNAPSHOT + 1.2.11 CRaSH telnet The CRaSH telner module From d37888f7923761812f287d523501184915526596 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Wed, 4 Jun 2014 09:59:42 +0200 Subject: [PATCH 32/33] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 4 +- distrib/pom.xml | 4 +- doc/cookbook/pom.xml | 4 +- doc/pom.xml | 4 +- doc/reference/pom.xml | 4 +- jcr/core/pom.xml | 4 +- jcr/exo/pom.xml | 4 +- jcr/jackrabbit/pom.xml | 4 +- jcr/pom.xml | 4 +- plugins/crowd/pom.xml | 4 +- plugins/pom.xml | 4 +- pom.xml | 80 +++++++++++++++++++------------------- shell/core/pom.xml | 4 +- shell/embed/pom.xml | 4 +- shell/embed/spring/pom.xml | 4 +- shell/packaging/pom.xml | 4 +- shell/pom.xml | 4 +- shell/ssh/pom.xml | 4 +- shell/telnet/pom.xml | 4 +- 19 files changed, 76 insertions(+), 76 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index f4e4f1319..0eb777702 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.cli jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH CLI The CRaSH command line interface module diff --git a/distrib/pom.xml b/distrib/pom.xml index daee64ed1..72994f2a0 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -2,12 +2,12 @@ crsh.parent org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.distrib jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH distrib The CRaSH distribution diff --git a/doc/cookbook/pom.xml b/doc/cookbook/pom.xml index 1cb9b9ccd..0a7ad5dba 100644 --- a/doc/cookbook/pom.xml +++ b/doc/cookbook/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.doc.cookbook jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH cookbook documentation The CRaSH cookbook documentation diff --git a/doc/pom.xml b/doc/pom.xml index f7ab775d9..c470942e9 100644 --- a/doc/pom.xml +++ b/doc/pom.xml @@ -3,12 +3,12 @@ crsh.parent org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.doc pom - 1.2.11 + 1.2.12-SNAPSHOT CRaSH doc parent diff --git a/doc/reference/pom.xml b/doc/reference/pom.xml index d11b9d8fb..a5dd4a4eb 100644 --- a/doc/reference/pom.xml +++ b/doc/reference/pom.xml @@ -22,12 +22,12 @@ crsh.doc org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.doc.reference jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH reference documentation The CRaSH reference documentation diff --git a/jcr/core/pom.xml b/jcr/core/pom.xml index ef478ac26..6e6f1d0a5 100644 --- a/jcr/core/pom.xml +++ b/jcr/core/pom.xml @@ -2,13 +2,13 @@ crsh.jcr org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 org.crsh crsh.jcr.core jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH jcr core The CRaSH JCR module diff --git a/jcr/exo/pom.xml b/jcr/exo/pom.xml index 314d371ab..fb9eafc53 100644 --- a/jcr/exo/pom.xml +++ b/jcr/exo/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 org.crsh crsh.jcr.exo jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH jcr Exo Implementation The CRaSH JCR module for Exo Plateform diff --git a/jcr/jackrabbit/pom.xml b/jcr/jackrabbit/pom.xml index 8a9ff003a..b9680d897 100644 --- a/jcr/jackrabbit/pom.xml +++ b/jcr/jackrabbit/pom.xml @@ -3,13 +3,13 @@ crsh.jcr org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 org.crsh crsh.jcr.jackrabbit jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH jcr Jackrabbit Implementation The CRaSH JCR module for Apache Jackrabbit diff --git a/jcr/pom.xml b/jcr/pom.xml index 5adec2693..3c169d4dc 100644 --- a/jcr/pom.xml +++ b/jcr/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 org.crsh crsh.jcr pom - 1.2.11 + 1.2.12-SNAPSHOT CRaSH JCR parent diff --git a/plugins/crowd/pom.xml b/plugins/crowd/pom.xml index 0e6dd3fd3..55f7603b3 100644 --- a/plugins/crowd/pom.xml +++ b/plugins/crowd/pom.xml @@ -2,12 +2,12 @@ crsh.plugins org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.plugins.crowd jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH Plugin - Atlassian Crowd authentication and commands This plugin allows to delegate CRaSH authentication to an Atlassian Crowd directory and to add various commands to manage the server diff --git a/plugins/pom.xml b/plugins/pom.xml index 5db6a1955..75892cdd9 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 org.crsh crsh.plugins pom - 1.2.11 + 1.2.12-SNAPSHOT CRaSH plugins parent diff --git a/pom.xml b/pom.xml index 8fa9bc994..e6efcdf4e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.crsh crsh.parent pom - 1.2.11 + 1.2.12-SNAPSHOT CRaSH parent The CRaSH is a shell for Java Content Repository that comes bundled as a war file to deploy in eXo Portal 2.5 or GateIn @@ -25,7 +25,7 @@ scm:git:git://github.com/crashub/crash.git scm:git:ssh://git@github.com/crashub/crash.git http://www.crashub.org - 1.2.11 + HEAD @@ -104,12 +104,12 @@ org.crsh crsh.cli - 1.2.11 + 1.2.12-SNAPSHOT org.crsh crsh.cli - 1.2.11 + 1.2.12-SNAPSHOT sources @@ -117,25 +117,25 @@ org.crsh crsh.shell.core - 1.2.11 + 1.2.12-SNAPSHOT jar org.crsh crsh.shell.core - 1.2.11 + 1.2.12-SNAPSHOT test-jar org.crsh crsh.shell.core - 1.2.11 + 1.2.12-SNAPSHOT sources org.crsh crsh.shell.core - 1.2.11 + 1.2.12-SNAPSHOT standalone @@ -143,18 +143,18 @@ org.crsh crsh.shell.telnet - 1.2.11 + 1.2.12-SNAPSHOT org.crsh crsh.shell.telnet - 1.2.11 + 1.2.12-SNAPSHOT sources org.crsh crsh.shell.telnet - 1.2.11 + 1.2.12-SNAPSHOT standalone @@ -162,18 +162,18 @@ org.crsh crsh.shell.ssh - 1.2.11 + 1.2.12-SNAPSHOT org.crsh crsh.shell.ssh - 1.2.11 + 1.2.12-SNAPSHOT sources org.crsh crsh.shell.ssh - 1.2.11 + 1.2.12-SNAPSHOT standalone @@ -181,12 +181,12 @@ org.crsh crsh.shell.embed.spring - 1.2.11 + 1.2.12-SNAPSHOT org.crsh crsh.shell.embed.spring - 1.2.11 + 1.2.12-SNAPSHOT sources @@ -194,32 +194,32 @@ org.crsh crsh.shell.packaging - 1.2.11 + 1.2.12-SNAPSHOT org.crsh crsh.shell.packaging - 1.2.11 + 1.2.12-SNAPSHOT war org.crsh crsh.shell.packaging - 1.2.11 + 1.2.12-SNAPSHOT war spring org.crsh crsh.shell.packaging - 1.2.11 + 1.2.12-SNAPSHOT zip mule-app org.crsh crsh.shell.packaging - 1.2.11 + 1.2.12-SNAPSHOT tar.gz @@ -227,37 +227,37 @@ org.crsh crsh.jcr.core - 1.2.11 + 1.2.12-SNAPSHOT jar org.crsh crsh.jcr.core - 1.2.11 + 1.2.12-SNAPSHOT war org.crsh crsh.jcr.core - 1.2.11 + 1.2.12-SNAPSHOT javadoc org.crsh crsh.jcr.core - 1.2.11 + 1.2.12-SNAPSHOT test-jar org.crsh crsh.jcr.core - 1.2.11 + 1.2.12-SNAPSHOT sources org.crsh crsh.jcr.core - 1.2.11 + 1.2.12-SNAPSHOT standalone @@ -265,19 +265,19 @@ org.crsh crsh.jcr.exo - 1.2.11 + 1.2.12-SNAPSHOT jar org.crsh crsh.jcr.exo - 1.2.11 + 1.2.12-SNAPSHOT war org.crsh crsh.jcr.exo - 1.2.11 + 1.2.12-SNAPSHOT sources @@ -285,19 +285,19 @@ org.crsh crsh.jcr.jackrabbit - 1.2.11 + 1.2.12-SNAPSHOT jar org.crsh crsh.jcr.jackrabbit - 1.2.11 + 1.2.12-SNAPSHOT war org.crsh crsh.jcr.jackrabbit - 1.2.11 + 1.2.12-SNAPSHOT sources @@ -305,13 +305,13 @@ org.crsh crsh.plugins.crowd - 1.2.11 + 1.2.12-SNAPSHOT jar org.crsh crsh.plugins.crowd - 1.2.11 + 1.2.12-SNAPSHOT sources @@ -319,20 +319,20 @@ org.crsh crsh.doc.reference - 1.2.11 + 1.2.12-SNAPSHOT pdf org.crsh crsh.doc.reference - 1.2.11 + 1.2.12-SNAPSHOT html zip org.crsh crsh.doc.reference - 1.2.11 + 1.2.12-SNAPSHOT javadoc @@ -340,13 +340,13 @@ org.crsh crsh.doc.cookbook - 1.2.11 + 1.2.12-SNAPSHOT pdf org.crsh crsh.doc.cookbook - 1.2.11 + 1.2.12-SNAPSHOT html zip diff --git a/shell/core/pom.xml b/shell/core/pom.xml index af4897628..f96d09dcf 100644 --- a/shell/core/pom.xml +++ b/shell/core/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.shell.core jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH core The CRaSH core module diff --git a/shell/embed/pom.xml b/shell/embed/pom.xml index 159f7529c..c776fdcfd 100644 --- a/shell/embed/pom.xml +++ b/shell/embed/pom.xml @@ -3,12 +3,12 @@ crsh.shell org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.shell.embed pom - 1.2.11 + 1.2.12-SNAPSHOT CRaSH shell embed parent diff --git a/shell/embed/spring/pom.xml b/shell/embed/spring/pom.xml index 395562c93..bd181711d 100644 --- a/shell/embed/spring/pom.xml +++ b/shell/embed/spring/pom.xml @@ -2,12 +2,12 @@ crsh.shell.embed org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.shell.embed.spring jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH Spring The CRaSH Spring integration module diff --git a/shell/packaging/pom.xml b/shell/packaging/pom.xml index 52a14d23b..cc05f46df 100644 --- a/shell/packaging/pom.xml +++ b/shell/packaging/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.shell.packaging jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH shell packaging The CRaSH shell packaging module diff --git a/shell/pom.xml b/shell/pom.xml index 09048de2e..c9e53ef71 100644 --- a/shell/pom.xml +++ b/shell/pom.xml @@ -3,13 +3,13 @@ crsh.parent org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 org.crsh crsh.shell pom - 1.2.11 + 1.2.12-SNAPSHOT CRaSH shell parent diff --git a/shell/ssh/pom.xml b/shell/ssh/pom.xml index 39e0c7242..9703f2755 100644 --- a/shell/ssh/pom.xml +++ b/shell/ssh/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.shell.ssh jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH ssh The CRaSH ssh module diff --git a/shell/telnet/pom.xml b/shell/telnet/pom.xml index 01ea4b46b..3c7d30d01 100644 --- a/shell/telnet/pom.xml +++ b/shell/telnet/pom.xml @@ -2,12 +2,12 @@ crsh.shell org.crsh - 1.2.11 + 1.2.12-SNAPSHOT 4.0.0 crsh.shell.telnet jar - 1.2.11 + 1.2.12-SNAPSHOT CRaSH telnet The CRaSH telner module From 27a1180e37023330bb00131c577afc9734274ab0 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Sun, 8 Jun 2014 18:07:28 +0200 Subject: [PATCH 33/33] Fix gvm generated file --- distrib/pom.xml | 113 +++++++++++++------------- distrib/src/bintrayUpload.groovy | 127 ++++++++++++++++++++++++++++++ distrib/src/main/assembly/gvm.xml | 2 +- 3 files changed, 188 insertions(+), 54 deletions(-) create mode 100644 distrib/src/bintrayUpload.groovy diff --git a/distrib/pom.xml b/distrib/pom.xml index 72994f2a0..10b85b112 100644 --- a/distrib/pom.xml +++ b/distrib/pom.xml @@ -204,6 +204,7 @@ single + false src/main/assembly/gvm.xml @@ -215,70 +216,76 @@ + - upload + gvm + + + org.codehaus.groovy + groovy-all + 2.0.7 + + + org.apache.ant + ant + 1.9.2 + + + org.codehaus.groovy.modules.http-builder + http-builder + 0.7.1 + + + org.apache.commons + commons-compress + 1.8.1 + + - com.googlecode.maven-gcu-plugin - maven-gcu-plugin + org.codehaus.gmaven + gmaven-plugin + 1.5 + + ${basedir}/src/bintrayUpload.groovy + install - upload + execute - - googlecode - true - crsh - - - ${project.build.directory}/crash-${project.version}-gatein.tar.gz - CRaSH GateIn web archive ${project.version} - - - - - - ${project.build.directory}/crash-${project.version}-mule-app.tar.gz - CRaSH Mule application ${project.version} - - - - - - ${project.build.directory}/crash-${project.version}-spring.tar.gz - CRaSH Spring web archive ${project.version} - - - - - - ${project.build.directory}/crash-${project.version}-war.tar.gz - CRaSH Standalone web archive ${project.version} - - - - - - ${project.build.directory}/crash-${project.version}-docs.tar.gz - CRaSH Documentation and sources bundle ${project.version} - - - - - - ${project.build.directory}/crash-${project.version}.tar.gz - CRaSH Standalone ${project.version} - - - - - - + + + org.codehaus.groovy + groovy-all + 2.0.7 + + + org.apache.ant + ant + 1.9.2 + + + org.codehaus.groovy.modules.http-builder + http-builder + 0.7.1 + + + org.apache.commons + commons-compress + 1.8.1 + + diff --git a/distrib/src/bintrayUpload.groovy b/distrib/src/bintrayUpload.groovy new file mode 100644 index 000000000..66264e2dc --- /dev/null +++ b/distrib/src/bintrayUpload.groovy @@ -0,0 +1,127 @@ +// This script uploads the gvm zip in bintray account +// it follows the gvm versionning scheme +// version with empty qualifiers or "crXYZ" will be uploaded +// SNAPSHOT version will be truncated to remove the SNAPSHOT as bintray does not accept them +// SNAPSHOT should be used for testing purpose + +import groovyx.net.http.HTTPBuilder +import org.apache.commons.compress.archivers.ArchiveOutputStream +import org.apache.commons.compress.archivers.ArchiveStreamFactory +import org.apache.commons.compress.archivers.zip.ZipArchiveEntry +import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream +import org.apache.log4j.ConsoleAppender; +import org.apache.log4j.PatternLayout; +import org.apache.log4j.Level; +import org.apache.log4j.Logger + +import static groovyx.net.http.ContentType.BINARY +import static groovyx.net.http.Method.* + +// Configure log4j +def console = new ConsoleAppender() +console.setLayout(new PatternLayout("%d [%p|%c|%C{1}] %m%n")); +console.setThreshold(Level.ALL); +console.activateOptions(); +Logger.getRootLogger().addAppender(console); +Logger.getRootLogger().setLevel(Level.INFO); +Logger.getLogger(HTTPBuilder.class).setLevel(Level.ALL) + +// Version check / change and so on +def pattern = ~/([0-9\.]+)(\-.+)?/ +def matcher = pattern.matcher(project.version); +if (!matcher.matches()) { + throw new Exception("Invalid version ${project.version} !") +} +def mmm = matcher.group(1); +def qualifier = matcher.group(2) +def version +if (qualifier != null && qualifier != "-SNAPSHOT") { + def qualifierPattern = ~/\-cr([0-9]+)(?:-SNAPSHOT)?/ + def qualifierMatcher = qualifierPattern.matcher(qualifier); + if (!qualifierMatcher.matches()) { + // Only candidate releases + return; + } + version = "${mmm}.RC${qualifierMatcher.group(1)}" +} else { + version = mmm; +} + +// Check we have the file to upload first +def file = new File(project.build.directory, "crash-${project.version}-gvm.zip") +if (!file.exists()) { + throw new Exception("${file.absolutePath} does not exists"); +} +if (!file.isFile()) { + throw new Exception("${file.absolutePath} is not a file"); +} + +// Transform file to prefix +ByteArrayOutputStream baos = new ByteArrayOutputStream((int)file.length()) +ZipArchiveInputStream zipIn = new ZipArchiveInputStream(new BufferedInputStream(new FileInputStream(file))); +ArchiveOutputStream zipOut = new ArchiveStreamFactory().createArchiveOutputStream("zip", baos); +byte[] buffer = new byte[512]; +while (true) { + ZipArchiveEntry entry = zipIn.getNextZipEntry(); + if (entry == null) { + break; + } else { + def length = (int)entry.size + entry.name = "crash-${version}/${entry.name}"; + if (entry.name.endsWith(".sh") || entry.name.endsWith(".bat")) { + entry.setUnixMode(0100755); + } + zipOut.putArchiveEntry(entry); + while (length > 0) { + def amount = zipIn.read(buffer, 0, Math.min(length, buffer.length)); + zipOut.write(buffer, 0, amount); + length -= amount; + } + zipOut.closeArchiveEntry(); + } +} +zipOut.close(); + +// Credentials +def bintrayUser = project.properties.bintrayUser; +def bintrayApiKey = project.properties.bintrayApiKey; +if (bintrayUser == null) { + throw new Exception("Property bintrayUser not found"); +} +if (bintrayApiKey == null) { + throw new Exception("Property bintrayApiKey not found"); +} + +// +def repoPath = "crashub/crash" +def packageName = "gvm" +def packagePath = "$repoPath/gvm" +def uploadUri = "/content/$packagePath/${version}/crash-${version}.zip"; + +// +def http = new HTTPBuilder("https://api.bintray.com"); +http.headers.Authorization = "Basic ${"$bintrayUser:$bintrayApiKey".toString().bytes.encodeBase64()}" + +println("Uploading ${file.absolutePath} to ${uploadUri}"); +def result = http.request(PUT) { + uri.path = uploadUri + requestContentType = BINARY + body = new ByteArrayInputStream(baos.toByteArray()); + response.success = { resp -> + return "Package ${packageName} uploaded."; + } + response.failure = { resp -> + def msg = "Cannot upload: ${resp.statusLine.statusCode} : ${resp.statusLine.reasonPhrase}"; + def entity = resp.entity; + if (entity != null) { + msg += "\n" + org.apache.http.util.EntityUtils.toString(entity); + } + return new Exception(msg); + } +} + +if (result instanceof Exception) { + throw result; +} else if (result != null) { + println(result) +} diff --git a/distrib/src/main/assembly/gvm.xml b/distrib/src/main/assembly/gvm.xml index ff522294f..cdf655f48 100644 --- a/distrib/src/main/assembly/gvm.xml +++ b/distrib/src/main/assembly/gvm.xml @@ -25,7 +25,7 @@ zip - crash-${project.version} + / src/main/assembly/distrib.xml