You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2016/10/11 18:41:44 UTC
svn commit: r1764317 - in /felix/trunk/gogo: ./ command/ gogo-parent/ jline/
jline/src/main/java/org/apache/felix/gogo/jline/ jline/src/main/resources/
runtime/ runtime/src/main/java/org/apache/felix/gogo/api/
runtime/src/main/java/org/apache/felix/gog...
Author: gnodet
Date: Tue Oct 11 18:41:43 2016
New Revision: 1764317
URL: http://svn.apache.org/viewvc?rev=1764317&view=rev
Log:
[gogo] Upgrade packages and bundles versions to 1.0.0
Added:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSessionListener.java
- copied, changed from r1764250, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/CommandSessionListener.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Job.java
- copied, changed from r1764250, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Job.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/JobListener.java
- copied, changed from r1764250, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/JobListener.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Process.java
- copied, changed from r1764250, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Process.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Result.java
- copied, changed from r1764250, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Result.java
Removed:
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/CommandSessionListener.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Job.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/JobListener.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Process.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Result.java
Modified:
felix/trunk/gogo/command/pom.xml
felix/trunk/gogo/gogo-parent/pom.xml
felix/trunk/gogo/jline/pom.xml
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Posix.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Procedural.java
felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Shell.java
felix/trunk/gogo/jline/src/main/resources/gosh_profile
felix/trunk/gogo/pom.xml
felix/trunk/gogo/runtime/pom.xml
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Expression.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestTokenizer.java
felix/trunk/gogo/shell/pom.xml
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
felix/trunk/gogo/shell/src/main/resources/gosh_profile
Modified: felix/trunk/gogo/command/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/command/pom.xml?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/command/pom.xml (original)
+++ felix/trunk/gogo/command/pom.xml Tue Oct 11 18:41:43 2016
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>gogo-parent</artifactId>
- <version>0.6.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../gogo-parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.felix.gogo.command</artifactId>
<packaging>bundle</packaging>
- <version>0.17.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Apache Felix Gogo Command</name>
<description>
@@ -44,12 +44,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -59,7 +59,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -67,19 +66,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <target>1.5</target>
- <source>1.5</source>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.5</version>
-
<extensions>true</extensions>
<configuration>
<instructions>
@@ -87,7 +75,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Private-Package>${pom.artifactId}</Private-Package>
<Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
- <Import-Package>org.apache.felix.service.command; status="provisional", org.osgi.framework; version="[1.5,2.0)", org.osgi.framework.wiring; resolution:=optional, *</Import-Package>
+ <Import-Package>org.apache.felix.service.command, org.osgi.framework; version="[1.5,2.0)", org.osgi.framework.wiring; resolution:=optional, *</Import-Package>
<Include-Resource>{maven-resources},META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
<DynamicImport-Package>org.apache.felix.bundlerepository, org.apache.felix.bundlerepository.*</DynamicImport-Package>
</instructions>
Modified: felix/trunk/gogo/gogo-parent/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/gogo-parent/pom.xml?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/gogo-parent/pom.xml (original)
+++ felix/trunk/gogo/gogo-parent/pom.xml Tue Oct 11 18:41:43 2016
@@ -29,20 +29,20 @@
<name>Apache Felix Gogo</name>
<description>Apache Felix Gogo Subproject</description>
<artifactId>gogo-parent</artifactId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
+ <version>2.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
</plugin>
</plugins>
@@ -71,8 +71,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
</plugins>
Modified: felix/trunk/gogo/jline/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/pom.xml?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/jline/pom.xml (original)
+++ felix/trunk/gogo/jline/pom.xml Tue Oct 11 18:41:43 2016
@@ -20,14 +20,14 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>gogo-parent</artifactId>
- <version>0.6.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../gogo-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix Gogo JLine Shell</name>
<artifactId>org.apache.felix.gogo.jline</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<properties>
<!-- Skip because of NPE -->
<animal.sniffer.skip>true</animal.sniffer.skip>
@@ -49,12 +49,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>0.17.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
- <version>3.0.0.M2</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
@@ -69,7 +69,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -77,6 +76,8 @@
org.apache.felix.gogo.jline
</Export-Package>
<Import-Package>
+ !org.apache.felix.gogo.runtime.threadio,
+ org.apache.felix.service.*;version="[1.0,2.0)",
*
</Import-Package>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
Modified: felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java (original)
+++ felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Builtin.java Tue Oct 11 18:41:43 2016
@@ -49,8 +49,8 @@ import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.felix.gogo.api.Job;
-import org.apache.felix.gogo.api.Process;
+import org.apache.felix.service.command.Job;
+import org.apache.felix.service.command.Process;
import org.apache.felix.gogo.runtime.CommandSessionImpl;
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Converter;
Modified: felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Posix.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Posix.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Posix.java (original)
+++ felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Posix.java Tue Oct 11 18:41:43 2016
@@ -71,7 +71,7 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.felix.gogo.api.Process;
+import org.apache.felix.service.command.Process;
import org.apache.felix.gogo.jline.Shell.Context;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
Modified: felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Procedural.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Procedural.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Procedural.java (original)
+++ felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Procedural.java Tue Oct 11 18:41:43 2016
@@ -25,7 +25,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.apache.felix.gogo.api.Process;
+import org.apache.felix.service.command.Process;
import org.apache.felix.service.command.CommandSession;
import org.apache.felix.service.command.Function;
import org.jline.builtins.Options;
Modified: felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Shell.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Shell.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Shell.java (original)
+++ felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/Shell.java Tue Oct 11 18:41:43 2016
@@ -19,7 +19,6 @@
package org.apache.felix.gogo.jline;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
@@ -29,6 +28,7 @@ import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.nio.CharBuffer;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -42,8 +42,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.felix.gogo.runtime.Closure;
import org.apache.felix.gogo.runtime.CommandProxy;
import org.apache.felix.gogo.runtime.CommandSessionImpl;
-import org.apache.felix.gogo.api.Job;
-import org.apache.felix.gogo.api.Job.Status;
+import org.apache.felix.service.command.Job;
+import org.apache.felix.service.command.Job.Status;
import org.apache.felix.gogo.runtime.Reflective;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
@@ -60,7 +60,6 @@ import org.jline.reader.LineReaderBuilde
import org.jline.reader.ParsedLine;
import org.jline.reader.UserInterruptException;
import org.jline.reader.impl.LineReaderImpl;
-import org.jline.reader.impl.history.history.FileHistory;
import org.jline.terminal.Terminal;
import org.jline.terminal.Terminal.Signal;
import org.jline.terminal.Terminal.SignalHandler;
@@ -260,6 +259,7 @@ public class Shell {
newSession.put("#COLUMNS", (Function) (s, arguments) -> terminal.getWidth());
newSession.put("#LINES", (Function) (s, arguments) -> terminal.getHeight());
newSession.put("#PWD", (Function) (s, arguments) -> s.currentDir().toString());
+ newSession.put(LineReader.HISTORY_FILE, Paths.get(System.getProperty("user.home"), ".gogo.history"));
LineReader reader;
if (args.isEmpty() && interactive) {
@@ -292,7 +292,6 @@ public class Shell {
.variables(((CommandSessionImpl) newSession).getVariables())
.completer(new org.jline.builtins.Completers.Completer(completionEnvironment))
.highlighter(new Highlighter(session))
- .history(new FileHistory(new File(System.getProperty("user.home"), ".gogo.history")))
.parser(new Parser())
.expander(new Expander(newSession))
.build();
@@ -418,11 +417,7 @@ public class Shell {
} catch (UserInterruptException e) {
// continue;
} catch (EndOfFileException e) {
- try {
- reader.getHistory().flush();
- } catch (IOException e1) {
- e.addSuppressed(e1);
- }
+ reader.getHistory().save();
break;
}
}
Modified: felix/trunk/gogo/jline/src/main/resources/gosh_profile
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/resources/gosh_profile?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/jline/src/main/resources/gosh_profile (original)
+++ felix/trunk/gogo/jline/src/main/resources/gosh_profile Tue Oct 11 18:41:43 2016
@@ -30,7 +30,7 @@ try {
addcommand context ${.context}
# add methods on System object as commands
- #addcommand system (((${.context} getClass) getClassLoader) loadClass java.lang.System)
+ addcommand system (((${.context} getClass) getClassLoader) loadClass java.lang.System)
# alias to print full stack trace
e = { $exception printStackTrace }
@@ -292,7 +292,9 @@ try {
$uri resolve $path
}
}
- cat (__resolve_uri $0 motd)
+
+ # print welcome message, unless we're explicitly told not to...
+ if { $.gosh_quiet } { } { cat ($0 resolve motd) }
} {
echo "$0: ERROR: $exception"
}
Modified: felix/trunk/gogo/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/pom.xml?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/pom.xml (original)
+++ felix/trunk/gogo/pom.xml Tue Oct 11 18:41:43 2016
@@ -29,7 +29,7 @@
<name>Apache Felix Gogo</name>
<description>Apache Felix Gogo Subproject</description>
<artifactId>gogo-reactor</artifactId>
- <version>0.7.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/gogo</connection>
Modified: felix/trunk/gogo/runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/pom.xml (original)
+++ felix/trunk/gogo/runtime/pom.xml Tue Oct 11 18:41:43 2016
@@ -20,14 +20,14 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>gogo-parent</artifactId>
- <version>0.6.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../gogo-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix Gogo Runtime</name>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>0.17.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<properties>
<!-- Skip because of NPE -->
<animal.sniffer.skip>true</animal.sniffer.skip>
@@ -37,13 +37,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.0.0</version>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -57,19 +57,17 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Service>
- org.apache.felix.service.threadio.ThreadIO,
- org.apache.felix.service.command.CommandProcessor
- </Export-Service>
+ <Provide-Capability>
+ osgi.service; effective:=active; objectClass="org.apache.felix.service.threadio.ThreadIO",
+ osgi.service; effective:=active; objectClass="org.apache.felix.service.command.CommandProcessor"
+ </Provide-Capability>
<Export-Package>
- org.apache.felix.service.command;
- org.apache.felix.service.threadio; version=${project.version}; status="provisional"; mandatory:="status",
+ org.apache.felix.service.command; version=1.0.0,
+ org.apache.felix.service.threadio; version=1.0.0,
org.apache.felix.gogo.runtime*; version=${project.version},
- org.apache.felix.gogo.api; version=${project.version}
</Export-Package>
<Import-Package>
org.osgi.service.event*; resolution:=optional,
@@ -87,13 +85,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java Tue Oct 11 18:41:43 2016
@@ -33,7 +33,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.felix.gogo.api.Job.Status;
+import org.apache.felix.service.command.Job.Status;
import org.apache.felix.gogo.runtime.Parser.Array;
import org.apache.felix.gogo.runtime.Parser.Executable;
import org.apache.felix.gogo.runtime.Parser.Operator;
Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java Tue Oct 11 18:41:43 2016
@@ -32,12 +32,7 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArraySet;
-import org.apache.felix.gogo.api.CommandSessionListener;
-import org.apache.felix.service.command.CommandProcessor;
-import org.apache.felix.service.command.CommandSession;
-import org.apache.felix.service.command.Converter;
-import org.apache.felix.service.command.Descriptor;
-import org.apache.felix.service.command.Function;
+import org.apache.felix.service.command.*;
import org.apache.felix.service.threadio.ThreadIO;
public class CommandProcessorImpl implements CommandProcessor
Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java Tue Oct 11 18:41:43 2016
@@ -50,10 +50,10 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import org.apache.felix.gogo.api.Job;
-import org.apache.felix.gogo.api.Job.Status;
-import org.apache.felix.gogo.api.JobListener;
-import org.apache.felix.gogo.api.Process;
+import org.apache.felix.service.command.Job;
+import org.apache.felix.service.command.Job.Status;
+import org.apache.felix.service.command.JobListener;
+import org.apache.felix.service.command.Process;
import org.apache.felix.gogo.runtime.Pipe.Result;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Expression.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Expression.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Expression.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Expression.java Tue Oct 11 18:41:43 2016
@@ -1,4 +1,22 @@
/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/*
* Copyright 2012 Udo Klimaschewski
*
* http://UdoJava.com/
Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java Tue Oct 11 18:41:43 2016
@@ -47,9 +47,9 @@ import java.util.concurrent.atomic.Atomi
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.felix.gogo.api.Job;
-import org.apache.felix.gogo.api.Job.Status;
-import org.apache.felix.gogo.api.Process;
+import org.apache.felix.service.command.Job;
+import org.apache.felix.service.command.Job.Status;
+import org.apache.felix.service.command.Process;
import org.apache.felix.gogo.runtime.CommandSessionImpl.JobImpl;
import org.apache.felix.gogo.runtime.Parser.Statement;
import org.apache.felix.gogo.runtime.Pipe.Result;
@@ -60,7 +60,7 @@ public class Pipe implements Callable<Re
{
private static final ThreadLocal<Pipe> CURRENT = new ThreadLocal<>();
- public static class Result implements org.apache.felix.gogo.api.Result {
+ public static class Result implements org.apache.felix.service.command.Result {
public final Object result;
public final Exception exception;
public final int error;
Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java Tue Oct 11 18:41:43 2016
@@ -25,10 +25,10 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.felix.gogo.api.CommandSessionListener;
import org.apache.felix.gogo.runtime.CommandProcessorImpl;
import org.apache.felix.gogo.runtime.CommandProxy;
import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
+import org.apache.felix.service.command.CommandSessionListener;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.Converter;
import org.apache.felix.service.threadio.ThreadIO;
@@ -85,39 +85,39 @@ public class Activator implements Bundle
commandTracker = trackOSGiCommands(context);
commandTracker.open();
- converterTracker = new ServiceTracker(context, Converter.class.getName(), null)
+ converterTracker = new ServiceTracker<Converter, Converter>(context, Converter.class, null)
{
@Override
- public Object addingService(ServiceReference reference)
+ public Converter addingService(ServiceReference<Converter> reference)
{
- Converter converter = (Converter) super.addingService(reference);
+ Converter converter = super.addingService(reference);
processor.addConverter(converter);
return converter;
}
@Override
- public void removedService(ServiceReference reference, Object service)
+ public void removedService(ServiceReference<Converter> reference, Converter service)
{
- processor.removeConverter((Converter) service);
+ processor.removeConverter(service);
super.removedService(reference, service);
}
};
converterTracker.open();
- listenerTracker = new ServiceTracker(context, CommandSessionListener.class.getName(), null)
+ listenerTracker = new ServiceTracker<CommandSessionListener, CommandSessionListener>(context, CommandSessionListener.class.getName(), null)
{
@Override
- public Object addingService(ServiceReference reference)
+ public CommandSessionListener addingService(ServiceReference<CommandSessionListener> reference)
{
- CommandSessionListener listener = (CommandSessionListener) super.addingService(reference);
+ CommandSessionListener listener = super.addingService(reference);
processor.addListener(listener);
return listener;
}
@Override
- public void removedService(ServiceReference reference, Object service)
+ public void removedService(ServiceReference<CommandSessionListener> reference, CommandSessionListener service)
{
- processor.removeListener((CommandSessionListener) service);
+ processor.removeListener(service);
super.removedService(reference, service);
}
};
@@ -141,13 +141,13 @@ public class Activator implements Bundle
Filter filter = context.createFilter(String.format("(&(%s=*)(%s=*))",
CommandProcessor.COMMAND_SCOPE, CommandProcessor.COMMAND_FUNCTION));
- return new ServiceTracker(context, filter, null)
+ return new ServiceTracker<Object, List<Object>>(context, filter, null)
{
- private final ConcurrentMap<ServiceReference, Map<String, CommandProxy>> proxies
+ private final ConcurrentMap<ServiceReference<Object>, Map<String, CommandProxy>> proxies
= new ConcurrentHashMap<>();
@Override
- public Object addingService(ServiceReference reference)
+ public List<Object> addingService(ServiceReference<Object> reference)
{
Object scope = reference.getProperty(CommandProcessor.COMMAND_SCOPE);
Object function = reference.getProperty(CommandProcessor.COMMAND_FUNCTION);
@@ -193,7 +193,7 @@ public class Activator implements Bundle
}
@Override
- public void removedService(ServiceReference reference, Object service)
+ public void removedService(ServiceReference<Object> reference, List<Object> service)
{
Object scope = reference.getProperty(CommandProcessor.COMMAND_SCOPE);
Object function = reference.getProperty(CommandProcessor.COMMAND_FUNCTION);
Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/EventAdminListener.java Tue Oct 11 18:41:43 2016
@@ -18,10 +18,11 @@
*/
package org.apache.felix.gogo.runtime.activator;
-import java.util.Properties;
+import java.util.HashMap;
+import java.util.Map;
-import org.apache.felix.gogo.api.CommandSessionListener;
import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.CommandSessionListener;
import org.osgi.framework.BundleContext;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
@@ -29,21 +30,21 @@ import org.osgi.util.tracker.ServiceTrac
public class EventAdminListener implements CommandSessionListener
{
- private ServiceTracker tracker;
+ private ServiceTracker<EventAdmin, EventAdmin> tracker;
public EventAdminListener(BundleContext bundleContext)
{
- tracker = new ServiceTracker(bundleContext, EventAdmin.class.getName(), null);
+ tracker = new ServiceTracker<>(bundleContext, EventAdmin.class, null);
tracker.open();
}
public void beforeExecute(CommandSession session, CharSequence command)
{
- EventAdmin admin = (EventAdmin) tracker.getService();
+ EventAdmin admin = tracker.getService();
if (admin != null)
{
- Properties props = new Properties();
- props.setProperty("command", command.toString());
+ Map<String, Object> props = new HashMap<>();
+ props.put("command", command.toString());
Event event = new Event("org/apache/felix/service/command/EXECUTING", props);
admin.postEvent(event);
}
Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java Tue Oct 11 18:41:43 2016
@@ -23,9 +23,6 @@ import java.io.PrintStream;
import java.nio.file.Path;
import java.util.List;
-import org.apache.felix.gogo.api.Job;
-import org.apache.felix.gogo.api.JobListener;
-
public interface CommandSession extends AutoCloseable
{
Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSessionListener.java (from r1764250, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/CommandSessionListener.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSessionListener.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSessionListener.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/CommandSessionListener.java&r1=1764250&r2=1764317&rev=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/CommandSessionListener.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSessionListener.java Tue Oct 11 18:41:43 2016
@@ -16,9 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.api;
-
-import org.apache.felix.service.command.CommandSession;
+package org.apache.felix.service.command;
/**
* Listener for command executions.
Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Job.java (from r1764250, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Job.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Job.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Job.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Job.java&r1=1764250&r2=1764317&rev=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Job.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Job.java Tue Oct 11 18:41:43 2016
@@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.api;
+package org.apache.felix.service.command;
import java.util.List;
-import org.apache.felix.service.command.CommandSession;
-
public interface Job
{
Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/JobListener.java (from r1764250, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/JobListener.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/JobListener.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/JobListener.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/JobListener.java&r1=1764250&r2=1764317&rev=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/JobListener.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/JobListener.java Tue Oct 11 18:41:43 2016
@@ -16,9 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.api;
-
-import org.apache.felix.gogo.api.Job.Status;
+package org.apache.felix.service.command;
/**
* Listener for command executions.
@@ -29,6 +27,6 @@ import org.apache.felix.gogo.api.Job.Sta
public interface JobListener
{
- void jobChanged(Job job, Status previous, Status current);
+ void jobChanged(Job job, Job.Status previous, Job.Status current);
}
Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Process.java (from r1764250, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Process.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Process.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Process.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Process.java&r1=1764250&r2=1764317&rev=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Process.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Process.java Tue Oct 11 18:41:43 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.api;
+package org.apache.felix.service.command;
import java.io.InputStream;
import java.io.PrintStream;
Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Result.java (from r1764250, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Result.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Result.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Result.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Result.java&r1=1764250&r2=1764317&rev=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/api/Result.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Result.java Tue Oct 11 18:41:43 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.gogo.api;
+package org.apache.felix.service.command;
public interface Result
{
Modified: felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java (original)
+++ felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java Tue Oct 11 18:41:43 2016
@@ -27,7 +27,7 @@ import java.util.Collection;
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.felix.gogo.api.Process;
+import org.apache.felix.service.command.Process;
import org.apache.felix.gogo.runtime.Parser.Pipeline;
import org.apache.felix.gogo.runtime.Parser.Program;
import org.apache.felix.gogo.runtime.Parser.Sequence;
Modified: felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestTokenizer.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestTokenizer.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestTokenizer.java (original)
+++ felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestTokenizer.java Tue Oct 11 18:41:43 2016
@@ -532,7 +532,7 @@ public class TestTokenizer
private BundleContext createMockContext() throws ClassNotFoundException
{
Bundle systemBundle = mock(Bundle.class);
- when(systemBundle.loadClass(eq("java.lang.System"))).thenReturn(System.class);
+ when(systemBundle.loadClass(eq("java.lang.System"))).thenReturn((Class) System.class);
BundleContext bc = mock(BundleContext.class);
when(bc.getBundles()).thenReturn(new Bundle[] { systemBundle });
Modified: felix/trunk/gogo/shell/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/pom.xml?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/shell/pom.xml (original)
+++ felix/trunk/gogo/shell/pom.xml Tue Oct 11 18:41:43 2016
@@ -13,31 +13,31 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>gogo-parent</artifactId>
- <version>0.6.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../gogo-parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix Gogo Shell</name>
<artifactId>org.apache.felix.gogo.shell</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
+ <version>4.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>0.16.2</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
@@ -51,7 +51,7 @@
<Export-Package>
</Export-Package>
<Import-Package>
- org.apache.felix.service.command; status="provisional",
+ org.apache.felix.service.command,
*
</Import-Package>
<Private-Package>
@@ -84,13 +84,6 @@
</excludes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java (original)
+++ felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Activator.java Tue Oct 11 18:41:43 2016
@@ -18,6 +18,9 @@
*/
package org.apache.felix.gogo.shell;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.util.Arrays;
import java.util.Dictionary;
import java.util.HashSet;
@@ -191,7 +194,10 @@ public class Activator implements Bundle
public void run()
{
- session = processor.createSession(System.in, System.out, System.err);
+
+ session = processor.createSession(new FileInputStream(FileDescriptor.in),
+ new FileOutputStream(FileDescriptor.out),
+ new FileOutputStream(FileDescriptor.err));
try
{
// wait for gosh command to be registered
Modified: felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java (original)
+++ felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Converters.java Tue Oct 11 18:41:43 2016
@@ -188,7 +188,7 @@ public class Converters implements Conve
String s = in.toString();
if (s.startsWith("(") && s.endsWith(")"))
{
- ServiceReference refs[] = context.getServiceReferences(null, String.format(
+ ServiceReference refs[] = context.getServiceReferences((String) null, String.format(
"(|(service.id=%s)(service.pid=%s))", in, in));
if (refs != null && refs.length > 0)
{
@@ -196,7 +196,7 @@ public class Converters implements Conve
}
}
- ServiceReference refs[] = context.getServiceReferences(null, String.format(
+ ServiceReference refs[] = context.getServiceReferences((String) null, String.format(
"(|(service.id=%s)(service.pid=%s))", in, in));
if (refs != null && refs.length > 0)
{
Modified: felix/trunk/gogo/shell/src/main/resources/gosh_profile
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/resources/gosh_profile?rev=1764317&r1=1764316&r2=1764317&view=diff
==============================================================================
--- felix/trunk/gogo/shell/src/main/resources/gosh_profile (original)
+++ felix/trunk/gogo/shell/src/main/resources/gosh_profile Tue Oct 11 18:41:43 2016
@@ -6,7 +6,7 @@
try {
# ensure gogo commands are found first
- SCOPE = gogo:*
+ SCOPE = 'gogo:*'
# add methods on BundleContext object as commands
#addcommand context ${.context} (${.context} class)
@@ -31,7 +31,7 @@ try {
prompt = 'g! '
# print welcome message, unless we're explicitly told not to...
- if {$.gosh_quiet} {} { cat ($0 resolve motd) }
+ if { $.gosh_quiet } { } { cat ($0 resolve motd) }
} {
echo "$0: ERROR: $exception"
}