-
+
|
@@ -222,7 +282,7 @@
-
+
|
|
@@ -272,5 +332,119 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
+
+
+ Test Name: |
+
+
+ |
+
+
+
+
+ Test Description: |
+
+
+ |
+
+
+
+ Test Result: |
+
+
+ |
+
+
+
+ Test Request: |
+
+
+ Request Method: |
+
+
+
+ |
+
+
+ Request URI: |
+
+
+ |
+
+
+ Request Response: |
+
+
+ |
+
+
+
+ Reason of failure: |
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
From 1620a700d100eeeeb05d7a1e26a0a35220015df1 Mon Sep 17 00:00:00 2001
From: Keshav Nangare
Date: Wed, 19 Apr 2017 15:14:56 +0530
Subject: [PATCH 10/19] Added support for the XML representaion in html using
lib. Updated the viewSessionLog page with the HTML report. Created the new
page to display old teamengine result and added the link into the to redirect
that page.
---
teamengine-core/pom.xml | 5 +
.../src/main/java/com/occamlab/te/TECore.java | 31 +-
teamengine-resources/pom.xml | 2 +
.../occamlab/te/earl/lib/js/shAutoloader.js | 17 +
.../com/occamlab/te/earl/lib/js/shBrushAS3.js | 59 +++
.../te/earl/lib/js/shBrushAppleScript.js | 75 ++++
.../occamlab/te/earl/lib/js/shBrushBash.js | 59 +++
.../occamlab/te/earl/lib/js/shBrushCSharp.js | 65 ++++
.../te/earl/lib/js/shBrushColdFusion.js | 100 ++++++
.../com/occamlab/te/earl/lib/js/shBrushCpp.js | 97 +++++
.../com/occamlab/te/earl/lib/js/shBrushCss.js | 91 +++++
.../occamlab/te/earl/lib/js/shBrushDelphi.js | 55 +++
.../occamlab/te/earl/lib/js/shBrushDiff.js | 41 +++
.../occamlab/te/earl/lib/js/shBrushErlang.js | 52 +++
.../occamlab/te/earl/lib/js/shBrushGroovy.js | 67 ++++
.../occamlab/te/earl/lib/js/shBrushJScript.js | 52 +++
.../occamlab/te/earl/lib/js/shBrushJava.js | 57 +++
.../occamlab/te/earl/lib/js/shBrushJavaFX.js | 58 +++
.../occamlab/te/earl/lib/js/shBrushPerl.js | 72 ++++
.../com/occamlab/te/earl/lib/js/shBrushPhp.js | 88 +++++
.../occamlab/te/earl/lib/js/shBrushPlain.js | 33 ++
.../te/earl/lib/js/shBrushPowerShell.js | 74 ++++
.../occamlab/te/earl/lib/js/shBrushPython.js | 64 ++++
.../occamlab/te/earl/lib/js/shBrushRuby.js | 55 +++
.../occamlab/te/earl/lib/js/shBrushSass.js | 94 +++++
.../occamlab/te/earl/lib/js/shBrushScala.js | 51 +++
.../com/occamlab/te/earl/lib/js/shBrushSql.js | 66 ++++
.../com/occamlab/te/earl/lib/js/shBrushVb.js | 56 +++
.../com/occamlab/te/earl/lib/js/shBrushXml.js | 69 ++++
.../com/occamlab/te/earl/lib/js/shCore.js | 17 +
.../com/occamlab/te/earl/lib/js/shLegacy.js | 17 +
.../occamlab/te/earl/lib/styles/shCore.css | 226 ++++++++++++
.../te/earl/lib/styles/shCoreDefault.css | 328 +++++++++++++++++
.../te/earl/lib/styles/shCoreDjango.css | 331 +++++++++++++++++
.../te/earl/lib/styles/shCoreEclipse.css | 339 ++++++++++++++++++
.../te/earl/lib/styles/shCoreEmacs.css | 324 +++++++++++++++++
.../te/earl/lib/styles/shCoreFadeToGrey.css | 328 +++++++++++++++++
.../te/earl/lib/styles/shCoreMDUltra.css | 324 +++++++++++++++++
.../te/earl/lib/styles/shCoreMidnight.css | 324 +++++++++++++++++
.../te/earl/lib/styles/shCoreRDark.css | 324 +++++++++++++++++
.../te/earl/lib/styles/shThemeDefault.css | 117 ++++++
.../te/earl/lib/styles/shThemeDjango.css | 120 +++++++
.../te/earl/lib/styles/shThemeEclipse.css | 128 +++++++
.../te/earl/lib/styles/shThemeEmacs.css | 113 ++++++
.../te/earl/lib/styles/shThemeFadeToGrey.css | 117 ++++++
.../te/earl/lib/styles/shThemeMDUltra.css | 113 ++++++
.../te/earl/lib/styles/shThemeMidnight.css | 113 ++++++
.../te/earl/lib/styles/shThemeRDark.css | 113 ++++++
.../com/occamlab/te/earl_html_report.xsl | 172 ++++++---
.../com/occamlab/te/web/viewoldlog.xsl | 209 +++++++++++
.../src/main/webapp/viewOldSessionLog.jsp | 185 ++++++++++
.../src/main/webapp/viewSessionLog.jsp | 30 +-
52 files changed, 6050 insertions(+), 67 deletions(-)
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shAutoloader.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushAS3.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushAppleScript.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushBash.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCSharp.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushColdFusion.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCpp.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCss.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushDelphi.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushDiff.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushErlang.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushGroovy.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJScript.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJava.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJavaFX.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPerl.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPhp.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPlain.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPowerShell.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPython.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushRuby.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushSass.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushScala.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushSql.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushVb.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushXml.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shCore.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shLegacy.js
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shCore.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shCoreDefault.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shCoreDjango.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shCoreEclipse.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shCoreEmacs.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shCoreFadeToGrey.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shCoreMDUltra.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shCoreMidnight.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shCoreRDark.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shThemeDefault.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shThemeDjango.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shThemeEclipse.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shThemeEmacs.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shThemeFadeToGrey.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shThemeMDUltra.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shThemeMidnight.css
create mode 100644 teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/styles/shThemeRDark.css
create mode 100644 teamengine-web/src/main/resources/com/occamlab/te/web/viewoldlog.xsl
create mode 100644 teamengine-web/src/main/webapp/viewOldSessionLog.jsp
diff --git a/teamengine-core/pom.xml b/teamengine-core/pom.xml
index 66dddae82..8d631eac9 100644
--- a/teamengine-core/pom.xml
+++ b/teamengine-core/pom.xml
@@ -52,6 +52,11 @@
xml-resolver
1.2
+
+ commons-io
+ commons-io
+ 2.5
+
com.thaiopensource
jing
diff --git a/teamengine-core/src/main/java/com/occamlab/te/TECore.java b/teamengine-core/src/main/java/com/occamlab/te/TECore.java
index da661d775..4f3b34c0b 100644
--- a/teamengine-core/src/main/java/com/occamlab/te/TECore.java
+++ b/teamengine-core/src/main/java/com/occamlab/te/TECore.java
@@ -69,6 +69,7 @@
import javax.xml.transform.stream.StreamSource;
import javax.xml.XMLConstants; // Addition for Fortify modifications
+import org.apache.commons.io.FileUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Comment;
import org.w3c.dom.Comment;
@@ -332,7 +333,9 @@ public void execute() throws Exception {
// Create xml execution report file
LogUtils.createFullReportLog(opts.getLogDir().getAbsolutePath()
+ File.separator + opts.getSessionId());
-
+ System.out.println("Form Result: " + this.userInputs);
+
+
/*
* Transform CTL result into EARL result,
* when the CTL test is executed through the webapp.
@@ -2466,29 +2469,35 @@ public String getTestServletURL() {
public void setTestServletURL(String testServletURL) {
this.testServletURL = testServletURL;
}
-
+ /**
+ * Transform CTL result into EARL report using XSLT.
+ * @param outputDir
+ */
public void earlHtmlReport(String outputDir) {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ String resourceDir = cl.getResource("com/occamlab/te/earl/lib").getPath();
String earlXsl = cl.getResource("com/occamlab/te/earl_html_report.xsl").toString();
File earlResult = null;
File htmlOutput = null;
- File file = new File(outputDir);
+ File file = new File(outputDir + System.getProperty("file.separator") + "testng");
String[] dir = file.list();
- if(new File(outputDir, "earl-results.rdf").exists()){
- htmlOutput = new File(outputDir);
+ String outDir = null;
+ if(!file.exists()){
+ htmlOutput = new File(outputDir,"result");
earlResult = new File(outputDir, "earl-results.rdf");
- } else if (new File(outputDir + System.getProperty("file.separator") + dir[0]).isDirectory()) {
- String d = outputDir + System.getProperty("file.separator") + dir[0];
- htmlOutput = new File(outputDir);
- earlResult = new File(d, "earl-results.rdf");
+ } else if (new File(file + System.getProperty("file.separator") + dir[0]).isDirectory()) {
+ earlResult = new File(file + System.getProperty("file.separator") + dir[0], "earl-results.rdf");
+ outDir = file + System.getProperty("file.separator") + dir[0];
+ htmlOutput = new File(outputDir, "result");
}
try {
Transformer transformer = TransformerFactory.newInstance()
.newTransformer(new StreamSource(earlXsl));
-
+ transformer.setParameter("outputDir", htmlOutput);
transformer.transform(new StreamSource(earlResult),
- new StreamResult(new File(htmlOutput, "output.html")));
+ new StreamResult(new FileOutputStream("index.html")));
+ FileUtils.copyDirectory(new File(resourceDir), htmlOutput);
} catch (Exception e) {
System.out.println(e.getMessage() + e.getCause());
}
diff --git a/teamengine-resources/pom.xml b/teamengine-resources/pom.xml
index b04c701fa..c059ba521 100644
--- a/teamengine-resources/pom.xml
+++ b/teamengine-resources/pom.xml
@@ -32,6 +32,8 @@
**/*.xsl
**/*.ctl
**/*.xsd
+ **/*.js
+ **/*.css
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shAutoloader.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shAutoloader.js
new file mode 100644
index 000000000..4e29bddec
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shAutoloader.js
@@ -0,0 +1,17 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+eval(function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(2(){1 h=5;h.I=2(){2 n(c,a){4(1 d=0;d|<|≥|>=|≤|<=|\*|\+|-|\/|÷|\^)/g,
+ css: 'color2' },
+
+ { regex: /\b(?:and|as|div|mod|not|or|return(?!\s&)(ing)?|equals|(is(n't| not)? )?equal( to)?|does(n't| not) equal|(is(n't| not)? )?(greater|less) than( or equal( to)?)?|(comes|does(n't| not) come) (after|before)|is(n't| not)?( in)? (back|front) of|is(n't| not)? behind|is(n't| not)?( (in|contained by))?|does(n't| not) contain|contain(s)?|(start|begin|end)(s)? with|((but|end) )?(consider|ignor)ing|prop(erty)?|(a )?ref(erence)?( to)?|repeat (until|while|with)|((end|exit) )?repeat|((else|end) )?if|else|(end )?(script|tell|try)|(on )?error|(put )?into|(of )?(it|me)|its|my|with (timeout( of)?|transaction)|end (timeout|transaction))\b/g,
+ css: 'keyword' },
+
+ { regex: /\b\d+(st|nd|rd|th)\b/g, // ordinals
+ css: 'keyword' },
+
+ { regex: /\b(?:about|above|against|around|at|below|beneath|beside|between|by|(apart|aside) from|(instead|out) of|into|on(to)?|over|since|thr(ough|u)|under)\b/g,
+ css: 'color3' },
+
+ { regex: /\b(?:adding folder items to|after receiving|choose( ((remote )?application|color|folder|from list|URL))?|clipboard info|set the clipboard to|(the )?clipboard|entire contents|display(ing| (alert|dialog|mode))?|document( (edited|file|nib name))?|file( (name|type))?|(info )?for|giving up after|(name )?extension|quoted form|return(ed)?|second(?! item)(s)?|list (disks|folder)|text item(s| delimiters)?|(Unicode )?text|(disk )?item(s)?|((current|list) )?view|((container|key) )?window|with (data|icon( (caution|note|stop))?|parameter(s)?|prompt|properties|seed|title)|case|diacriticals|hyphens|numeric strings|punctuation|white space|folder creation|application(s( folder)?| (processes|scripts position|support))?|((desktop )?(pictures )?|(documents|downloads|favorites|home|keychain|library|movies|music|public|scripts|sites|system|users|utilities|workflows) )folder|desktop|Folder Action scripts|font(s| panel)?|help|internet plugins|modem scripts|(system )?preferences|printer descriptions|scripting (additions|components)|shared (documents|libraries)|startup (disk|items)|temporary items|trash|on server|in AppleTalk zone|((as|long|short) )?user name|user (ID|locale)|(with )?password|in (bundle( with identifier)?|directory)|(close|open for) access|read|write( permission)?|(g|s)et eof|using( delimiters)?|starting at|default (answer|button|color|country code|entr(y|ies)|identifiers|items|name|location|script editor)|hidden( answer)?|open(ed| (location|untitled))?|error (handling|reporting)|(do( shell)?|load|run|store) script|administrator privileges|altering line endings|get volume settings|(alert|boot|input|mount|output|set) volume|output muted|(fax|random )?number|round(ing)?|up|down|toward zero|to nearest|as taught in school|system (attribute|info)|((AppleScript( Studio)?|system) )?version|(home )?directory|(IPv4|primary Ethernet) address|CPU (type|speed)|physical memory|time (stamp|to GMT)|replacing|ASCII (character|number)|localized string|from table|offset|summarize|beep|delay|say|(empty|multiple) selections allowed|(of|preferred) type|invisibles|showing( package contents)?|editable URL|(File|FTP|News|Media|Web) [Ss]ervers|Telnet hosts|Directory services|Remote applications|waiting until completion|saving( (in|to))?|path (for|to( (((current|frontmost) )?application|resource))?)|POSIX (file|path)|(background|RGB) color|(OK|cancel) button name|cancel button|button(s)?|cubic ((centi)?met(re|er)s|yards|feet|inches)|square ((kilo)?met(re|er)s|miles|yards|feet)|(centi|kilo)?met(re|er)s|miles|yards|feet|inches|lit(re|er)s|gallons|quarts|(kilo)?grams|ounces|pounds|degrees (Celsius|Fahrenheit|Kelvin)|print( (dialog|settings))?|clos(e(able)?|ing)|(de)?miniaturized|miniaturizable|zoom(ed|able)|attribute run|action (method|property|title)|phone|email|((start|end)ing|home) page|((birth|creation|current|custom|modification) )?date|((((phonetic )?(first|last|middle))|computer|host|maiden|related) |nick)?name|aim|icq|jabber|msn|yahoo|address(es)?|save addressbook|should enable action|city|country( code)?|formatte(r|d address)|(palette )?label|state|street|zip|AIM [Hh]andle(s)?|my card|select(ion| all)?|unsaved|(alpha )?value|entr(y|ies)|group|(ICQ|Jabber|MSN) handle|person|people|company|department|icon image|job title|note|organization|suffix|vcard|url|copies|collating|pages (across|down)|request print time|target( printer)?|((GUI Scripting|Script menu) )?enabled|show Computer scripts|(de)?activated|awake from nib|became (key|main)|call method|of (class|object)|center|clicked toolbar item|closed|for document|exposed|(can )?hide|idle|keyboard (down|up)|event( (number|type))?|launch(ed)?|load (image|movie|nib|sound)|owner|log|mouse (down|dragged|entered|exited|moved|up)|move|column|localization|resource|script|register|drag (info|types)|resigned (active|key|main)|resiz(e(d)?|able)|right mouse (down|dragged|up)|scroll wheel|(at )?index|should (close|open( untitled)?|quit( after last window closed)?|zoom)|((proposed|screen) )?bounds|show(n)?|behind|in front of|size (mode|to fit)|update(d| toolbar item)?|was (hidden|miniaturized)|will (become active|close|finish launching|hide|miniaturize|move|open|quit|(resign )?active|((maximum|minimum|proposed) )?size|show|zoom)|bundle|data source|movie|pasteboard|sound|tool(bar| tip)|(color|open|save) panel|coordinate system|frontmost|main( (bundle|menu|window))?|((services|(excluded from )?windows) )?menu|((executable|frameworks|resource|scripts|shared (frameworks|support)) )?path|(selected item )?identifier|data|content(s| view)?|character(s)?|click count|(command|control|option|shift) key down|context|delta (x|y|z)|key( code)?|location|pressure|unmodified characters|types|(first )?responder|playing|(allowed|selectable) identifiers|allows customization|(auto saves )?configuration|visible|image( name)?|menu form representation|tag|user(-| )defaults|associated file name|(auto|needs) display|current field editor|floating|has (resize indicator|shadow)|hides when deactivated|level|minimized (image|title)|opaque|position|release when closed|sheet|title(d)?)\b/g,
+ css: 'color3' },
+
+ { regex: new RegExp(this.getKeywords(specials), 'gm'), css: 'color3' },
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' },
+ { regex: new RegExp(this.getKeywords(ordinals), 'gm'), css: 'keyword' }
+ ];
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['applescript'];
+
+ SyntaxHighlighter.brushes.AppleScript = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushBash.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushBash.js
new file mode 100644
index 000000000..8c296969f
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushBash.js
@@ -0,0 +1,59 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ var keywords = 'if fi then elif else for do done until while break continue case function return in eq ne ge le';
+ var commands = 'alias apropos awk basename bash bc bg builtin bzip2 cal cat cd cfdisk chgrp chmod chown chroot' +
+ 'cksum clear cmp comm command cp cron crontab csplit cut date dc dd ddrescue declare df ' +
+ 'diff diff3 dig dir dircolors dirname dirs du echo egrep eject enable env ethtool eval ' +
+ 'exec exit expand export expr false fdformat fdisk fg fgrep file find fmt fold format ' +
+ 'free fsck ftp gawk getopts grep groups gzip hash head history hostname id ifconfig ' +
+ 'import install join kill less let ln local locate logname logout look lpc lpr lprint ' +
+ 'lprintd lprintq lprm ls lsof make man mkdir mkfifo mkisofs mknod more mount mtools ' +
+ 'mv netstat nice nl nohup nslookup open op passwd paste pathchk ping popd pr printcap ' +
+ 'printenv printf ps pushd pwd quota quotacheck quotactl ram rcp read readonly renice ' +
+ 'remsync rm rmdir rsync screen scp sdiff sed select seq set sftp shift shopt shutdown ' +
+ 'sleep sort source split ssh strace su sudo sum symlink sync tail tar tee test time ' +
+ 'times touch top traceroute trap tr true tsort tty type ulimit umask umount unalias ' +
+ 'uname unexpand uniq units unset unshar useradd usermod users uuencode uudecode v vdir ' +
+ 'vi watch wc whereis which who whoami Wget xargs yes'
+ ;
+
+ this.regexList = [
+ { regex: /^#!.*$/gm, css: 'preprocessor bold' },
+ { regex: /\/[\w-\/]+/gm, css: 'plain' },
+ { regex: SyntaxHighlighter.regexLib.singleLinePerlComments, css: 'comments' }, // one line comments
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // double quoted strings
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // single quoted strings
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' }, // keywords
+ { regex: new RegExp(this.getKeywords(commands), 'gm'), css: 'functions' } // commands
+ ];
+ }
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['bash', 'shell'];
+
+ SyntaxHighlighter.brushes.Bash = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCSharp.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCSharp.js
new file mode 100644
index 000000000..079214efe
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCSharp.js
@@ -0,0 +1,65 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ var keywords = 'abstract as base bool break byte case catch char checked class const ' +
+ 'continue decimal default delegate do double else enum event explicit ' +
+ 'extern false finally fixed float for foreach get goto if implicit in int ' +
+ 'interface internal is lock long namespace new null object operator out ' +
+ 'override params private protected public readonly ref return sbyte sealed set ' +
+ 'short sizeof stackalloc static string struct switch this throw true try ' +
+ 'typeof uint ulong unchecked unsafe ushort using virtual void while';
+
+ function fixComments(match, regexInfo)
+ {
+ var css = (match[0].indexOf("///") == 0)
+ ? 'color1'
+ : 'comments'
+ ;
+
+ return [new SyntaxHighlighter.Match(match[0], match.index, css)];
+ }
+
+ this.regexList = [
+ { regex: SyntaxHighlighter.regexLib.singleLineCComments, func : fixComments }, // one line comments
+ { regex: SyntaxHighlighter.regexLib.multiLineCComments, css: 'comments' }, // multiline comments
+ { regex: /@"(?:[^"]|"")*"/g, css: 'string' }, // @-quoted strings
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // strings
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // strings
+ { regex: /^\s*#.*/gm, css: 'preprocessor' }, // preprocessor tags like #region and #endregion
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' }, // c# keyword
+ { regex: /\bpartial(?=\s+(?:class|interface|struct)\b)/g, css: 'keyword' }, // contextual keyword: 'partial'
+ { regex: /\byield(?=\s+(?:return|break)\b)/g, css: 'keyword' } // contextual keyword: 'yield'
+ ];
+
+ this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['c#', 'c-sharp', 'csharp'];
+
+ SyntaxHighlighter.brushes.CSharp = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
+
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushColdFusion.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushColdFusion.js
new file mode 100644
index 000000000..627dbb9b7
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushColdFusion.js
@@ -0,0 +1,100 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ // Contributed by Jen
+ // http://www.jensbits.com/2009/05/14/coldfusion-brush-for-syntaxhighlighter-plus
+
+ var funcs = 'Abs ACos AddSOAPRequestHeader AddSOAPResponseHeader AjaxLink AjaxOnLoad ArrayAppend ArrayAvg ArrayClear ArrayDeleteAt ' +
+ 'ArrayInsertAt ArrayIsDefined ArrayIsEmpty ArrayLen ArrayMax ArrayMin ArraySet ArraySort ArraySum ArraySwap ArrayToList ' +
+ 'Asc ASin Atn BinaryDecode BinaryEncode BitAnd BitMaskClear BitMaskRead BitMaskSet BitNot BitOr BitSHLN BitSHRN BitXor ' +
+ 'Ceiling CharsetDecode CharsetEncode Chr CJustify Compare CompareNoCase Cos CreateDate CreateDateTime CreateObject ' +
+ 'CreateODBCDate CreateODBCDateTime CreateODBCTime CreateTime CreateTimeSpan CreateUUID DateAdd DateCompare DateConvert ' +
+ 'DateDiff DateFormat DatePart Day DayOfWeek DayOfWeekAsString DayOfYear DaysInMonth DaysInYear DE DecimalFormat DecrementValue ' +
+ 'Decrypt DecryptBinary DeleteClientVariable DeserializeJSON DirectoryExists DollarFormat DotNetToCFType Duplicate Encrypt ' +
+ 'EncryptBinary Evaluate Exp ExpandPath FileClose FileCopy FileDelete FileExists FileIsEOF FileMove FileOpen FileRead ' +
+ 'FileReadBinary FileReadLine FileSetAccessMode FileSetAttribute FileSetLastModified FileWrite Find FindNoCase FindOneOf ' +
+ 'FirstDayOfMonth Fix FormatBaseN GenerateSecretKey GetAuthUser GetBaseTagData GetBaseTagList GetBaseTemplatePath ' +
+ 'GetClientVariablesList GetComponentMetaData GetContextRoot GetCurrentTemplatePath GetDirectoryFromPath GetEncoding ' +
+ 'GetException GetFileFromPath GetFileInfo GetFunctionList GetGatewayHelper GetHttpRequestData GetHttpTimeString ' +
+ 'GetK2ServerDocCount GetK2ServerDocCountLimit GetLocale GetLocaleDisplayName GetLocalHostIP GetMetaData GetMetricData ' +
+ 'GetPageContext GetPrinterInfo GetProfileSections GetProfileString GetReadableImageFormats GetSOAPRequest GetSOAPRequestHeader ' +
+ 'GetSOAPResponse GetSOAPResponseHeader GetTempDirectory GetTempFile GetTemplatePath GetTickCount GetTimeZoneInfo GetToken ' +
+ 'GetUserRoles GetWriteableImageFormats Hash Hour HTMLCodeFormat HTMLEditFormat IIf ImageAddBorder ImageBlur ImageClearRect ' +
+ 'ImageCopy ImageCrop ImageDrawArc ImageDrawBeveledRect ImageDrawCubicCurve ImageDrawLine ImageDrawLines ImageDrawOval ' +
+ 'ImageDrawPoint ImageDrawQuadraticCurve ImageDrawRect ImageDrawRoundRect ImageDrawText ImageFlip ImageGetBlob ImageGetBufferedImage ' +
+ 'ImageGetEXIFTag ImageGetHeight ImageGetIPTCTag ImageGetWidth ImageGrayscale ImageInfo ImageNegative ImageNew ImageOverlay ImagePaste ' +
+ 'ImageRead ImageReadBase64 ImageResize ImageRotate ImageRotateDrawingAxis ImageScaleToFit ImageSetAntialiasing ImageSetBackgroundColor ' +
+ 'ImageSetDrawingColor ImageSetDrawingStroke ImageSetDrawingTransparency ImageSharpen ImageShear ImageShearDrawingAxis ImageTranslate ' +
+ 'ImageTranslateDrawingAxis ImageWrite ImageWriteBase64 ImageXORDrawingMode IncrementValue InputBaseN Insert Int IsArray IsBinary ' +
+ 'IsBoolean IsCustomFunction IsDate IsDDX IsDebugMode IsDefined IsImage IsImageFile IsInstanceOf IsJSON IsLeapYear IsLocalHost ' +
+ 'IsNumeric IsNumericDate IsObject IsPDFFile IsPDFObject IsQuery IsSimpleValue IsSOAPRequest IsStruct IsUserInAnyRole IsUserInRole ' +
+ 'IsUserLoggedIn IsValid IsWDDX IsXML IsXmlAttribute IsXmlDoc IsXmlElem IsXmlNode IsXmlRoot JavaCast JSStringFormat LCase Left Len ' +
+ 'ListAppend ListChangeDelims ListContains ListContainsNoCase ListDeleteAt ListFind ListFindNoCase ListFirst ListGetAt ListInsertAt ' +
+ 'ListLast ListLen ListPrepend ListQualify ListRest ListSetAt ListSort ListToArray ListValueCount ListValueCountNoCase LJustify Log ' +
+ 'Log10 LSCurrencyFormat LSDateFormat LSEuroCurrencyFormat LSIsCurrency LSIsDate LSIsNumeric LSNumberFormat LSParseCurrency LSParseDateTime ' +
+ 'LSParseEuroCurrency LSParseNumber LSTimeFormat LTrim Max Mid Min Minute Month MonthAsString Now NumberFormat ParagraphFormat ParseDateTime ' +
+ 'Pi PrecisionEvaluate PreserveSingleQuotes Quarter QueryAddColumn QueryAddRow QueryConvertForGrid QueryNew QuerySetCell QuotedValueList Rand ' +
+ 'Randomize RandRange REFind REFindNoCase ReleaseComObject REMatch REMatchNoCase RemoveChars RepeatString Replace ReplaceList ReplaceNoCase ' +
+ 'REReplace REReplaceNoCase Reverse Right RJustify Round RTrim Second SendGatewayMessage SerializeJSON SetEncoding SetLocale SetProfileString ' +
+ 'SetVariable Sgn Sin Sleep SpanExcluding SpanIncluding Sqr StripCR StructAppend StructClear StructCopy StructCount StructDelete StructFind ' +
+ 'StructFindKey StructFindValue StructGet StructInsert StructIsEmpty StructKeyArray StructKeyExists StructKeyList StructKeyList StructNew ' +
+ 'StructSort StructUpdate Tan TimeFormat ToBase64 ToBinary ToScript ToString Trim UCase URLDecode URLEncodedFormat URLSessionFormat Val ' +
+ 'ValueList VerifyClient Week Wrap Wrap WriteOutput XmlChildPos XmlElemNew XmlFormat XmlGetNodeType XmlNew XmlParse XmlSearch XmlTransform ' +
+ 'XmlValidate Year YesNoFormat';
+
+ var keywords = 'cfabort cfajaximport cfajaxproxy cfapplet cfapplication cfargument cfassociate cfbreak cfcache cfcalendar ' +
+ 'cfcase cfcatch cfchart cfchartdata cfchartseries cfcol cfcollection cfcomponent cfcontent cfcookie cfdbinfo ' +
+ 'cfdefaultcase cfdirectory cfdiv cfdocument cfdocumentitem cfdocumentsection cfdump cfelse cfelseif cferror ' +
+ 'cfexchangecalendar cfexchangeconnection cfexchangecontact cfexchangefilter cfexchangemail cfexchangetask ' +
+ 'cfexecute cfexit cffeed cffile cfflush cfform cfformgroup cfformitem cfftp cffunction cfgrid cfgridcolumn ' +
+ 'cfgridrow cfgridupdate cfheader cfhtmlhead cfhttp cfhttpparam cfif cfimage cfimport cfinclude cfindex ' +
+ 'cfinput cfinsert cfinterface cfinvoke cfinvokeargument cflayout cflayoutarea cfldap cflocation cflock cflog ' +
+ 'cflogin cfloginuser cflogout cfloop cfmail cfmailparam cfmailpart cfmenu cfmenuitem cfmodule cfNTauthenticate ' +
+ 'cfobject cfobjectcache cfoutput cfparam cfpdf cfpdfform cfpdfformparam cfpdfparam cfpdfsubform cfpod cfpop ' +
+ 'cfpresentation cfpresentationslide cfpresenter cfprint cfprocessingdirective cfprocparam cfprocresult ' +
+ 'cfproperty cfquery cfqueryparam cfregistry cfreport cfreportparam cfrethrow cfreturn cfsavecontent cfschedule ' +
+ 'cfscript cfsearch cfselect cfset cfsetting cfsilent cfslider cfsprydataset cfstoredproc cfswitch cftable ' +
+ 'cftextarea cfthread cfthrow cftimer cftooltip cftrace cftransaction cftree cftreeitem cftry cfupdate cfwddx ' +
+ 'cfwindow cfxml cfzip cfzipparam';
+
+ var operators = 'all and any between cross in join like not null or outer some';
+
+ this.regexList = [
+ { regex: new RegExp('--(.*)$', 'gm'), css: 'comments' }, // one line and multiline comments
+ { regex: SyntaxHighlighter.regexLib.xmlComments, css: 'comments' }, // single quoted strings
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // double quoted strings
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // single quoted strings
+ { regex: new RegExp(this.getKeywords(funcs), 'gmi'), css: 'functions' }, // functions
+ { regex: new RegExp(this.getKeywords(operators), 'gmi'), css: 'color1' }, // operators and such
+ { regex: new RegExp(this.getKeywords(keywords), 'gmi'), css: 'keyword' } // keyword
+ ];
+ }
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['coldfusion','cf'];
+
+ SyntaxHighlighter.brushes.ColdFusion = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCpp.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCpp.js
new file mode 100644
index 000000000..9f70d3aed
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCpp.js
@@ -0,0 +1,97 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ // Copyright 2006 Shin, YoungJin
+
+ var datatypes = 'ATOM BOOL BOOLEAN BYTE CHAR COLORREF DWORD DWORDLONG DWORD_PTR ' +
+ 'DWORD32 DWORD64 FLOAT HACCEL HALF_PTR HANDLE HBITMAP HBRUSH ' +
+ 'HCOLORSPACE HCONV HCONVLIST HCURSOR HDC HDDEDATA HDESK HDROP HDWP ' +
+ 'HENHMETAFILE HFILE HFONT HGDIOBJ HGLOBAL HHOOK HICON HINSTANCE HKEY ' +
+ 'HKL HLOCAL HMENU HMETAFILE HMODULE HMONITOR HPALETTE HPEN HRESULT ' +
+ 'HRGN HRSRC HSZ HWINSTA HWND INT INT_PTR INT32 INT64 LANGID LCID LCTYPE ' +
+ 'LGRPID LONG LONGLONG LONG_PTR LONG32 LONG64 LPARAM LPBOOL LPBYTE LPCOLORREF ' +
+ 'LPCSTR LPCTSTR LPCVOID LPCWSTR LPDWORD LPHANDLE LPINT LPLONG LPSTR LPTSTR ' +
+ 'LPVOID LPWORD LPWSTR LRESULT PBOOL PBOOLEAN PBYTE PCHAR PCSTR PCTSTR PCWSTR ' +
+ 'PDWORDLONG PDWORD_PTR PDWORD32 PDWORD64 PFLOAT PHALF_PTR PHANDLE PHKEY PINT ' +
+ 'PINT_PTR PINT32 PINT64 PLCID PLONG PLONGLONG PLONG_PTR PLONG32 PLONG64 POINTER_32 ' +
+ 'POINTER_64 PSHORT PSIZE_T PSSIZE_T PSTR PTBYTE PTCHAR PTSTR PUCHAR PUHALF_PTR ' +
+ 'PUINT PUINT_PTR PUINT32 PUINT64 PULONG PULONGLONG PULONG_PTR PULONG32 PULONG64 ' +
+ 'PUSHORT PVOID PWCHAR PWORD PWSTR SC_HANDLE SC_LOCK SERVICE_STATUS_HANDLE SHORT ' +
+ 'SIZE_T SSIZE_T TBYTE TCHAR UCHAR UHALF_PTR UINT UINT_PTR UINT32 UINT64 ULONG ' +
+ 'ULONGLONG ULONG_PTR ULONG32 ULONG64 USHORT USN VOID WCHAR WORD WPARAM WPARAM WPARAM ' +
+ 'char bool short int __int32 __int64 __int8 __int16 long float double __wchar_t ' +
+ 'clock_t _complex _dev_t _diskfree_t div_t ldiv_t _exception _EXCEPTION_POINTERS ' +
+ 'FILE _finddata_t _finddatai64_t _wfinddata_t _wfinddatai64_t __finddata64_t ' +
+ '__wfinddata64_t _FPIEEE_RECORD fpos_t _HEAPINFO _HFILE lconv intptr_t ' +
+ 'jmp_buf mbstate_t _off_t _onexit_t _PNH ptrdiff_t _purecall_handler ' +
+ 'sig_atomic_t size_t _stat __stat64 _stati64 terminate_function ' +
+ 'time_t __time64_t _timeb __timeb64 tm uintptr_t _utimbuf ' +
+ 'va_list wchar_t wctrans_t wctype_t wint_t signed';
+
+ var keywords = 'break case catch class const __finally __exception __try ' +
+ 'const_cast continue private public protected __declspec ' +
+ 'default delete deprecated dllexport dllimport do dynamic_cast ' +
+ 'else enum explicit extern if for friend goto inline ' +
+ 'mutable naked namespace new noinline noreturn nothrow ' +
+ 'register reinterpret_cast return selectany ' +
+ 'sizeof static static_cast struct switch template this ' +
+ 'thread throw true false try typedef typeid typename union ' +
+ 'using uuid virtual void volatile whcar_t while';
+
+ var functions = 'assert isalnum isalpha iscntrl isdigit isgraph islower isprint' +
+ 'ispunct isspace isupper isxdigit tolower toupper errno localeconv ' +
+ 'setlocale acos asin atan atan2 ceil cos cosh exp fabs floor fmod ' +
+ 'frexp ldexp log log10 modf pow sin sinh sqrt tan tanh jmp_buf ' +
+ 'longjmp setjmp raise signal sig_atomic_t va_arg va_end va_start ' +
+ 'clearerr fclose feof ferror fflush fgetc fgetpos fgets fopen ' +
+ 'fprintf fputc fputs fread freopen fscanf fseek fsetpos ftell ' +
+ 'fwrite getc getchar gets perror printf putc putchar puts remove ' +
+ 'rename rewind scanf setbuf setvbuf sprintf sscanf tmpfile tmpnam ' +
+ 'ungetc vfprintf vprintf vsprintf abort abs atexit atof atoi atol ' +
+ 'bsearch calloc div exit free getenv labs ldiv malloc mblen mbstowcs ' +
+ 'mbtowc qsort rand realloc srand strtod strtol strtoul system ' +
+ 'wcstombs wctomb memchr memcmp memcpy memmove memset strcat strchr ' +
+ 'strcmp strcoll strcpy strcspn strerror strlen strncat strncmp ' +
+ 'strncpy strpbrk strrchr strspn strstr strtok strxfrm asctime ' +
+ 'clock ctime difftime gmtime localtime mktime strftime time';
+
+ this.regexList = [
+ { regex: SyntaxHighlighter.regexLib.singleLineCComments, css: 'comments' }, // one line comments
+ { regex: SyntaxHighlighter.regexLib.multiLineCComments, css: 'comments' }, // multiline comments
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // strings
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // strings
+ { regex: /^ *#.*/gm, css: 'preprocessor' },
+ { regex: new RegExp(this.getKeywords(datatypes), 'gm'), css: 'color1 bold' },
+ { regex: new RegExp(this.getKeywords(functions), 'gm'), css: 'functions bold' },
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword bold' }
+ ];
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['cpp', 'c'];
+
+ SyntaxHighlighter.brushes.Cpp = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCss.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCss.js
new file mode 100644
index 000000000..4297a9a64
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushCss.js
@@ -0,0 +1,91 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ function getKeywordsCSS(str)
+ {
+ return '\\b([a-z_]|)' + str.replace(/ /g, '(?=:)\\b|\\b([a-z_\\*]|\\*|)') + '(?=:)\\b';
+ };
+
+ function getValuesCSS(str)
+ {
+ return '\\b' + str.replace(/ /g, '(?!-)(?!:)\\b|\\b()') + '\:\\b';
+ };
+
+ var keywords = 'ascent azimuth background-attachment background-color background-image background-position ' +
+ 'background-repeat background baseline bbox border-collapse border-color border-spacing border-style border-top ' +
+ 'border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color ' +
+ 'border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width ' +
+ 'border-bottom-width border-left-width border-width border bottom cap-height caption-side centerline clear clip color ' +
+ 'content counter-increment counter-reset cue-after cue-before cue cursor definition-src descent direction display ' +
+ 'elevation empty-cells float font-size-adjust font-family font-size font-stretch font-style font-variant font-weight font ' +
+ 'height left letter-spacing line-height list-style-image list-style-position list-style-type list-style margin-top ' +
+ 'margin-right margin-bottom margin-left margin marker-offset marks mathline max-height max-width min-height min-width orphans ' +
+ 'outline-color outline-style outline-width outline overflow padding-top padding-right padding-bottom padding-left padding page ' +
+ 'page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position ' +
+ 'quotes right richness size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress ' +
+ 'table-layout text-align top text-decoration text-indent text-shadow text-transform unicode-bidi unicode-range units-per-em ' +
+ 'vertical-align visibility voice-family volume white-space widows width widths word-spacing x-height z-index';
+
+ var values = 'above absolute all always aqua armenian attr aural auto avoid baseline behind below bidi-override black blink block blue bold bolder '+
+ 'both bottom braille capitalize caption center center-left center-right circle close-quote code collapse compact condensed '+
+ 'continuous counter counters crop cross crosshair cursive dashed decimal decimal-leading-zero default digits disc dotted double '+
+ 'embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed format fuchsia '+
+ 'gray green groove handheld hebrew help hidden hide high higher icon inline-table inline inset inside invert italic '+
+ 'justify landscape large larger left-side left leftwards level lighter lime line-through list-item local loud lower-alpha '+
+ 'lowercase lower-greek lower-latin lower-roman lower low ltr marker maroon medium message-box middle mix move narrower '+
+ 'navy ne-resize no-close-quote none no-open-quote no-repeat normal nowrap n-resize nw-resize oblique olive once open-quote outset '+
+ 'outside overline pointer portrait pre print projection purple red relative repeat repeat-x repeat-y rgb ridge right right-side '+
+ 'rightwards rtl run-in screen scroll semi-condensed semi-expanded separate se-resize show silent silver slower slow '+
+ 'small small-caps small-caption smaller soft solid speech spell-out square s-resize static status-bar sub super sw-resize '+
+ 'table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group teal '+
+ 'text-bottom text-top thick thin top transparent tty tv ultra-condensed ultra-expanded underline upper-alpha uppercase upper-latin '+
+ 'upper-roman url visible wait white wider w-resize x-fast x-high x-large x-loud x-low x-slow x-small x-soft xx-large xx-small yellow';
+
+ var fonts = '[mM]onospace [tT]ahoma [vV]erdana [aA]rial [hH]elvetica [sS]ans-serif [sS]erif [cC]ourier mono sans serif';
+
+ this.regexList = [
+ { regex: SyntaxHighlighter.regexLib.multiLineCComments, css: 'comments' }, // multiline comments
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // double quoted strings
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // single quoted strings
+ { regex: /\#[a-fA-F0-9]{3,6}/g, css: 'value' }, // html colors
+ { regex: /(-?\d+)(\.\d+)?(px|em|pt|\:|\%|)/g, css: 'value' }, // sizes
+ { regex: /!important/g, css: 'color3' }, // !important
+ { regex: new RegExp(getKeywordsCSS(keywords), 'gm'), css: 'keyword' }, // keywords
+ { regex: new RegExp(getValuesCSS(values), 'g'), css: 'value' }, // values
+ { regex: new RegExp(this.getKeywords(fonts), 'g'), css: 'color1' } // fonts
+ ];
+
+ this.forHtmlScript({
+ left: /(<|<)\s*style.*?(>|>)/gi,
+ right: /(<|<)\/\s*style\s*(>|>)/gi
+ });
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['css'];
+
+ SyntaxHighlighter.brushes.CSS = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushDelphi.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushDelphi.js
new file mode 100644
index 000000000..e1060d446
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushDelphi.js
@@ -0,0 +1,55 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ var keywords = 'abs addr and ansichar ansistring array as asm begin boolean byte cardinal ' +
+ 'case char class comp const constructor currency destructor div do double ' +
+ 'downto else end except exports extended false file finalization finally ' +
+ 'for function goto if implementation in inherited int64 initialization ' +
+ 'integer interface is label library longint longword mod nil not object ' +
+ 'of on or packed pansichar pansistring pchar pcurrency pdatetime pextended ' +
+ 'pint64 pointer private procedure program property pshortstring pstring ' +
+ 'pvariant pwidechar pwidestring protected public published raise real real48 ' +
+ 'record repeat set shl shortint shortstring shr single smallint string then ' +
+ 'threadvar to true try type unit until uses val var varirnt while widechar ' +
+ 'widestring with word write writeln xor';
+
+ this.regexList = [
+ { regex: /\(\*[\s\S]*?\*\)/gm, css: 'comments' }, // multiline comments (* *)
+ { regex: /{(?!\$)[\s\S]*?}/gm, css: 'comments' }, // multiline comments { }
+ { regex: SyntaxHighlighter.regexLib.singleLineCComments, css: 'comments' }, // one line
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // strings
+ { regex: /\{\$[a-zA-Z]+ .+\}/g, css: 'color1' }, // compiler Directives and Region tags
+ { regex: /\b[\d\.]+\b/g, css: 'value' }, // numbers 12345
+ { regex: /\$[a-zA-Z0-9]+\b/g, css: 'value' }, // numbers $F5D3
+ { regex: new RegExp(this.getKeywords(keywords), 'gmi'), css: 'keyword' } // keyword
+ ];
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['delphi', 'pascal', 'pas'];
+
+ SyntaxHighlighter.brushes.Delphi = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushDiff.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushDiff.js
new file mode 100644
index 000000000..e9b14fc58
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushDiff.js
@@ -0,0 +1,41 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ this.regexList = [
+ { regex: /^\+\+\+.*$/gm, css: 'color2' },
+ { regex: /^\-\-\-.*$/gm, css: 'color2' },
+ { regex: /^\s.*$/gm, css: 'color1' },
+ { regex: /^@@.*@@$/gm, css: 'variable' },
+ { regex: /^\+[^\+]{1}.*$/gm, css: 'string' },
+ { regex: /^\-[^\-]{1}.*$/gm, css: 'comments' }
+ ];
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['diff', 'patch'];
+
+ SyntaxHighlighter.brushes.Diff = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushErlang.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushErlang.js
new file mode 100644
index 000000000..6ba7d9da8
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushErlang.js
@@ -0,0 +1,52 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ // Contributed by Jean-Lou Dupont
+ // http://jldupont.blogspot.com/2009/06/erlang-syntax-highlighter.html
+
+ // According to: http://erlang.org/doc/reference_manual/introduction.html#1.5
+ var keywords = 'after and andalso band begin bnot bor bsl bsr bxor '+
+ 'case catch cond div end fun if let not of or orelse '+
+ 'query receive rem try when xor'+
+ // additional
+ ' module export import define';
+
+ this.regexList = [
+ { regex: new RegExp("[A-Z][A-Za-z0-9_]+", 'g'), css: 'constants' },
+ { regex: new RegExp("\\%.+", 'gm'), css: 'comments' },
+ { regex: new RegExp("\\?[A-Za-z0-9_]+", 'g'), css: 'preprocessor' },
+ { regex: new RegExp("[a-z0-9_]+:[a-z0-9_]+", 'g'), css: 'functions' },
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' },
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' },
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' }
+ ];
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['erl', 'erlang'];
+
+ SyntaxHighlighter.brushes.Erland = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushGroovy.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushGroovy.js
new file mode 100644
index 000000000..6ec5c1852
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushGroovy.js
@@ -0,0 +1,67 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ // Contributed by Andres Almiray
+ // http://jroller.com/aalmiray/entry/nice_source_code_syntax_highlighter
+
+ var keywords = 'as assert break case catch class continue def default do else extends finally ' +
+ 'if in implements import instanceof interface new package property return switch ' +
+ 'throw throws try while public protected private static';
+ var types = 'void boolean byte char short int long float double';
+ var constants = 'null';
+ var methods = 'allProperties count get size '+
+ 'collect each eachProperty eachPropertyName eachWithIndex find findAll ' +
+ 'findIndexOf grep inject max min reverseEach sort ' +
+ 'asImmutable asSynchronized flatten intersect join pop reverse subMap toList ' +
+ 'padRight padLeft contains eachMatch toCharacter toLong toUrl tokenize ' +
+ 'eachFile eachFileRecurse eachB yte eachLine readBytes readLine getText ' +
+ 'splitEachLine withReader append encodeBase64 decodeBase64 filterLine ' +
+ 'transformChar transformLine withOutputStream withPrintWriter withStream ' +
+ 'withStreams withWriter withWriterAppend write writeLine '+
+ 'dump inspect invokeMethod print println step times upto use waitForOrKill '+
+ 'getText';
+
+ this.regexList = [
+ { regex: SyntaxHighlighter.regexLib.singleLineCComments, css: 'comments' }, // one line comments
+ { regex: SyntaxHighlighter.regexLib.multiLineCComments, css: 'comments' }, // multiline comments
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // strings
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // strings
+ { regex: /""".*"""/g, css: 'string' }, // GStrings
+ { regex: new RegExp('\\b([\\d]+(\\.[\\d]+)?|0x[a-f0-9]+)\\b', 'gi'), css: 'value' }, // numbers
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' }, // goovy keyword
+ { regex: new RegExp(this.getKeywords(types), 'gm'), css: 'color1' }, // goovy/java type
+ { regex: new RegExp(this.getKeywords(constants), 'gm'), css: 'constants' }, // constants
+ { regex: new RegExp(this.getKeywords(methods), 'gm'), css: 'functions' } // methods
+ ];
+
+ this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+ }
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['groovy'];
+
+ SyntaxHighlighter.brushes.Groovy = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJScript.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJScript.js
new file mode 100644
index 000000000..ff98daba1
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJScript.js
@@ -0,0 +1,52 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ var keywords = 'break case catch continue ' +
+ 'default delete do else false ' +
+ 'for function if in instanceof ' +
+ 'new null return super switch ' +
+ 'this throw true try typeof var while with'
+ ;
+
+ var r = SyntaxHighlighter.regexLib;
+
+ this.regexList = [
+ { regex: r.multiLineDoubleQuotedString, css: 'string' }, // double quoted strings
+ { regex: r.multiLineSingleQuotedString, css: 'string' }, // single quoted strings
+ { regex: r.singleLineCComments, css: 'comments' }, // one line comments
+ { regex: r.multiLineCComments, css: 'comments' }, // multiline comments
+ { regex: /\s*#.*/gm, css: 'preprocessor' }, // preprocessor tags like #region and #endregion
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' } // keywords
+ ];
+
+ this.forHtmlScript(r.scriptScriptTags);
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['js', 'jscript', 'javascript'];
+
+ SyntaxHighlighter.brushes.JScript = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJava.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJava.js
new file mode 100644
index 000000000..d692fd638
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJava.js
@@ -0,0 +1,57 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ var keywords = 'abstract assert boolean break byte case catch char class const ' +
+ 'continue default do double else enum extends ' +
+ 'false final finally float for goto if implements import ' +
+ 'instanceof int interface long native new null ' +
+ 'package private protected public return ' +
+ 'short static strictfp super switch synchronized this throw throws true ' +
+ 'transient try void volatile while';
+
+ this.regexList = [
+ { regex: SyntaxHighlighter.regexLib.singleLineCComments, css: 'comments' }, // one line comments
+ { regex: /\/\*([^\*][\s\S]*)?\*\//gm, css: 'comments' }, // multiline comments
+ { regex: /\/\*(?!\*\/)\*[\s\S]*?\*\//gm, css: 'preprocessor' }, // documentation comments
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // strings
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // strings
+ { regex: /\b([\d]+(\.[\d]+)?|0x[a-f0-9]+)\b/gi, css: 'value' }, // numbers
+ { regex: /(?!\@interface\b)\@[\$\w]+\b/g, css: 'color1' }, // annotation @anno
+ { regex: /\@interface\b/g, css: 'color2' }, // @interface keyword
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' } // java keyword
+ ];
+
+ this.forHtmlScript({
+ left : /(<|<)%[@!=]?/g,
+ right : /%(>|>)/g
+ });
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['java'];
+
+ SyntaxHighlighter.brushes.Java = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJavaFX.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJavaFX.js
new file mode 100644
index 000000000..1a150a6ad
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushJavaFX.js
@@ -0,0 +1,58 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ // Contributed by Patrick Webster
+ // http://patrickwebster.blogspot.com/2009/04/javafx-brush-for-syntaxhighlighter.html
+ var datatypes = 'Boolean Byte Character Double Duration '
+ + 'Float Integer Long Number Short String Void'
+ ;
+
+ var keywords = 'abstract after and as assert at before bind bound break catch class '
+ + 'continue def delete else exclusive extends false finally first for from '
+ + 'function if import in indexof init insert instanceof into inverse last '
+ + 'lazy mixin mod nativearray new not null on or override package postinit '
+ + 'protected public public-init public-read replace return reverse sizeof '
+ + 'step super then this throw true try tween typeof var where while with '
+ + 'attribute let private readonly static trigger'
+ ;
+
+ this.regexList = [
+ { regex: SyntaxHighlighter.regexLib.singleLineCComments, css: 'comments' },
+ { regex: SyntaxHighlighter.regexLib.multiLineCComments, css: 'comments' },
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' },
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' },
+ { regex: /(-?\.?)(\b(\d*\.?\d+|\d+\.?\d*)(e[+-]?\d+)?|0x[a-f\d]+)\b\.?/gi, css: 'color2' }, // numbers
+ { regex: new RegExp(this.getKeywords(datatypes), 'gm'), css: 'variable' }, // datatypes
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' }
+ ];
+ this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['jfx', 'javafx'];
+
+ SyntaxHighlighter.brushes.JavaFX = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPerl.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPerl.js
new file mode 100644
index 000000000..d94a2e0ec
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPerl.js
@@ -0,0 +1,72 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ // Contributed by David Simmons-Duffin and Marty Kube
+
+ var funcs =
+ 'abs accept alarm atan2 bind binmode chdir chmod chomp chop chown chr ' +
+ 'chroot close closedir connect cos crypt defined delete each endgrent ' +
+ 'endhostent endnetent endprotoent endpwent endservent eof exec exists ' +
+ 'exp fcntl fileno flock fork format formline getc getgrent getgrgid ' +
+ 'getgrnam gethostbyaddr gethostbyname gethostent getlogin getnetbyaddr ' +
+ 'getnetbyname getnetent getpeername getpgrp getppid getpriority ' +
+ 'getprotobyname getprotobynumber getprotoent getpwent getpwnam getpwuid ' +
+ 'getservbyname getservbyport getservent getsockname getsockopt glob ' +
+ 'gmtime grep hex index int ioctl join keys kill lc lcfirst length link ' +
+ 'listen localtime lock log lstat map mkdir msgctl msgget msgrcv msgsnd ' +
+ 'oct open opendir ord pack pipe pop pos print printf prototype push ' +
+ 'quotemeta rand read readdir readline readlink readpipe recv rename ' +
+ 'reset reverse rewinddir rindex rmdir scalar seek seekdir select semctl ' +
+ 'semget semop send setgrent sethostent setnetent setpgrp setpriority ' +
+ 'setprotoent setpwent setservent setsockopt shift shmctl shmget shmread ' +
+ 'shmwrite shutdown sin sleep socket socketpair sort splice split sprintf ' +
+ 'sqrt srand stat study substr symlink syscall sysopen sysread sysseek ' +
+ 'system syswrite tell telldir time times tr truncate uc ucfirst umask ' +
+ 'undef unlink unpack unshift utime values vec wait waitpid warn write';
+
+ var keywords =
+ 'bless caller continue dbmclose dbmopen die do dump else elsif eval exit ' +
+ 'for foreach goto if import last local my next no our package redo ref ' +
+ 'require return sub tie tied unless untie until use wantarray while';
+
+ this.regexList = [
+ { regex: new RegExp('#[^!].*$', 'gm'), css: 'comments' },
+ { regex: new RegExp('^\\s*#!.*$', 'gm'), css: 'preprocessor' }, // shebang
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' },
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' },
+ { regex: new RegExp('(\\$|@|%)\\w+', 'g'), css: 'variable' },
+ { regex: new RegExp(this.getKeywords(funcs), 'gmi'), css: 'functions' },
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' }
+ ];
+
+ this.forHtmlScript(SyntaxHighlighter.regexLib.phpScriptTags);
+ }
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['perl', 'Perl', 'pl'];
+
+ SyntaxHighlighter.brushes.Perl = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPhp.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPhp.js
new file mode 100644
index 000000000..95e6e4325
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPhp.js
@@ -0,0 +1,88 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ var funcs = 'abs acos acosh addcslashes addslashes ' +
+ 'array_change_key_case array_chunk array_combine array_count_values array_diff '+
+ 'array_diff_assoc array_diff_key array_diff_uassoc array_diff_ukey array_fill '+
+ 'array_filter array_flip array_intersect array_intersect_assoc array_intersect_key '+
+ 'array_intersect_uassoc array_intersect_ukey array_key_exists array_keys array_map '+
+ 'array_merge array_merge_recursive array_multisort array_pad array_pop array_product '+
+ 'array_push array_rand array_reduce array_reverse array_search array_shift '+
+ 'array_slice array_splice array_sum array_udiff array_udiff_assoc '+
+ 'array_udiff_uassoc array_uintersect array_uintersect_assoc '+
+ 'array_uintersect_uassoc array_unique array_unshift array_values array_walk '+
+ 'array_walk_recursive atan atan2 atanh base64_decode base64_encode base_convert '+
+ 'basename bcadd bccomp bcdiv bcmod bcmul bindec bindtextdomain bzclose bzcompress '+
+ 'bzdecompress bzerrno bzerror bzerrstr bzflush bzopen bzread bzwrite ceil chdir '+
+ 'checkdate checkdnsrr chgrp chmod chop chown chr chroot chunk_split class_exists '+
+ 'closedir closelog copy cos cosh count count_chars date decbin dechex decoct '+
+ 'deg2rad delete ebcdic2ascii echo empty end ereg ereg_replace eregi eregi_replace error_log '+
+ 'error_reporting escapeshellarg escapeshellcmd eval exec exit exp explode extension_loaded '+
+ 'feof fflush fgetc fgetcsv fgets fgetss file_exists file_get_contents file_put_contents '+
+ 'fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype '+
+ 'floatval flock floor flush fmod fnmatch fopen fpassthru fprintf fputcsv fputs fread fscanf '+
+ 'fseek fsockopen fstat ftell ftok getallheaders getcwd getdate getenv gethostbyaddr gethostbyname '+
+ 'gethostbynamel getimagesize getlastmod getmxrr getmygid getmyinode getmypid getmyuid getopt '+
+ 'getprotobyname getprotobynumber getrandmax getrusage getservbyname getservbyport gettext '+
+ 'gettimeofday gettype glob gmdate gmmktime ini_alter ini_get ini_get_all ini_restore ini_set '+
+ 'interface_exists intval ip2long is_a is_array is_bool is_callable is_dir is_double '+
+ 'is_executable is_file is_finite is_float is_infinite is_int is_integer is_link is_long '+
+ 'is_nan is_null is_numeric is_object is_readable is_real is_resource is_scalar is_soap_fault '+
+ 'is_string is_subclass_of is_uploaded_file is_writable is_writeable mkdir mktime nl2br '+
+ 'parse_ini_file parse_str parse_url passthru pathinfo print readlink realpath rewind rewinddir rmdir '+
+ 'round str_ireplace str_pad str_repeat str_replace str_rot13 str_shuffle str_split '+
+ 'str_word_count strcasecmp strchr strcmp strcoll strcspn strftime strip_tags stripcslashes '+
+ 'stripos stripslashes stristr strlen strnatcasecmp strnatcmp strncasecmp strncmp strpbrk '+
+ 'strpos strptime strrchr strrev strripos strrpos strspn strstr strtok strtolower strtotime '+
+ 'strtoupper strtr strval substr substr_compare';
+
+ var keywords = 'abstract and array as break case catch cfunction class clone const continue declare default die do ' +
+ 'else elseif enddeclare endfor endforeach endif endswitch endwhile extends final for foreach ' +
+ 'function include include_once global goto if implements interface instanceof namespace new ' +
+ 'old_function or private protected public return require require_once static switch ' +
+ 'throw try use var while xor ';
+
+ var constants = '__FILE__ __LINE__ __METHOD__ __FUNCTION__ __CLASS__';
+
+ this.regexList = [
+ { regex: SyntaxHighlighter.regexLib.singleLineCComments, css: 'comments' }, // one line comments
+ { regex: SyntaxHighlighter.regexLib.multiLineCComments, css: 'comments' }, // multiline comments
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // double quoted strings
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // single quoted strings
+ { regex: /\$\w+/g, css: 'variable' }, // variables
+ { regex: new RegExp(this.getKeywords(funcs), 'gmi'), css: 'functions' }, // common functions
+ { regex: new RegExp(this.getKeywords(constants), 'gmi'), css: 'constants' }, // constants
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' } // keyword
+ ];
+
+ this.forHtmlScript(SyntaxHighlighter.regexLib.phpScriptTags);
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['php'];
+
+ SyntaxHighlighter.brushes.Php = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPlain.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPlain.js
new file mode 100644
index 000000000..9f7d9e90c
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPlain.js
@@ -0,0 +1,33 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['text', 'plain'];
+
+ SyntaxHighlighter.brushes.Plain = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPowerShell.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPowerShell.js
new file mode 100644
index 000000000..0be175296
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPowerShell.js
@@ -0,0 +1,74 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ // Contributes by B.v.Zanten, Getronics
+ // http://confluence.atlassian.com/display/CONFEXT/New+Code+Macro
+
+ var keywords = 'Add-Content Add-History Add-Member Add-PSSnapin Clear(-Content)? Clear-Item ' +
+ 'Clear-ItemProperty Clear-Variable Compare-Object ConvertFrom-SecureString Convert-Path ' +
+ 'ConvertTo-Html ConvertTo-SecureString Copy(-Item)? Copy-ItemProperty Export-Alias ' +
+ 'Export-Clixml Export-Console Export-Csv ForEach(-Object)? Format-Custom Format-List ' +
+ 'Format-Table Format-Wide Get-Acl Get-Alias Get-AuthenticodeSignature Get-ChildItem Get-Command ' +
+ 'Get-Content Get-Credential Get-Culture Get-Date Get-EventLog Get-ExecutionPolicy ' +
+ 'Get-Help Get-History Get-Host Get-Item Get-ItemProperty Get-Location Get-Member ' +
+ 'Get-PfxCertificate Get-Process Get-PSDrive Get-PSProvider Get-PSSnapin Get-Service ' +
+ 'Get-TraceSource Get-UICulture Get-Unique Get-Variable Get-WmiObject Group-Object ' +
+ 'Import-Alias Import-Clixml Import-Csv Invoke-Expression Invoke-History Invoke-Item ' +
+ 'Join-Path Measure-Command Measure-Object Move(-Item)? Move-ItemProperty New-Alias ' +
+ 'New-Item New-ItemProperty New-Object New-PSDrive New-Service New-TimeSpan ' +
+ 'New-Variable Out-Default Out-File Out-Host Out-Null Out-Printer Out-String Pop-Location ' +
+ 'Push-Location Read-Host Remove-Item Remove-ItemProperty Remove-PSDrive Remove-PSSnapin ' +
+ 'Remove-Variable Rename-Item Rename-ItemProperty Resolve-Path Restart-Service Resume-Service ' +
+ 'Select-Object Select-String Set-Acl Set-Alias Set-AuthenticodeSignature Set-Content ' +
+ 'Set-Date Set-ExecutionPolicy Set-Item Set-ItemProperty Set-Location Set-PSDebug ' +
+ 'Set-Service Set-TraceSource Set(-Variable)? Sort-Object Split-Path Start-Service ' +
+ 'Start-Sleep Start-Transcript Stop-Process Stop-Service Stop-Transcript Suspend-Service ' +
+ 'Tee-Object Test-Path Trace-Command Update-FormatData Update-TypeData Where(-Object)? ' +
+ 'Write-Debug Write-Error Write(-Host)? Write-Output Write-Progress Write-Verbose Write-Warning';
+ var alias = 'ac asnp clc cli clp clv cpi cpp cvpa diff epal epcsv fc fl ' +
+ 'ft fw gal gc gci gcm gdr ghy gi gl gm gp gps group gsv ' +
+ 'gsnp gu gv gwmi iex ihy ii ipal ipcsv mi mp nal ndr ni nv oh rdr ' +
+ 'ri rni rnp rp rsnp rv rvpa sal sasv sc select si sl sleep sort sp ' +
+ 'spps spsv sv tee cat cd cp h history kill lp ls ' +
+ 'mount mv popd ps pushd pwd r rm rmdir echo cls chdir del dir ' +
+ 'erase rd ren type % \\?';
+
+ this.regexList = [
+ { regex: /#.*$/gm, css: 'comments' }, // one line comments
+ { regex: /\$[a-zA-Z0-9]+\b/g, css: 'value' }, // variables $Computer1
+ { regex: /\-[a-zA-Z]+\b/g, css: 'keyword' }, // Operators -not -and -eq
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // strings
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // strings
+ { regex: new RegExp(this.getKeywords(keywords), 'gmi'), css: 'keyword' },
+ { regex: new RegExp(this.getKeywords(alias), 'gmi'), css: 'keyword' }
+ ];
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['powershell', 'ps'];
+
+ SyntaxHighlighter.brushes.PowerShell = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPython.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPython.js
new file mode 100644
index 000000000..ce7746297
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushPython.js
@@ -0,0 +1,64 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ // Contributed by Gheorghe Milas and Ahmad Sherif
+
+ var keywords = 'and assert break class continue def del elif else ' +
+ 'except exec finally for from global if import in is ' +
+ 'lambda not or pass print raise return try yield while';
+
+ var funcs = '__import__ abs all any apply basestring bin bool buffer callable ' +
+ 'chr classmethod cmp coerce compile complex delattr dict dir ' +
+ 'divmod enumerate eval execfile file filter float format frozenset ' +
+ 'getattr globals hasattr hash help hex id input int intern ' +
+ 'isinstance issubclass iter len list locals long map max min next ' +
+ 'object oct open ord pow print property range raw_input reduce ' +
+ 'reload repr reversed round set setattr slice sorted staticmethod ' +
+ 'str sum super tuple type type unichr unicode vars xrange zip';
+
+ var special = 'None True False self cls class_';
+
+ this.regexList = [
+ { regex: SyntaxHighlighter.regexLib.singleLinePerlComments, css: 'comments' },
+ { regex: /^\s*@\w+/gm, css: 'decorator' },
+ { regex: /(['\"]{3})([^\1])*?\1/gm, css: 'comments' },
+ { regex: /"(?!")(?:\.|\\\"|[^\""\n])*"/gm, css: 'string' },
+ { regex: /'(?!')(?:\.|(\\\')|[^\''\n])*'/gm, css: 'string' },
+ { regex: /\+|\-|\*|\/|\%|=|==/gm, css: 'keyword' },
+ { regex: /\b\d+\.?\w*/g, css: 'value' },
+ { regex: new RegExp(this.getKeywords(funcs), 'gmi'), css: 'functions' },
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' },
+ { regex: new RegExp(this.getKeywords(special), 'gm'), css: 'color1' }
+ ];
+
+ this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['py', 'python'];
+
+ SyntaxHighlighter.brushes.Python = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushRuby.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushRuby.js
new file mode 100644
index 000000000..ff82130a7
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushRuby.js
@@ -0,0 +1,55 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ // Contributed by Erik Peterson.
+
+ var keywords = 'alias and BEGIN begin break case class def define_method defined do each else elsif ' +
+ 'END end ensure false for if in module new next nil not or raise redo rescue retry return ' +
+ 'self super then throw true undef unless until when while yield';
+
+ var builtins = 'Array Bignum Binding Class Continuation Dir Exception FalseClass File::Stat File Fixnum Fload ' +
+ 'Hash Integer IO MatchData Method Module NilClass Numeric Object Proc Range Regexp String Struct::TMS Symbol ' +
+ 'ThreadGroup Thread Time TrueClass';
+
+ this.regexList = [
+ { regex: SyntaxHighlighter.regexLib.singleLinePerlComments, css: 'comments' }, // one line comments
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // double quoted strings
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // single quoted strings
+ { regex: /\b[A-Z0-9_]+\b/g, css: 'constants' }, // constants
+ { regex: /:[a-z][A-Za-z0-9_]*/g, css: 'color2' }, // symbols
+ { regex: /(\$|@@|@)\w+/g, css: 'variable bold' }, // $global, @instance, and @@class variables
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' }, // keywords
+ { regex: new RegExp(this.getKeywords(builtins), 'gm'), css: 'color1' } // builtins
+ ];
+
+ this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['ruby', 'rails', 'ror', 'rb'];
+
+ SyntaxHighlighter.brushes.Ruby = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushSass.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushSass.js
new file mode 100644
index 000000000..aa04da099
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushSass.js
@@ -0,0 +1,94 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ function getKeywordsCSS(str)
+ {
+ return '\\b([a-z_]|)' + str.replace(/ /g, '(?=:)\\b|\\b([a-z_\\*]|\\*|)') + '(?=:)\\b';
+ };
+
+ function getValuesCSS(str)
+ {
+ return '\\b' + str.replace(/ /g, '(?!-)(?!:)\\b|\\b()') + '\:\\b';
+ };
+
+ var keywords = 'ascent azimuth background-attachment background-color background-image background-position ' +
+ 'background-repeat background baseline bbox border-collapse border-color border-spacing border-style border-top ' +
+ 'border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color ' +
+ 'border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width ' +
+ 'border-bottom-width border-left-width border-width border bottom cap-height caption-side centerline clear clip color ' +
+ 'content counter-increment counter-reset cue-after cue-before cue cursor definition-src descent direction display ' +
+ 'elevation empty-cells float font-size-adjust font-family font-size font-stretch font-style font-variant font-weight font ' +
+ 'height left letter-spacing line-height list-style-image list-style-position list-style-type list-style margin-top ' +
+ 'margin-right margin-bottom margin-left margin marker-offset marks mathline max-height max-width min-height min-width orphans ' +
+ 'outline-color outline-style outline-width outline overflow padding-top padding-right padding-bottom padding-left padding page ' +
+ 'page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position ' +
+ 'quotes right richness size slope src speak-header speak-numeral speak-punctuation speak speech-rate stemh stemv stress ' +
+ 'table-layout text-align top text-decoration text-indent text-shadow text-transform unicode-bidi unicode-range units-per-em ' +
+ 'vertical-align visibility voice-family volume white-space widows width widths word-spacing x-height z-index';
+
+ var values = 'above absolute all always aqua armenian attr aural auto avoid baseline behind below bidi-override black blink block blue bold bolder '+
+ 'both bottom braille capitalize caption center center-left center-right circle close-quote code collapse compact condensed '+
+ 'continuous counter counters crop cross crosshair cursive dashed decimal decimal-leading-zero digits disc dotted double '+
+ 'embed embossed e-resize expanded extra-condensed extra-expanded fantasy far-left far-right fast faster fixed format fuchsia '+
+ 'gray green groove handheld hebrew help hidden hide high higher icon inline-table inline inset inside invert italic '+
+ 'justify landscape large larger left-side left leftwards level lighter lime line-through list-item local loud lower-alpha '+
+ 'lowercase lower-greek lower-latin lower-roman lower low ltr marker maroon medium message-box middle mix move narrower '+
+ 'navy ne-resize no-close-quote none no-open-quote no-repeat normal nowrap n-resize nw-resize oblique olive once open-quote outset '+
+ 'outside overline pointer portrait pre print projection purple red relative repeat repeat-x repeat-y rgb ridge right right-side '+
+ 'rightwards rtl run-in screen scroll semi-condensed semi-expanded separate se-resize show silent silver slower slow '+
+ 'small small-caps small-caption smaller soft solid speech spell-out square s-resize static status-bar sub super sw-resize '+
+ 'table-caption table-cell table-column table-column-group table-footer-group table-header-group table-row table-row-group teal '+
+ 'text-bottom text-top thick thin top transparent tty tv ultra-condensed ultra-expanded underline upper-alpha uppercase upper-latin '+
+ 'upper-roman url visible wait white wider w-resize x-fast x-high x-large x-loud x-low x-slow x-small x-soft xx-large xx-small yellow';
+
+ var fonts = '[mM]onospace [tT]ahoma [vV]erdana [aA]rial [hH]elvetica [sS]ans-serif [sS]erif [cC]ourier mono sans serif';
+
+ var statements = '!important !default';
+ var preprocessor = '@import @extend @debug @warn @if @for @while @mixin @include';
+
+ var r = SyntaxHighlighter.regexLib;
+
+ this.regexList = [
+ { regex: r.multiLineCComments, css: 'comments' }, // multiline comments
+ { regex: r.singleLineCComments, css: 'comments' }, // singleline comments
+ { regex: r.doubleQuotedString, css: 'string' }, // double quoted strings
+ { regex: r.singleQuotedString, css: 'string' }, // single quoted strings
+ { regex: /\#[a-fA-F0-9]{3,6}/g, css: 'value' }, // html colors
+ { regex: /\b(-?\d+)(\.\d+)?(px|em|pt|\:|\%|)\b/g, css: 'value' }, // sizes
+ { regex: /\$\w+/g, css: 'variable' }, // variables
+ { regex: new RegExp(this.getKeywords(statements), 'g'), css: 'color3' }, // statements
+ { regex: new RegExp(this.getKeywords(preprocessor), 'g'), css: 'preprocessor' }, // preprocessor
+ { regex: new RegExp(getKeywordsCSS(keywords), 'gm'), css: 'keyword' }, // keywords
+ { regex: new RegExp(getValuesCSS(values), 'g'), css: 'value' }, // values
+ { regex: new RegExp(this.getKeywords(fonts), 'g'), css: 'color1' } // fonts
+ ];
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['sass', 'scss'];
+
+ SyntaxHighlighter.brushes.Sass = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushScala.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushScala.js
new file mode 100644
index 000000000..4b0b6f04d
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushScala.js
@@ -0,0 +1,51 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ // Contributed by Yegor Jbanov and David Bernard.
+
+ var keywords = 'val sealed case def true trait implicit forSome import match object null finally super ' +
+ 'override try lazy for var catch throw type extends class while with new final yield abstract ' +
+ 'else do if return protected private this package false';
+
+ var keyops = '[_:=><%#@]+';
+
+ this.regexList = [
+ { regex: SyntaxHighlighter.regexLib.singleLineCComments, css: 'comments' }, // one line comments
+ { regex: SyntaxHighlighter.regexLib.multiLineCComments, css: 'comments' }, // multiline comments
+ { regex: SyntaxHighlighter.regexLib.multiLineSingleQuotedString, css: 'string' }, // multi-line strings
+ { regex: SyntaxHighlighter.regexLib.multiLineDoubleQuotedString, css: 'string' }, // double-quoted string
+ { regex: SyntaxHighlighter.regexLib.singleQuotedString, css: 'string' }, // strings
+ { regex: /0x[a-f0-9]+|\d+(\.\d+)?/gi, css: 'value' }, // numbers
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' }, // keywords
+ { regex: new RegExp(keyops, 'gm'), css: 'keyword' } // scala keyword
+ ];
+ }
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['scala'];
+
+ SyntaxHighlighter.brushes.Scala = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushSql.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushSql.js
new file mode 100644
index 000000000..5c2cd8806
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushSql.js
@@ -0,0 +1,66 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ var funcs = 'abs avg case cast coalesce convert count current_timestamp ' +
+ 'current_user day isnull left lower month nullif replace right ' +
+ 'session_user space substring sum system_user upper user year';
+
+ var keywords = 'absolute action add after alter as asc at authorization begin bigint ' +
+ 'binary bit by cascade char character check checkpoint close collate ' +
+ 'column commit committed connect connection constraint contains continue ' +
+ 'create cube current current_date current_time cursor database date ' +
+ 'deallocate dec decimal declare default delete desc distinct double drop ' +
+ 'dynamic else end end-exec escape except exec execute false fetch first ' +
+ 'float for force foreign forward free from full function global goto grant ' +
+ 'group grouping having hour ignore index inner insensitive insert instead ' +
+ 'int integer intersect into is isolation key last level load local max min ' +
+ 'minute modify move name national nchar next no numeric of off on only ' +
+ 'open option order out output partial password precision prepare primary ' +
+ 'prior privileges procedure public read real references relative repeatable ' +
+ 'restrict return returns revoke rollback rollup rows rule schema scroll ' +
+ 'second section select sequence serializable set size smallint static ' +
+ 'statistics table temp temporary then time timestamp to top transaction ' +
+ 'translation trigger true truncate uncommitted union unique update values ' +
+ 'varchar varying view when where with work';
+
+ var operators = 'all and any between cross in join like not null or outer some';
+
+ this.regexList = [
+ { regex: /--(.*)$/gm, css: 'comments' }, // one line and multiline comments
+ { regex: SyntaxHighlighter.regexLib.multiLineDoubleQuotedString, css: 'string' }, // double quoted strings
+ { regex: SyntaxHighlighter.regexLib.multiLineSingleQuotedString, css: 'string' }, // single quoted strings
+ { regex: new RegExp(this.getKeywords(funcs), 'gmi'), css: 'color2' }, // functions
+ { regex: new RegExp(this.getKeywords(operators), 'gmi'), css: 'color1' }, // operators and such
+ { regex: new RegExp(this.getKeywords(keywords), 'gmi'), css: 'keyword' } // keyword
+ ];
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['sql'];
+
+ SyntaxHighlighter.brushes.Sql = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
+
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushVb.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushVb.js
new file mode 100644
index 000000000..be845dc0b
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushVb.js
@@ -0,0 +1,56 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ var keywords = 'AddHandler AddressOf AndAlso Alias And Ansi As Assembly Auto ' +
+ 'Boolean ByRef Byte ByVal Call Case Catch CBool CByte CChar CDate ' +
+ 'CDec CDbl Char CInt Class CLng CObj Const CShort CSng CStr CType ' +
+ 'Date Decimal Declare Default Delegate Dim DirectCast Do Double Each ' +
+ 'Else ElseIf End Enum Erase Error Event Exit False Finally For Friend ' +
+ 'Function Get GetType GoSub GoTo Handles If Implements Imports In ' +
+ 'Inherits Integer Interface Is Let Lib Like Long Loop Me Mod Module ' +
+ 'MustInherit MustOverride MyBase MyClass Namespace New Next Not Nothing ' +
+ 'NotInheritable NotOverridable Object On Option Optional Or OrElse ' +
+ 'Overloads Overridable Overrides ParamArray Preserve Private Property ' +
+ 'Protected Public RaiseEvent ReadOnly ReDim REM RemoveHandler Resume ' +
+ 'Return Select Set Shadows Shared Short Single Static Step Stop String ' +
+ 'Structure Sub SyncLock Then Throw To True Try TypeOf Unicode Until ' +
+ 'Variant When While With WithEvents WriteOnly Xor';
+
+ this.regexList = [
+ { regex: /'.*$/gm, css: 'comments' }, // one line comments
+ { regex: SyntaxHighlighter.regexLib.doubleQuotedString, css: 'string' }, // strings
+ { regex: /^\s*#.*$/gm, css: 'preprocessor' }, // preprocessor tags like #region and #endregion
+ { regex: new RegExp(this.getKeywords(keywords), 'gm'), css: 'keyword' } // vb keyword
+ ];
+
+ this.forHtmlScript(SyntaxHighlighter.regexLib.aspScriptTags);
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['vb', 'vbnet'];
+
+ SyntaxHighlighter.brushes.Vb = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushXml.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushXml.js
new file mode 100644
index 000000000..69d9fd0b1
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shBrushXml.js
@@ -0,0 +1,69 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+;(function()
+{
+ // CommonJS
+ typeof(require) != 'undefined' ? SyntaxHighlighter = require('shCore').SyntaxHighlighter : null;
+
+ function Brush()
+ {
+ function process(match, regexInfo)
+ {
+ var constructor = SyntaxHighlighter.Match,
+ code = match[0],
+ tag = new XRegExp('(<|<)[\\s\\/\\?]*(?[:\\w-\\.]+)', 'xg').exec(code),
+ result = []
+ ;
+
+ if (match.attributes != null)
+ {
+ var attributes,
+ regex = new XRegExp('(? [\\w:\\-\\.]+)' +
+ '\\s*=\\s*' +
+ '(? ".*?"|\'.*?\'|\\w+)',
+ 'xg');
+
+ while ((attributes = regex.exec(code)) != null)
+ {
+ result.push(new constructor(attributes.name, match.index + attributes.index, 'color1'));
+ result.push(new constructor(attributes.value, match.index + attributes.index + attributes[0].indexOf(attributes.value), 'string'));
+ }
+ }
+
+ if (tag != null)
+ result.push(
+ new constructor(tag.name, match.index + tag[0].indexOf(tag.name), 'keyword')
+ );
+
+ return result;
+ }
+
+ this.regexList = [
+ { regex: new XRegExp('(\\<|<)\\!\\[[\\w\\s]*?\\[(.|\\s)*?\\]\\](\\>|>)', 'gm'), css: 'color2' }, //
+ { regex: SyntaxHighlighter.regexLib.xmlComments, css: 'comments' }, //
+ { regex: new XRegExp('(<|<)[\\s\\/\\?]*(\\w+)(?.*?)[\\s\\/\\?]*(>|>)', 'sg'), func: process }
+ ];
+ };
+
+ Brush.prototype = new SyntaxHighlighter.Highlighter();
+ Brush.aliases = ['xml', 'xhtml', 'xslt', 'html'];
+
+ SyntaxHighlighter.brushes.Xml = Brush;
+
+ // CommonJS
+ typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
+})();
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shCore.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shCore.js
new file mode 100644
index 000000000..b47b64547
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shCore.js
@@ -0,0 +1,17 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+eval(function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('K M;I(M)1S 2U("2a\'t 4k M 4K 2g 3l 4G 4H");(6(){6 r(f,e){I(!M.1R(f))1S 3m("3s 15 4R");K a=f.1w;f=M(f.1m,t(f)+(e||""));I(a)f.1w={1m:a.1m,19:a.19?a.19.1a(0):N};H f}6 t(f){H(f.1J?"g":"")+(f.4s?"i":"")+(f.4p?"m":"")+(f.4v?"x":"")+(f.3n?"y":"")}6 B(f,e,a,b){K c=u.L,d,h,g;v=R;5K{O(;c--;){g=u[c];I(a&g.3r&&(!g.2p||g.2p.W(b))){g.2q.12=e;I((h=g.2q.X(f))&&h.P===e){d={3k:g.2b.W(b,h,a),1C:h};1N}}}}5v(i){1S i}5q{v=11}H d}6 p(f,e,a){I(3b.Z.1i)H f.1i(e,a);O(a=a||0;a-1},3d:6(g){e+=g}};c1&&p(e,"")>-1){a=15(J.1m,n.Q.W(t(J),"g",""));n.Q.W(f.1a(e.P),a,6(){O(K c=1;c<14.L-2;c++)I(14[c]===1d)e[c]=1d})}I(J.1w&&J.1w.19)O(K b=1;be.P&&J.12--}H e};I(!D)15.Z.1A=6(f){(f=n.X.W(J,f))&&J.1J&&!f[0].L&&J.12>f.P&&J.12--;H!!f};1r.Z.1C=6(f){M.1R(f)||(f=15(f));I(f.1J){K e=n.1C.1p(J,14);f.12=0;H e}H f.X(J)};1r.Z.Q=6(f,e){K a=M.1R(f),b,c;I(a&&1j e.58()==="3f"&&e.1i("${")===-1&&y)H n.Q.1p(J,14);I(a){I(f.1w)b=f.1w.19}Y f+="";I(1j e==="6")c=n.Q.W(J,f,6(){I(b){14[0]=1f 1r(14[0]);O(K d=0;dd.L-3;){i=1r.Z.1a.W(g,-1)+i;g=1Q.3i(g/10)}H(g?d[g]||"":"$")+i}Y{g=+i;I(g<=d.L-3)H d[g];g=b?p(b,i):-1;H g>-1?d[g+1]:h}})})}I(a&&f.1J)f.12=0;H c};1r.Z.1e=6(f,e){I(!M.1R(f))H n.1e.1p(J,14);K a=J+"",b=[],c=0,d,h;I(e===1d||+e<0)e=5D;Y{e=1Q.3i(+e);I(!e)H[]}O(f=M.3c(f);d=f.X(a);){I(f.12>c){b.U(a.1a(c,d.P));d.L>1&&d.P=e)1N}f.12===d.P&&f.12++}I(c===a.L){I(!n.1A.W(f,"")||h)b.U("")}Y b.U(a.1a(c));H b.L>e?b.1a(0,e):b};M.1h(/\\(\\?#[^)]*\\)/,6(f){H n.1A.W(A,f.2S.1a(f.P+f[0].L))?"":"(?:)"});M.1h(/\\((?!\\?)/,6(){J.19.U(N);H"("});M.1h(/\\(\\?<([$\\w]+)>/,6(f){J.19.U(f[1]);J.2N=R;H"("});M.1h(/\\\\k<([\\w$]+)>/,6(f){K e=p(J.19,f[1]);H e>-1?"\\\\"+(e+1)+(3R(f.2S.3a(f.P+f[0].L))?"":"(?:)"):f[0]});M.1h(/\\[\\^?]/,6(f){H f[0]==="[]"?"\\\\b\\\\B":"[\\\\s\\\\S]"});M.1h(/^\\(\\?([5A]+)\\)/,6(f){J.3d(f[1]);H""});M.1h(/(?:\\s+|#.*)+/,6(f){H n.1A.W(A,f.2S.1a(f.P+f[0].L))?"":"(?:)"},M.1B,6(){H J.2K("x")});M.1h(/\\./,6(){H"[\\\\s\\\\S]"},M.1B,6(){H J.2K("s")})})();1j 2e!="1d"&&(2e.M=M);K 1v=6(){6 r(a,b){a.1l.1i(b)!=-1||(a.1l+=" "+b)}6 t(a){H a.1i("3e")==0?a:"3e"+a}6 B(a){H e.1Y.2A[t(a)]}6 p(a,b,c){I(a==N)H N;K d=c!=R?a.3G:[a.2G],h={"#":"1c",".":"1l"}[b.1o(0,1)]||"3h",g,i;g=h!="3h"?b.1o(1):b.5u();I((a[h]||"").1i(g)!=-1)H a;O(a=0;d&&a\'+c+"17>"});H a}6 n(a,b){a.1e("\\n");O(K c="",d=0;d<50;d++)c+=" ";H a=v(a,6(h){I(h.1i("\\t")==-1)H h;O(K g=0;(g=h.1i("\\t"))!=-1;)h=h.1o(0,g)+c.1o(0,b-g%b)+h.1o(g+1,h.L);H h})}6 x(a){H a.Q(/^\\s+|\\s+$/g,"")}6 D(a,b){I(a.Pb.P)H 1;Y I(a.Lb.L)H 1;H 0}6 y(a,b){6 c(k){H k[0]}O(K d=N,h=[],g=b.2D?b.2D:c;(d=b.1I.X(a))!=N;){K i=g(d,b);I(1j i=="3f")i=[1f e.2L(i,d.P,b.23)];h=h.1O(i)}H h}6 E(a){K b=/(.*)((&1G;|&1y;).*)/;H a.Q(e.3A.3M,6(c){K d="",h=N;I(h=b.X(c)){c=h[1];d=h[2]}H\'\'+c+""+d})}6 z(){O(K a=1E.36("1k"),b=[],c=0;c<1z 4I="1Z://2y.3L.3K/4L/5L"><3J><4N 1Z-4M="5G-5M" 6K="2O/1z; 6J=6I-8" /><1t>6L 1v1t>3J><3B 1L="25-6M:6Q,6P,6O,6N-6F;6y-2f:#6x;2f:#6w;25-22:6v;2O-3D:3C;">1v3v 3.0.76 (72 73 3x)1Z://3u.2w/1v70 17 6U 71.6T 6X-3x 6Y 6D.6t 61 60 J 1k, 5Z 5R 5V <2R/>5U 5T 5S!3B>1z>\'}},1Y:{2j:N,2A:{}},1U:{},3A:{6n:/\\/\\*[\\s\\S]*?\\*\\//2c,6m:/\\/\\/.*$/2c,6l:/#.*$/2c,6k:/"([^\\\\"\\n]|\\\\.)*"/g,6o:/\'([^\\\\\'\\n]|\\\\.)*\'/g,6p:1f M(\'"([^\\\\\\\\"]|\\\\\\\\.)*"\',"3z"),6s:1f M("\'([^\\\\\\\\\']|\\\\\\\\.)*\'","3z"),6q:/(&1y;|<)!--[\\s\\S]*?--(&1G;|>)/2c,3M:/\\w+:\\/\\/[\\w-.\\/?%&=:@;]*/g,6a:{18:/(&1y;|<)\\?=?/g,1b:/\\?(&1G;|>)/g},69:{18:/(&1y;|<)%=?/g,1b:/%(&1G;|>)/g},6d:{18:/(&1y;|<)\\s*1k.*?(&1G;|>)/2T,1b:/(&1y;|<)\\/\\s*1k\\s*(&1G;|>)/2T}},16:{1H:6(a){6 b(i,k){H e.16.2o(i,k,e.13.1x[k])}O(K c=\'\',d=e.16.2x,h=d.2X,g=0;g";H c},2o:6(a,b,c){H\'<2W>\'+c+"2W>"},2b:6(a){K b=a.1F,c=b.1l||"";b=B(p(b,".20",R).1c);K d=6(h){H(h=15(h+"6f(\\\\w+)").X(c))?h[1]:N}("6g");b&&d&&e.16.2x[d].2B(b);a.3N()},2x:{2X:["21","2P"],21:{1H:6(a){I(a.V("2l")!=R)H"";K b=a.V("1t");H e.16.2o(a,"21",b?b:e.13.1x.21)},2B:6(a){a=1E.6j(t(a.1c));a.1l=a.1l.Q("47","")}},2P:{2B:6(){K a="68=0";a+=", 18="+(31.30-33)/2+", 32="+(31.2Z-2Y)/2+", 30=33, 2Z=2Y";a=a.Q(/^,/,"");a=1P.6Z("","38",a);a.2C();K b=a.1E;b.6W(e.13.1x.37);b.6V();a.2C()}}}},35:6(a,b){K c;I(b)c=[b];Y{c=1E.36(e.13.34);O(K d=[],h=0;h(.*?))\\\\]$"),s=1f M("(?<27>[\\\\w-]+)\\\\s*:\\\\s*(?<1T>[\\\\w-%#]+|\\\\[.*?\\\\]|\\".*?\\"|\'.*?\')\\\\s*;?","g");(j=s.X(k))!=N;){K o=j.1T.Q(/^[\'"]|[\'"]$/g,"");I(o!=N&&m.1A(o)){o=m.X(o);o=o.2V.L>0?o.2V.1e(/\\s*,\\s*/):[]}l[j.27]=o}g={1F:g,1n:C(i,l)};g.1n.1D!=N&&d.U(g)}H d},1M:6(a,b){K c=J.35(a,b),d=N,h=e.13;I(c.L!==0)O(K g=0;g")==o-3){m=m.4h(0,o-3);s=R}l=s?m:l}I((i.1t||"")!="")k.1t=i.1t;k.1D=j;d.2Q(k);b=d.2F(l);I((i.1c||"")!="")b.1c=i.1c;i.2G.74(b,i)}}},2E:6(a){w(1P,"4k",6(){e.1M(a)})}};e.2E=e.2E;e.1M=e.1M;e.2L=6(a,b,c){J.1T=a;J.P=b;J.L=a.L;J.23=c;J.1V=N};e.2L.Z.1q=6(){H J.1T};e.4l=6(a){6 b(j,l){O(K m=0;md)1N;Y I(g.P==c.P&&g.L>c.L)a[b]=N;Y I(g.P>=c.P&&g.P\'+c+""},3Q:6(a,b){K c="",d=a.1e("\\n").L,h=2u(J.V("2i-1s")),g=J.V("2z-1s-2t");I(g==R)g=(h+d-1).1q().L;Y I(3R(g)==R)g=0;O(K i=0;i\'+j+"17>":"")+i)}H a},4f:6(a){H a?"<4a>"+a+"4a>":""},4b:6(a,b){6 c(l){H(l=l?l.1V||g:g)?l+" ":""}O(K d=0,h="",g=J.V("1D",""),i=0;i|&1y;2R\\s*\\/?&1G;/2T;I(e.13.46==R)b=b.Q(h,"\\n");I(e.13.44==R)b=b.Q(h,"");b=b.1e("\\n");h=/^\\s*/;g=4Q;O(K i=0;i0;i++){K k=b[i];I(x(k).L!=0){k=h.X(k);I(k==N){a=a;1N a}g=1Q.4q(k[0].L,g)}}I(g>0)O(i=0;i\'+(J.V("16")?e.16.1H(J):"")+\'<3Z 5z="0" 5H="0" 5J="0">\'+J.4f(J.V("1t"))+"<3T><3P>"+(1u?\'<2d 1g="1u">\'+J.3Q(a)+"2d>":"")+\'<2d 1g="17">\'+b+"2d>3P>3T>3Z>"},2F:6(a){I(a===N)a="";J.17=a;K b=J.3Y("T");b.3X=J.1H(a);J.V("16")&&w(p(b,".16"),"5c",e.16.2b);J.V("3V-17")&&w(p(b,".17"),"56",f);H b},2Q:6(a){J.1c=""+1Q.5d(1Q.5n()*5k).1q();e.1Y.2A[t(J.1c)]=J;J.1n=C(e.2v,a||{});I(J.V("2k")==R)J.1n.16=J.1n.1u=11},5j:6(a){a=a.Q(/^\\s+|\\s+$/g,"").Q(/\\s+/g,"|");H"\\\\b(?:"+a+")\\\\b"},5f:6(a){J.28={18:{1I:a.18,23:"1k"},1b:{1I:a.1b,23:"1k"},17:1f M("(?<18>"+a.18.1m+")(?<17>.*?)(?<1b>"+a.1b.1m+")","5o")}}};H e}();1j 2e!="1d"&&(2e.1v=1v);',62,441,'||||||function|||||||||||||||||||||||||||||||||||||return|if|this|var|length|XRegExp|null|for|index|replace|true||div|push|getParam|call|exec|else|prototype||false|lastIndex|config|arguments|RegExp|toolbar|code|left|captureNames|slice|right|id|undefined|split|new|class|addToken|indexOf|typeof|script|className|source|params|substr|apply|toString|String|line|title|gutter|SyntaxHighlighter|_xregexp|strings|lt|html|test|OUTSIDE_CLASS|match|brush|document|target|gt|getHtml|regex|global|join|style|highlight|break|concat|window|Math|isRegExp|throw|value|brushes|brushName|space|alert|vars|http|syntaxhighlighter|expandSource|size|css|case|font|Fa|name|htmlScript|dA|can|handler|gm|td|exports|color|in|href|first|discoveredBrushes|light|collapse|object|cache|getButtonHtml|trigger|pattern|getLineHtml|nbsp|numbers|parseInt|defaults|com|items|www|pad|highlighters|execute|focus|func|all|getDiv|parentNode|navigator|INSIDE_CLASS|regexList|hasFlag|Match|useScriptTags|hasNamedCapture|text|help|init|br|input|gi|Error|values|span|list|250|height|width|screen|top|500|tagName|findElements|getElementsByTagName|aboutDialog|_blank|appendChild|charAt|Array|copyAsGlobal|setFlag|highlighter_|string|attachEvent|nodeName|floor|backref|output|the|TypeError|sticky|Za|iterate|freezeTokens|scope|type|textarea|alexgorbatchev|version|margin|2010|005896|gs|regexLib|body|center|align|noBrush|require|childNodes|DTD|xhtml1|head|org|w3|url|preventDefault|container|tr|getLineNumbersHtml|isNaN|userAgent|tbody|isLineHighlighted|quick|void|innerHTML|create|table|links|auto|smart|tab|stripBrs|tabs|bloggerMode|collapsed|plain|getCodeLinesHtml|caption|getMatchesHtml|findMatches|figureOutLineNumbers|removeNestedMatches|getTitleHtml|brushNotHtmlScript|substring|createElement|Highlighter|load|HtmlScript|Brush|pre|expand|multiline|min|Can|ignoreCase|find|blur|extended|toLowerCase|aliases|addEventListener|innerText|textContent|wasn|select|createTextNode|removeChild|option|same|frame|xmlns|dtd|twice|1999|equiv|meta|htmlscript|transitional|1E3|expected|PUBLIC|DOCTYPE|on|W3C|XHTML|TR|EN|Transitional||configured|srcElement|Object|after|run|dblclick|matchChain|valueOf|constructor|default|switch|click|round|execAt|forHtmlScript|token|gimy|functions|getKeywords|1E6|escape|within|random|sgi|another|finally|supply|MSIE|ie|toUpperCase|catch|returnValue|definition|event|border|imsx|constructing|one|Infinity|from|when|Content|cellpadding|flags|cellspacing|try|xhtml|Type|spaces|2930402|hosted_button_id|lastIndexOf|donate|active|development|keep|to|xclick|_s|Xml|please|like|you|paypal|cgi|cmd|webscr|bin|highlighted|scrollbars|aspScriptTags|phpScriptTags|sort|max|scriptScriptTags|toolbar_item|_|command|command_|number|getElementById|doubleQuotedString|singleLinePerlComments|singleLineCComments|multiLineCComments|singleQuotedString|multiLineDoubleQuotedString|xmlComments|alt|multiLineSingleQuotedString|If|https|1em|000|fff|background|5em|xx|bottom|75em|Gorbatchev|large|serif|CDATA|continue|utf|charset|content|About|family|sans|Helvetica|Arial|Geneva|3em|nogutter|Copyright|syntax|close|write|2004|Alex|open|JavaScript|highlighter|July|02|replaceChild|offset|83'.split('|'),0,{}))
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shLegacy.js b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shLegacy.js
new file mode 100644
index 000000000..6d9fd4d19
--- /dev/null
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl/lib/js/shLegacy.js
@@ -0,0 +1,17 @@
+/**
+ * SyntaxHighlighter
+ * http://alexgorbatchev.com/SyntaxHighlighter
+ *
+ * SyntaxHighlighter is donationware. If you are using it, please donate.
+ * http://alexgorbatchev.com/SyntaxHighlighter/donate.html
+ *
+ * @version
+ * 3.0.83 (July 02 2010)
+ *
+ * @copyright
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ *
+ * @license
+ * Dual licensed under the MIT and GPL licenses.
+ */
+eval(function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('3 u={8:{}};u.8={A:4(c,k,l,m,n,o){4 d(a,b){2 a!=1?a:b}4 f(a){2 a!=1?a.E():1}c=c.I(":");3 g=c[0],e={};t={"r":K};M=1;5=8.5;9(3 j R c)e[c[j]]="r";k=f(d(k,5.C));l=f(d(l,5.D));m=f(d(m,5.s));o=f(d(o,5.Q));n=f(d(n,5["x-y"]));2{P:g,C:d(t[e.O],k),D:d(t[e.N],l),s:d({"r":r}[e.s],m),"x-y":d(4(a,b){9(3 h=T S("^"+b+"\\\\[(?\\\\w+)\\\\]$","U"),i=1,p=0;p
-
+
+
@@ -46,18 +47,16 @@
Test INPUT:
-
+
-
- Resource:
-
- URI:
+
+ Resource:
+ URI:
-
-
+
Result:
- Number of conformance classes tested:
+ Number of conformance classes tested:
@@ -68,9 +67,9 @@
- Passed core(Can be certified):
- Number of conformance class passed:
- Number of conformance class failed:
+ Passed core(Can be certified):
+ Number of conformance class passed:
+ Number of conformance class failed:
@@ -214,6 +213,7 @@
+
@@ -232,7 +232,8 @@
-
+
+
@@ -248,14 +249,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
+
|
|
@@ -263,26 +274,36 @@
-
+
|
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
-
+
|
|
@@ -332,6 +353,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -350,7 +393,8 @@
-
+
+
@@ -365,28 +409,53 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
|
+
+
|
Test Name: |
-
+
|
-
+
Test Description: |
-
+
|
@@ -398,39 +467,50 @@
- Test Request: |
+ Inputs : |
- Request Method: |
+ Method: |
|
- Request URI: |
+ URI: |
|
- Request Response: |
+ Outputs : |
-
+
+
|
- Reason of failure: |
+ Reason of Failure: |
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
diff --git a/teamengine-web/src/main/resources/com/occamlab/te/web/viewoldlog.xsl b/teamengine-web/src/main/resources/com/occamlab/te/web/viewoldlog.xsl
new file mode 100644
index 000000000..406208932
--- /dev/null
+++ b/teamengine-web/src/main/resources/com/occamlab/te/web/viewoldlog.xsl
@@ -0,0 +1,209 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ -1
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ images/
+
+ fail
+ incomplete
+ inheritedFailure
+ warn
+ skipped
+ notTested
+ pass
+ continue
+ bestPractice
+
+ .png
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
(
+ View Details
+ ):
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -1
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+
+
+
+
+
+
+
+
+
+ Summary of results |
+
+
+
+ Best Practice |
+
+ Passed |
+
+ Continue |
+
+ Not Tested |
+
+ Warning |
+
+ Skipped |
+
+ Failed |
+
+ Failed (Inherited) |
+
+
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+
+
+
\ No newline at end of file
diff --git a/teamengine-web/src/main/webapp/viewOldSessionLog.jsp b/teamengine-web/src/main/webapp/viewOldSessionLog.jsp
new file mode 100644
index 000000000..e51bcbb33
--- /dev/null
+++ b/teamengine-web/src/main/webapp/viewOldSessionLog.jsp
@@ -0,0 +1,185 @@
+<%@ page
+ language="java"
+ session="false"
+ import="javax.xml.parsers.*, javax.xml.transform.*, javax.xml.transform.dom.*, javax.xml.transform.stream.*, java.io.Writer, java.io.File, java.util.*, com.occamlab.te.*, com.occamlab.te.index.*, com.occamlab.te.util.Misc, com.occamlab.te.web.*, net.sf.saxon.dom.DocumentBuilderImpl, net.sf.saxon.FeatureKeys, net.sf.saxon.Configuration"
+%><%!
+Config Conf;
+DocumentBuilderImpl DB;
+Templates ViewLogTemplates;
+public void jspInit() {
+ try {
+ Conf = new Config();
+ File stylesheet = Misc.getResourceAsFile("com/occamlab/te/web/viewlog.xsl");
+ ViewLogTemplates = ViewLog.transformerFactory.newTemplates(new StreamSource(stylesheet));
+ } catch (Exception e) {
+ e.printStackTrace(System.out);
+ }
+}
+%>
+
+<%@page import="java.net.URLEncoder"%>
+
+
+
+ Test Session Results
+
+
+
+ <%@ include file="header.jsp" %>
+ Results for session <%=request.getParameter("session")%>
+<%
+ File userlog = new File(Conf.getUsersDir(), request.getRemoteUser());
+ String sessionId = request.getParameter("session");
+ TestSession ts = new TestSession();
+ ts.load(userlog, sessionId);
+ String suiteName = "null";
+ String sourcesName = ts.getSourcesName();
+ SuiteEntry suiteEntry = null;
+ String sourceIdKey = "";
+ Map> profileInfos;
+ for(String key : Conf.getSuites().keySet()) {
+ String onlySourceName = sourcesName.substring(0,sourcesName.lastIndexOf("_"));
+ if(key.contains(onlySourceName)){
+ sourceIdKey = key;
+ suiteEntry = Conf.getSuites().get(key);
+ }
+ }
+ if (sourcesName == null) {
+ suiteName = "error: sourcesName is null";
+ } else {
+ SuiteEntry se = Conf.getSuites().get(sourcesName);
+ if (se == null) {
+ if(suiteEntry != null){
+ String title = suiteEntry.getTitle();
+ suiteName = (title == null) ? "error: suiteEntry title is null" : title;
+ } else {
+ suiteName = "error: suitEntry is null";
+ }
+ } else {
+ String title = se.getTitle();
+ suiteName = (title == null) ? "error: suiteEntry title is null" : title;
+ }
+ }
+ out.println("Test Suite: " + suiteName + "");
+ ArrayList tests = new ArrayList();
+ boolean complete = ViewLog.view_log(suiteName,userlog, sessionId, tests, ViewLogTemplates, out);
+ out.println(" ");
+ if (!complete) {
+ out.println("");
+ }
+ String profileParams = "";
+ String sourceId = "";
+ if (complete) {
+ int i = 0;
+
+ if(Conf.getProfiles().get(ts.getSourcesName()) == null){
+ sourceId = sourceIdKey;
+ } else {
+ sourceId = ts.getSourcesName();
+ }
+ for (ProfileEntry profile : Conf.getProfiles().get(sourceId)) {
+ out.println("Profile: " + profile.getTitle() + "");
+ if (ts.getProfiles().contains(profile.getId())) {
+ String path = sessionId + "/" + profile.getLocalName();
+ complete = ViewLog.view_log(suiteName,userlog, path, tests, ViewLogTemplates, out, (i+2));
+ out.println(" ");
+ profileParams += "&" + "profile_" + Integer.toString(i) + "=" + URLEncoder.encode(profile.getId(), "UTF-8");
+ i++;
+ }
+ }
+ }
+%>
+
+<%-- Insert link to TestNG report if it exists. --%>
+<%
+File userLog = new File(Conf.getUsersDir(), request.getRemoteUser());
+File htmlReportDir = new File(userLog, sessionId + System.getProperty("file.separator") + "html");
+if ( htmlReportDir.isDirectory()) {
+%>
+
+ See the detailed test report.
+
+<% } %>
+
+<%--
+ File userlog = new File(Conf.getUsersDir(), request.getRemoteUser());
+ String sessionId = request.getParameter("session");
+ ArrayList tests = new ArrayList();
+ boolean complete = ViewLog.view_log(userlog, sessionId, tests, ViewLogTemplates, out);
+ out.println(" ");
+ if (!complete) {
+ out.println("");
+ }
+--%>
+
+ <%=profileParams%>'"/>
+<%
+ boolean hasCache = ViewLog.hasCache();
+ if (hasCache) {
+ out.print( "");
+ }
+%>
+
+ '"/>
+
+<%-- '"/> --%>
+
+ Sessions list
+ <%@ include file="footer.jsp" %>
+
+
\ No newline at end of file
diff --git a/teamengine-web/src/main/webapp/viewSessionLog.jsp b/teamengine-web/src/main/webapp/viewSessionLog.jsp
index daca7e7c2..cc67e1fcc 100644
--- a/teamengine-web/src/main/webapp/viewSessionLog.jsp
+++ b/teamengine-web/src/main/webapp/viewSessionLog.jsp
@@ -89,6 +89,11 @@ public void jspInit() {
window.location = "deleteSession?session=<%=request.getParameter("session")%>"
}
}
+
+ function viewTestDetails(path){
+ var testDetailsUrl = path.substring(path.lastIndexOf("/") + 1, path.length);
+ window.location.replace("<%=request.getContextPath()%>"+ "/reports/" + "<%=request.getRemoteUser()%>" + "/" + "<%=request.getParameter("session")%>" +"/result/"+ testDetailsUrl);
+ }
@@ -162,23 +167,24 @@ public void jspInit() {
<%
File userLog = new File(Conf.getUsersDir(), request.getRemoteUser());
File htmlReportDir = new File(userLog, sessionId + System.getProperty("file.separator") + "html");
-String resultdir = userLog.toString() + System.getProperty("file.separator") + sessionId + System.getProperty("file.separator") + "testng";
-File resDir = new File(resultdir);
+String resultdir = userLog.toString() + System.getProperty("file.separator") + sessionId;
+File resDir = new File(resultdir + System.getProperty("file.separator") + "testng");
if(!resDir.exists()){
resDir = new File(userLog.toString() + System.getProperty("file.separator") + sessionId );
}
if(resDir.exists()){
-core.earlHtmlReport(resDir.toString());
-File earlHtml = new File(resDir + System.getProperty("file.separator") + "output.html");
-BufferedReader reader = new java.io.BufferedReader( new java.io.FileReader( earlHtml ) );
-String line = null;
-while ( null != ( line = reader.readLine() )) {
-out.write(line);
-}
-reader.close();
+core.earlHtmlReport(resultdir.toString());
+File earlHtml = new File(resultdir + System.getProperty("file.separator") + "result" + System.getProperty("file.separator") + "index.html");
+
}
/* if ( htmlReportDir.isDirectory()) { */
%>
+<%
+String testurl= "reports/" + request.getRemoteUser()+ "/" + request.getParameter("session") + "/result/index.html";
+%>
+
+
+
<%--
See the detailed test report.
--%>
@@ -190,6 +196,10 @@ reader.close();
--%>
<% /* } */ %>
+
+ See the detailed old test report.
+
+
<%--
File userlog = new File(Conf.getUsersDir(), request.getRemoteUser());
String sessionId = request.getParameter("session");
From ebb9654626a6f57337311856c5a01bc91905175c Mon Sep 17 00:00:00 2001
From: Keshav Nangare
Date: Fri, 21 Apr 2017 20:40:20 +0530
Subject: [PATCH 11/19] Updated the xsl file to view OldsessionLog
---
teamengine-web/src/main/webapp/viewOldSessionLog.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/teamengine-web/src/main/webapp/viewOldSessionLog.jsp b/teamengine-web/src/main/webapp/viewOldSessionLog.jsp
index e51bcbb33..46a567fd2 100644
--- a/teamengine-web/src/main/webapp/viewOldSessionLog.jsp
+++ b/teamengine-web/src/main/webapp/viewOldSessionLog.jsp
@@ -9,7 +9,7 @@ Templates ViewLogTemplates;
public void jspInit() {
try {
Conf = new Config();
- File stylesheet = Misc.getResourceAsFile("com/occamlab/te/web/viewlog.xsl");
+ File stylesheet = Misc.getResourceAsFile("com/occamlab/te/web/viewoldlog.xsl");
ViewLogTemplates = ViewLog.transformerFactory.newTemplates(new StreamSource(stylesheet));
} catch (Exception e) {
e.printStackTrace(System.out);
From f4b238023fc3447cf8123327fda4681aec760414 Mon Sep 17 00:00:00 2001
From: Keshav Nangare
Date: Tue, 25 Apr 2017 17:21:20 +0530
Subject: [PATCH 12/19] Updated the basic cc element name in earl reporter.
---
.../src/main/java/com/occamlab/te/spi/vocabulary/Config.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/vocabulary/Config.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/vocabulary/Config.java
index f6ad20fdc..d4bd8964d 100644
--- a/teamengine-spi/src/main/java/com/occamlab/te/spi/vocabulary/Config.java
+++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/vocabulary/Config.java
@@ -121,7 +121,7 @@ public Config() {
}
ArrayList ccList = new ArrayList(); // Conformance class list.
- Element conformanceClasses = getElementByTagName(suiteEl, "conformanceClasses");
+ Element conformanceClasses = getElementByTagName(suiteEl, "BasicConformanceClasses");
if(null != conformanceClasses){
for (Element ccElement : getChildElements(conformanceClasses)) {
From cf502abfb2d8fa61faa5765712ed3ca830eb4925 Mon Sep 17 00:00:00 2001
From: Keshav Nangare
Date: Wed, 10 May 2017 18:44:37 +0530
Subject: [PATCH 13/19] Updated the key and value of test inputs in tabular
form.
---
.../java/com/occamlab/te/CtlEarlReporter.java | 48 ++++++++--
.../src/main/java/com/occamlab/te/TECore.java | 12 +--
.../com/occamlab/te/earl_html_report.xsl | 87 +++++++++++++++++--
3 files changed, 129 insertions(+), 18 deletions(-)
diff --git a/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java b/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java
index 397a93db4..651a6a2c3 100644
--- a/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java
+++ b/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java
@@ -5,6 +5,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
+import java.io.StringReader;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
@@ -18,6 +19,7 @@
import java.util.TimeZone;
import java.util.regex.Pattern;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.OutputKeys;
@@ -36,6 +38,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import com.occamlab.te.spi.vocabulary.CITE;
@@ -523,12 +526,45 @@ void processResultAttributes(Resource earlResult, Element childlogElements, Mode
}
private void addTestInputs(Model earl, String params) {
- Bag inputs = earl.createBag();
-
- Resource testInput = earl.createResource(CONTENT.ContentAsXML);
- testInput.addProperty(DCTerms.description, params);
- inputs.add(testInput);
-
+ Bag inputs = earl.createBag();
+ DocumentBuilder docBuild;
+ Document inputDoc = null;
+ if(!params.equals("") && params != null){
+ try {
+ docBuild = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+
+ InputSource inputsrc = new InputSource();
+ inputsrc.setCharacterStream(new StringReader(params));
+
+ inputDoc = docBuild.parse(inputsrc);
+ } catch (ParserConfigurationException | SAXException | IOException e) {
+ e.printStackTrace();
+ }
+ NodeList valuesList = inputDoc.getElementsByTagName("values");
+ Element valuesElement = (Element) valuesList.item(0);
+ NodeList valueList = valuesElement.getElementsByTagName("value");
+ String value = "";
+ String key = "";
+
+ for (int i = 0; i < valueList.getLength(); i++) {
+ Element valueElement = (Element) valueList.item(i);
+ key = valueElement.getAttribute("key");
+ NodeList fileList = valueElement.getElementsByTagName("file-entry");
+
+ System.out.println("Element Name: " + valueElement.getNodeName());
+ if(fileList.getLength() > 0){
+ Element fileElement = (Element) fileList.item(0);
+ System.out.println("Key: " + valueElement.getAttribute("key"));
+ value = fileElement.getAttribute("full-path");
+ } else value = valueElement.getTextContent();
+
+ System.out.println("Key: " + valueElement.getAttribute("key")+ " ==> " + "Value: " + value);
+ Resource testInputs = earl.createResource();
+ testInputs.addProperty(DCTerms.title, key);
+ testInputs.addProperty(DCTerms.description, value);
+ inputs.add(testInputs);
+ }
+ }
this.testRun.addProperty(CITE.inputs, inputs);
}
diff --git a/teamengine-core/src/main/java/com/occamlab/te/TECore.java b/teamengine-core/src/main/java/com/occamlab/te/TECore.java
index 4f3b34c0b..ab5ec66c0 100644
--- a/teamengine-core/src/main/java/com/occamlab/te/TECore.java
+++ b/teamengine-core/src/main/java/com/occamlab/te/TECore.java
@@ -219,7 +219,7 @@ public class TECore implements Runnable {
public static String Clause = "";
public static String Purpose = "";
public static ArrayList rootTestName = new ArrayList();
- public String userInputs = "";
+ public static String userInputs = "";
public TECore() {
@@ -333,7 +333,7 @@ public void execute() throws Exception {
// Create xml execution report file
LogUtils.createFullReportLog(opts.getLogDir().getAbsolutePath()
+ File.separator + opts.getSessionId());
- System.out.println("Form Result: " + this.userInputs);
+ System.out.println("Form Result: " + userInputs);
/*
@@ -346,10 +346,10 @@ public void execute() throws Exception {
File testLog = new File(resultsDir, "report_logs.xml");
CtlEarlReporter report = new CtlEarlReporter();
- if (null != opts.getSuiteName()) {
+ if (null != opts.getSourcesName()) {
report.generateEarlReport(resultsDir, testLog,
- opts.getSuiteName(),
- this.userInputs);
+ opts.getSourcesName(),
+ userInputs);
}
} catch (IOException iox) {
throw new RuntimeException(
@@ -1345,7 +1345,7 @@ public void setFormResults(Document doc) {
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
transformer.transform(new DOMSource(doc), new StreamResult(sw));
- this.userInputs = sw.toString();
+ userInputs = sw.toString();
LOGR.info("Setting form results:\n " + sw.toString());
} catch(Exception e) {
LOGR.log(Level.SEVERE, "Failed to log the form results", e);
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
index 9ee04bf30..a4e8c0885 100644
--- a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
@@ -38,21 +38,61 @@
-
- Test Name:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Test Name:
+
+ Test version:
Time:
Test INPUT:
-
+
+
+
+
-
- Resource:
- URI:
+
Result:
@@ -527,4 +567,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From bdc2c87814c5883e2a1b9800e94f4c2d64f24893 Mon Sep 17 00:00:00 2001
From: Keshav Nangare
Date: Tue, 23 May 2017 16:14:14 +0530
Subject: [PATCH 14/19] Added the list of basic CC in HTML report.
---
.../resources/com/occamlab/te/earl_html_report.xsl | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
index a4e8c0885..7894af20f 100644
--- a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
@@ -17,6 +17,7 @@
+
@@ -76,6 +77,17 @@
Time:
+ Basic Conformance Classes:
+
+
Test INPUT:
From 48fb4ea3066ca02cc2fe64417eed873369e5576a Mon Sep 17 00:00:00 2001
From: Keshav Nangare
Date: Tue, 20 Jun 2017 16:24:43 +0530
Subject: [PATCH 15/19] Added conformance classes and updated test inputs with
correct indentation.
---
.../com/occamlab/te/earl_html_report.xsl | 23 +++++--------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
index 7894af20f..30d486e4a 100644
--- a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
@@ -78,29 +78,18 @@
Basic Conformance Classes:
-
+
Test INPUT:
-
-
-
+
+ :
+
From 4dacbae14f0a9d42d239629b7fe14a759bf9419e Mon Sep 17 00:00:00 2001
From: Keshav Nangare
Date: Thu, 27 Jul 2017 15:53:52 +0530
Subject: [PATCH 16/19] Added the total test count in report.
---
.../src/main/java/com/occamlab/te/TECore.java | 10 ++++----
.../com/occamlab/te/earl_html_report.xsl | 23 +++++++++++--------
2 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/teamengine-core/src/main/java/com/occamlab/te/TECore.java b/teamengine-core/src/main/java/com/occamlab/te/TECore.java
index ab5ec66c0..eeef43fcc 100644
--- a/teamengine-core/src/main/java/com/occamlab/te/TECore.java
+++ b/teamengine-core/src/main/java/com/occamlab/te/TECore.java
@@ -334,15 +334,16 @@ public void execute() throws Exception {
LogUtils.createFullReportLog(opts.getLogDir().getAbsolutePath()
+ File.separator + opts.getSessionId());
System.out.println("Form Result: " + userInputs);
-
-
+ File resultsDir = new File(opts.getLogDir(),
+ opts.getSessionId());
+ if (! new File(resultsDir, "testng").exists())
+ {
/*
* Transform CTL result into EARL result,
* when the CTL test is executed through the webapp.
*/
try {
- File resultsDir = new File(opts.getLogDir(),
- opts.getSessionId());
+
File testLog = new File(resultsDir, "report_logs.xml");
CtlEarlReporter report = new CtlEarlReporter();
@@ -356,6 +357,7 @@ public void execute() throws Exception {
"Failed to serialize EARL results to " + iox);
}
}
+ }
}
}
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
index 30d486e4a..357c63142 100644
--- a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
@@ -178,6 +178,16 @@
-->
+
+ Total tests:
+
+
+
+
+
+
+
+ |
@@ -187,9 +197,8 @@
-
+
-
@@ -210,7 +219,7 @@
-
+
@@ -222,13 +231,9 @@
-
-
-
-
-
+
+
From fe348ecdef412f7e8acf2109f7c04552cfe97989 Mon Sep 17 00:00:00 2001
From: Keshav Nangare
Date: Tue, 1 Aug 2017 18:50:46 +0530
Subject: [PATCH 17/19] Updated the earl file name in api.
---
.../com/occamlab/te/spi/executors/testng/TestNGExecutor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/TestNGExecutor.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/TestNGExecutor.java
index 20ddd7c5c..5a89ea553 100644
--- a/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/TestNGExecutor.java
+++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/TestNGExecutor.java
@@ -150,7 +150,7 @@ public Source execute(Document testRunArgs) {
File getResultsFile(String mediaType, String outputDirectory) throws FileNotFoundException {
// split out any media type parameters
String contentType = mediaType.split(";")[0];
- String fileName = (contentType.endsWith("rdf+xml")) ? "earl.rdf" : "testng-results.xml";
+ String fileName = (contentType.endsWith("rdf+xml")) ? "earl-results.rdf" : "testng-results.xml";
File resultsFile = new File(outputDirectory, fileName);
if (!resultsFile.exists()) {
throw new FileNotFoundException("Test run results not found at " + resultsFile.getAbsolutePath());
From 0d7db9cda49d6fd0961a9cd120ce0d914b0c39a4 Mon Sep 17 00:00:00 2001
From: Keshav Nangare
Date: Wed, 30 Aug 2017 19:30:07 +0530
Subject: [PATCH 18/19] Updated the REST API for TestNG and CTL test according
to #217
---
.../java/com/occamlab/te/CtlEarlReporter.java | 110 ++++++-----
.../src/main/java/com/occamlab/te/TECore.java | 46 ++++-
.../com/occamlab/te/spi/ctl/CtlExecutor.java | 93 ++++++++--
teamengine-spi/pom.xml | 5 +
.../spi/executors/testng/TestNGExecutor.java | 42 +++--
.../te/spi/jaxrs/resources/TestResultLog.java | 171 ++++++++++++++++++
.../spi/jaxrs/resources/TestRunResource.java | 2 +-
.../com/occamlab/te/spi/util/HtmlReport.java | 152 ++++++++++++++++
8 files changed, 534 insertions(+), 87 deletions(-)
create mode 100644 teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestResultLog.java
create mode 100644 teamengine-spi/src/main/java/com/occamlab/te/spi/util/HtmlReport.java
diff --git a/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java b/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java
index 651a6a2c3..b540911a3 100644
--- a/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java
+++ b/teamengine-core/src/main/java/com/occamlab/te/CtlEarlReporter.java
@@ -84,7 +84,7 @@ public CtlEarlReporter() {
totalInheritedFailureCount = 0;
}
- public void generateEarlReport(File outputDirectory, File reportFile, String suiteName, String iut) throws UnsupportedEncodingException {
+ public void generateEarlReport(File outputDirectory, File reportFile, String suiteName, Map params) throws UnsupportedEncodingException {
DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
docFactory.setNamespaceAware(true);
@@ -97,13 +97,13 @@ public void generateEarlReport(File outputDirectory, File reportFile, String sui
} catch (IOException | SAXException | ParserConfigurationException e) {
throw new RuntimeException(e);
}
-
+ String iut = "";
document.getDocumentElement().normalize();
// Here comes the root node
Element root = document.getDocumentElement();
Model model = initializeModel(suiteName, iut);
- addTestInputs(model, iut);
+ addTestInputs(model, params);
this.reqs = model.createSeq();
NodeList executionList = document.getElementsByTagName("execution");
@@ -169,13 +169,23 @@ public void getSubtestResult(Model model, NodeList testcallList, NodeList logLis
for (int j = 0; j < logList.getLength(); j++) {
Element logElements = (Element) logList.item(j);
- String decodedBaseURL = "";
-
- decodedBaseURL = java.net.URLDecoder.decode(logElements.getAttribute("xml:base"), "UTF-8");
- String baseUrl = decodedBaseURL.substring(decodedBaseURL.indexOf("users"));
- int first = baseUrl.indexOf(System.getProperty("file.separator"));
- int second = baseUrl.indexOf(System.getProperty("file.separator"), first + 1);
- String logtestcall = baseUrl.substring(second + 1, baseUrl.lastIndexOf(System.getProperty("file.separator")));
+ String baseUrl= "";
+ String logtestcall = "";
+ String decodedBaseURL = java.net.URLDecoder.decode(logElements.getAttribute("xml:base"), "UTF-8");
+
+ if (decodedBaseURL.contains("users")) {
+ baseUrl = decodedBaseURL.substring(decodedBaseURL.indexOf("users"));
+ int first = baseUrl.indexOf(System.getProperty("file.separator"));
+ int second = baseUrl.indexOf(System.getProperty("file.separator"),
+ first + 1);
+ logtestcall = baseUrl.substring(second + 1,
+ baseUrl.lastIndexOf(System.getProperty("file.separator")));
+ } else if (decodedBaseURL.contains("temp")) {
+ baseUrl = decodedBaseURL.substring(decodedBaseURL.indexOf("temp"));
+ logtestcall = baseUrl.substring(
+ baseUrl.indexOf(System.getProperty("file.separator")) + 1,
+ baseUrl.lastIndexOf(System.getProperty("file.separator")));
+ }
if(logtestcall.contains("\\")){
logtestcall = logtestcall.replace("\\", "/");
@@ -328,10 +338,21 @@ public void processTestResults(Model earl, Element logElements, NodeList logList
childlogElements = (Element) logList.item(m);
String decodedBaseURL = java.net.URLDecoder.decode(childlogElements.getAttribute("xml:base"), "UTF-8");
- String baseUrl = decodedBaseURL.substring(decodedBaseURL.indexOf("users"));
- int first = baseUrl.indexOf(System.getProperty("file.separator"));
- int second = baseUrl.indexOf(System.getProperty("file.separator"), first + 1);
- childLogtestcall = baseUrl.substring(second + 1, baseUrl.lastIndexOf(System.getProperty("file.separator")));
+ String baseUrl= "";
+
+ if (decodedBaseURL.contains("users")) {
+ baseUrl = decodedBaseURL.substring(decodedBaseURL.indexOf("users"));
+ int first = baseUrl.indexOf(System.getProperty("file.separator"));
+ int second = baseUrl.indexOf(System.getProperty("file.separator"),
+ first + 1);
+ childLogtestcall = baseUrl.substring(second + 1,
+ baseUrl.lastIndexOf(System.getProperty("file.separator")));
+ } else if (decodedBaseURL.contains("temp")) {
+ baseUrl = decodedBaseURL.substring(decodedBaseURL.indexOf("temp"));
+ childLogtestcall = baseUrl.substring(
+ baseUrl.indexOf(System.getProperty("file.separator")) + 1,
+ baseUrl.lastIndexOf(System.getProperty("file.separator")));
+ }
if(childLogtestcall.contains("\\")){
childLogtestcall = childLogtestcall.replace("\\", "/");
@@ -524,49 +545,26 @@ void processResultAttributes(Resource earlResult, Element childlogElements, Mode
earlResult.addProperty(CITE.message, httpReq);
}
}
-
- private void addTestInputs(Model earl, String params) {
- Bag inputs = earl.createBag();
- DocumentBuilder docBuild;
- Document inputDoc = null;
- if(!params.equals("") && params != null){
- try {
- docBuild = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-
- InputSource inputsrc = new InputSource();
- inputsrc.setCharacterStream(new StringReader(params));
-
- inputDoc = docBuild.parse(inputsrc);
- } catch (ParserConfigurationException | SAXException | IOException e) {
- e.printStackTrace();
+ /**
+ * This method is used to add test inputs in to earl report.
+ * @param earl Model object to add the result into it.
+ * @param params
+ * The variable is type of Map with all the user input.
+ */
+ private void addTestInputs(Model earl, Map params) {
+ Bag inputs = earl.createBag();
+ if (!params.equals("") && params != null) {
+ String value = "";
+ for (String key : params.keySet()) {
+ value = params.get(key);
+ Resource testInputs = earl.createResource();
+ testInputs.addProperty(DCTerms.title, key);
+ testInputs.addProperty(DCTerms.description, value);
+ inputs.add(testInputs);
+ }
}
- NodeList valuesList = inputDoc.getElementsByTagName("values");
- Element valuesElement = (Element) valuesList.item(0);
- NodeList valueList = valuesElement.getElementsByTagName("value");
- String value = "";
- String key = "";
-
- for (int i = 0; i < valueList.getLength(); i++) {
- Element valueElement = (Element) valueList.item(i);
- key = valueElement.getAttribute("key");
- NodeList fileList = valueElement.getElementsByTagName("file-entry");
-
- System.out.println("Element Name: " + valueElement.getNodeName());
- if(fileList.getLength() > 0){
- Element fileElement = (Element) fileList.item(0);
- System.out.println("Key: " + valueElement.getAttribute("key"));
- value = fileElement.getAttribute("full-path");
- } else value = valueElement.getTextContent();
-
- System.out.println("Key: " + valueElement.getAttribute("key")+ " ==> " + "Value: " + value);
- Resource testInputs = earl.createResource();
- testInputs.addProperty(DCTerms.title, key);
- testInputs.addProperty(DCTerms.description, value);
- inputs.add(testInputs);
- }
- }
- this.testRun.addProperty(CITE.inputs, inputs);
- }
+ this.testRun.addProperty(CITE.inputs, inputs);
+ }
/*
* Write CTL result into EARL report.
diff --git a/teamengine-core/src/main/java/com/occamlab/te/TECore.java b/teamengine-core/src/main/java/com/occamlab/te/TECore.java
index eeef43fcc..0806ecfa9 100644
--- a/teamengine-core/src/main/java/com/occamlab/te/TECore.java
+++ b/teamengine-core/src/main/java/com/occamlab/te/TECore.java
@@ -219,7 +219,7 @@ public class TECore implements Runnable {
public static String Clause = "";
public static String Purpose = "";
public static ArrayList rootTestName = new ArrayList();
- public static String userInputs = "";
+ public static Document userInputs = null;
public TECore() {
@@ -333,10 +333,12 @@ public void execute() throws Exception {
// Create xml execution report file
LogUtils.createFullReportLog(opts.getLogDir().getAbsolutePath()
+ File.separator + opts.getSessionId());
- System.out.println("Form Result: " + userInputs);
File resultsDir = new File(opts.getLogDir(),
opts.getSessionId());
- if (! new File(resultsDir, "testng").exists())
+ Map testInputMap = new HashMap();
+ testInputMap = extractTestInputs(userInputs, opts);
+
+ if (! new File(resultsDir, "testng").exists() && null != testInputMap)
{
/*
* Transform CTL result into EARL result,
@@ -350,7 +352,7 @@ public void execute() throws Exception {
if (null != opts.getSourcesName()) {
report.generateEarlReport(resultsDir, testLog,
opts.getSourcesName(),
- userInputs);
+ testInputMap);
}
} catch (IOException iox) {
throw new RuntimeException(
@@ -1347,7 +1349,9 @@ public void setFormResults(Document doc) {
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
transformer.transform(new DOMSource(doc), new StreamResult(sw));
- userInputs = sw.toString();
+ if(userInputs == null){
+ userInputs = doc;
+ }
LOGR.info("Setting form results:\n " + sw.toString());
} catch(Exception e) {
LOGR.log(Level.SEVERE, "Failed to log the form results", e);
@@ -2504,7 +2508,37 @@ public void earlHtmlReport(String outputDir) {
System.out.println(e.getMessage() + e.getCause());
}
}
-
+
+ /**
+ * This method is used to extract the test input into
+ * Map from the document element.
+ * @param userInput Document node
+ * @param runOpts
+ * @return User Input Map
+ */
+ private Map extractTestInputs(Document userInput,
+ RuntimeOptions runOpts) {
+ Map inputMap = new HashMap();
+ if (null != userInputs) {
+ NodeList values = userInputs.getDocumentElement()
+ .getElementsByTagName("value");
+ if (values.getLength() == 0) {
+ throw new IllegalArgumentException("No test inputs found.");
+ }
+ for (int i = 0; i < values.getLength(); i++) {
+ Element value = (Element) values.item(i);
+ inputMap.put(value.getAttribute("key"), value.getTextContent());
+ }
+ } else if (null != opts.getParams()) {
+ List runParams = opts.getParams();
+ for (String param : runParams) {
+ String[] kvp = param.split("=");
+ inputMap.put(kvp[0], kvp[1]);
+ }
+ }
+ return inputMap;
+ }
+
/**
* Builds a DOM Document representing a classpath resource.
*
diff --git a/teamengine-spi-ctl/src/main/java/com/occamlab/te/spi/ctl/CtlExecutor.java b/teamengine-spi-ctl/src/main/java/com/occamlab/te/spi/ctl/CtlExecutor.java
index eb32caf08..363ae6dc7 100644
--- a/teamengine-spi-ctl/src/main/java/com/occamlab/te/spi/ctl/CtlExecutor.java
+++ b/teamengine-spi-ctl/src/main/java/com/occamlab/te/spi/ctl/CtlExecutor.java
@@ -10,10 +10,18 @@
import com.occamlab.te.index.Index;
import com.occamlab.te.index.SuiteEntry;
import com.occamlab.te.spi.executors.TestRunExecutor;
+import com.occamlab.te.spi.util.HtmlReport;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -22,10 +30,11 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
-
+import javax.xml.transform.sax.SAXSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
@@ -34,7 +43,7 @@
public class CtlExecutor implements TestRunExecutor {
private final SetupOptions setupOpts;
- private String iut = null;
+ private Map testInputs = new HashMap();
/**
* Constructs a new CtlExecutor using the given set of configuration
@@ -88,7 +97,7 @@ public Source execute(Document testRunArgs) {
CtlEarlReporter report = new CtlEarlReporter();
try{
- report.generateEarlReport (resultsDir, testLog, suiteName, this.iut);
+ report.generateEarlReport (resultsDir, testLog, suiteName, this.testInputs);
} catch (IOException iox) {
throw new RuntimeException("Failed to serialize EARL results to " + resultsDir.getAbsolutePath(), iox);
}
@@ -99,9 +108,16 @@ public Source execute(Document testRunArgs) {
docFactory.setXIncludeAware(true);
Source results = null;
try {
- Document resultsDoc = docFactory.newDocumentBuilder().parse(testLog);
- results = new DOMSource(resultsDoc, testLog.toURI().toString());
- //results = new StreamSource(new FileInputStream(testLog), testLog.toURI().toString());
+ File resultsFile = getResultsFile(getPreferredMediaType(testRunArgs), resultsDir.toString());
+ if(getPreferredMediaType(testRunArgs).endsWith("zip")){
+ InputStream inStream = new FileInputStream(resultsFile);
+ InputSource inSource = new InputSource(new InputStreamReader(inStream, StandardCharsets.UTF_8));
+ results = new SAXSource(inSource);
+ results.setSystemId(resultsFile.toURI().toString());
+ } else {
+ Document resultsDoc = docFactory.newDocumentBuilder().parse(resultsFile);
+ results = new DOMSource(resultsDoc, resultsFile.toURI().toString());
+ }
} catch (IOException | SAXException | ParserConfigurationException e) {
throw new RuntimeException(e);
}
@@ -131,13 +147,68 @@ RuntimeOptions extractTestRunArguments(Document testRunArgs) {
Element entry = (Element) entries.item(i);
String kvp = String.format("%s=%s", entry.getAttribute("key"), entry.getTextContent().trim());
runOpts.addParam(kvp);
-
- if(entry.getAttribute("key").contains("iut") || entry.getAttribute("key").contains("capabilities-url")){
- this.iut = entry.getTextContent().trim();
- }
+ this.testInputs.put(entry.getAttribute("key"), entry.getTextContent().trim());
}
}
return runOpts;
}
-
+
+ /**
+ * Returns the test results in the specified format. The default media type
+ * is "application/xml", but "application/rdf+xml" (RDF/XML) is also
+ * supported.
+ *
+ * @param mediaType
+ * The media type of the test results (XML or RDF/XML).
+ * @param outputDirectory
+ * The directory containing the test run output.
+ * @return A File containing the test results.
+ * @throws FileNotFoundException
+ * If no test results are found.
+ */
+ File getResultsFile(String mediaType, String outputDirectory) throws FileNotFoundException {
+ // split out any media type parameters
+ String contentType = mediaType.split(";")[0];
+ String fileName = null;
+ if(contentType.endsWith("rdf+xml")){
+ fileName = "earl-results.rdf";
+ } else if(contentType.endsWith("zip")){
+
+ File htmlResult = HtmlReport.getHtmlResultZip(outputDirectory);
+ fileName = "result.zip";
+ } else{
+ fileName = "report_logs.xml";
+ }
+ File resultsFile = new File(outputDirectory, fileName);
+ if (!resultsFile.exists()) {
+ throw new FileNotFoundException("Test run results not found at " + resultsFile.getAbsolutePath());
+ }
+ return resultsFile;
+ }
+
+ /**
+ * Gets the preferred media type for the test results as indicated by the
+ * value of the "acceptMediaType" key in the given properties file. The
+ * default value is "application/xml".
+ *
+ * @param testRunArgs
+ * An XML properties file containing test run arguments.
+ * @return The preferred media type.
+ */
+ String getPreferredMediaType(Document testRunArgs) {
+ String mediaType = "application/rdf+xml";
+ NodeList entries = testRunArgs.getElementsByTagName("entry");
+ for (int i = 0; i < entries.getLength(); i++) {
+ Element entry = (Element) entries.item(i);
+ if (entry.getAttribute("key").equals("format")) {
+ if(entry.getTextContent().trim().equalsIgnoreCase("xml")){
+ mediaType = "application/xml";
+ } else if(entry.getTextContent().trim().equalsIgnoreCase("html")){
+ mediaType = "application/zip";
+ }
+ }
+ }
+ return mediaType;
+ }
+
}
diff --git a/teamengine-spi/pom.xml b/teamengine-spi/pom.xml
index 89c4b7089..d19daaa62 100644
--- a/teamengine-spi/pom.xml
+++ b/teamengine-spi/pom.xml
@@ -91,6 +91,11 @@
+
+ commons-io
+ commons-io
+ 2.5
+
org.slf4j
diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/TestNGExecutor.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/TestNGExecutor.java
index 5a89ea553..e27ee0d27 100644
--- a/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/TestNGExecutor.java
+++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/executors/testng/TestNGExecutor.java
@@ -24,6 +24,7 @@
import org.xml.sax.InputSource;
import com.occamlab.te.spi.executors.TestRunExecutor;
+import com.occamlab.te.spi.util.HtmlReport;
/**
*
@@ -147,16 +148,26 @@ public Source execute(Document testRunArgs) {
* @throws FileNotFoundException
* If no test results are found.
*/
- File getResultsFile(String mediaType, String outputDirectory) throws FileNotFoundException {
- // split out any media type parameters
- String contentType = mediaType.split(";")[0];
- String fileName = (contentType.endsWith("rdf+xml")) ? "earl-results.rdf" : "testng-results.xml";
- File resultsFile = new File(outputDirectory, fileName);
- if (!resultsFile.exists()) {
- throw new FileNotFoundException("Test run results not found at " + resultsFile.getAbsolutePath());
- }
- return resultsFile;
- }
+ File getResultsFile(String mediaType, String outputDirectory)
+ throws FileNotFoundException {
+ // split out any media type parameters
+ String contentType = mediaType.split(";")[0];
+ String fileName = null;
+ if (contentType.endsWith("rdf+xml")) {
+ fileName = "earl-results.rdf";
+ } else if (contentType.endsWith("zip")) {
+ File htmlResult = HtmlReport.getHtmlResultZip(outputDirectory);
+ fileName = "result.zip";
+ } else {
+ fileName = "testng-results.xml";
+ }
+ File resultsFile = new File(outputDirectory, fileName);
+ if (!resultsFile.exists()) {
+ throw new FileNotFoundException("Test run results not found at "
+ + resultsFile.getAbsolutePath());
+ }
+ return resultsFile;
+ }
/**
* Gets the preferred media type for the test results as indicated by the
@@ -168,12 +179,16 @@ File getResultsFile(String mediaType, String outputDirectory) throws FileNotFoun
* @return The preferred media type.
*/
String getPreferredMediaType(Document testRunArgs) {
- String mediaType = "application/xml";
+ String mediaType = "application/rdf+xml";
NodeList entries = testRunArgs.getElementsByTagName("entry");
for (int i = 0; i < entries.getLength(); i++) {
Element entry = (Element) entries.item(i);
- if (entry.getAttribute("key").equals("acceptMediaType")) {
- mediaType = entry.getTextContent().trim();
+ if (entry.getAttribute("key").equals("format")) {
+ if(entry.getTextContent().trim().equalsIgnoreCase("xml")){
+ mediaType = "application/xml";
+ } else if(entry.getTextContent().trim().equalsIgnoreCase("html")){
+ mediaType = "application/zip";
+ }
}
}
return mediaType;
@@ -212,4 +227,5 @@ private void setTestSuites(TestNG driver, URI ets) {
driver.setTestSuites(testSuites);
}
}
+
}
diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestResultLog.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestResultLog.java
new file mode 100644
index 000000000..428a3fad1
--- /dev/null
+++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestResultLog.java
@@ -0,0 +1,171 @@
+package com.occamlab.te.spi.jaxrs.resources;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Source;
+
+import org.apache.commons.io.FileUtils;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import com.occamlab.te.spi.jaxrs.ErrorResponseBuilder;
+import com.occamlab.te.spi.jaxrs.TestSuiteController;
+import com.occamlab.te.spi.jaxrs.TestSuiteRegistry;
+
+@Path("suites/{etsCode}/{etsVersion}/html/run")
+@Produces("application/zip")
+public class TestResultLog {
+
+ private static final Logger LOGR = Logger.getLogger(TestRunResource.class.getPackage().getName());
+ @Context
+ private UriInfo reqUriInfo;
+
+ @Context
+ private HttpHeaders headers;
+
+ @GET
+ // @Consumes({"application/html"})
+ public Response handleHtmlGet(@PathParam("etsCode") String etsCode, @PathParam("etsVersion") String etsVersion ) throws IOException {
+ MultivaluedMap params = this.reqUriInfo.getQueryParameters();
+ Source results = executeTestRun(etsCode, etsVersion, params);
+
+ String htmlOutput = results.getSystemId().toString();
+ int count = htmlOutput.split(":", -1).length-1;
+ String zipFile = (count > 1) ? htmlOutput.split("file:/")[1] : htmlOutput.split("file:")[1];
+ File fileOut = new File(zipFile);
+ if (!fileOut.exists()) {
+ throw new WebApplicationException(404);
+ }
+ return Response
+ .ok(FileUtils.readFileToByteArray(fileOut))
+ .type("application/zip")
+ .header("Content-Disposition", "attachment; filename=\"result.zip\";").header("Cache-Control", "no-cache")
+ .build();
+ //return results;
+ }
+
+ /**
+ * Executes a test run using the supplied arguments.
+ *
+ * @param etsCode
+ * A String that identifies the test suite to be run.
+ * @param etsVersion
+ * A String specifying the desired test suite version.
+ * @param testRunArgs
+ * A multi-valued Map containing the test run arguments.
+ * @return An XML representation of the test run results.
+ * @throws WebApplicationException
+ * If an error occurs while executing a test run.
+ */
+ Source executeTestRun(String etsCode, String etsVersion, Map> testRunArgs) {
+ MediaType preferredMediaType = this.headers.getAcceptableMediaTypes().get(0);
+ testRunArgs.put("acceptMediaType", Arrays.asList(preferredMediaType.toString()));
+ if (LOGR.isLoggable(Level.FINE)) {
+ StringBuilder msg = new StringBuilder("Test run arguments - ");
+ msg.append(etsCode).append("/").append(etsVersion).append("\n");
+ msg.append(testRunArgs.toString());
+ if (null != this.headers.getMediaType()) {
+ msg.append("Entity media type: " + this.headers.getMediaType());
+ }
+ LOGR.fine(msg.toString());
+ }
+ Document xmlArgs = readTestRunArguments(testRunArgs);
+ TestSuiteController controller = findController(etsCode, etsVersion);
+ Source testResults = null;
+ try {
+ testResults = controller.doTestRun(xmlArgs);
+ } catch (IllegalArgumentException iae) {
+ ErrorResponseBuilder builder = new ErrorResponseBuilder();
+ Response rsp = builder.buildErrorResponse(400, iae.getMessage());
+ throw new WebApplicationException(rsp);
+ } catch (Exception ex) {
+ LOGR.log(Level.WARNING, ex.getMessage(), ex);
+ ErrorResponseBuilder builder = new ErrorResponseBuilder();
+ Response rsp = builder.buildErrorResponse(500,
+ String.format("Error executing test suite (%s-%s)", etsCode, etsVersion));
+ throw new WebApplicationException(rsp);
+ }
+ LOGR.fine(String.format("Test results for suite %s-%s: %s", etsCode, etsVersion, testResults.getSystemId()));
+ return testResults;
+ }
+
+ /**
+ * Obtains a TestSuiteController for a particular executable
+ * test suite (ETS) identified by code and version.
+ *
+ * @param code
+ * A String identifying the ETS to execute.
+ * @param version
+ * A String indicating the version of the ETS.
+ * @return The TestSuiteController for the requested ETS.
+ * @throws WebApplicationException
+ * If a corresponding controller cannot be found.
+ */
+ TestSuiteController findController(String code, String version) throws WebApplicationException {
+ TestSuiteRegistry registry = TestSuiteRegistry.getInstance();
+ TestSuiteController controller = registry.getController(code, version);
+ if (null == controller) {
+ throw new WebApplicationException(404);
+ }
+ return controller;
+ }
+
+ /**
+ * Extracts test run arguments from the given Map and inserts them into a
+ * DOM Document representing an XML properties file.
+ *
+ * @param requestParams
+ * A collection of key-value pairs. Each key can have zero or
+ * more values but only the first value is used.
+ * @return A DOM Document node.
+ * @see java.util.Properties
+ */
+ Document readTestRunArguments(Map> requestParams) {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ Document propsDoc = null;
+ try {
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ propsDoc = db.newDocument();
+ } catch (ParserConfigurationException ex) {
+ Logger.getLogger(TestRunResource.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ Element docElem = propsDoc.createElement("properties");
+ docElem.setAttribute("version", "1.0");
+ for (Map.Entry> param : requestParams.entrySet()) {
+ Element entry = propsDoc.createElement("entry");
+ entry.setAttribute("key", param.getKey());
+ StringBuilder values = new StringBuilder();
+ for (Iterator itr = param.getValue().iterator(); itr.hasNext();) {
+ values.append(itr.next());
+ if (itr.hasNext()) {
+ values.append(",");
+ }
+ }
+ entry.setTextContent(values.toString());
+ docElem.appendChild(entry);
+ }
+ propsDoc.appendChild(docElem);
+ return propsDoc;
+ }
+}
diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java
index 3a2789c75..3be769037 100644
--- a/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java
+++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/jaxrs/resources/TestRunResource.java
@@ -43,7 +43,7 @@
* @see JSR 311
*/
@Path("suites/{etsCode}/{etsVersion}/run")
-@Produces({ "application/xml; charset='utf-8'", "application/rdf+xml; charset='utf-8'" })
+@Produces({ "application/xml; charset='utf-8'", "application/rdf+xml; charset='utf-8'", "application/zip; charset='utf-8'" })
public class TestRunResource {
private static final Logger LOGR = Logger.getLogger(TestRunResource.class.getPackage().getName());
diff --git a/teamengine-spi/src/main/java/com/occamlab/te/spi/util/HtmlReport.java b/teamengine-spi/src/main/java/com/occamlab/te/spi/util/HtmlReport.java
new file mode 100644
index 000000000..118a03ee2
--- /dev/null
+++ b/teamengine-spi/src/main/java/com/occamlab/te/spi/util/HtmlReport.java
@@ -0,0 +1,152 @@
+package com.occamlab.te.spi.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.apache.commons.io.FileUtils;
+
+/**
+ *
+ * This class is used to process HTML result.
+ * It will transform EARL result into HTML report
+ * and return the HTML result with zip file.
+ *
+ */
+public class HtmlReport {
+
+ /**
+ * This method will return the HTML result with zip file.
+ * @param outputDirectory
+ *
+ * @return
+ * @throws FileNotFoundException
+ */
+ public static File getHtmlResultZip (String outputDirectory) throws FileNotFoundException{
+ File htmlResultFile = null;
+ File htmlResult = earlHtmlReport(outputDirectory);
+ htmlResultFile = new File(outputDirectory, "result.zip");
+// File resultDir = new File(outputDirectory, "result");
+ try {
+ zipDir(htmlResultFile, htmlResult);
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ }
+ return htmlResultFile;
+
+ }
+
+ /**
+ * Convert EARL result into HTML report.
+ *
+ * @param outputDir
+ * Location of the test result.
+ * @return
+ * Return the output file.
+ * @throws FileNotFoundException
+ * Throws exception if file is not available.
+ */
+ public static File earlHtmlReport(String outputDir) throws FileNotFoundException {
+
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ String resourceDir = cl.getResource("com/occamlab/te/earl/lib").getPath();
+ String earlXsl = cl.getResource("com/occamlab/te/earl_html_report.xsl").toString();
+ File earlResult = null;
+ File htmlOutput = null;
+
+ htmlOutput = new File(outputDir,"result");
+ earlResult = new File(outputDir, "earl-results.rdf");
+
+ try {
+ Transformer transformer = TransformerFactory.newInstance()
+ .newTransformer(new StreamSource(earlXsl));
+ transformer.setParameter("outputDir", htmlOutput);
+ transformer.transform(new StreamSource(earlResult),
+ new StreamResult(new FileOutputStream("index.html")));
+ FileUtils.copyDirectory(new File(resourceDir), htmlOutput);
+ } catch (Exception e) {
+ System.out.println(e.getMessage() + e.getCause());
+ }
+ if(!htmlOutput.exists()){
+ throw new FileNotFoundException("HTML results not found at " + htmlOutput.getAbsolutePath());
+ }
+ return htmlOutput;
+ }
+
+ /**
+ * Zips the directory and all of it's sub directories
+ * @param zipFile
+ * Path of zip file.
+ * @param dirObj
+ * Location of test result
+ * @throws Exception
+ * It will throw this exception if file not found.
+ */
+ public static void zipDir(File zipFile, File dirObj) throws Exception {
+ // File dirObj = new File(dir);
+ if (!dirObj.isDirectory()) {
+ System.err.println(dirObj.getName() + " is not a directory");
+ System.exit(1);
+ }
+
+ try {
+
+ ZipOutputStream out = new ZipOutputStream(new FileOutputStream(
+ zipFile));
+
+ System.out.println("Creating : " + zipFile);
+
+ addDir(dirObj, out);
+ // Complete the ZIP file
+ out.close();
+
+ } catch (IOException e) {
+ throw new Exception(e.getMessage());
+ }
+
+ }
+
+ /**
+ * Add directory to zip file
+ * @param dirObj
+ * @param out
+ * @throws IOException
+ */
+ private static void addDir(File dirObj, ZipOutputStream out)
+ throws IOException {
+ File[] dirList = dirObj.listFiles();
+ byte[] tmpBuf = new byte[1024];
+
+ for (int i = 0; i < dirList.length; i++) {
+ if (dirList[i].isDirectory()) {
+ addDir(dirList[i], out);
+ continue;
+ }
+
+ FileInputStream in = new FileInputStream(
+ dirList[i].getAbsolutePath());
+ System.out.println(" Adding: " + dirList[i].getAbsolutePath());
+
+ out.putNextEntry(new ZipEntry(dirList[i].getAbsolutePath()));
+
+ // Transfer from the file to the ZIP file
+ int len;
+ while ((len = in.read(tmpBuf)) > 0) {
+ out.write(tmpBuf, 0, len);
+ }
+
+ // Complete the entry
+ out.closeEntry();
+ in.close();
+ }
+ }
+}
From 8d6698916a7fd20a1c87fb51978051a0a2eb85d5 Mon Sep 17 00:00:00 2001
From: Keshav Nangare
Date: Fri, 1 Sep 2017 17:04:03 +0530
Subject: [PATCH 19/19] Added the message in result page. Fixed #223.
---
.../resources/com/occamlab/te/earl_html_report.xsl | 2 ++
teamengine-web/src/main/webapp/viewSessionLog.jsp | 12 +++++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
index 357c63142..cd133e57a 100644
--- a/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
+++ b/teamengine-resources/src/main/resources/com/occamlab/te/earl_html_report.xsl
@@ -98,6 +98,8 @@
Result:
Number of conformance classes tested:
+
+
diff --git a/teamengine-web/src/main/webapp/viewSessionLog.jsp b/teamengine-web/src/main/webapp/viewSessionLog.jsp
index cc67e1fcc..53e41169a 100644
--- a/teamengine-web/src/main/webapp/viewSessionLog.jsp
+++ b/teamengine-web/src/main/webapp/viewSessionLog.jsp
@@ -43,7 +43,8 @@ public void jspInit() {
<%@page import="java.net.URLEncoder"%>
-
+
+
Test Session Results
|