diff --git a/.gitignore b/.gitignore index 1f0b684..aac1ffa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /6.0.1.Final.tar.gz /6.0.2.Final.tar.gz /infinispan-8.1.0.Final.tar.gz +/infinispan-8.2.4.Final.tar.gz diff --git a/infinispan-8.1.0.Final-aesh.patch b/infinispan-8.1.0.Final-aesh.patch deleted file mode 100644 index b68ea57..0000000 --- a/infinispan-8.1.0.Final-aesh.patch +++ /dev/null @@ -1,163 +0,0 @@ -diff -Nru infinispan-8.1.0.Final/cli/cli-client/src/main/java/org/infinispan/cli/io/ConsoleIOAdapter.java infinispan-8.1.0.Final.aesh/cli/cli-client/src/main/java/org/infinispan/cli/io/ConsoleIOAdapter.java ---- infinispan-8.1.0.Final/cli/cli-client/src/main/java/org/infinispan/cli/io/ConsoleIOAdapter.java 2015-12-07 22:05:24.000000000 +0100 -+++ infinispan-8.1.0.Final.aesh/cli/cli-client/src/main/java/org/infinispan/cli/io/ConsoleIOAdapter.java 2016-07-09 20:46:56.103951385 +0200 -@@ -22,18 +22,17 @@ - - @Override - public String readln(String prompt) throws IOException { -- return console.read(prompt).getBuffer(); -+ return read(prompt, null); - } - - @Override - public String secureReadln(String prompt) throws IOException { -- return console.read(new Prompt(prompt), (char) 0).getBuffer(); -+ return read(prompt, (char)0); - } - - @Override - public void println(String s) throws IOException { -- console.pushToStdOut(s); -- console.pushToStdOut("\n"); -+ console.getShell().out().println(s); - } - - @Override -@@ -61,4 +60,23 @@ - console.stop(); - } - -+ private String read(String prompt, Character mask) { -+ Prompt origPrompt = null; -+ if (!console.getPrompt().getPromptAsString().equals(prompt)) { -+ origPrompt = console.getPrompt(); -+ console.setPrompt(new Prompt(prompt, mask)); -+ } -+ try { -+ return console.getInputLine(); -+ } catch (InterruptedException e) { -+ Thread.currentThread().interrupt(); -+ } finally { -+ if (origPrompt != null) { -+ console.setPrompt(origPrompt); -+ } -+ } -+ return null; -+ } -+ -+ - } -diff -Nru infinispan-8.1.0.Final/cli/cli-client/src/main/java/org/infinispan/cli/shell/CLIConsoleCallback.java infinispan-8.1.0.Final.aesh/cli/cli-client/src/main/java/org/infinispan/cli/shell/CLIConsoleCallback.java ---- infinispan-8.1.0.Final/cli/cli-client/src/main/java/org/infinispan/cli/shell/CLIConsoleCallback.java 1970-01-01 01:00:00.000000000 +0100 -+++ infinispan-8.1.0.Final.aesh/cli/cli-client/src/main/java/org/infinispan/cli/shell/CLIConsoleCallback.java 2016-07-09 20:48:53.234307694 +0200 -@@ -0,0 +1,22 @@ -+package org.infinispan.cli.shell; -+ -+import org.jboss.aesh.console.AeshConsoleCallback; -+import org.jboss.aesh.console.ConsoleCallback; -+import org.jboss.aesh.console.ConsoleOperation; -+import org.jboss.aesh.console.Process; -+import org.jboss.aesh.console.command.CommandOperation; -+ -+/** -+ * CLIConsoleCallback -+ * -+ * @author Tristan Tarrant -+ * @since 9.0 -+ */ -+ -+public class CLIConsoleCallback extends AeshConsoleCallback{ -+ @Override -+ public int execute(ConsoleOperation output) throws InterruptedException { -+ return 0; -+ } -+ -+} -diff -Nru infinispan-8.1.0.Final/cli/cli-client/src/main/java/org/infinispan/cli/shell/Completer.java infinispan-8.1.0.Final.aesh/cli/cli-client/src/main/java/org/infinispan/cli/shell/Completer.java ---- infinispan-8.1.0.Final/cli/cli-client/src/main/java/org/infinispan/cli/shell/Completer.java 2015-12-07 22:05:24.000000000 +0100 -+++ infinispan-8.1.0.Final.aesh/cli/cli-client/src/main/java/org/infinispan/cli/shell/Completer.java 2016-07-09 20:49:53.951382164 +0200 -@@ -1,7 +1,7 @@ - package org.infinispan.cli.shell; - -+import java.util.ArrayList; - import java.util.Collection; --import java.util.Collections; - import java.util.List; - - import org.infinispan.cli.Context; -@@ -21,13 +21,12 @@ - @Override - public void complete(CompleteOperation op) { - String buffer = op.getBuffer(); -- List candidates = op.getCompletionCandidates(); - if(buffer.isEmpty()) { - // Nothing in the buffer, return all commands - for(String name : context.getCommandRegistry().getCommandNames()) { - Command command = context.getCommandRegistry().getCommand(name); - if(command.isAvailable(context)) { -- candidates.add(name); -+ op.addCompletionCandidate(name); - } - } - } else { -@@ -37,7 +36,7 @@ - for(String name : context.getCommandRegistry().getCommandNames()) { - Command command = context.getCommandRegistry().getCommand(name); - if(command.isAvailable(context) && name.startsWith(procCmd.getCommand())) { -- candidates.add(name); -+ op.addCompletionCandidate(name); - } - } - } else { -@@ -51,12 +50,13 @@ - break; - } - } -+ List candidates = new ArrayList<>(); - addPrefixMatches(procCmd.getCurrentArgument(), command.getOptions(), candidates); - command.complete(context, procCmd, candidates); -+ op.addCompletionCandidates(candidates); - } - } - } -- Collections.sort(candidates); - } - - public static void addPrefixMatches(Argument argument, Collection all, List candidates) { -diff -Nru infinispan-8.1.0.Final/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellImpl.java infinispan-8.1.0.Final.aesh/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellImpl.java ---- infinispan-8.1.0.Final/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellImpl.java 2015-12-07 22:05:24.000000000 +0100 -+++ infinispan-8.1.0.Final.aesh/cli/cli-client/src/main/java/org/infinispan/cli/shell/ShellImpl.java 2016-07-09 20:51:50.723755721 +0200 -@@ -29,7 +29,7 @@ - import org.infinispan.cli.io.StreamIOAdapter; - import org.infinispan.cli.util.SystemUtils; - import org.jboss.aesh.console.Console; --import org.jboss.aesh.console.settings.Settings; -+import org.jboss.aesh.console.settings.SettingsBuilder; - - /** - * -@@ -125,18 +125,20 @@ - private void interactiveRun() throws IOException { - config = new ConfigImpl(SystemUtils.getAppConfigFolder("InfinispanShell")); - config.load(); -- Settings settings = Settings.getInstance(); -- settings.setAliasEnabled(false); -- console = new Console(); -+ SettingsBuilder settings = new SettingsBuilder(); -+ settings.enableAlias(false).outputStream(System.out).outputStreamError(System.err).inputStream(System.in); -+ console = new Console(settings.create()); - context.setOutputAdapter(new ConsoleIOAdapter(console)); - console.addCompletion(new Completer(context)); -+ console.setConsoleCallback(new CLIConsoleCallback()); -+ console.start(); - ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(); - sessionPingTask = executor.scheduleWithFixedDelay(new PingTask(), SESSION_PING_TIMEOUT, SESSION_PING_TIMEOUT, TimeUnit.SECONDS); - - while (!context.isQuitting()) { - try { - context.refreshProperties(); -- String line = console.read(getPrompt()).getBuffer(); -+ String line = context.getOutputAdapter().readln(getPrompt()); - - if (line != null) { - if (!"".equals(line.trim())) { diff --git a/infinispan.spec b/infinispan.spec index 5f40c23..c05d414 100644 --- a/infinispan.spec +++ b/infinispan.spec @@ -10,14 +10,12 @@ %endif Name: infinispan -Version: 8.1.0 -Release: 2%{?dist} +Version: 8.2.4 +Release: 1%{?dist} Summary: Data grid platform License: ASL 2.0 and LGPLv2+ and Public Domain URL: http://infinispan.org/ Source0: https://github.com/infinispan/infinispan/archive/%{namedversion}/%{name}-%{namedversion}.tar.gz -# Port to aesh 0.66.X -Patch0: infinispan-8.1.0.Final-aesh.patch BuildRequires: maven-local BuildRequires: mvn(com.clearspring.analytics:stream) @@ -31,6 +29,7 @@ BuildRequires: mvn(javax.enterprise:cdi-api) BuildRequires: mvn(net.jcip:jcip-annotations) BuildRequires: mvn(org.antlr:antlr-runtime) BuildRequires: mvn(org.antlr:antlr3-maven-plugin) +BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jcache_1.0_spec) BuildRequires: mvn(org.apache.httpcomponents:httpclient) @@ -63,6 +62,7 @@ BuildRequires: mvn(org.infinispan:infinispan-query-dsl) BuildRequires: mvn(org.infinispan.protostream:protostream) >= 3.0.4 BuildRequires: mvn(org.iq80.leveldb:leveldb) BuildRequires: mvn(org.javassist:javassist) +BuildRequires: mvn(org.jboss:jboss-parent:pom:) BuildRequires: mvn(org.jboss.aesh:aesh) BuildRequires: mvn(org.jboss.arquillian:arquillian-bom:pom:) BuildRequires: mvn(org.jboss.logging:jboss-logging) @@ -84,6 +84,7 @@ BuildRequires: mvn(org.springframework:spring-context) BuildRequires: mvn(org.springframework:spring-context:4) %endif BuildRequires: mvn(org.wildfly.core:wildfly-controller) +BuildRequires: mvn(org.wildfly.core:wildfly-core-parent:pom:) # Public Domain: ./commons/src/main/java/org/infinispan/commons/util/Base64.java Provides: bundled(java-base64) = 4.2 @@ -111,8 +112,6 @@ This package contains the API documentation for %{name}. find . -name "*.jar" -print -delete find . -name "*.class" -print -delete -%patch0 -p1 - # Rename the license file cp -pr license/src/main/resources/META-INF/LICENSE.txt.vm LICENSE.txt @@ -163,23 +162,19 @@ cp -pr license/src/main/resources/META-INF/LICENSE.txt.vm LICENSE.txt %pom_remove_plugin ":maven-remote-resources-plugin" parent # org.scala-tools:maven-scala-plugin:2.15.2 used for generate-blueprint task -%pom_remove_plugin -r ":maven-scala-plugin" core extended-statistics query remote-query/remote-query-server tree -%pom_remove_plugin -r ":maven-scala-plugin" jcache/embedded cdi/embedded cdi/remote cli/cli-interpreter -%pom_remove_plugin -r ":maven-scala-plugin" persistence/rest persistence/soft-index persistence/leveldb -%pom_remove_plugin -r ":maven-scala-plugin" persistence/jdbc persistence/jpa persistence/remote persistence/cli +%pom_remove_plugin -r ":maven-scala-plugin" parent jcache/embedded %pom_remove_plugin :jetty-maven-plugin persistence/rest %pom_remove_plugin :maven-invoker-plugin jcache/embedded -%pom_remove_plugin :maven-failsafe-plugin jcache/remote -%pom_remove_plugin :maven-resources-plugin jcache/remote +%pom_remove_plugin :maven-failsafe-plugin parent # Use eclipse apis: type ServiceTracker does not take parameters %pom_change_dep -r org.osgi:org.osgi.core org.eclipse.osgi:org.eclipse.osgi commons persistence/jpa osgi bom %pom_remove_dep -r org.osgi:org.osgi.compendium commons persistence/jpa %pom_change_dep -r org.osgi:org.osgi.compendium org.eclipse.osgi:org.eclipse.osgi.services osgi bom -%pom_change_dep -r javax.cache:cache-api org.apache.geronimo.specs:geronimo-jcache_1.0_spec:1.0-alpha-1 jcache/commons jcache/embedded jcache/remote bom core +%pom_change_dep -r javax.cache:cache-api org.apache.geronimo.specs:geronimo-jcache_1.0_spec:1.0-alpha-1 jcache/commons jcache/embedded jcache/remote bom core cdi/remote %pom_change_dep :leveldbjni-all :leveldbjni persistence/leveldb @@ -270,6 +265,9 @@ done %license LICENSE.txt %changelog +* Sun Aug 21 2016 gil cattaneo 8.2.4-1 +- update to 8.2.4.Final + * Fri Aug 05 2016 gil cattaneo 8.1.0-2 - Rebuild with infinispan dependency diff --git a/sources b/sources index 6b53de2..df1e9fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0be0d548631d3b061f887836a5171426 infinispan-8.1.0.Final.tar.gz +bf5ecfeb18849faa0d11bfa7ecd59ad0 infinispan-8.2.4.Final.tar.gz