diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/patterns.dat b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/patterns.dat
index f3c1963ebec..06ddc16388e 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/patterns.dat
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/patterns.dat
@@ -10,11 +10,11 @@ command: grep -.*n.*
grep file line pattern =([\w,.,/,(,),\\,\-,\+,\d]*):(\d*):.*
command: grep .*
- grep file pattern =([\w,.,/,(,)\\,\-,\+,\d]*):.*
+ grep file pattern =([\w,.,/,(,)\\,\-,\+,\d]*):.*
+
-
command: pwd
- directory file pattern=([\w,.,/,(,),\\,\-,\+,\d,:]*)
+ directory file pattern=([\w,.,/,(,),\\,\-,\+,\d,:]*)
command: nmake.*
error pattern=NMAKE : .*
@@ -25,8 +25,8 @@ command: nmake.*
informational file line pattern=([\w,.,/,\-,\+,(,),\\]*)\((\d*):\d*\) : informational .*
command: make.*
- error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
- error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\",, line (\d*)\.\d*: \d*-\d* \(E\).*
+ error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
+ error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\",, line (\d*)\.\d*: \d*-\d* \(E\).*
warning file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(W\).*
informational file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(I\).*
warning file line pattern =([\w,.,/,(,),\-,\+,\\]*):(\d*): warning: .*
@@ -40,14 +40,14 @@ command: make.*
#makefile errors
error file line pattern=\"([\w,\.,/,(,),\-,\+,\\]*)\", line (\d*): make:.*
#xlc Options warnings
- warning pattern=\(W\) Option .*
- #c89 errors
+ warning pattern=\(W\) Option .*
+ #c89 errors
error file line pattern=ERROR CBC\d* ([\w,.,/,\\,\-,\+,(,)]*):(\d*) .*
warning file line pattern=WARNING CBC\d* ([\w,.,/,\\,\-,\+,(,)]*):(\d*) .*
informational pattern=CBC\d*\(I\) .*
-
+
command: gmake.*
- error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
+ error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
warning file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(W\).*
informational file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(I\).*
warning file line pattern =([\w,.,/,(,),\-,\+,\\]*):(\d*): warning: .*
@@ -63,7 +63,7 @@ command: gmake.*
error file line pattern =([\w,.,/,\\,\-,\+,(,)]*):(\d*):.*
command: gcc\s.*
- error file line pattern=\"([\w,.,/,\\,\-,\+,(,)]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
+ error file line pattern=\"([\w,.,/,\\,\-,\+,(,)]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
warning file line pattern=\"([\w,.,/,\\,\-,\+,(,)]*)\", line (\d*)\.\d*: \d*-\d* \(W\).*
informational file line pattern=\"([\w,.,/,\\,\-,\+,(,)]*)\", line (\d*)\.\d*: \d*-\d* \(I\).*
warning file line pattern =([\w,.,/,\\,\-,\+,(,)]*):(\d*): warning: .*
@@ -82,26 +82,26 @@ command: c89.*
error file line pattern=ERROR CBC\d* ([\w,.,/,\\,\-,\+,(,)]*):(\d*) .*
warning file line pattern=WARNING CBC\d* ([\w,.,/,\\,\-,\+,(,)]*):(\d*) .*
informational pattern=CBC\d*\(I\) .*
-
+
command: icc.*
error file line pattern =([\w,.,/,\\,\-,\+,(,)]*),\s(\d*)\.\d*:\s.*
error file line pattern =\"([\w,.,/,\\,\-,\+,(,)]*)\",\sline\s(\d*)\.\d*:\s.*
-
+
command: javac.*
warning file line pattern=([\w,.,/,\\,\-,\+,(,),:]*):(\d*): warning.*
error file line pattern=([\w,.,/,\\,\-,\+,(,),:]*):(\d*):.*
command: .*bat\s.*
- error file line pattern=\[javac\]\s([\w,.,/,\\,:]*):(\d*):.*
- error file line pattern=file:([\w,.,/,\\,:]*):(\d*):.*
-
+ error file line pattern=\[javac\]\s([\w,.,/,\\,:]*):(\d*):.*
+ error file line pattern=file:([\w,.,/,\\,:]*):(\d*):.*
+
command: dir.*
directory file pattern=\d{2}/\d{2}/\d*\s*\d{2}:\d{2}\s[a,p,AM,PM]+\s*
\s*([\w,.,/,\\,\s,\-,\+,\d]*).*
directory file pattern=.*\s*([\w,.,/,\\,\s,\-,\+,\d]*).*
file file pattern=\d{2}/\d{2}/\d*\s*\d{2}:\d{2}\s[a,p,AM,PM]+\s*[\d,,]*\s*([\w,.,/,\\,\s,\-,\+,\d]*).*
directory file pattern=[\d,/,\\,.,-]+.\s*\d{2}[:,.]\d{2}.\s*\s*([\w,.,/,\\,\s,\-,\+,\d]*)
file file pattern=[\d,/,\\,.,-]+.\s*\d{2}[:,.]\d{2}.\s*[\d,,,.]*\s*([\w,.,/,\\,\s,\-,\+,\d]*)
-
+
command: ls -l.*
file file pattern=-[-,r,w,x]+\s.*\s[\d{4},\d{2}:\d{2}]+,\s([\w,.,/,(,),\\,\-,\+\s,\d]*)
file file pattern=l[-,r,w,x]+\s.*\s[\d{4},\d{2}:\d{2}]+,\s([\w,.,/,(,),\\,\-,\+\s,\d]*)\s->\s[\w,.,/,(,),\\,\-,\+\s,\d]*
@@ -109,38 +109,38 @@ command: ls -l.*
file file pattern=-.* \d{4} ([\w,.,/,(,),\\,\-,\+,\s,\d]*)
file file pattern=l.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+,\s,\d]*)\s->\s[\w,.,/,(,),\\,\-,\+\s,\d]*
file file pattern=l.* \d{4} ([\w,.,/,(,),\\,\-,\+,\s,\d]*)\s->\s[\w,.,/,(,),\\,\-,\+\s,\d]*
- directory file pattern=d.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
- directory file pattern=d.*\d{4} ([\w,.,/,(,),\\,\-,\+,\s,\d]*)
+ directory file pattern=d.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
+ directory file pattern=d.*\d{4} ([\w,.,/,(,),\\,\-,\+,\s,\d]*)
command: ls -a.*
file file pattern=-.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
file file pattern=-.* \d{4} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
- directory file pattern=d.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
- directory file pattern=d.*\d{4} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
+ directory file pattern=d.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
+ directory file pattern=d.*\d{4} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
command: ls
- file file pattern=([\w,\d,.,(,),\-,\+\s]+)
-
+ file file pattern=([\w,\d,.,(,),\-,\+\s]+)
+
command: ls\s.*
- file file pattern=([\w,\d,.,(,),\-,\+\s]+)
+ file file pattern=([\w,\d,.,(,),\-,\+\s]+)
command: .*
prompt file pattern=([\w,.,/,(,),\\,\-,\+,\d,:,\s]*)>.*
-
-command: find .*
- file file pattern=([\w,.,/,\\,(,),\-]+)
+
+command: find .*
+ file file pattern=([\w,.,/,\\,(,),\-]+)
command: env
- pathenvvar file pattern=PATH\=(.*)
- libpathenvvar file pattern=LIBPATH\=(.*)
- libpathenvvar file pattern=LIB\=(.*)
- envvar pattern=[\w\d]+\=.*
+ pathenvvar file pattern=PATH\=(.*)
+ libpathenvvar file pattern=LIBPATH\=(.*)
+ libpathenvvar file pattern=LIB\=(.*)
+ envvar pattern=[\w\d]+\=.*
command: ps
- process pattern=[\s]*[\d]+\s.*
-
+ process pattern=[\s]*[\d]+\s.*
+
command: ps .*
- process pattern=[\s]*[\d]+\s.*
+ process pattern=[\s]*[\d]+\s.*
command: xl[C,c].*
error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\",, line (\d*)\.\d*: \d*-\d* \(S\).*
@@ -151,20 +151,20 @@ command: xl[C,c].*
command: ixlc.*
error file line pattern=([\w,.,/,\\]*) Line (\d*)\s.*
error file line pattern=[\w,.,/,\\]* Line \d* \"([\w,.,/,\\]*)\", line (\d*)\.\d*: .*
-
+
command: cat.*patterns.*
- warning file pattern=# .*(PATTERNS.DAT).*
- Output pattern=command: .*
- #statement pattern=#.*
- statement pattern=.* pattern.*=.*
+ warning file pattern=# .*(PATTERNS.DAT).*
+ Output pattern=command: .*
+ #statement pattern=#.*
+ statement pattern=.* pattern.*=.*
# special for autoconf
command: ./bootstrap.sc.*
- error file line pattern=aclocal: ([\w,.,/,\\]*): (\d*):.*
- warning file line pattern=([\w,.,/,\\]*):(\d*):.*
+ error file line pattern=aclocal: ([\w,.,/,\\]*): (\d*):.*
+ warning file line pattern=([\w,.,/,\\]*):(\d*):.*
command: ./configure.*
- error file line pattern=./(configure): line (\d*): .*
+ error file line pattern=./(configure): line (\d*): .*
# How Patterns Work
# -----------------
@@ -201,7 +201,7 @@ command: ./configure.*
#
# where:
# : The type of object that will be created in the Output View if
-# a line of output matches this pattern.
+# a line of output matches this pattern.
#
# : This is some combination of the words "file" and "line" or nothing
# at all. This is used to define how the backreferences in the
diff --git a/rse/plugins/org.eclipse.rse.services.local/patterns.dat b/rse/plugins/org.eclipse.rse.services.local/patterns.dat
index 0a084ac1a3a..06ddc16388e 100644
--- a/rse/plugins/org.eclipse.rse.services.local/patterns.dat
+++ b/rse/plugins/org.eclipse.rse.services.local/patterns.dat
@@ -10,11 +10,11 @@ command: grep -.*n.*
grep file line pattern =([\w,.,/,(,),\\,\-,\+,\d]*):(\d*):.*
command: grep .*
- grep file pattern =([\w,.,/,(,)\\,\-,\+,\d]*):.*
+ grep file pattern =([\w,.,/,(,)\\,\-,\+,\d]*):.*
+
-
command: pwd
- directory file pattern=([\w,.,/,(,),\\,\-,\+,\d,:]*)
+ directory file pattern=([\w,.,/,(,),\\,\-,\+,\d,:]*)
command: nmake.*
error pattern=NMAKE : .*
@@ -25,8 +25,8 @@ command: nmake.*
informational file line pattern=([\w,.,/,\-,\+,(,),\\]*)\((\d*):\d*\) : informational .*
command: make.*
- error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
- error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\",, line (\d*)\.\d*: \d*-\d* \(E\).*
+ error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
+ error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\",, line (\d*)\.\d*: \d*-\d* \(E\).*
warning file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(W\).*
informational file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(I\).*
warning file line pattern =([\w,.,/,(,),\-,\+,\\]*):(\d*): warning: .*
@@ -40,14 +40,14 @@ command: make.*
#makefile errors
error file line pattern=\"([\w,\.,/,(,),\-,\+,\\]*)\", line (\d*): make:.*
#xlc Options warnings
- warning pattern=\(W\) Option .*
- #c89 errors
+ warning pattern=\(W\) Option .*
+ #c89 errors
error file line pattern=ERROR CBC\d* ([\w,.,/,\\,\-,\+,(,)]*):(\d*) .*
warning file line pattern=WARNING CBC\d* ([\w,.,/,\\,\-,\+,(,)]*):(\d*) .*
informational pattern=CBC\d*\(I\) .*
-
+
command: gmake.*
- error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
+ error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
warning file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(W\).*
informational file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\", line (\d*)\.\d*: \d*-\d* \(I\).*
warning file line pattern =([\w,.,/,(,),\-,\+,\\]*):(\d*): warning: .*
@@ -63,7 +63,7 @@ command: gmake.*
error file line pattern =([\w,.,/,\\,\-,\+,(,)]*):(\d*):.*
command: gcc\s.*
- error file line pattern=\"([\w,.,/,\\,\-,\+,(,)]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
+ error file line pattern=\"([\w,.,/,\\,\-,\+,(,)]*)\", line (\d*)\.\d*: \d*-\d* \(S\).*
warning file line pattern=\"([\w,.,/,\\,\-,\+,(,)]*)\", line (\d*)\.\d*: \d*-\d* \(W\).*
informational file line pattern=\"([\w,.,/,\\,\-,\+,(,)]*)\", line (\d*)\.\d*: \d*-\d* \(I\).*
warning file line pattern =([\w,.,/,\\,\-,\+,(,)]*):(\d*): warning: .*
@@ -82,26 +82,26 @@ command: c89.*
error file line pattern=ERROR CBC\d* ([\w,.,/,\\,\-,\+,(,)]*):(\d*) .*
warning file line pattern=WARNING CBC\d* ([\w,.,/,\\,\-,\+,(,)]*):(\d*) .*
informational pattern=CBC\d*\(I\) .*
-
+
command: icc.*
error file line pattern =([\w,.,/,\\,\-,\+,(,)]*),\s(\d*)\.\d*:\s.*
error file line pattern =\"([\w,.,/,\\,\-,\+,(,)]*)\",\sline\s(\d*)\.\d*:\s.*
-
+
command: javac.*
warning file line pattern=([\w,.,/,\\,\-,\+,(,),:]*):(\d*): warning.*
error file line pattern=([\w,.,/,\\,\-,\+,(,),:]*):(\d*):.*
command: .*bat\s.*
- error file line pattern=\[javac\]\s([\w,.,/,\\,:]*):(\d*):.*
- error file line pattern=file:([\w,.,/,\\,:]*):(\d*):.*
-
+ error file line pattern=\[javac\]\s([\w,.,/,\\,:]*):(\d*):.*
+ error file line pattern=file:([\w,.,/,\\,:]*):(\d*):.*
+
command: dir.*
directory file pattern=\d{2}/\d{2}/\d*\s*\d{2}:\d{2}\s[a,p,AM,PM]+\s*\s*([\w,.,/,\\,\s,\-,\+,\d]*).*
directory file pattern=.*\s*([\w,.,/,\\,\s,\-,\+,\d]*).*
file file pattern=\d{2}/\d{2}/\d*\s*\d{2}:\d{2}\s[a,p,AM,PM]+\s*[\d,,]*\s*([\w,.,/,\\,\s,\-,\+,\d]*).*
directory file pattern=[\d,/,\\,.,-]+.\s*\d{2}[:,.]\d{2}.\s*\s*([\w,.,/,\\,\s,\-,\+,\d]*)
file file pattern=[\d,/,\\,.,-]+.\s*\d{2}[:,.]\d{2}.\s*[\d,,,.]*\s*([\w,.,/,\\,\s,\-,\+,\d]*)
-
+
command: ls -l.*
file file pattern=-[-,r,w,x]+\s.*\s[\d{4},\d{2}:\d{2}]+,\s([\w,.,/,(,),\\,\-,\+\s,\d]*)
file file pattern=l[-,r,w,x]+\s.*\s[\d{4},\d{2}:\d{2}]+,\s([\w,.,/,(,),\\,\-,\+\s,\d]*)\s->\s[\w,.,/,(,),\\,\-,\+\s,\d]*
@@ -109,38 +109,38 @@ command: ls -l.*
file file pattern=-.* \d{4} ([\w,.,/,(,),\\,\-,\+,\s,\d]*)
file file pattern=l.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+,\s,\d]*)\s->\s[\w,.,/,(,),\\,\-,\+\s,\d]*
file file pattern=l.* \d{4} ([\w,.,/,(,),\\,\-,\+,\s,\d]*)\s->\s[\w,.,/,(,),\\,\-,\+\s,\d]*
- directory file pattern=d.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
- directory file pattern=d.*\d{4} ([\w,.,/,(,),\\,\-,\+,\s,\d]*)
+ directory file pattern=d.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
+ directory file pattern=d.*\d{4} ([\w,.,/,(,),\\,\-,\+,\s,\d]*)
command: ls -a.*
file file pattern=-.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
file file pattern=-.* \d{4} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
- directory file pattern=d.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
- directory file pattern=d.*\d{4} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
+ directory file pattern=d.*\d{2}:\d{2} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
+ directory file pattern=d.*\d{4} ([\w,.,/,(,),\\,\-,\+\s,\d]*)
command: ls
- file file pattern=([\w,\d,.,(,),\-,\+\s]+)
-
+ file file pattern=([\w,\d,.,(,),\-,\+\s]+)
+
command: ls\s.*
- file file pattern=([\w,\d,.,(,),\-,\+\s]+)
+ file file pattern=([\w,\d,.,(,),\-,\+\s]+)
command: .*
prompt file pattern=([\w,.,/,(,),\\,\-,\+,\d,:,\s]*)>.*
-
-command: find .*
- file file pattern=([\w,.,/,\\,(,),\-]+)
+
+command: find .*
+ file file pattern=([\w,.,/,\\,(,),\-]+)
command: env
- pathenvvar file pattern=PATH\=(.*)
- libpathenvvar file pattern=LIBPATH\=(.*)
- libpathenvvar file pattern=LIB\=(.*)
- envvar pattern=[\w\d]+\=.*
+ pathenvvar file pattern=PATH\=(.*)
+ libpathenvvar file pattern=LIBPATH\=(.*)
+ libpathenvvar file pattern=LIB\=(.*)
+ envvar pattern=[\w\d]+\=.*
command: ps
- process pattern=[\s]*[\d]+\s.*
-
+ process pattern=[\s]*[\d]+\s.*
+
command: ps .*
- process pattern=[\s]*[\d]+\s.*
+ process pattern=[\s]*[\d]+\s.*
command: xl[C,c].*
error file line pattern=\"([\w,.,/,(,),\-,\+,\\]*)\",, line (\d*)\.\d*: \d*-\d* \(S\).*
@@ -151,20 +151,20 @@ command: xl[C,c].*
command: ixlc.*
error file line pattern=([\w,.,/,\\]*) Line (\d*)\s.*
error file line pattern=[\w,.,/,\\]* Line \d* \"([\w,.,/,\\]*)\", line (\d*)\.\d*: .*
-
+
command: cat.*patterns.*
- warning file pattern=# .*(PATTERNS.DAT).*
- Output pattern=command: .*
- #statement pattern=#.*
- statement pattern=.* pattern.*=.*
+ warning file pattern=# .*(PATTERNS.DAT).*
+ Output pattern=command: .*
+ #statement pattern=#.*
+ statement pattern=.* pattern.*=.*
# special for autoconf
command: ./bootstrap.sc.*
- error file line pattern=aclocal: ([\w,.,/,\\]*): (\d*):.*
- warning file line pattern=([\w,.,/,\\]*):(\d*):.*
+ error file line pattern=aclocal: ([\w,.,/,\\]*): (\d*):.*
+ warning file line pattern=([\w,.,/,\\]*):(\d*):.*
command: ./configure.*
- error file line pattern=./(configure): line (\d*): .*
+ error file line pattern=./(configure): line (\d*): .*
# How Patterns Work
# -----------------