Seam SVN: r14842 - in branches/enterprise/WFK-2_0/extras: jsUnit and 3 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-06 13:27:29 -0400 (Wed, 06 Jun 2012)
New Revision: 14842
Removed:
branches/enterprise/WFK-2_0/extras/jsUnit/app/css/jsUnitStyle.css
branches/enterprise/WFK-2_0/extras/jsUnit/app/css/readme
branches/enterprise/WFK-2_0/extras/jsUnit/app/emptyPage.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitCore.js
branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitMockTimeout.js
branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTestManager.js
branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTestSuite.js
branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTracer.js
branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitVersionCheck.js
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-errors.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-failures.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-runs.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-data.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-errors.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-frame.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-loader.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-progress.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-results.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/main-status.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/testContainer.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/testContainerController.html
branches/enterprise/WFK-2_0/extras/jsUnit/app/xbDebug.js
branches/enterprise/WFK-2_0/extras/jsUnit/images/green.gif
branches/enterprise/WFK-2_0/extras/jsUnit/images/logo_jsunit.gif
branches/enterprise/WFK-2_0/extras/jsUnit/images/powerby-transparent.gif
branches/enterprise/WFK-2_0/extras/jsUnit/images/red.gif
branches/enterprise/WFK-2_0/extras/jsUnit/testRunner.html
branches/enterprise/WFK-2_0/extras/mail-ra.rar
branches/enterprise/WFK-2_0/extras/readme.txt
Log:
removed extras directory bz #827425
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/css/jsUnitStyle.css
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/css/jsUnitStyle.css 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/css/jsUnitStyle.css 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,50 +0,0 @@
-body {
- margin-top: 0;
- margin-bottom: 0;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- color: #000;
- font-size: 0.8em;
- background-color: #fff;
-}
-
-a:link, a:visited {
- color: #00F;
-}
-
-a:hover {
- color: #F00;
-}
-
-h1 {
- font-size: 1.2em;
- font-weight: bold;
- color: #039;
- font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-h2 {
- font-weight: bold;
- color: #039;
- font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-h3 {
- font-weight: bold;
- color: #039;
- text-decoration: underline;
- font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-h4 {
- font-weight: bold;
- color: #039;
- font-family: Verdana, Arial, Helvetica, sans-serif;
-}
-
-.jsUnitTestResultSuccess {
- color: #000;
-}
-
-.jsUnitTestResultNotSuccess {
- color: #F00;
-}
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/css/readme
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/css/readme 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/css/readme 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,10 +0,0 @@
-this file is required due to differences in behavior between Mozilla/Opera
-and Internet Explorer.
-
-main-data.html calls kickOffTests() which calls top.testManager.start()
-in the top most frame. top.testManager.start() initializes the output
-frames using document.write and HTML containing a relative <link> to the
-jsUnitStyle.css file. In MSIE, the base href used to find the CSS file is
-that of the top level frame however in Mozilla/Opera the base href is
-that of main-data.html. This leads to not-found for the jsUnitStyle.css
-in Mozilla/Opera. Creating app/css/jsUnitStyle.css works around this problem.
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/emptyPage.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/emptyPage.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/emptyPage.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>emptyPage</title>
-</head>
-
-<body>
-</body>
-</html>
-
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitCore.js
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitCore.js 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitCore.js 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,534 +0,0 @@
-var JSUNIT_UNDEFINED_VALUE;
-var JSUNIT_VERSION = 2.2;
-var isTestPageLoaded = false;
-
-//hack for NS62 bug
-function jsUnitFixTop() {
- var tempTop = top;
- if (!tempTop) {
- tempTop = window;
- while (tempTop.parent) {
- tempTop = tempTop.parent;
- if (tempTop.top && tempTop.top.jsUnitTestSuite) {
- tempTop = tempTop.top;
- break;
- }
- }
- }
- try {
- window.top = tempTop;
- } catch (e) {
- }
-}
-
-jsUnitFixTop();
-
-/**
- + * A more functional typeof
- + * @param Object o
- + * @return String
- + */
-function _trueTypeOf(something) {
- var result = typeof something;
- try {
- switch (result) {
- case 'string':
- case 'boolean':
- case 'number':
- break;
- case 'object':
- case 'function':
- switch (something.constructor)
- {
- case String:
- result = 'String';
- break;
- case Boolean:
- result = 'Boolean';
- break;
- case Number:
- result = 'Number';
- break;
- case Array:
- result = 'Array';
- break;
- case RegExp:
- result = 'RegExp';
- break;
- case Function:
- result = 'Function';
- break;
- default:
- var m = something.constructor.toString().match(/function\s*([^( ]+)\(/);
- if (m)
- result = m[1];
- else
- break;
- }
- break;
- }
- }
- finally {
- result = result.substr(0, 1).toUpperCase() + result.substr(1);
- return result;
- }
-}
-
-function _displayStringForValue(aVar) {
- var result = '<' + aVar + '>';
- if (!(aVar === null || aVar === top.JSUNIT_UNDEFINED_VALUE)) {
- result += ' (' + _trueTypeOf(aVar) + ')';
- }
- return result;
-}
-
-function fail(failureMessage) {
- throw new JsUnitException("Call to fail()", failureMessage);
-}
-
-function error(errorMessage) {
- var errorObject = new Object();
- errorObject.description = errorMessage;
- errorObject.stackTrace = getStackTrace();
- throw errorObject;
-}
-
-function argumentsIncludeComments(expectedNumberOfNonCommentArgs, args) {
- return args.length == expectedNumberOfNonCommentArgs + 1;
-}
-
-function commentArg(expectedNumberOfNonCommentArgs, args) {
- if (argumentsIncludeComments(expectedNumberOfNonCommentArgs, args))
- return args[0];
-
- return null;
-}
-
-function nonCommentArg(desiredNonCommentArgIndex, expectedNumberOfNonCommentArgs, args) {
- return argumentsIncludeComments(expectedNumberOfNonCommentArgs, args) ?
- args[desiredNonCommentArgIndex] :
- args[desiredNonCommentArgIndex - 1];
-}
-
-function _validateArguments(expectedNumberOfNonCommentArgs, args) {
- if (!( args.length == expectedNumberOfNonCommentArgs ||
- (args.length == expectedNumberOfNonCommentArgs + 1 && typeof(args[0]) == 'string') ))
- error('Incorrect arguments passed to assert function');
-}
-
-function _assert(comment, booleanValue, failureMessage) {
- if (!booleanValue)
- throw new JsUnitException(comment, failureMessage);
-}
-
-function assert() {
- _validateArguments(1, arguments);
- var booleanValue = nonCommentArg(1, 1, arguments);
-
- if (typeof(booleanValue) != 'boolean')
- error('Bad argument to assert(boolean)');
-
- _assert(commentArg(1, arguments), booleanValue === true, 'Call to assert(boolean) with false');
-}
-
-function assertTrue() {
- _validateArguments(1, arguments);
- var booleanValue = nonCommentArg(1, 1, arguments);
-
- if (typeof(booleanValue) != 'boolean')
- error('Bad argument to assertTrue(boolean)');
-
- _assert(commentArg(1, arguments), booleanValue === true, 'Call to assertTrue(boolean) with false');
-}
-
-function assertFalse() {
- _validateArguments(1, arguments);
- var booleanValue = nonCommentArg(1, 1, arguments);
-
- if (typeof(booleanValue) != 'boolean')
- error('Bad argument to assertFalse(boolean)');
-
- _assert(commentArg(1, arguments), booleanValue === false, 'Call to assertFalse(boolean) with true');
-}
-
-function assertEquals() {
- _validateArguments(2, arguments);
- var var1 = nonCommentArg(1, 2, arguments);
- var var2 = nonCommentArg(2, 2, arguments);
- _assert(commentArg(2, arguments), var1 === var2, 'Expected ' + _displayStringForValue(var1) + ' but was ' + _displayStringForValue(var2));
-}
-
-function assertNotEquals() {
- _validateArguments(2, arguments);
- var var1 = nonCommentArg(1, 2, arguments);
- var var2 = nonCommentArg(2, 2, arguments);
- _assert(commentArg(2, arguments), var1 !== var2, 'Expected not to be ' + _displayStringForValue(var2));
-}
-
-function assertNull() {
- _validateArguments(1, arguments);
- var aVar = nonCommentArg(1, 1, arguments);
- _assert(commentArg(1, arguments), aVar === null, 'Expected ' + _displayStringForValue(null) + ' but was ' + _displayStringForValue(aVar));
-}
-
-function assertNotNull() {
- _validateArguments(1, arguments);
- var aVar = nonCommentArg(1, 1, arguments);
- _assert(commentArg(1, arguments), aVar !== null, 'Expected not to be ' + _displayStringForValue(null));
-}
-
-function assertUndefined() {
- _validateArguments(1, arguments);
- var aVar = nonCommentArg(1, 1, arguments);
- _assert(commentArg(1, arguments), aVar === top.JSUNIT_UNDEFINED_VALUE, 'Expected ' + _displayStringForValue(top.JSUNIT_UNDEFINED_VALUE) + ' but was ' + _displayStringForValue(aVar));
-}
-
-function assertNotUndefined() {
- _validateArguments(1, arguments);
- var aVar = nonCommentArg(1, 1, arguments);
- _assert(commentArg(1, arguments), aVar !== top.JSUNIT_UNDEFINED_VALUE, 'Expected not to be ' + _displayStringForValue(top.JSUNIT_UNDEFINED_VALUE));
-}
-
-function assertNaN() {
- _validateArguments(1, arguments);
- var aVar = nonCommentArg(1, 1, arguments);
- _assert(commentArg(1, arguments), isNaN(aVar), 'Expected NaN');
-}
-
-function assertNotNaN() {
- _validateArguments(1, arguments);
- var aVar = nonCommentArg(1, 1, arguments);
- _assert(commentArg(1, arguments), !isNaN(aVar), 'Expected not NaN');
-}
-
-function assertObjectEquals() {
- _validateArguments(2, arguments);
- var var1 = nonCommentArg(1, 2, arguments);
- var var2 = nonCommentArg(2, 2, arguments);
- var type;
- var msg = commentArg(2, arguments)?commentArg(2, arguments):'';
- var isSame = (var1 === var2);
- //shortpath for references to same object
- var isEqual = ( (type = _trueTypeOf(var1)) == _trueTypeOf(var2) );
- if (isEqual && !isSame) {
- switch (type) {
- case 'String':
- case 'Number':
- isEqual = (var1 == var2);
- break;
- case 'Boolean':
- case 'Date':
- isEqual = (var1 === var2);
- break;
- case 'RegExp':
- case 'Function':
- isEqual = (var1.toString() === var2.toString());
- break;
- default: //Object | Array
- var i;
- if (isEqual = (var1.length === var2.length))
- for (i in var1)
- assertObjectEquals(msg + ' found nested ' + type + '@' + i + '\n', var1[i], var2[i]);
- }
- _assert(msg, isEqual, 'Expected ' + _displayStringForValue(var1) + ' but was ' + _displayStringForValue(var2));
- }
-}
-
-assertArrayEquals = assertObjectEquals;
-
-function assertEvaluatesToTrue() {
- _validateArguments(1, arguments);
- var value = nonCommentArg(1, 1, arguments);
- if (!value)
- fail(commentArg(1, arguments));
-}
-
-function assertEvaluatesToFalse() {
- _validateArguments(1, arguments);
- var value = nonCommentArg(1, 1, arguments);
- if (value)
- fail(commentArg(1, arguments));
-}
-
-function assertHTMLEquals() {
- _validateArguments(2, arguments);
- var var1 = nonCommentArg(1, 2, arguments);
- var var2 = nonCommentArg(2, 2, arguments);
- var var1Standardized = standardizeHTML(var1);
- var var2Standardized = standardizeHTML(var2);
-
- _assert(commentArg(2, arguments), var1Standardized === var2Standardized, 'Expected ' + _displayStringForValue(var1Standardized) + ' but was ' + _displayStringForValue(var2Standardized));
-}
-
-function assertHashEquals() {
- _validateArguments(2, arguments);
- var var1 = nonCommentArg(1, 2, arguments);
- var var2 = nonCommentArg(2, 2, arguments);
- for (var key in var1) {
- assertNotUndefined("Expected hash had key " + key + " that was not found", var2[key]);
- assertEquals(
- "Value for key " + key + " mismatch - expected = " + var1[key] + ", actual = " + var2[key],
- var1[key], var2[key]
- );
- }
- for (var key in var2) {
- assertNotUndefined("Actual hash had key " + key + " that was not expected", var1[key]);
- }
-}
-
-function assertRoughlyEquals() {
- _validateArguments(3, arguments);
- var expected = nonCommentArg(1, 3, arguments);
- var actual = nonCommentArg(2, 3, arguments);
- var tolerance = nonCommentArg(3, 3, arguments);
- assertTrue(
- "Expected " + expected + ", but got " + actual + " which was more than " + tolerance + " away",
- Math.abs(expected - actual) < tolerance
- );
-}
-
-function assertContains() {
- _validateArguments(2, arguments);
- var contained = nonCommentArg(1, 2, arguments);
- var container = nonCommentArg(2, 2, arguments);
- assertTrue(
- "Expected '" + container + "' to contain '" + contained + "'",
- container.indexOf(contained) != -1
- );
-}
-
-function standardizeHTML(html) {
- var translator = document.createElement("DIV");
- translator.innerHTML = html;
- return translator.innerHTML;
-}
-
-function isLoaded() {
- return isTestPageLoaded;
-}
-
-function setUp() {
-}
-
-function tearDown() {
-}
-
-function getFunctionName(aFunction) {
- var regexpResult = aFunction.toString().match(/function(\s*)(\w*)/);
- if (regexpResult && regexpResult.length >= 2 && regexpResult[2]) {
- return regexpResult[2];
- }
- return 'anonymous';
-}
-
-function getStackTrace() {
- var result = '';
-
- if (typeof(arguments.caller) != 'undefined') { // IE, not ECMA
- for (var a = arguments.caller; a != null; a = a.caller) {
- result += '> ' + getFunctionName(a.callee) + '\n';
- if (a.caller == a) {
- result += '*';
- break;
- }
- }
- }
- else { // Mozilla, not ECMA
- // fake an exception so we can get Mozilla's error stack
- var testExcp;
- try
- {
- foo.bar;
- }
- catch(testExcp)
- {
- var stack = parseErrorStack(testExcp);
- for (var i = 1; i < stack.length; i++)
- {
- result += '> ' + stack[i] + '\n';
- }
- }
- }
-
- return result;
-}
-
-function parseErrorStack(excp)
-{
- var stack = [];
- var name;
-
- if (!excp || !excp.stack)
- {
- return stack;
- }
-
- var stacklist = excp.stack.split('\n');
-
- for (var i = 0; i < stacklist.length - 1; i++)
- {
- var framedata = stacklist[i];
-
- name = framedata.match(/^(\w*)/)[1];
- if (!name) {
- name = 'anonymous';
- }
-
- stack[stack.length] = name;
- }
- // remove top level anonymous functions to match IE
-
- while (stack.length && stack[stack.length - 1] == 'anonymous')
- {
- stack.length = stack.length - 1;
- }
- return stack;
-}
-
-function JsUnitException(comment, message) {
- this.isJsUnitException = true;
- this.comment = comment;
- this.jsUnitMessage = message;
- this.stackTrace = getStackTrace();
-}
-
-function warn() {
- if (top.tracer != null)
- top.tracer.warn(arguments[0], arguments[1]);
-}
-
-function inform() {
- if (top.tracer != null)
- top.tracer.inform(arguments[0], arguments[1]);
-}
-
-function info() {
- inform(arguments[0], arguments[1]);
-}
-
-function debug() {
- if (top.tracer != null)
- top.tracer.debug(arguments[0], arguments[1]);
-}
-
-function setJsUnitTracer(aJsUnitTracer) {
- top.tracer = aJsUnitTracer;
-}
-
-function trim(str) {
- if (str == null)
- return null;
-
- var startingIndex = 0;
- var endingIndex = str.length - 1;
-
- while (str.substring(startingIndex, startingIndex + 1) == ' ')
- startingIndex++;
-
- while (str.substring(endingIndex, endingIndex + 1) == ' ')
- endingIndex--;
-
- if (endingIndex < startingIndex)
- return '';
-
- return str.substring(startingIndex, endingIndex + 1);
-}
-
-function isBlank(str) {
- return trim(str) == '';
-}
-
-// the functions push(anArray, anObject) and pop(anArray)
-// exist because the JavaScript Array.push(anObject) and Array.pop()
-// functions are not available in IE 5.0
-
-function push(anArray, anObject) {
- anArray[anArray.length] = anObject;
-}
-function pop(anArray) {
- if (anArray.length >= 1) {
- delete anArray[anArray.length - 1];
- anArray.length--;
- }
-}
-
-function jsUnitGetParm(name)
-{
- if (typeof(top.jsUnitParmHash[name]) != 'undefined')
- {
- return top.jsUnitParmHash[name];
- }
- return null;
-}
-
-if (top && typeof(top.xbDEBUG) != 'undefined' && top.xbDEBUG.on && top.testManager)
-{
- top.xbDebugTraceObject('top.testManager.containerTestFrame', 'JSUnitException');
- // asserts
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', '_displayStringForValue');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'error');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'argumentsIncludeComments');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'commentArg');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'nonCommentArg');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', '_validateArguments');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', '_assert');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assert');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertTrue');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertEquals');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNotEquals');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNull');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNotNull');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertUndefined');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNotUndefined');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNaN');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'assertNotNaN');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'isLoaded');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'setUp');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'tearDown');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'getFunctionName');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'getStackTrace');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'warn');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'inform');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'debug');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'setJsUnitTracer');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'trim');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'isBlank');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'newOnLoadEvent');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'push');
- top.xbDebugTraceFunction('top.testManager.containerTestFrame', 'pop');
-}
-
-function newOnLoadEvent() {
- isTestPageLoaded = true;
-}
-
-function jsUnitSetOnLoad(windowRef, onloadHandler)
-{
- var isKonqueror = navigator.userAgent.indexOf('Konqueror/') != -1 ||
- navigator.userAgent.indexOf('Safari/') != -1;
-
- if (typeof(windowRef.attachEvent) != 'undefined') {
- // Internet Explorer, Opera
- windowRef.attachEvent("onload", onloadHandler);
- } else if (typeof(windowRef.addEventListener) != 'undefined' && !isKonqueror) {
- // Mozilla, Konqueror
- // exclude Konqueror due to load issues
- windowRef.addEventListener("load", onloadHandler, false);
- } else if (typeof(windowRef.document.addEventListener) != 'undefined' && !isKonqueror) {
- // DOM 2 Events
- // exclude Mozilla, Konqueror due to load issues
- windowRef.document.addEventListener("load", onloadHandler, false);
- } else if (typeof(windowRef.onload) != 'undefined' && windowRef.onload) {
- windowRef.jsunit_original_onload = windowRef.onload;
- windowRef.onload = function() {
- windowRef.jsunit_original_onload();
- onloadHandler();
- };
- } else {
- // browsers that do not support windowRef.attachEvent or
- // windowRef.addEventListener will override a page's own onload event
- windowRef.onload = onloadHandler;
- }
-}
-
-jsUnitSetOnLoad(window, newOnLoadEvent);
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitMockTimeout.js
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitMockTimeout.js 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitMockTimeout.js 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,81 +0,0 @@
-// Mock setTimeout, clearTimeout
-// Contributed by Pivotal Computer Systems, www.pivotalsf.com
-
-var Clock = {
- timeoutsMade: 0,
- scheduledFunctions: {},
- nowMillis: 0,
- reset: function() {
- this.scheduledFunctions = {};
- this.nowMillis = 0;
- this.timeoutsMade = 0;
- },
- tick: function(millis) {
- var oldMillis = this.nowMillis;
- var newMillis = oldMillis + millis;
- this.runFunctionsWithinRange(oldMillis, newMillis);
- this.nowMillis = newMillis;
- },
- runFunctionsWithinRange: function(oldMillis, nowMillis) {
- var scheduledFunc;
- var funcsToRun = [];
- for (var timeoutKey in this.scheduledFunctions) {
- scheduledFunc = this.scheduledFunctions[timeoutKey];
- if (scheduledFunc != undefined &&
- scheduledFunc.runAtMillis >= oldMillis &&
- scheduledFunc.runAtMillis <= nowMillis) {
- funcsToRun.push(scheduledFunc);
- this.scheduledFunctions[timeoutKey] = undefined;
- }
- }
-
- if (funcsToRun.length > 0) {
- funcsToRun.sort(function(a, b) {
- return a.runAtMillis - b.runAtMillis;
- });
- for (var i = 0; i < funcsToRun.length; ++i) {
- try {
- this.nowMillis = funcsToRun[i].runAtMillis;
- funcsToRun[i].funcToCall();
- if (funcsToRun[i].recurring) {
- Clock.scheduleFunction(funcsToRun[i].timeoutKey,
- funcsToRun[i].funcToCall,
- funcsToRun[i].millis,
- true);
- }
- } catch(e) {
- }
- }
- this.runFunctionsWithinRange(oldMillis, nowMillis);
- }
- },
- scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
- Clock.scheduledFunctions[timeoutKey] = {
- runAtMillis: Clock.nowMillis + millis,
- funcToCall: funcToCall,
- recurring: recurring,
- timeoutKey: timeoutKey,
- millis: millis
- };
- }
-};
-
-function setTimeout(funcToCall, millis) {
- Clock.timeoutsMade = Clock.timeoutsMade + 1;
- Clock.scheduleFunction(Clock.timeoutsMade, funcToCall, millis, false);
- return Clock.timeoutsMade;
-}
-
-function setInterval(funcToCall, millis) {
- Clock.timeoutsMade = Clock.timeoutsMade + 1;
- Clock.scheduleFunction(Clock.timeoutsMade, funcToCall, millis, true);
- return Clock.timeoutsMade;
-}
-
-function clearTimeout(timeoutKey) {
- Clock.scheduledFunctions[timeoutKey] = undefined;
-}
-
-function clearInterval(timeoutKey) {
- Clock.scheduledFunctions[timeoutKey] = undefined;
-}
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTestManager.js
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTestManager.js 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTestManager.js 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,705 +0,0 @@
-function jsUnitTestManager() {
- this._windowForAllProblemMessages = null;
-
- this.container = top.frames.testContainer
- this.documentLoader = top.frames.documentLoader;
- this.mainFrame = top.frames.mainFrame;
-
- this.containerController = this.container.frames.testContainerController;
- this.containerTestFrame = this.container.frames.testFrame;
-
- var mainData = this.mainFrame.frames.mainData;
-
- // form elements on mainData frame
- this.testFileName = mainData.document.testRunnerForm.testFileName;
- this.runButton = mainData.document.testRunnerForm.runButton;
- this.traceLevel = mainData.document.testRunnerForm.traceLevel;
- this.closeTraceWindowOnNewRun = mainData.document.testRunnerForm.closeTraceWindowOnNewRun;
- this.timeout = mainData.document.testRunnerForm.timeout;
- this.setUpPageTimeout = mainData.document.testRunnerForm.setUpPageTimeout;
-
- // image output
- this.progressBar = this.mainFrame.frames.mainProgress.document.progress;
-
- this.problemsListField = this.mainFrame.frames.mainErrors.document.testRunnerForm.problemsList;
- this.testCaseResultsField = this.mainFrame.frames.mainResults.document.resultsForm.testCases;
- this.resultsTimeField = this.mainFrame.frames.mainResults.document.resultsForm.time;
-
- // 'layer' output frames
- this.uiFrames = new Object();
- this.uiFrames.mainStatus = this.mainFrame.frames.mainStatus;
-
- var mainCounts = this.mainFrame.frames.mainCounts;
-
- this.uiFrames.mainCountsErrors = mainCounts.frames.mainCountsErrors;
- this.uiFrames.mainCountsFailures = mainCounts.frames.mainCountsFailures;
- this.uiFrames.mainCountsRuns = mainCounts.frames.mainCountsRuns;
- this._baseURL = "";
-
- this.setup();
-}
-
-// seconds to wait for each test page to load
-jsUnitTestManager.TESTPAGE_WAIT_SEC = 120;
-jsUnitTestManager.TIMEOUT_LENGTH = 20;
-
-// seconds to wait for setUpPage to complete
-jsUnitTestManager.SETUPPAGE_TIMEOUT = 120;
-
-// milliseconds to wait between polls on setUpPages
-jsUnitTestManager.SETUPPAGE_INTERVAL = 100;
-
-jsUnitTestManager.RESTORED_HTML_DIV_ID = "jsUnitRestoredHTML";
-
-jsUnitTestManager.prototype.setup = function () {
- this.totalCount = 0;
- this.errorCount = 0;
- this.failureCount = 0;
- this._suiteStack = Array();
-
- var initialSuite = new top.jsUnitTestSuite();
- push(this._suiteStack, initialSuite);
-}
-
-jsUnitTestManager.prototype.start = function () {
- this._baseURL = this.resolveUserEnteredTestFileName();
- var firstQuery = this._baseURL.indexOf("?");
- if (firstQuery >= 0) {
- this._baseURL = this._baseURL.substring(0, firstQuery);
- }
- var lastSlash = this._baseURL.lastIndexOf("/");
- var lastRevSlash = this._baseURL.lastIndexOf("\\");
- if (lastRevSlash > lastSlash) {
- lastSlash = lastRevSlash;
- }
- if (lastSlash > 0) {
- this._baseURL = this._baseURL.substring(0, lastSlash + 1);
- }
-
- this._timeRunStarted = new Date();
- this.initialize();
- setTimeout('top.testManager._nextPage();', jsUnitTestManager.TIMEOUT_LENGTH);
-}
-
-jsUnitTestManager.prototype.getBaseURL = function () {
- return this._baseURL;
-}
-
-jsUnitTestManager.prototype.doneLoadingPage = function (pageName) {
- //this.containerTestFrame.setTracer(top.tracer);
- this._testFileName = pageName;
- if (this.isTestPageSuite())
- this._handleNewSuite();
- else
- {
- this._testIndex = 0;
- this._testsInPage = this.getTestFunctionNames();
- this._numberOfTestsInPage = this._testsInPage.length;
- this._runTest();
- }
-}
-
-jsUnitTestManager.prototype._handleNewSuite = function () {
- var allegedSuite = this.containerTestFrame.suite();
- if (allegedSuite.isjsUnitTestSuite) {
- var newSuite = allegedSuite.clone();
- if (newSuite.containsTestPages())
- push(this._suiteStack, newSuite);
- this._nextPage();
- }
- else {
- this.fatalError('Invalid test suite in file ' + this._testFileName);
- this.abort();
- }
-}
-
-jsUnitTestManager.prototype._runTest = function () {
- if (this._testIndex + 1 > this._numberOfTestsInPage)
- {
- // execute tearDownPage *synchronously*
- // (unlike setUpPage which is asynchronous)
- if (typeof this.containerTestFrame.tearDownPage == 'function') {
- this.containerTestFrame.tearDownPage();
- }
-
- this._nextPage();
- return;
- }
-
- if (this._testIndex == 0) {
- this.storeRestoredHTML();
- if (typeof(this.containerTestFrame.setUpPage) == 'function') {
- // first test for this page and a setUpPage is defined
- if (typeof(this.containerTestFrame.setUpPageStatus) == 'undefined') {
- // setUpPage() not called yet, so call it
- this.containerTestFrame.setUpPageStatus = false;
- this.containerTestFrame.startTime = new Date();
- this.containerTestFrame.setUpPage();
- // try test again later
- setTimeout('top.testManager._runTest()', jsUnitTestManager.SETUPPAGE_INTERVAL);
- return;
- }
-
- if (this.containerTestFrame.setUpPageStatus != 'complete') {
- top.status = 'setUpPage not completed... ' + this.containerTestFrame.setUpPageStatus + ' ' + (new Date());
- if ((new Date() - this.containerTestFrame.startTime) / 1000 > this.getsetUpPageTimeout()) {
- this.fatalError('setUpPage timed out without completing.');
- if (!this.userConfirm('Retry Test Run?')) {
- this.abort();
- return;
- }
- this.containerTestFrame.startTime = (new Date());
- }
- // try test again later
- setTimeout('top.testManager._runTest()', jsUnitTestManager.SETUPPAGE_INTERVAL);
- return;
- }
- }
- }
-
- top.status = '';
- // either not first test, or no setUpPage defined, or setUpPage completed
- this.executeTestFunction(this._testsInPage[this._testIndex]);
- this.totalCount++;
- this.updateProgressIndicators();
- this._testIndex++;
- setTimeout('top.testManager._runTest()', jsUnitTestManager.TIMEOUT_LENGTH);
-}
-
-jsUnitTestManager.prototype._done = function () {
- var secondsSinceRunBegan = (new Date() - this._timeRunStarted) / 1000;
- this.setStatus('Done (' + secondsSinceRunBegan + ' seconds)');
- this._cleanUp();
- if (top.shouldSubmitResults()) {
- this.resultsTimeField.value = secondsSinceRunBegan;
- top.submitResults();
- }
-}
-
-jsUnitTestManager.prototype._nextPage = function () {
- this._restoredHTML = null;
- if (this._currentSuite().hasMorePages()) {
- this.loadPage(this._currentSuite().nextPage());
- }
- else {
- pop(this._suiteStack);
- if (this._currentSuite() == null)
- this._done();
- else
- this._nextPage();
- }
-}
-
-jsUnitTestManager.prototype._currentSuite = function () {
- var suite = null;
-
- if (this._suiteStack && this._suiteStack.length > 0)
- suite = this._suiteStack[this._suiteStack.length - 1];
-
- return suite;
-}
-
-jsUnitTestManager.prototype.calculateProgressBarProportion = function () {
- if (this.totalCount == 0)
- return 0;
- var currentDivisor = 1;
- var result = 0;
-
- for (var i = 0; i < this._suiteStack.length; i++) {
- var aSuite = this._suiteStack[i];
- currentDivisor *= aSuite.testPages.length;
- result += (aSuite.pageIndex - 1) / currentDivisor;
- }
- result += (this._testIndex + 1) / (this._numberOfTestsInPage * currentDivisor);
- return result;
-}
-
-jsUnitTestManager.prototype._cleanUp = function () {
- this.containerController.setTestPage('./app/emptyPage.html');
- this.finalize();
- top.tracer.finalize();
-}
-
-jsUnitTestManager.prototype.abort = function () {
- this.setStatus('Aborted');
- this._cleanUp();
-}
-
-jsUnitTestManager.prototype.getTimeout = function () {
- var result = jsUnitTestManager.TESTPAGE_WAIT_SEC;
- try {
- result = eval(this.timeout.value);
- }
- catch (e) {
- }
- return result;
-}
-
-jsUnitTestManager.prototype.getsetUpPageTimeout = function () {
- var result = jsUnitTestManager.SETUPPAGE_TIMEOUT;
- try {
- result = eval(this.setUpPageTimeout.value);
- }
- catch (e) {
- }
- return result;
-}
-
-jsUnitTestManager.prototype.isTestPageSuite = function () {
- var result = false;
- if (typeof(this.containerTestFrame.suite) == 'function')
- {
- result = true;
- }
- return result;
-}
-
-jsUnitTestManager.prototype.getTestFunctionNames = function () {
- var testFrame = this.containerTestFrame;
- var testFunctionNames = new Array();
- var i;
-
- if (testFrame && typeof(testFrame.exposeTestFunctionNames) == 'function')
- return testFrame.exposeTestFunctionNames();
-
- if (testFrame &&
- testFrame.document &&
- typeof(testFrame.document.scripts) != 'undefined' &&
- testFrame.document.scripts.length > 0) { // IE5 and up
- var scriptsInTestFrame = testFrame.document.scripts;
-
- for (i = 0; i < scriptsInTestFrame.length; i++) {
- var someNames = this._extractTestFunctionNamesFromScript(scriptsInTestFrame[i]);
- if (someNames)
- testFunctionNames = testFunctionNames.concat(someNames);
- }
- }
- else {
- for (i in testFrame) {
- if (i.substring(0, 4) == 'test' && typeof(testFrame[i]) == 'function')
- push(testFunctionNames, i);
- }
- }
- return testFunctionNames;
-}
-
-jsUnitTestManager.prototype._extractTestFunctionNamesFromScript = function (aScript) {
- var result;
- var remainingScriptToInspect = aScript.text;
- var currentIndex = this._indexOfTestFunctionIn(remainingScriptToInspect);
- while (currentIndex != -1) {
- if (!result)
- result = new Array();
-
- var fragment = remainingScriptToInspect.substring(currentIndex, remainingScriptToInspect.length);
- result = result.concat(fragment.substring('function '.length, fragment.indexOf('(')));
- remainingScriptToInspect = remainingScriptToInspect.substring(currentIndex + 12, remainingScriptToInspect.length);
- currentIndex = this._indexOfTestFunctionIn(remainingScriptToInspect);
- }
- return result;
-}
-
-jsUnitTestManager.prototype._indexOfTestFunctionIn = function (string) {
- return string.indexOf('function test');
-}
-
-jsUnitTestManager.prototype.loadPage = function (testFileName) {
- this._testFileName = testFileName;
- this._loadAttemptStartTime = new Date();
- this.setStatus('Opening Test Page "' + this._testFileName + '"');
- this.containerController.setTestPage(this._testFileName);
- this._callBackWhenPageIsLoaded();
-}
-
-jsUnitTestManager.prototype._callBackWhenPageIsLoaded = function () {
- if ((new Date() - this._loadAttemptStartTime) / 1000 > this.getTimeout()) {
- this.fatalError('Reading Test Page ' + this._testFileName + ' timed out.\nMake sure that the file exists and is a Test Page.');
- if (this.userConfirm('Retry Test Run?')) {
- this.loadPage(this._testFileName);
- return;
- } else {
- this.abort();
- return;
- }
- }
- if (!this._isTestFrameLoaded()) {
- setTimeout('top.testManager._callBackWhenPageIsLoaded();', jsUnitTestManager.TIMEOUT_LENGTH);
- return;
- }
- this.doneLoadingPage(this._testFileName);
-}
-
-jsUnitTestManager.prototype._isTestFrameLoaded = function () {
- try {
- return this.containerController.isPageLoaded();
- }
- catch (e) {
- }
- return false;
-}
-
-jsUnitTestManager.prototype.executeTestFunction = function (functionName) {
- this._testFunctionName = functionName;
- this.setStatus('Running test "' + this._testFunctionName + '"');
- var excep = null;
- var timeBefore = new Date();
- try {
- if (this._restoredHTML)
- top.testContainer.testFrame.document.getElementById(jsUnitTestManager.RESTORED_HTML_DIV_ID).innerHTML = this._restoredHTML;
- if (this.containerTestFrame.setUp !== JSUNIT_UNDEFINED_VALUE)
- this.containerTestFrame.setUp();
- this.containerTestFrame[this._testFunctionName]();
- }
- catch (e1) {
- excep = e1;
- }
- finally {
- try {
- if (this.containerTestFrame.tearDown !== JSUNIT_UNDEFINED_VALUE)
- this.containerTestFrame.tearDown();
- }
- catch (e2) {
- //Unlike JUnit, only assign a tearDown exception to excep if there is not already an exception from the test body
- if (excep == null)
- excep = e2;
- }
- }
- var timeTaken = (new Date() - timeBefore) / 1000;
- if (excep != null)
- this._handleTestException(excep);
- var serializedTestCaseString = this._currentTestFunctionNameWithTestPageName(true) + "|" + timeTaken + "|";
- if (excep == null)
- serializedTestCaseString += "S||";
- else {
- if (typeof(excep.isJsUnitException) != 'undefined' && excep.isJsUnitException)
- serializedTestCaseString += "F|";
- else {
- serializedTestCaseString += "E|";
- }
- serializedTestCaseString += this._problemDetailMessageFor(excep);
- }
- this._addOption(this.testCaseResultsField,
- serializedTestCaseString,
- serializedTestCaseString);
-}
-
-jsUnitTestManager.prototype._currentTestFunctionNameWithTestPageName = function(useFullyQualifiedTestPageName) {
- var testURL = this.containerTestFrame.location.href;
- var testQuery = testURL.indexOf("?");
- if (testQuery >= 0) {
- testURL = testURL.substring(0, testQuery);
- }
- if (!useFullyQualifiedTestPageName) {
- if (testURL.substring(0, this._baseURL.length) == this._baseURL)
- testURL = testURL.substring(this._baseURL.length);
- }
- return testURL + ':' + this._testFunctionName;
-}
-
-jsUnitTestManager.prototype._addOption = function(listField, problemValue, problemMessage) {
- if (typeof(listField.ownerDocument) != 'undefined'
- && typeof(listField.ownerDocument.createElement) != 'undefined') {
- // DOM Level 2 HTML method.
- // this is required for Opera 7 since appending to the end of the
- // options array does not work, and adding an Option created by new Option()
- // and appended by listField.options.add() fails due to WRONG_DOCUMENT_ERR
- var problemDocument = listField.ownerDocument;
- var errOption = problemDocument.createElement('option');
- errOption.setAttribute('value', problemValue);
- errOption.appendChild(problemDocument.createTextNode(problemMessage));
- listField.appendChild(errOption);
- }
- else {
- // new Option() is DOM 0
- errOption = new Option(problemMessage, problemValue);
- if (typeof(listField.add) != 'undefined') {
- // DOM 2 HTML
- listField.add(errOption, null);
- }
- else if (typeof(listField.options.add) != 'undefined') {
- // DOM 0
- listField.options.add(errOption, null);
- }
- else {
- // DOM 0
- listField.options[listField.length] = errOption;
- }
- }
-}
-
-jsUnitTestManager.prototype._handleTestException = function (excep) {
- var problemMessage = this._currentTestFunctionNameWithTestPageName(false) + ' ';
- var errOption;
- if (typeof(excep.isJsUnitException) == 'undefined' || !excep.isJsUnitException) {
- problemMessage += 'had an error';
- this.errorCount++;
- }
- else {
- problemMessage += 'failed';
- this.failureCount++;
- }
- var listField = this.problemsListField;
- this._addOption(listField,
- this._problemDetailMessageFor(excep),
- problemMessage);
-}
-
-jsUnitTestManager.prototype._problemDetailMessageFor = function (excep) {
- var result = null;
- if (typeof(excep.isJsUnitException) != 'undefined' && excep.isJsUnitException) {
- result = '';
- if (excep.comment != null)
- result += ('"' + excep.comment + '"\n');
-
- result += excep.jsUnitMessage;
-
- if (excep.stackTrace)
- result += '\n\nStack trace follows:\n' + excep.stackTrace;
- }
- else {
- result = 'Error message is:\n"';
- result +=
- (typeof(excep.description) == 'undefined') ?
- excep :
- excep.description;
- result += '"';
- if (typeof(excep.stack) != 'undefined') // Mozilla only
- result += '\n\nStack trace follows:\n' + excep.stack;
- }
- return result;
-}
-
-jsUnitTestManager.prototype._setTextOnLayer = function (layerName, str) {
- try {
- var content;
- if (content = this.uiFrames[layerName].document.getElementById('content'))
- content.innerHTML = str;
- else
- throw 'No content div found.';
- }
- catch (e) {
- var html = '';
- html += '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
- html += '<html><head><link rel="stylesheet" type="text/css" href="css/jsUnitStyle.css"><\/head>';
- html += '<body><div id="content">';
- html += str;
- html += '<\/div><\/body>';
- html += '<\/html>';
- this.uiFrames[layerName].document.write(html);
- this.uiFrames[layerName].document.close();
- }
-}
-
-jsUnitTestManager.prototype.setStatus = function (str) {
- this._setTextOnLayer('mainStatus', '<b>Status:<\/b> ' + str);
-}
-
-jsUnitTestManager.prototype._setErrors = function (n) {
- this._setTextOnLayer('mainCountsErrors', '<b>Errors: <\/b>' + n);
-}
-
-jsUnitTestManager.prototype._setFailures = function (n) {
- this._setTextOnLayer('mainCountsFailures', '<b>Failures:<\/b> ' + n);
-}
-
-jsUnitTestManager.prototype._setTotal = function (n) {
- this._setTextOnLayer('mainCountsRuns', '<b>Runs:<\/b> ' + n);
-}
-
-jsUnitTestManager.prototype._setProgressBarImage = function (imgName) {
- this.progressBar.src = imgName;
-}
-
-jsUnitTestManager.prototype._setProgressBarWidth = function (w) {
- this.progressBar.width = w;
-}
-
-jsUnitTestManager.prototype.updateProgressIndicators = function () {
- this._setTotal(this.totalCount);
- this._setErrors(this.errorCount);
- this._setFailures(this.failureCount);
- this._setProgressBarWidth(300 * this.calculateProgressBarProportion());
-
- if (this.errorCount > 0 || this.failureCount > 0)
- this._setProgressBarImage('../images/red.gif');
- else
- this._setProgressBarImage('../images/green.gif');
-}
-
-jsUnitTestManager.prototype.showMessageForSelectedProblemTest = function () {
- var problemTestIndex = this.problemsListField.selectedIndex;
- if (problemTestIndex != -1)
- this.fatalError(this.problemsListField[problemTestIndex].value);
-}
-
-jsUnitTestManager.prototype.showMessagesForAllProblemTests = function () {
- if (this.problemsListField.length == 0)
- return;
-
- try {
- if (this._windowForAllProblemMessages && !this._windowForAllProblemMessages.closed)
- this._windowForAllProblemMessages.close();
- }
- catch(e) {
- }
-
- this._windowForAllProblemMessages = window.open('', '', 'width=600, height=350,status=no,resizable=yes,scrollbars=yes');
- var resDoc = this._windowForAllProblemMessages.document;
- resDoc.write('<html><head><link rel="stylesheet" href="../css/jsUnitStyle.css"><title>Tests with problems - JsUnit<\/title><head><body>');
- resDoc.write('<p class="jsUnitSubHeading">Tests with problems (' + this.problemsListField.length + ' total) - JsUnit<\/p>');
- resDoc.write('<p class="jsUnitSubSubHeading"><i>Running on ' + navigator.userAgent + '</i></p>');
- for (var i = 0; i < this.problemsListField.length; i++)
- {
- resDoc.write('<p class="jsUnitDefault">');
- resDoc.write('<b>' + (i + 1) + '. ');
- resDoc.write(this.problemsListField[i].text);
- resDoc.write('<\/b><\/p><p><pre>');
- resDoc.write(this._makeHTMLSafe(this.problemsListField[i].value));
- resDoc.write('<\/pre><\/p>');
- }
-
- resDoc.write('<\/body><\/html>');
- resDoc.close();
-}
-
-jsUnitTestManager.prototype._makeHTMLSafe = function (string) {
- string = string.replace(/&/g, '&');
- string = string.replace(/</g, '<');
- string = string.replace(/>/g, '>');
- return string;
-}
-
-jsUnitTestManager.prototype._clearProblemsList = function () {
- var listField = this.problemsListField;
- var initialLength = listField.options.length;
-
- for (var i = 0; i < initialLength; i++)
- listField.remove(0);
-}
-
-jsUnitTestManager.prototype.initialize = function () {
- this.setStatus('Initializing...');
- this._setRunButtonEnabled(false);
- this._clearProblemsList();
- this.updateProgressIndicators();
- this.setStatus('Done initializing');
-}
-
-jsUnitTestManager.prototype.finalize = function () {
- this._setRunButtonEnabled(true);
-}
-
-jsUnitTestManager.prototype._setRunButtonEnabled = function (b) {
- this.runButton.disabled = !b;
-}
-
-jsUnitTestManager.prototype.getTestFileName = function () {
- var rawEnteredFileName = this.testFileName.value;
- var result = rawEnteredFileName;
-
- while (result.indexOf('\\') != -1)
- result = result.replace('\\', '/');
-
- return result;
-}
-
-jsUnitTestManager.prototype.getTestFunctionName = function () {
- return this._testFunctionName;
-}
-
-jsUnitTestManager.prototype.resolveUserEnteredTestFileName = function (rawText) {
- var userEnteredTestFileName = top.testManager.getTestFileName();
-
- // only test for file:// since Opera uses a different format
- if (userEnteredTestFileName.indexOf('http://') == 0 || userEnteredTestFileName.indexOf('https://') == 0 || userEnteredTestFileName.indexOf('file://') == 0)
- return userEnteredTestFileName;
-
- return getTestFileProtocol() + this.getTestFileName();
-}
-
-jsUnitTestManager.prototype.storeRestoredHTML = function () {
- if (document.getElementById && top.testContainer.testFrame.document.getElementById(jsUnitTestManager.RESTORED_HTML_DIV_ID))
- this._restoredHTML = top.testContainer.testFrame.document.getElementById(jsUnitTestManager.RESTORED_HTML_DIV_ID).innerHTML;
-}
-
-jsUnitTestManager.prototype.fatalError = function(aMessage) {
- if (top.shouldSubmitResults())
- this.setStatus(aMessage);
- else
- alert(aMessage);
-}
-
-jsUnitTestManager.prototype.userConfirm = function(aMessage) {
- if (top.shouldSubmitResults())
- return false;
- else
- return confirm(aMessage);
-}
-
-function getTestFileProtocol() {
- return getDocumentProtocol();
-}
-
-function getDocumentProtocol() {
- var protocol = top.document.location.protocol;
-
- if (protocol == "file:")
- return "file:///";
-
- if (protocol == "http:")
- return "http://";
-
- if (protocol == 'https:')
- return 'https://';
-
- if (protocol == "chrome:")
- return "chrome://";
-
- return null;
-}
-
-function browserSupportsReadingFullPathFromFileField() {
- return !isOpera() && !isIE7();
-}
-
-function isOpera() {
- return navigator.userAgent.toLowerCase().indexOf("opera") != -1;
-}
-
-function isIE7() {
- return navigator.userAgent.toLowerCase().indexOf("msie 7") != -1;
-}
-
-function isBeingRunOverHTTP() {
- return getDocumentProtocol() == "http://";
-}
-
-function getWebserver() {
- if (isBeingRunOverHTTP()) {
- var myUrl = location.href;
- var myUrlWithProtocolStripped = myUrl.substring(myUrl.indexOf("/") + 2);
- return myUrlWithProtocolStripped.substring(0, myUrlWithProtocolStripped.indexOf("/"));
- }
- return null;
-}
-
-// the functions push(anArray, anObject) and pop(anArray)
-// exist because the JavaScript Array.push(anObject) and Array.pop()
-// functions are not available in IE 5.0
-
-function push(anArray, anObject) {
- anArray[anArray.length] = anObject;
-}
-
-function pop(anArray) {
- if (anArray.length >= 1) {
- delete anArray[anArray.length - 1];
- anArray.length--;
- }
-}
-
-if (xbDEBUG.on) {
- xbDebugTraceObject('window', 'jsUnitTestManager');
- xbDebugTraceFunction('window', 'getTestFileProtocol');
- xbDebugTraceFunction('window', 'getDocumentProtocol');
-}
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTestSuite.js
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTestSuite.js 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTestSuite.js 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,44 +0,0 @@
-function jsUnitTestSuite() {
- this.isjsUnitTestSuite = true;
- this.testPages = Array();
- this.pageIndex = 0;
-}
-
-jsUnitTestSuite.prototype.addTestPage = function (pageName)
-{
- this.testPages[this.testPages.length] = pageName;
-}
-
-jsUnitTestSuite.prototype.addTestSuite = function (suite)
-{
- for (var i = 0; i < suite.testPages.length; i++)
- this.addTestPage(suite.testPages[i]);
-}
-
-jsUnitTestSuite.prototype.containsTestPages = function ()
-{
- return this.testPages.length > 0;
-}
-
-jsUnitTestSuite.prototype.nextPage = function ()
-{
- return this.testPages[this.pageIndex++];
-}
-
-jsUnitTestSuite.prototype.hasMorePages = function ()
-{
- return this.pageIndex < this.testPages.length;
-}
-
-jsUnitTestSuite.prototype.clone = function ()
-{
- var clone = new jsUnitTestSuite();
- clone.testPages = this.testPages;
- return clone;
-}
-
-if (xbDEBUG.on)
-{
- xbDebugTraceObject('window', 'jsUnitTestSuite');
-}
-
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTracer.js
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTracer.js 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitTracer.js 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,102 +0,0 @@
-var TRACE_LEVEL_NONE = new JsUnitTraceLevel(0, null);
-var TRACE_LEVEL_WARNING = new JsUnitTraceLevel(1, "#FF0000");
-var TRACE_LEVEL_INFO = new JsUnitTraceLevel(2, "#009966");
-var TRACE_LEVEL_DEBUG = new JsUnitTraceLevel(3, "#0000FF");
-
-function JsUnitTracer(testManager) {
- this._testManager = testManager;
- this._traceWindow = null;
- this.popupWindowsBlocked = false;
-}
-
-JsUnitTracer.prototype.initialize = function() {
- if (this._traceWindow != null && top.testManager.closeTraceWindowOnNewRun.checked)
- this._traceWindow.close();
- this._traceWindow = null;
-}
-
-JsUnitTracer.prototype.finalize = function() {
- if (this._traceWindow != null) {
- this._traceWindow.document.write('<\/body>\n<\/html>');
- this._traceWindow.document.close();
- }
-}
-
-JsUnitTracer.prototype.warn = function() {
- this._trace(arguments[0], arguments[1], TRACE_LEVEL_WARNING);
-}
-
-JsUnitTracer.prototype.inform = function() {
- this._trace(arguments[0], arguments[1], TRACE_LEVEL_INFO);
-}
-
-JsUnitTracer.prototype.debug = function() {
- this._trace(arguments[0], arguments[1], TRACE_LEVEL_DEBUG);
-}
-
-JsUnitTracer.prototype._trace = function(message, value, traceLevel) {
- if (!top.shouldSubmitResults() && this._getChosenTraceLevel().matches(traceLevel)) {
- var traceString = message;
- if (value)
- traceString += ': ' + value;
- var prefix = this._testManager.getTestFileName() + ":" +
- this._testManager.getTestFunctionName() + " - ";
- this._writeToTraceWindow(prefix, traceString, traceLevel);
- }
-}
-
-JsUnitTracer.prototype._getChosenTraceLevel = function() {
- var levelNumber = eval(top.testManager.traceLevel.value);
- return traceLevelByLevelNumber(levelNumber);
-}
-
-JsUnitTracer.prototype._writeToTraceWindow = function(prefix, traceString, traceLevel) {
- var htmlToAppend = '<p class="jsUnitDefault">' + prefix + '<font color="' + traceLevel.getColor() + '">' + traceString + '</font><\/p>\n';
- this._getTraceWindow().document.write(htmlToAppend);
-}
-
-JsUnitTracer.prototype._getTraceWindow = function() {
- if (this._traceWindow == null && !top.shouldSubmitResults() && !this.popupWindowsBlocked) {
- this._traceWindow = window.open('', '', 'width=600, height=350,status=no,resizable=yes,scrollbars=yes');
- if (!this._traceWindow)
- this.popupWindowsBlocked = true;
- else {
- var resDoc = this._traceWindow.document;
- resDoc.write('<html>\n<head>\n<link rel="stylesheet" href="css/jsUnitStyle.css">\n<title>Tracing - JsUnit<\/title>\n<head>\n<body>');
- resDoc.write('<h2>Tracing - JsUnit<\/h2>\n');
- resDoc.write('<p class="jsUnitDefault"><i>(Traces are color coded: ');
- resDoc.write('<font color="' + TRACE_LEVEL_WARNING.getColor() + '">Warning</font> - ');
- resDoc.write('<font color="' + TRACE_LEVEL_INFO.getColor() + '">Information</font> - ');
- resDoc.write('<font color="' + TRACE_LEVEL_DEBUG.getColor() + '">Debug</font>');
- resDoc.write(')</i></p>');
- }
- }
- return this._traceWindow;
-}
-
-if (xbDEBUG.on) {
- xbDebugTraceObject('window', 'JsUnitTracer');
-}
-
-function JsUnitTraceLevel(levelNumber, color) {
- this._levelNumber = levelNumber;
- this._color = color;
-}
-
-JsUnitTraceLevel.prototype.matches = function(anotherTraceLevel) {
- return this._levelNumber >= anotherTraceLevel._levelNumber;
-}
-
-JsUnitTraceLevel.prototype.getColor = function() {
- return this._color;
-}
-
-function traceLevelByLevelNumber(levelNumber) {
- switch (levelNumber) {
- case 0: return TRACE_LEVEL_NONE;
- case 1: return TRACE_LEVEL_WARNING;
- case 2: return TRACE_LEVEL_INFO;
- case 3: return TRACE_LEVEL_DEBUG;
- }
- return null;
-}
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitVersionCheck.js
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitVersionCheck.js 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/jsUnitVersionCheck.js 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,59 +0,0 @@
-var versionRequest;
-
-function isOutOfDate(newVersionNumber) {
- return JSUNIT_VERSION < newVersionNumber;
-}
-
-function sendRequestForLatestVersion(url) {
- versionRequest = createXmlHttpRequest();
- if (versionRequest) {
- versionRequest.onreadystatechange = requestStateChanged;
- versionRequest.open("GET", url, true);
- versionRequest.send(null);
- }
-}
-
-function createXmlHttpRequest() {
- if (window.XMLHttpRequest)
- return new XMLHttpRequest();
- else if (window.ActiveXObject)
- return new ActiveXObject("Microsoft.XMLHTTP");
-}
-
-function requestStateChanged() {
- if (versionRequest && versionRequest.readyState == 4) {
- if (versionRequest.status == 200) {
- var latestVersion = versionRequest.responseText;
- if (isOutOfDate(latestVersion))
- versionNotLatest(latestVersion);
- else
- versionLatest();
- } else
- versionCheckError();
- }
-}
-
-function checkForLatestVersion(url) {
- setLatestVersionDivHTML("Checking for newer version...");
- try {
- sendRequestForLatestVersion(url);
- } catch (e) {
- setLatestVersionDivHTML("An error occurred while checking for a newer version: " + e.message);
- }
-}
-
-function versionNotLatest(latestVersion) {
- setLatestVersionDivHTML('<font color="red">A newer version of JsUnit, version ' + latestVersion + ', is available.</font>');
-}
-
-function versionLatest() {
- setLatestVersionDivHTML("You are running the latest version of JsUnit.");
-}
-
-function setLatestVersionDivHTML(string) {
- document.getElementById("versionCheckDiv").innerHTML = string;
-}
-
-function versionCheckError() {
- setLatestVersionDivHTML("An error occurred while checking for a newer version.");
-}
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-errors.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-errors.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-errors.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/jsUnitStyle.css">
-</head>
-
-<body>
-<div id="content"><b>Errors:</b> 0</div>
-</body>
-</html>
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-failures.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-failures.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-failures.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/jsUnitStyle.css">
-</head>
-
-<body>
-<div id="content"><b>Failures:</b> 0</div>
-
-</body>
-</html>
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-runs.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-runs.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts-runs.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title></title>
- <link rel="stylesheet" type="text/css" href="../css/jsUnitStyle.css">
-</head>
-
-<body>
-<div id="content"><b>Runs:</b> 0</div>
-
-</body>
-</html>
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-counts.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title></title>
-</head>
-
-<frameset cols="200,190,*" border="0">
- <frame name="mainCountsRuns" src="main-counts-runs.html" scrolling="no" frameborder="0">
- <frame name="mainCountsErrors" src="main-counts-errors.html" scrolling="no" frameborder="0">
- <frame name="mainCountsFailures" src="main-counts-failures.html" scrolling="no" frameborder="0">
-
- <noframes>
- <body>
- <p>jsUnit uses frames in order to remove dependencies upon a browser's implementation of document.getElementById
- and HTMLElement.innerHTML.</p>
- </body>
- </noframes>
-</frameset>
-</html>
-
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-data.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-data.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-data.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,178 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JsUnit main-data.html</title>
- <link rel="stylesheet" type="text/css" href="../css/jsUnitStyle.css">
- <script language="JavaScript" type="text/javascript" src="jsUnitCore.js"></script>
- <script language="JavaScript" type="text/javascript" src="jsUnitVersionCheck.js"></script>
- <script language="JavaScript" type="text/javascript">
-
- function pageLoaded() {
- giveFocusToTestFileNameField();
- }
-
- function giveFocusToTestFileNameField() {
- if (document.testRunnerForm.testFileName.type != "hidden")
- document.testRunnerForm.testFileName.focus();
- }
-
- function kickOffTests() {
- //
- // Check if Init was called by onload handler
- //
- if (typeof(top.testManager) == 'undefined') {
- top.init();
- }
-
- if (isBlank(top.testManager.getTestFileName())) {
- top.testManager.fatalError('No Test Page specified.');
- return;
- }
-
- top.testManager.setup();
-
- top.testManager._currentSuite().addTestPage(top.testManager.resolveUserEnteredTestFileName());
- top.tracer.initialize();
-
- var traceLevel = document.forms.testRunnerForm.traceLevel;
- if (traceLevel.value != '0')
- {
- var traceWindow = top.tracer._getTraceWindow();
- if (traceWindow) {
- traceWindow.focus();
- }
- else {
- top.testManager.fatalError('Tracing requires popup windows, and popups are blocked in your browser.\n\nPlease enable popups if you wish to use tracing.');
- }
- }
-
- top.testManager.start();
- }
-
- </script>
-</head>
-
-<body onload="pageLoaded();">
-<table width="100%" cellpadding="0" cellspacing="0" border="0" summary="jsUnit Information" bgcolor="#DDDDDD">
- <tr>
- <td width="1"><a href="http://www.jsunit.net" target="_blank"><img src="../images/logo_jsunit.gif" alt="JsUnit" border="0"/></a></td>
- <td width="50"> </td>
- <th nowrap align="left">
- <h4>JsUnit <script language="javascript">document.write(JSUNIT_VERSION);</script> TestRunner</h4>
- <font size="-2"><i>Running on <script language="javascript" type="text/javascript">document.write(navigator.userAgent);</script>
- </i></font>
- </th>
-
- <td nowrap align="right" valign="middle">
- <font size="-2">
- <b><a href="http://www.jsunit.net/" target="_blank">www.jsunit.net</a></b> <br>
- </font>
- <a href="http://www.pivotalsf.com/" target="top">
- <img border="0" src="../images/powerby-transparent.gif" alt="Powered By Pivotal">
- </a>
- </td>
- </tr>
-</table>
-
-<form name="testRunnerForm" action="">
- <script type="text/javascript" language="javascript">
- if (!jsUnitGetParm('testpage')) {
- document.write("<p>Enter the filename of the Test Page to be run:</p>");
- } else {
- document.write("<br>");
- };
- </script>
-
- <table cellpadding="0" cellspacing="0" border="0" summary="Form for entering test case location">
- <tr>
- <td align="center" valign="middle">
- <script language="JavaScript" type="text/javascript">
- document.write(top.getDocumentProtocol());
- </script>
- </td>
-
- <td nowrap align="center" valign="bottom">
-
- <script language="JavaScript" type="text/javascript">
- var specifiedTestPage = jsUnitGetParm('testpage');
- if (specifiedTestPage) {
- var html = '<input type="hidden" name="testFileName" value="';
- var valueString = '';
- if ((top.getDocumentProtocol() == 'http://' || top.getDocumentProtocol() == 'https://') && jsUnitGetParm('testpage').indexOf('/') == 0)
- valueString += top.location.host;
- valueString += specifiedTestPage;
- var testParms = top.jsUnitConstructTestParms();
- if (testParms != '') {
- valueString += '?';
- valueString += testParms;
- }
- html += valueString;
- html += '">';
- html += valueString;
- document.write(html);
- } else {
- if (top.getDocumentProtocol() == 'file:///' && top.browserSupportsReadingFullPathFromFileField())
- document.write('<input type="file" name="testFileName" size="60">');
- else
- document.write('<input type="text" name="testFileName" size="60">');
- }
- </script>
- <input type="button" name="runButton" value="Run" onclick="kickOffTests()">
- </td>
- </tr>
- </table>
- <br>
- <hr>
-
- <table cellpadding="0" cellspacing="0" border="0" summary="Choose Trace Level">
- <tr>
- <td nowrap>Trace level:</td>
-
- <td><select name="traceLevel">
- <option value="0" selected>
- no tracing
- </option>
-
- <option value="1">
- warning (lowest)
- </option>
-
- <option value="2">
- info
- </option>
-
- <option value="3">
- debug (highest)
- </option>
- </select></td>
-
- <td> </td>
-
- <td><input type="checkbox" name="closeTraceWindowOnNewRun" checked></td>
- <td nowrap>Close old trace window on new run</td>
-
- <td> </td>
-
- <td nowrap>Page load timeout:</td>
- <td>
- <script language="javascript" type="text/javascript">
- document.write('<input type="text" size="2" name="timeout" value="' + top.jsUnitTestManager.TESTPAGE_WAIT_SEC + '">');
- </script>
- </td>
-
- <td> </td>
-
- <td nowrap>Setup page timeout:</td>
- <td>
- <script language="javascript" type="text/javascript">
- document.write('<input type="text" size="2" name="setUpPageTimeout" value="' + top.jsUnitTestManager.SETUPPAGE_TIMEOUT + '">');
- </script>
- </td>
- </tr>
- </table>
- <hr>
-</form>
-</body>
-</html>
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-errors.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-errors.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-errors.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JsUnit main-errors.html</title>
- <link rel="stylesheet" type="text/css" href="../css/jsUnitStyle.css">
-</head>
-
-<body>
-<hr>
-
-<form name="testRunnerForm" action="javascript:top.testManager.showMessageForSelectedProblemTest()">
- <p>Errors and failures: </p>
- <select size="5" ondblclick="top.testManager.showMessageForSelectedProblemTest()" name="problemsList">
- <option> </option>
- </select>
- <br>
- <input type="button" value="Show selected" onclick="top.testManager.showMessageForSelectedProblemTest()">
-
- <input type="button" value="Show all" onclick="top.testManager.showMessagesForAllProblemTests()">
-</form>
-</body>
-</html>
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-frame.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-frame.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-frame.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<html>
-<head>
- <title>jsUnit Main Frame</title>
-</head>
-<frameset rows="230,30,30,30,0,*" border="0">
- <frame name="mainData" src="main-data.html" scrolling="no" frameborder="0">
- <frame name="mainStatus" src="main-status.html" scrolling="no" frameborder="0">
- <frame name="mainProgress" src="main-progress.html" scrolling="no" frameborder="0">
- <frame name="mainCounts" src="main-counts.html" scrolling="no" frameborder="0">
- <frame name="mainResults" src="main-results.html" scrolling="no" frameborder="0">
- <frame name="mainErrors" src="main-errors.html" scrolling="no" frameborder="0">
- <noframes>
- <body>
- <p>Sorry, JsUnit requires frames.</p>
- </body>
- </noframes>
-</frameset>
-</html>
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-loader.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-loader.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-loader.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>jsUnit External Data Document loader</title>
- <script language="JavaScript" type="text/javascript">
-
- var loadStatus;
- var callback = function () {
- };
-
- function buffer() {
- return window.frames.documentBuffer;
- }
-
- function load(uri) {
- loadStatus = 'loading';
- buffer().document.location.href = uri;
- }
-
- function loadComplete() {
- top.xbDEBUG.dump('main-loader.html:loadComplete(): loadStatus = ' + loadStatus + ' href=' + buffer().document.location.href);
- if (loadStatus == 'loading') {
- loadStatus = 'complete';
- callback();
- callback = function () {
- };
- }
- }
-
- if (top.xbDEBUG.on) {
- var scopeName = 'main_loader_' + (new Date()).getTime();
- top[scopeName] = window;
- top.xbDebugTraceFunction(scopeName, 'buffer');
- top.xbDebugTraceFunction(scopeName, 'load');
- top.xbDebugTraceFunction(scopeName, 'loadComplete');
- }
-
- </script>
-</head>
-
-<body>
-<iframe name="documentBuffer" onload="loadComplete()"></iframe>
-</body>
-</html>
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-progress.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-progress.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-progress.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JsUnit main-progress.html</title>
- <link rel="stylesheet" type="text/css" href="../css/jsUnitStyle.css">
-</head>
-
-<body>
-<table width="375" cellpadding="0" cellspacing="0" border="0" summary="Test progress indicator">
- <tr>
- <td width="65" valign="top"><b>Progress:</b></td>
-
- <td width="300" height="14" valign="middle">
- <table width="300" cellpadding="0" cellspacing="0" border="1" summary="Progress image">
- <tr>
- <td width="300" height="14" valign="top"><img name="progress" height="14" width="0"
- alt="progress image" src="../images/green.gif"></td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-</body>
-</html>
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-results.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-results.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-results.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JsUnit main-results.html</title>
- <link rel="stylesheet" type="text/css" href="../css/jsUnitStyle.css">
-</head>
-
-<body>
-<script language="javascript" type="text/javascript">
- var DEFAULT_SUBMIT_WEBSERVER = "localhost:8080";
-
- function submitUrlFromSpecifiedUrl() {
- var result = "";
- var specifiedUrl = top.getSpecifiedResultUrl();
- if (specifiedUrl.indexOf("http://") != 0)
- result = "http://";
- result += specifiedUrl;
- return result;
- }
-
- function submitUrlFromTestRunnerLocation() {
- var result = "http://";
- var webserver = top.getWebserver();
- if (webserver == null) // running over file:///
- webserver = DEFAULT_SUBMIT_WEBSERVER;
- result += webserver;
- result += "/jsunit/acceptor";
- return result;
- }
-
- var submitUrl = "";
- if (top.wasResultUrlSpecified()) {
- submitUrl = submitUrlFromSpecifiedUrl();
- } else {
- submitUrl = submitUrlFromTestRunnerLocation();
- }
-
- var formString = "<form name=\"resultsForm\" action=\"" + submitUrl + "\" method=\"post\" target=\"_top\">";
- document.write(formString);
-</script>
-<input type="hidden" name="id">
-<input type="hidden" name="userAgent">
-<input type="hidden" name="jsUnitVersion">
-<input type="hidden" name="time">
-<input type="hidden" name="url">
-<input type="hidden" name="cacheBuster">
-<select size="5" name="testCases" multiple></select>
-<script language="javascript" type="text/javascript">
- function populateHeaderFields(id, userAgent, jsUnitVersion, baseURL) {
- document.resultsForm.id.value = id;
- document.resultsForm.userAgent.value = userAgent;
- document.resultsForm.jsUnitVersion.value = jsUnitVersion;
- document.resultsForm.url.value = baseURL;
- document.resultsForm.cacheBuster.value = new Date().getTime();
- }
- function submitResults() {
- var testCasesField = document.resultsForm.testCases;
- for (var i = 0; i < testCasesField.length; i++) {
- testCasesField[i].selected = true;
- }
- document.resultsForm.submit();
- }
-</script>
-</body>
-</html>
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/main-status.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/main-status.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/main-status.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JsUnit main-status.html</title>
- <link rel="stylesheet" type="text/css" href="../css/jsUnitStyle.css">
-</head>
-
-<body>
-<div id="content"><b>Status:</b> (Idle)</div>
-
-</body>
-</html>
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/testContainer.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/testContainer.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/testContainer.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JsUnit Test Container</title>
-</head>
-<frameset rows="0, *" border="0">
- <frame name="testContainerController" src="testContainerController.html">
- <frame name="testFrame" src="emptyPage.html">
- <noframes>
- <body>
- <p>Sorry, JsUnit requires frames.</p>
- </body>
- </noframes>
-</frameset>
-</html>
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/testContainerController.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/testContainerController.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/testContainerController.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,77 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>JsUnit Test Container Controller</title>
- <script language="javascript" type="text/javascript">
- var containerReady = false;
-
- function init() {
- containerReady = true;
- }
-
- function isPageLoaded() {
- if (!containerReady)
- return false;
-
- var isTestPageLoaded = false;
-
- try {
- // attempt to access the var isTestPageLoaded in the testFrame
- if (typeof(top.testManager.containerTestFrame.isTestPageLoaded) != 'undefined') {
- isTestPageLoaded = top.testManager.containerTestFrame.isTestPageLoaded;
- }
-
- // ok, if the above did not throw an exception, then the
- // variable is defined. If the onload has not fired in the
- // testFrame then isTestPageLoaded is still false. Otherwise
- // the testFrame has set it to true
- }
- catch (e) {
- // an error occured while attempting to access the isTestPageLoaded
- // in the testFrame, therefore the testFrame has not loaded yet
- isTestPageLoaded = false;
- }
- return isTestPageLoaded;
- }
-
- function isContainerReady() {
- return containerReady;
- }
-
- function setNotReady() {
- try {
- // attempt to set the isTestPageLoaded variable
- // in the test frame to false.
- top.testManager.containerTestFrame.isTestPageLoaded = false;
- }
- catch (e) {
- // testFrame.isTestPageLoaded not available... ignore
- }
- }
- function setTestPage(testPageURI) {
- setNotReady();
- top.jsUnitParseParms(testPageURI);
- testPageURI = appendCacheBusterParameterTo(testPageURI);
- try {
- top.testManager.containerTestFrame.location.href = testPageURI;
- } catch (e) {
- }
- }
-
- function appendCacheBusterParameterTo(testPageURI) {
- if (testPageURI.indexOf("?") == -1)
- testPageURI += "?";
- else
- testPageURI += "&";
- testPageURI += "cacheBuster=";
- testPageURI += new Date().getTime();
- return testPageURI;
- }
- </script>
-</head>
-
-<body onload="init()">
-Test Container Controller
-</body>
-</html>
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/app/xbDebug.js
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/app/xbDebug.js 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/app/xbDebug.js 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,306 +0,0 @@
-// xbDebug.js revision: 0.003 2002-02-26
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Licensed under Version: MPL 1.1/GPL 2.0/LGPL 2.1
- * Full Terms at /xbProjects-srce/license/mpl-tri-license.txt
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Netscape code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Bob Clary <bclary(a)netscape.com>
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-ChangeLog:
-
-2002-02-25: bclary - modified xbDebugTraceOject to make sure
- that original versions of wrapped functions were not
- rewrapped. This had caused an infinite loop in IE.
-
-2002-02-07: bclary - modified xbDebug.prototype.close to not null
- the debug window reference. This can cause problems with
- Internet Explorer if the page is refreshed. These issues will
- be addressed at a later date.
-*/
-
-function xbDebug()
-{
- this.on = false;
- this.stack = new Array();
- this.debugwindow = null;
- this.execprofile = new Object();
-}
-
-xbDebug.prototype.push = function ()
-{
- this.stack[this.stack.length] = this.on;
- this.on = true;
-}
-
-xbDebug.prototype.pop = function ()
-{
- this.on = this.stack[this.stack.length - 1];
- --this.stack.length;
-}
-
-xbDebug.prototype.open = function ()
-{
- if (this.debugwindow && !this.debugwindow.closed)
- this.close();
-
- this.debugwindow = window.open('about:blank', 'DEBUGWINDOW', 'height=400,width=600,resizable=yes,scrollbars=yes');
-
- this.debugwindow.title = 'xbDebug Window';
- this.debugwindow.document.write('<html><head><title>xbDebug Window</title></head><body><h3>Javascript Debug Window</h3></body></html>');
- this.debugwindow.focus();
-}
-
-xbDebug.prototype.close = function ()
-{
- if (!this.debugwindow)
- return;
-
- if (!this.debugwindow.closed)
- this.debugwindow.close();
-
- // bc 2002-02-07, other windows may still hold a reference to this: this.debugwindow = null;
-}
-
-xbDebug.prototype.dump = function (msg)
-{
- if (!this.on)
- return;
-
- if (!this.debugwindow || this.debugwindow.closed)
- this.open();
-
- this.debugwindow.document.write(msg + '<br>');
-
- return;
-}
-
-var xbDEBUG = new xbDebug();
-
-window.onunload = function () {
- xbDEBUG.close();
-}
-
-function xbDebugGetFunctionName(funcref)
-{
-
- if (!funcref)
- {
- return '';
- }
-
- if (funcref.name)
- return funcref.name;
-
- var name = funcref + '';
- name = name.substring(name.indexOf(' ') + 1, name.indexOf('('));
- funcref.name = name;
-
- if (!name) alert('name not defined');
- return name;
-}
-
-// emulate functionref.apply for IE mac and IE win < 5.5
-function xbDebugApplyFunction(funcname, funcref, thisref, argumentsref)
-{
- var rv;
-
- if (!funcref)
- {
- alert('xbDebugApplyFunction: funcref is null');
- }
-
- if (typeof(funcref.apply) != 'undefined')
- return funcref.apply(thisref, argumentsref);
-
- var applyexpr = 'thisref.xbDebug_orig_' + funcname + '(';
- var i;
-
- for (i = 0; i < argumentsref.length; i++)
- {
- applyexpr += 'argumentsref[' + i + '],';
- }
-
- if (argumentsref.length > 0)
- {
- applyexpr = applyexpr.substring(0, applyexpr.length - 1);
- }
-
- applyexpr += ')';
-
- return eval(applyexpr);
-}
-
-function xbDebugCreateFunctionWrapper(scopename, funcname, precall, postcall)
-{
- var wrappedfunc;
- var scopeobject = eval(scopename);
- var funcref = scopeobject[funcname];
-
- scopeobject['xbDebug_orig_' + funcname] = funcref;
-
- wrappedfunc = function ()
- {
- var rv;
-
- precall(scopename, funcname, arguments);
- rv = xbDebugApplyFunction(funcname, funcref, scopeobject, arguments);
- postcall(scopename, funcname, arguments, rv);
- return rv;
- };
-
- if (typeof(funcref.constructor) != 'undefined')
- wrappedfunc.constructor = funcref.constuctor;
-
- if (typeof(funcref.prototype) != 'undefined')
- wrappedfunc.prototype = funcref.prototype;
-
- scopeobject[funcname] = wrappedfunc;
-}
-
-function xbDebugCreateMethodWrapper(contextname, classname, methodname, precall, postcall)
-{
- var context = eval(contextname);
- var methodref = context[classname].prototype[methodname];
-
- context[classname].prototype['xbDebug_orig_' + methodname] = methodref;
-
- var wrappedmethod = function ()
- {
- var rv;
- // eval 'this' at method run time to pick up reference to the object's instance
- var thisref = eval('this');
- // eval 'arguments' at method run time to pick up method's arguments
- var argsref = arguments;
-
- precall(contextname + '.' + classname, methodname, argsref);
- rv = xbDebugApplyFunction(methodname, methodref, thisref, argsref);
- postcall(contextname + '.' + classname, methodname, argsref, rv);
- return rv;
- };
-
- return wrappedmethod;
-}
-
-function xbDebugPersistToString(obj)
-{
- var s = '';
- var p;
-
- if (obj == null)
- return 'null';
-
- switch (typeof(obj))
- {
- case 'number':
- return obj;
- case 'string':
- return '"' + obj + '"';
- case 'undefined':
- return 'undefined';
- case 'boolean':
- return obj + '';
- }
-
- if (obj.constructor)
- return '[' + xbDebugGetFunctionName(obj.constructor) + ']';
-
- return null;
-}
-
-function xbDebugTraceBefore(scopename, funcname, funcarguments)
-{
- var i;
- var s = '';
- var execprofile = xbDEBUG.execprofile[scopename + '.' + funcname];
- if (!execprofile)
- execprofile = xbDEBUG.execprofile[scopename + '.' + funcname] = { started: 0, time: 0, count: 0 };
-
- for (i = 0; i < funcarguments.length; i++)
- {
- s += xbDebugPersistToString(funcarguments[i]);
- if (i < funcarguments.length - 1)
- s += ', ';
- }
-
- xbDEBUG.dump('enter ' + scopename + '.' + funcname + '(' + s + ')');
- execprofile.started = (new Date()).getTime();
-}
-
-function xbDebugTraceAfter(scopename, funcname, funcarguments, rv)
-{
- var i;
- var s = '';
- var execprofile = xbDEBUG.execprofile[scopename + '.' + funcname];
- if (!execprofile)
- xbDEBUG.dump('xbDebugTraceAfter: execprofile not created for ' + scopename + '.' + funcname);
- else if (execprofile.started == 0)
- xbDEBUG.dump('xbDebugTraceAfter: execprofile.started == 0 for ' + scopename + '.' + funcname);
- else
- {
- execprofile.time += (new Date()).getTime() - execprofile.started;
- execprofile.count++;
- execprofile.started = 0;
- }
-
- for (i = 0; i < funcarguments.length; i++)
- {
- s += xbDebugPersistToString(funcarguments[i]);
- if (i < funcarguments.length - 1)
- s += ', ';
- }
-
- xbDEBUG.dump('exit ' + scopename + '.' + funcname + '(' + s + ')==' + xbDebugPersistToString(rv));
-}
-
-function xbDebugTraceFunction(scopename, funcname)
-{
- xbDebugCreateFunctionWrapper(scopename, funcname, xbDebugTraceBefore, xbDebugTraceAfter);
-}
-
-function xbDebugTraceObject(contextname, classname)
-{
- var classref = eval(contextname + '.' + classname);
- var p;
- var sp;
-
- if (!classref || !classref.prototype)
- return;
-
- for (p in classref.prototype)
- {
- sp = p + '';
- if (typeof(classref.prototype[sp]) == 'function' && (sp).indexOf('xbDebug_orig') == -1)
- {
- classref.prototype[sp] = xbDebugCreateMethodWrapper(contextname, classname, sp, xbDebugTraceBefore, xbDebugTraceAfter);
- }
- }
-}
-
-function xbDebugDumpProfile()
-{
- var p;
- var execprofile;
- var avg;
-
- for (p in xbDEBUG.execprofile)
- {
- execprofile = xbDEBUG.execprofile[p];
- avg = Math.round(100 * execprofile.time / execprofile.count) / 100;
- xbDEBUG.dump('Execution profile ' + p + ' called ' + execprofile.count + ' times. Total time=' + execprofile.time + 'ms. Avg Time=' + avg + 'ms.');
- }
-}
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/images/green.gif
===================================================================
(Binary files differ)
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/images/logo_jsunit.gif
===================================================================
(Binary files differ)
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/images/powerby-transparent.gif
===================================================================
(Binary files differ)
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/images/red.gif
===================================================================
(Binary files differ)
Deleted: branches/enterprise/WFK-2_0/extras/jsUnit/testRunner.html
===================================================================
--- branches/enterprise/WFK-2_0/extras/jsUnit/testRunner.html 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/jsUnit/testRunner.html 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,167 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>JsUnit Test Runner</title>
-<script language="JavaScript" type="text/javascript" src="app/xbDebug.js"></script>
-<script language="JavaScript" type="text/javascript" src="app/jsUnitCore.js"></script>
-<script language="JavaScript" type="text/javascript">
- var DEFAULT_TEST_FRAME_HEIGHT = 250;
-
- function jsUnitParseParms(string) {
- var i;
- var searchString = unescape(string);
- var parameterHash = new Object();
-
- if (!searchString) {
- return parameterHash;
- }
-
- i = searchString.indexOf('?');
- if (i != -1) {
- searchString = searchString.substring(i + 1);
- }
-
- var parmList = searchString.split('&');
- var a;
- for (i = 0; i < parmList.length; i++) {
- a = parmList[i].split('=');
- a[0] = a[0].toLowerCase();
- if (a.length > 1) {
- parameterHash[a[0]] = a[1];
- }
- else {
- parameterHash[a[0]] = true;
- }
- }
- return parameterHash;
- }
-
- function jsUnitConstructTestParms() {
- var p;
- var parms = '';
-
- for (p in jsUnitParmHash) {
- var value = jsUnitParmHash[p];
-
- if (!value ||
- p == 'testpage' ||
- p == 'autorun' ||
- p == 'submitresults' ||
- p == 'showtestframe' ||
- p == 'resultid') {
- continue;
- }
-
- if (parms) {
- parms += '&';
- }
-
- parms += p;
-
- if (typeof(value) != 'boolean') {
- parms += '=' + value;
- }
- }
- return escape(parms);
- }
-
- var jsUnitParmHash = jsUnitParseParms(document.location.search);
-
- // set to true to turn debugging code on, false to turn it off.
- xbDEBUG.on = jsUnitGetParm('debug') ? true : false;
-</script>
-
-<script language="JavaScript" type="text/javascript" src="app/jsUnitTestManager.js"></script>
-<script language="JavaScript" type="text/javascript" src="app/jsUnitTracer.js"></script>
-<script language="JavaScript" type="text/javascript" src="app/jsUnitTestSuite.js"></script>
-<script language="JavaScript" type="text/javascript">
-
- var testManager;
- var utility;
- var tracer;
-
-
- if (!Array.prototype.push) {
- Array.prototype.push = function (anObject) {
- this[this.length] = anObject;
- }
- }
-
- if (!Array.prototype.pop) {
- Array.prototype.pop = function () {
- if (this.length > 0) {
- delete this[this.length - 1];
- this.length--;
- }
- }
- }
-
- function shouldKickOffTestsAutomatically() {
- return jsUnitGetParm('autorun') == "true";
- }
-
- function shouldShowTestFrame() {
- return jsUnitGetParm('showtestframe');
- }
-
- function shouldSubmitResults() {
- return jsUnitGetParm('submitresults');
- }
-
- function getResultId() {
- if (jsUnitGetParm('resultid'))
- return jsUnitGetParm('resultid');
- return "";
- }
-
- function submitResults() {
- window.mainFrame.mainData.document.testRunnerForm.runButton.disabled = true;
- window.mainFrame.mainResults.populateHeaderFields(getResultId(), navigator.userAgent, JSUNIT_VERSION, testManager.resolveUserEnteredTestFileName());
- window.mainFrame.mainResults.submitResults();
- }
-
- function wasResultUrlSpecified() {
- return shouldSubmitResults() && jsUnitGetParm('submitresults') != 'true';
- }
-
- function getSpecifiedResultUrl() {
- return jsUnitGetParm('submitresults');
- }
-
- function init() {
- var testRunnerFrameset = document.getElementById('testRunnerFrameset');
- if (shouldShowTestFrame() && testRunnerFrameset) {
- var testFrameHeight;
- if (jsUnitGetParm('showtestframe') == 'true')
- testFrameHeight = DEFAULT_TEST_FRAME_HEIGHT;
- else
- testFrameHeight = jsUnitGetParm('showtestframe');
- testRunnerFrameset.rows = '*,0,' + testFrameHeight;
- }
- testManager = new jsUnitTestManager();
- tracer = new JsUnitTracer(testManager);
- if (shouldKickOffTestsAutomatically()) {
- window.mainFrame.mainData.kickOffTests();
- }
- }
-
-
-</script>
-</head>
-
-<frameset id="testRunnerFrameset" rows="*,0,0" border="0" onload="init()">
-
- <frame frameborder="0" name="mainFrame" src="./app/main-frame.html">
- <frame frameborder="0" name="documentLoader" src="./app/main-loader.html">
- <frame frameborder="0" name="testContainer" src="./app/testContainer.html">
-
- <noframes>
- <body>
- <p>Sorry, JsUnit requires support for frames.</p>
- </body>
- </noframes>
-</frameset>
-
-</html>
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/extras/mail-ra.rar
===================================================================
(Binary files differ)
Deleted: branches/enterprise/WFK-2_0/extras/readme.txt
===================================================================
--- branches/enterprise/WFK-2_0/extras/readme.txt 2012-06-06 17:27:08 UTC (rev 14841)
+++ branches/enterprise/WFK-2_0/extras/readme.txt 2012-06-06 17:27:29 UTC (rev 14842)
@@ -1,15 +0,0 @@
-Running Unit Tests for Seam Remoting Javascript source
-------------------------------------------------------
-
-Load /extras/jsUnit/testRunner.html in a web browser, then click "Browse" and
-load /src/test/jsUnit/jsUnitSeamRemoting.html. Then click "Run" to execute.
-
-Notice: Remoting is now as prototype using Jasmine maven plugin to get and run Jasmine framework for testing Javascript code.
-
-
-Mail-ra.rar
-------------------------------------------------------
-Copy/replace mail-ra.rar in <jboss-4.2.x_install_path>/server/<profile>/deploy/
-
-This RA is only for JBoss AS 4.2.x. JBoss AS 5 and newer has got already applied patches due we distribute this file.
-
12 years, 6 months
- 1
- 0
Seam SVN: r14841 - in branches/enterprise/WFK-2_0: bom and 10 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-06 13:27:08 -0400 (Wed, 06 Jun 2012)
New Revision: 14841
Removed:
branches/enterprise/WFK-2_0/jboss-seam-flex/pom.xml
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexAuthenticationBridge.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexFilter.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexRemote.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexSeamFactory.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/MessageBrokerManager.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/Remote.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamAdapter.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamFlexConfigurationManager.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/package-info.java
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/flex/seam-default-services-config.xml
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/seam-deployment.properties
branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/seam.properties
Modified:
branches/enterprise/WFK-2_0/bom/pom.xml
branches/enterprise/WFK-2_0/build/common.build.xml
branches/enterprise/WFK-2_0/distribution/pom.xml
branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml
branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-ear-war.list
branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-war.list
branches/enterprise/WFK-2_0/pom.xml
branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml
Log:
bz #828702 removed flex module
Modified: branches/enterprise/WFK-2_0/bom/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/bom/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/bom/pom.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -167,12 +167,6 @@
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- <version>${version.seam}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-excel</artifactId>
<version>${version.seam}</version>
</dependency>
@@ -185,18 +179,6 @@
</dependency>
<dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <version>3.2.10.SP3_seam2</version>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>1.2.3</version>
Modified: branches/enterprise/WFK-2_0/build/common.build.xml
===================================================================
--- branches/enterprise/WFK-2_0/build/common.build.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/build/common.build.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -77,11 +77,9 @@
<target name="copyseamdependencies" if="mavenized.property" unless="copyseamdependenciesdone" depends="initcopy, initpoms">
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="runtime" />
- <copyDependencies id="wicket" pom="${wicket.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="runtime" />
- <copyDependencies id="flex" pom="${flex.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="excel" pom="${excel.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="runtime" />
<copyDependencies id="resteasy" pom="${resteasy.pom}" todir="${lib.dir}" scope="runtime" />
@@ -89,13 +87,10 @@
<copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}/gen" scope="runtime" />
<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="compile" />
- <copyDependencies id="wicket" pom="${wicket.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="mail" pom="${mail.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" />
- <copyDependencies id="flex" pom="${flex.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="excel" pom="${excel.pom}" todir="${lib.dir}" scope="compile" />
- <copyDependencies id="rss" pom="${rss.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="resteasy" pom="${resteasy.pom}" todir="${lib.dir}" scope="compile" />
<copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="compile" />
@@ -111,7 +106,6 @@
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ioc" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-mail" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" />
- <dependency groupId="org.jboss.seam" artifactId="jboss-seam-flex" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-resteasy" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${complete.version}" />
Modified: branches/enterprise/WFK-2_0/distribution/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/distribution/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/distribution/pom.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -80,10 +80,6 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ioc</artifactId>
</dependency>
<dependency>
@@ -127,12 +123,6 @@
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-flex</artifactId>
- <classifier>sources</classifier>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-ioc</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
Modified: branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/distribution/src/main/assembly/dist.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -129,7 +129,6 @@
<include>org.jboss.seam:jboss-seam-mail:jar</include>
<include>org.jboss.seam:jboss-seam-resteasy:jar</include>
<include>org.jboss.seam:jboss-seam-remoting:jar</include>
- <include>org.jboss.seam:jboss-seam-flex:jar</include>
<include>org.jboss.seam:jboss-seam-ioc:jar</include>
</includes>
<excludes>
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/pom.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,96 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>jboss-seam-parent</artifactId>
- <groupId>org.jboss.seam</groupId>
- <version>2.3.0.Beta2-redhat-1</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>jboss-seam-flex</artifactId>
- <name>Seam Flex</name>
-
- <dependencies>
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-common</artifactId>
- </dependency>
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-remoting</artifactId>
- </dependency>
- <dependency>
- <groupId>com.adobe.blazeds</groupId>
- <artifactId>blazeds-proxy</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <profiles>
- <profile>
- <id>code-coverage</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>distribution</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <excludeGroupIds>org.jboss.seam</excludeGroupIds>
- <excludeClassifiers>sources, project, distribution</excludeClassifiers>
- <outputDirectory>../jar-dependencies</outputDirectory>
- <stripVersion>true</stripVersion>
- <type>jar</type>
- <transitive>true</transitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexAuthenticationBridge.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexAuthenticationBridge.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexAuthenticationBridge.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,38 +0,0 @@
-package org.jboss.seam.flex;
-
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.seam.security.Credentials;
-import org.jboss.seam.security.Identity;
-
-
-@Name("org.jboss.seam.flex.login")
-@Install(false)
-@FlexRemote(name="login")
-public class FlexAuthenticationBridge
-{
- private static final LogProvider log = Logging.getLogProvider(FlexAuthenticationBridge.class);
-
- @In Identity identity;
- @In Credentials credentials;
-
- public String login(String username, String password) {
- System.out.println("---");
- log.info("*LOGIN " + username + " " + password);
- credentials.setUsername(username);
- credentials.setPassword(password);
-
- String result = identity.login();
-
- log.info("*LOGIN RESULT " + result);
- return result;
- }
-
- public void logout() {
- log.info("*LOGOUT ");
- identity.logout();
- }
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexFilter.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexFilter.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexFilter.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,122 +0,0 @@
-package org.jboss.seam.flex;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import java.io.*;
-import java.util.*;
-
-import org.jboss.seam.*;
-
-import org.jboss.seam.annotations.*;
-import org.jboss.seam.annotations.intercept.*;
-import org.jboss.seam.deployment.AnnotationDeploymentHandler;
-import org.jboss.seam.deployment.DeploymentStrategy;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.seam.web.AbstractFilter;
-
-(a)Scope(ScopeType.APPLICATION)
-@Name("org.jboss.seam.flex.flexFilter")
-@Startup
-(a)Install(precedence=Install.BUILT_IN, value=false)
-@BypassInterceptors
-(a)org.jboss.seam.annotations.web.Filter //within={"org.jboss.seam.????"}
-public class FlexFilter
- extends AbstractFilter
-{
- private static final LogProvider log = Logging.getLogProvider(FlexFilter.class);
-
- MessageBrokerManager messageBrokerManager;
- List<Class<?>> scanned = new ArrayList<Class<?>>();
-
- private AnnotationDeploymentHandler annotationDeploymentHandler() {
- DeploymentStrategy deployment = (DeploymentStrategy) Component.getInstance("deploymentStrategy");
-
- if (deployment != null) {
- return (AnnotationDeploymentHandler)
- deployment.getDeploymentHandlers().get(AnnotationDeploymentHandler.NAME);
- }
-
- return null;
- }
-
- private Collection<Class<?>> scannedClasses() {
- Collection<Class<?>> result = null;
-
- AnnotationDeploymentHandler handler = annotationDeploymentHandler();
- if (handler !=null) {
- result = handler.getClassMap().get(FlexRemote.class.getName());
- }
-
- return result != null ? result : new ArrayList<Class<?>>(0);
- }
-
- @Create
- public void seamInit() {
- // deployment handler only knows about scanned classes during startup
- // so we need to get them now and save them
- scanned.addAll(scannedClasses());
- }
-
- @Override
- public void init(FilterConfig filterConfig)
- throws ServletException
- {
- super.init(filterConfig);
-
- messageBrokerManager = new MessageBrokerManager();
- messageBrokerManager.init(new FlexServletConfig(filterConfig.getServletContext()));
- messageBrokerManager.addDestinations(scanned);
- }
-
-
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException
- {
- if (isMappedToCurrentRequestPath(request)) {
- messageBrokerManager.service((HttpServletRequest)request, (HttpServletResponse)response);
- } else {
- chain.doFilter(request, response);
- }
- }
-
-
- private static class FlexServletConfig
- implements ServletConfig
- {
- Map<String,String> params;
- ServletContext context;
-
- public FlexServletConfig(ServletContext context) {
- this(context, null);
- }
-
- public FlexServletConfig(ServletContext context, Map<String,String> params) {
- this.context = context;
- this.params = (params!=null) ? params : new HashMap<String,String>();
- }
-
- public ServletContext getServletContext() {
- return context;
- }
-
- public String getServletName() {
- return "FlexServlet";
- }
-
- public String getInitParameter(String param) {
- String result = params.get(param);
-
- log.info("init param " + param + " is " + result);
- return result;
- }
-
- @SuppressWarnings("unchecked")
- public Enumeration getInitParameterNames() {
- return Collections.enumeration(params.keySet());
- }
-
- }
-}
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexRemote.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexRemote.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexRemote.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,16 +0,0 @@
-package org.jboss.seam.flex;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-(a)Target(ElementType.TYPE)
-@Documented
-(a)Retention(RetentionPolicy.RUNTIME)
-public @interface FlexRemote
-{
- abstract String name();
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexSeamFactory.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexSeamFactory.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/FlexSeamFactory.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,45 +0,0 @@
-package org.jboss.seam.flex;
-
-import org.jboss.seam.Component;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-
-import flex.messaging.FlexFactory;
-import flex.messaging.FactoryInstance;
-import flex.messaging.config.ConfigMap;
-
-
-public class FlexSeamFactory
- implements FlexFactory
-{
- private static final LogProvider log = Logging.getLogProvider(FlexSeamFactory.class);
-
- String destinationName;
- String componentName;
-
- public FlexSeamFactory(String destinationName, String componentName) {
- this.componentName = componentName;
- this.destinationName = destinationName;
- }
-
- public void initialize(String id, ConfigMap configMap) {
- log.info("!FSF init " + id + " props=" + configMap);
- }
-
- public FactoryInstance createFactoryInstance(String id, ConfigMap properties) {
- log.info("!FSF create factory " + id + " props=" + properties);
- return new FactoryInstance(this, id, properties);
- }
-
- public Object lookup(FactoryInstance factory) {
- log.info("!FSF lookup " + factory);
-
- try {
- Object instance = Component.getInstance(componentName, true);
- return instance;
- } catch (Exception e) {
- log.error(e);
- return null;
- }
- }
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/MessageBrokerManager.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/MessageBrokerManager.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/MessageBrokerManager.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,266 +0,0 @@
-package org.jboss.seam.flex;
-
-import java.io.*;
-import java.lang.reflect.Method;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.Collection;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import flex.messaging.*;
-import flex.messaging.config.*;
-import flex.messaging.endpoints.Endpoint;
-import flex.messaging.log.ServletLogTarget;
-import flex.messaging.services.RemotingService;
-import flex.messaging.services.remoting.*;
-
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.seam.util.Reflections;
-import org.jboss.seam.util.Resources;
-
-
-public class MessageBrokerManager
-{
- private static final String SEAM_ENDPOINT = "seam-amf";
-
- private static final LogProvider log = Logging.getLogProvider(MessageBrokerManager.class);
-
- private static String WAR_CONFIG_PREFIX = "/WEB-INF/flex/";
- private static String EAR_CONFIG_PREFIX = "/META-INF/flex/seam-default-";
-
- private flex.messaging.MessageBroker broker;
-
- private ServletConfig servletConfig;
-
-
- public void init(ServletConfig servletConfig)
- throws ServletException
- {
- this.servletConfig = servletConfig;
-
- // allocate thread local variables
- createThreadLocals();
-
- try
- {
- FlexContext.setThreadLocalObjects(null, null, null, null, null, servletConfig);
- ServletLogTarget.setServletContext(servletConfig.getServletContext());
-
- FlexConfigurationManager configManager = new SeamFlexConfigurationManager();
- MessagingConfiguration config = configManager.getMessagingConfiguration(servletConfig);
-
- config.createLogAndTargets();
- broker = config.createBroker(servletConfig.getInitParameter("messageBrokerId"),
- Thread.currentThread().getContextClassLoader());
-
- // Set the servlet config as thread local
- FlexContext.setThreadLocalObjects(null, null, broker, null, null, servletConfig);
-
- setInitServletContext(broker, servletConfig.getServletContext());
-
- // Create endpoints, services, security, and logger on the broker based on configuration
- config.configureBroker(broker);
-
-
- if (broker.getChannelIds()== null || !broker.getChannelIds().contains(SEAM_ENDPOINT)) {
- log.info("seam-amf endpoint not found. creating...");
-
- broker.createEndpoint(SEAM_ENDPOINT,
- "http://{server.name}:{server.port}/{context.root}/messagebroker/seam-amf",
- "flex.messaging.endpoints.AMFEndpoint");
- }
-
-
- //initialize the httpSessionToFlexSessionMap
- synchronized(HttpFlexSession.mapLock)
- {
- if (servletConfig.getServletContext().getAttribute(HttpFlexSession.SESSION_MAP) == null) {
- servletConfig.getServletContext().setAttribute(HttpFlexSession.SESSION_MAP, new ConcurrentHashMap());
- }
- }
-
- broker.start();
-
- configManager.reportTokens();
- config.reportUnusedProperties();
-
-
-
- // clear the broker and servlet config as this thread is done
- FlexContext.clearThreadLocalObjects();
-
- } catch (Throwable t){
- log.error("MessageBrokerServlet failed to initialize due to runtime exception");
- destroy();
- throw new ServletException(t);
- }
- }
-
-
- private void setInitServletContext(flex.messaging.MessageBroker broker, ServletContext ctx)
- throws Exception
- {
- Method setMethod = flex.messaging.MessageBroker.class.
- getDeclaredMethod("setInitServletContext", ServletContext.class);
- setMethod.setAccessible(true);
- Reflections.invoke(setMethod, broker, ctx);
- }
-
-
-
- public void destroy()
- {
- if (broker != null) {
- broker.stop();
- // release static thread locals
- destroyThreadLocals();
- }
- }
-
- public void service(HttpServletRequest req, HttpServletResponse res)
- {
- log.info("=========== START FLEX REQUEST");
- try {
- broker.initThreadLocals();
-
- FlexContext.setThreadLocalObjects(null, null, broker, req, res, servletConfig);
-
- // necessary to create for later
- HttpFlexSession fs = HttpFlexSession.getFlexSession(req);
- log.info("flex session is " + fs);
-
- Endpoint endpoint = findEndpoint(req, res);
- log.info("Endpoint: " + endpoint.describeEndpoint());
-
- endpoint.service(req, res);
- } catch (UnsupportedOperationException ue) {
- ue.printStackTrace();
- sendError(res);
- } catch (RuntimeException e) {
- e.printStackTrace();
- } finally {
- FlexContext.clearThreadLocalObjects();
- }
-
- log.info("=========== END FLEX REQUEST");
- }
-
-
- private void sendError(HttpServletResponse res)
- {
- if (!res.isCommitted()) {
- try {
- res.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
- } catch (IOException ignored) {
-
- }
- }
- }
-
-
- private Endpoint findEndpoint(HttpServletRequest req, HttpServletResponse res)
- {
- String contextPath = req.getContextPath();
- String pathInfo = req.getPathInfo();
- String endpointPath = req.getServletPath();
- if (pathInfo != null) {
- endpointPath = endpointPath + pathInfo;
- }
-
- log.info("flex request for cp=" + contextPath + " ep=" + endpointPath);
- try {
- return broker.getEndpoint(endpointPath, contextPath);
- } catch (MessageException me) {
- if (!res.isCommitted()) {
- try {
- res.sendError(HttpServletResponse.SC_NOT_FOUND);
- } catch (IOException ignore) {
- // ignore
- }
- }
- return null;
- }
- }
-
-
- // Call ONLY on servlet startup
- public void createThreadLocals()
- {
- // allocate static thread local objects
- flex.messaging.MessageBroker.createThreadLocalObjects();
- FlexContext.createThreadLocalObjects();
- flex.messaging.io.SerializationContext.createThreadLocalObjects();
- flex.messaging.io.TypeMarshallingContext.createThreadLocalObjects();
- }
-
- protected void destroyThreadLocals()
- {
- // Destroy static thread local objects
- flex.messaging.MessageBroker.releaseThreadLocalObjects();
- FlexContext.releaseThreadLocalObjects();
- flex.messaging.io.SerializationContext.releaseThreadLocalObjects();
- flex.messaging.io.TypeMarshallingContext.releaseThreadLocalObjects();
- }
-
-
- private RemotingService createRemotingService() {
- RemotingService remotingService = null;
-
- remotingService = new RemotingService();
- remotingService.setId("remoting-service");
-
- broker.addService(remotingService);
- log.info("Flex remotingservice not found- creating " + remotingService);
- return remotingService;
- }
-
-
- private RemotingService findRemotingService() {
- return (RemotingService) broker.getServiceByType(RemotingService.class.getName());
- }
-
- private void registerSeamAdapter(RemotingService remotingService) {
- if (remotingService.getRegisteredAdapters().get(SeamAdapter.SEAM_ADAPTER_ID) == null) {
- remotingService.registerAdapter(SeamAdapter.SEAM_ADAPTER_ID,SeamAdapter.class.getName());
- }
- }
-
- private Destination createDestination(String destinationName, String componentName) {
- RemotingService remotingService = findRemotingService();
- if (remotingService==null) {
- remotingService = createRemotingService();
- }
-
- RemotingDestination destination =
- (RemotingDestination) remotingService.createDestination(destinationName);
-
- destination.setFactory(new FlexSeamFactory(destinationName, componentName));
-
- // configure adapter
- registerSeamAdapter(remotingService);
- destination.createAdapter(SeamAdapter.SEAM_ADAPTER_ID);
-
- destination.addChannel(SEAM_ENDPOINT);
-
- return destination;
- }
-
- public void addDestinations(Collection<Class<?>> destinations) {
- for (Class<?> annotatedClass: destinations) {
- log.info("Adding scanned flex desitionation for class " + annotatedClass);
- FlexRemote fr = annotatedClass.getAnnotation(FlexRemote.class);
-
- Name name = annotatedClass.getAnnotation(Name.class);
-
- String destinationName = fr.name();
- String componentName = name.value();
- Destination destination = createDestination(destinationName, componentName);
-
- destination.start();
- }
- }
-
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/Remote.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/Remote.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/Remote.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,41 +0,0 @@
-package org.jboss.seam.flex;
-
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Create;
-import org.jboss.seam.annotations.Install;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Startup;
-
-@Name("org.jboss.seam.flex.remote")
-@Startup
-@Install(false)
-(a)Scope(ScopeType.APPLICATION)
-public class Remote
-{
- String destinationName;
- String componentName;
-
- public void setDestinationName(String destionationName) {
- this.destinationName = destionationName;
- }
-
- public String getDestinationName() {
- return destinationName;
- }
-
- public void setComponentName(String componentName) {
- this.componentName = componentName;
- }
-
- public String getComponentName() {
- return componentName;
- }
-
-
- @Create
- public void init() {
- //System.out.println("** remoting destination " + destinationName + " for " + componentName);
- }
-
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamAdapter.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamAdapter.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamAdapter.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,104 +0,0 @@
-package org.jboss.seam.flex;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.jboss.seam.contexts.ServletLifecycle;
-import org.jboss.seam.core.ConversationPropagation;
-import org.jboss.seam.core.Manager;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.seam.servlet.ServletRequestSessionMap;
-import org.jboss.seam.web.ServletContexts;
-
-import flex.messaging.FlexContext;
-import flex.messaging.services.remoting.adapters.JavaAdapter;
-import flex.messaging.messages.AcknowledgeMessage;
-import flex.messaging.messages.Message;
-
-/**
- * The Seam adaptor should translate seam exceptions and do any other additional
- * management needed
- */
-public class SeamAdapter
- extends JavaAdapter
-{
- public static final String SEAM_ADAPTER_ID = "seam-adapter";
- private static final String CONVERSATION_ID = "conversationId";
-
- private static final LogProvider log = Logging.getLogProvider(SeamAdapter.class);
-
- @Override
- public Object invoke(Message message) {
- log.info("SeamAdapter: " + message);
-
- try {
- startSeamContexts(message, FlexContext.getHttpRequest());
-
- Object result = wrapResult(super.invoke(message));
-
- endSeamContexts(FlexContext.getHttpRequest());
-
- return result;
- } catch (RuntimeException e) {
- // XXX end request properly....
- e.printStackTrace();
- throw e;
- }
- }
-
-
- protected Object wrapResult(Object result)
- {
- AcknowledgeMessage response = new AcknowledgeMessage();
- response.setHeader(CONVERSATION_ID, Manager.instance().getCurrentConversationId());
- response.setBody(result);
-
- return response;
- }
-
-
- protected void startSeamContexts(Message message, HttpServletRequest request)
- {
- ServletLifecycle.beginRequest(request);
- ServletContexts.instance().setRequest(request);
-
- Map conversationParameters = conversationMap(message);
- ConversationPropagation.instance().restoreConversationId(conversationParameters);
- Manager.instance().restoreConversation();
- ServletLifecycle.resumeConversation(request);
- Manager.instance().handleConversationPropagation(conversationParameters);
-
- // Force creation of the session
- if (request.getSession(false) == null) {
- request.getSession(true);
- }
-
- }
-
- protected void endSeamContexts(HttpServletRequest request)
- {
- Manager.instance().endRequest( new ServletRequestSessionMap(request) );
- ServletLifecycle.endRequest(request);
- }
-
- protected Map conversationMap(Message message) {
- Map result = new HashMap();
-
- result.put(Manager.instance().getConversationIdParameter(), conversationId(message));
- return result;
- }
-
- protected String conversationId(Message message) {
- if (message == null) {
- return null;
- }
-
- Object header = message.getHeader(CONVERSATION_ID);
-
- return header == null ? null : header.toString();
- }
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamFlexConfigurationManager.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamFlexConfigurationManager.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/SeamFlexConfigurationManager.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,36 +0,0 @@
-package org.jboss.seam.flex;
-
-import java.io.InputStream;
-
-import javax.servlet.ServletConfig;
-
-import org.jboss.seam.util.Resources;
-
-import flex.messaging.config.FlexConfigurationManager;
-import flex.messaging.config.ServletResourceResolver;
-
-public class SeamFlexConfigurationManager
-extends FlexConfigurationManager
-{
-
- private static final String USER_CONFIG_FILE = "/WEB-INF/flex/services-config.xml";
- private static final String SEAM_DEFAULT_CONFIG_FILE = "/META-INF/flex/seam-default-services-config.xml";
-
- @Override
- protected void setupConfigurationPathAndResolver(final ServletConfig config)
- {
- configurationPath = USER_CONFIG_FILE;
-
- if (Resources.getResource(USER_CONFIG_FILE, config.getServletContext()) == null) {
- configurationPath = SEAM_DEFAULT_CONFIG_FILE;
- }
-
- configurationResolver = new ServletResourceResolver(config.getServletContext()) {
-
- @Override
- public InputStream getConfigurationFile(String path) {
- return Resources.getResourceAsStream(path, config.getServletContext());
- }
- };
- }
-}
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/package-info.java
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/package-info.java 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/java/org/jboss/seam/flex/package-info.java 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1,7 +0,0 @@
-@Namespace(value="http://jboss.org/schema/seam/flex", prefix="org.jboss.seam.flex")
-@AutoCreate
-package org.jboss.seam.flex;
-
-import org.jboss.seam.annotations.AutoCreate;
-import org.jboss.seam.annotations.Namespace;
-
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/flex/seam-default-services-config.xml
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/flex/seam-default-services-config.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/flex/seam-default-services-config.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1 +0,0 @@
-<services-config />
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/seam-deployment.properties
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/seam-deployment.properties 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/META-INF/seam-deployment.properties 2012-06-06 17:27:08 UTC (rev 14841)
@@ -1 +0,0 @@
-org.jboss.seam.deployment.annotationTypes=org.jboss.seam.flex.FlexRemote
\ No newline at end of file
Deleted: branches/enterprise/WFK-2_0/jboss-seam-flex/src/main/resources/seam.properties
===================================================================
Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-ear-war.list
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-ear-war.list 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-ear-war.list 2012-06-06 17:27:08 UTC (rev 14841)
@@ -5,9 +5,5 @@
jboss-seam-mail.jar
jboss-seam-pdf.jar
jboss-seam-remoting.jar
-jboss-seam-rss.jar
-jboss-seam-flex.jar
jboss-seam-jul.jar
jboss-seam-ui.jar
-jboss-seam-wicket-ant.jar
-jboss-seam-wicket.jar
Modified: branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-war.list
===================================================================
--- branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-war.list 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/jboss-seam-gen/dist/icefaces/build-scripts/deployed-jars-war.list 2012-06-06 17:27:08 UTC (rev 14841)
@@ -9,9 +9,6 @@
drools-core.jar
drools-decisiontables.jar
drools-templates.jar
-icefaces.jar
-icefaces-comps.jar
-icefaces-facelets.jar
janino.jar
jboss-el.jar
jboss-seam.jar
@@ -21,11 +18,6 @@
jboss-seam-mail.jar
jboss-seam-pdf.jar
jboss-seam-remoting.jar
-jboss-seam-rss.jar
-jboss-seam-flex.jar
jboss-seam-jul.jar
jboss-seam-ui.jar
-jboss-seam-wicket-ant.jar
-jboss-seam-wicket.jar
-jbpm-jpdl.jar
mvel2.jar
Modified: branches/enterprise/WFK-2_0/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/pom.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -359,7 +359,6 @@
<module>jboss-seam-debug</module>
<module>jboss-seam-gen</module>
<module>jboss-seam-excel</module>
- <module>jboss-seam-flex</module>
<module>jboss-seam-mail</module>
<module>jboss-seam-pdf</module>
<module>jboss-seam-remoting</module>
Modified: branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml
===================================================================
--- branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
+++ branches/enterprise/WFK-2_0/seam-integration-tests/pom.xml 2012-06-06 17:27:08 UTC (rev 14841)
@@ -174,7 +174,6 @@
<directory>${basedir}/../jboss-seam/src/main/java</directory>
<directory>${basedir}/../jboss-seam-debug/src/main/java</directory>
<directory>${basedir}/../jboss-seam-excel/src/main/java</directory>
- <directory>${basedir}/../jboss-seam-flex/src/main/java</directory>
<directory>${basedir}/../jboss-seam-gen/src/main/java</directory>
<directory>${basedir}/../jboss-seam-ioc/src/main/java</directory>
<directory>${basedir}/../jboss-seam-jul/src/main/java</directory>
12 years, 6 months
- 1
- 0
Seam SVN: r14840 - in branches/community/Seam_2_3/examples-ee6/seamdiscs: seamdiscs-ear and 8 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-06-06 10:24:38 -0400 (Wed, 06 Jun 2012)
New Revision: 14840
Added:
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/Deployments.java
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/arquillian.xml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/web.xml
Removed:
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/testng.xml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources/WEB-INF/
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources/seam.properties
Modified:
branches/community/Seam_2_3/examples-ee6/seamdiscs/pom.xml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ear/src/main/application/META-INF/jboss-seam-seambay-ds.xml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/src/main/java/org/jboss/seam/example/seamdiscs/action/BandMemberFinder.java
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayArtistTest.java
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayDiscTest.java
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/EditArtistTest.java
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/EditDiscTest.java
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/LoginTest.java
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/pom.xml
Log:
seamdiscs integration tests
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/pom.xml 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
@@ -19,7 +19,7 @@
<module>seamdiscs-ear</module>
<module>seamdiscs-ejb</module>
<module>seamdiscs-web</module>
-<!-- <module>seamdiscs-tests</module> -->
+ <module>seamdiscs-tests</module>
</modules>
<dependencyManagement>
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ear/pom.xml 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ear/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
@@ -30,10 +30,6 @@
<type>ejb</type>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ear/src/main/application/META-INF/jboss-seam-seambay-ds.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ear/src/main/application/META-INF/jboss-seam-seambay-ds.xml 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ear/src/main/application/META-INF/jboss-seam-seambay-ds.xml 2012-06-06 14:24:38 UTC (rev 14840)
@@ -4,7 +4,7 @@
jndi-name="java:/jboss/seamdiscsDatasource"
enabled="true"
use-java-context="true" pool-name="seamdiscs">
- <connection-url>jdbc:h2:mem:seambaydb;DB_CLOSE_DELAY=-1</connection-url>
+ <connection-url>jdbc:h2:mem:seamdiscsdb;DB_CLOSE_DELAY=-1</connection-url>
<driver>h2</driver>
<security>
<user-name>sa</user-name>
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
@@ -48,7 +48,6 @@
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/src/main/java/org/jboss/seam/example/seamdiscs/action/BandMemberFinder.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/src/main/java/org/jboss/seam/example/seamdiscs/action/BandMemberFinder.java 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/src/main/java/org/jboss/seam/example/seamdiscs/action/BandMemberFinder.java 2012-06-06 14:24:38 UTC (rev 14840)
@@ -14,7 +14,7 @@
@Transactional
public List<BandMember> getBandMembers(Object name)
{
- return getEntityManager().createQuery("select bm from BandMember bm where lower(bm.name) like lower(:name + '%')").setParameter("name", name).getResultList();
+ return getEntityManager().createQuery("select bm from BandMember bm where lower(bm.name) like lower(:name || '%')").setParameter("name", name).getResultList();
}
}
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
@@ -24,14 +24,8 @@
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
@@ -41,13 +35,16 @@
<artifactId>jboss-jsf-api_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium.server</groupId>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-server</artifactId>
- <classifier>standalone</classifier>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-java</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
@@ -61,15 +58,37 @@
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- </dependency>
- <dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.protocol</groupId>
+ <artifactId>arquillian-protocol-servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
@@ -79,68 +98,60 @@
<filtering>true</filtering>
</testResource>
<testResource>
- <directory>src/test/bootstrap</directory>
- <filtering>false</filtering>
+ <directory>src/test/resources-integration</directory>
</testResource>
- <testResource>
- <directory>${basedir}/../seamdiscs-ear/src/main/application</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>${basedir}/../seamdiscs-ear/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>${basedir}/../seamdiscs-web/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skipTests>false</skipTests>
- <argLine>-Dsun.lang.ClassLoader.allowArraySyntax=true -Xms512m -Xmx512m</argLine>
- <additionalClasspathElements>
- <additionalClasspathElement>${basedir}/../seamdiscs-web/src/main/webapp</additionalClasspathElement>
- <additionalClasspathElement>${project.build.directory}/dependency/bootstrap</additionalClasspathElement>
- </additionalClasspathElements>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources-integration/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
+ <skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-seam-bootstrap</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <includes>bootstrap/**</includes>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-embedded-bootstrap</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<profiles>
+
<profile>
+ <id>integration-tests</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ </property>
+ </activation>
+ </profile>
+
+ <profile>
+ <id>arq-jbossas-7-managed</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jbossas-managed-7</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>arq-jbossas-7-remote</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jbossas-remote-7</value>
+ </property>
+ </activation>
+ </profile>
+
+ <profile>
<id>ftest-jbossas</id>
<properties>
<example.context.path>seam-seamdiscs</example.context.path>
@@ -149,18 +160,6 @@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
- <param>${basedir}/../seamdiscs-ear/src/main/resources/jboss-seam-seamdiscs-ds.xml</param>
- <param>${basedir}/../seamdiscs-ear/target/seam-seamdiscs.ear</param>
- </fileNames>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
</plugin>
<plugin>
Added: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/Deployments.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/Deployments.java (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/Deployments.java 2012-06-06 14:24:38 UTC (rev 14840)
@@ -0,0 +1,37 @@
+package org.jboss.seam.example.seamdiscs.test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
+
+import java.io.File;
+
+public class Deployments {
+ public static EnterpriseArchive seamdiscsDeployment() {
+ EnterpriseArchive ear = ShrinkWrap.create(ZipImporter.class, "seam-seamdiscs.ear").importFrom(new File("../seamdiscs-ear/target/seam-seamdiscs.ear"))
+ .as(EnterpriseArchive.class);
+
+ // Install org.jboss.seam.mock.MockSeamListener
+ WebArchive web = ear.getAsType(WebArchive.class, "seamdiscs-web.war");
+ web.delete("/WEB-INF/web.xml");
+ web.addAsWebInfResource("web.xml");
+
+ web.delete("/WEB-INF/faces-config.xml");
+
+ web.addAsResource("org/jboss/seam/example/seamdiscs/test/BaseData.xml", "org/jboss/seam/example/seamdiscs/test/BaseData.xml");
+
+ JavaArchive ejb = ear.getAsType(JavaArchive.class, "seamdiscs-ejb.jar");
+ ejb.addClasses(TestStrings.class);
+
+ ear.addAsLibraries(DependencyResolvers.use(MavenDependencyResolver.class)
+ .configureFrom("pom.xml")
+ .artifact("org.dbunit:dbunit:jar:2.2")
+ .resolveAsFiles());
+
+ return ear;
+ }
+}
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayArtistTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayArtistTest.java 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayArtistTest.java 2012-06-06 14:24:38 UTC (rev 14840)
@@ -14,17 +14,39 @@
import org.apache.myfaces.trinidad.model.CollectionModel;
import org.apache.myfaces.trinidad.model.SortCriterion;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.example.seamdiscs.model.Artist;
import org.jboss.seam.example.seamdiscs.model.Band;
-import org.jboss.seam.mock.DBUnitSeamTest;
-import org.testng.annotations.Test;
+import org.jboss.seam.mock.DBJUnitSeamTest;
+import org.jboss.seam.trinidad.SeamCollectionModel;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.runner.RunWith;
+import org.junit.Test;
+(a)RunWith(Arquillian.class)
+public class DisplayArtistTest extends DBJUnitSeamTest
+{
+ @Deployment(name="DisplayArtistTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = Deployments.seamdiscsDeployment();
+ WebArchive web = er.getAsType(WebArchive.class, "seamdiscs-web.war");
+ web.addClasses(DisplayArtistTest.class);
-public class DisplayArtistTest extends DBUnitSeamTest
-{
+ return er;
+ }
@Override
protected void prepareDBUnitOperations() {
+
+ setDatabase("HSQL");
+ setDatasourceJndiName("java:/jboss/seamdiscsDatasource");
+
beforeTestOperations.add(
new DataSetOperation("org/jboss/seam/example/seamdiscs/test/BaseData.xml")
);
@@ -123,6 +145,7 @@
protected void renderResponse() throws Exception
{
Object artists = getValue("#{artists.dataModel}");
+
assert artists instanceof CollectionModel;
CollectionModel collectionModel = (CollectionModel) artists;
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayDiscTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayDiscTest.java 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/DisplayDiscTest.java 2012-06-06 14:24:38 UTC (rev 14840)
@@ -15,16 +15,35 @@
import javax.faces.model.DataModel;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.example.seamdiscs.model.Disc;
-import org.jboss.seam.mock.DBUnitSeamTest;
-import org.testng.annotations.Test;
+import org.jboss.seam.mock.DBJUnitSeamTest;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.runner.RunWith;
+import org.junit.Test;
-
-public class DisplayDiscTest extends DBUnitSeamTest
+(a)RunWith(Arquillian.class)
+public class DisplayDiscTest extends DBJUnitSeamTest
{
+ @Deployment(name="DisplayDiscTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = Deployments.seamdiscsDeployment();
+ WebArchive web = er.getAsType(WebArchive.class, "seamdiscs-web.war");
+ web.addClasses(DisplayDiscTest.class);
+ return er;
+ }
@Override
protected void prepareDBUnitOperations() {
+ setDatabase("HSQL");
+ setDatasourceJndiName("java:/jboss/seamdiscsDatasource");
+
beforeTestOperations.add(
new DataSetOperation("org/jboss/seam/example/seamdiscs/test/BaseData.xml")
);
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/EditArtistTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/EditArtistTest.java 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/EditArtistTest.java 2012-06-06 14:24:38 UTC (rev 14840)
@@ -19,22 +19,40 @@
import javax.el.PropertyNotFoundException;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.example.seamdiscs.model.BandMember;
-import org.jboss.seam.mock.DBUnitSeamTest;
-import org.testng.annotations.Test;
+import org.jboss.seam.mock.DBJUnitSeamTest;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.runner.RunWith;
+import org.junit.Test;
/**
* @author Pete Muir
*
*/
-public class EditArtistTest extends DBUnitSeamTest
+(a)RunWith(Arquillian.class)
+public class EditArtistTest extends DBJUnitSeamTest
{
-
-
+ @Deployment(name="EditArtistTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = Deployments.seamdiscsDeployment();
+ WebArchive web = er.getAsType(WebArchive.class, "seamdiscs-web.war");
+ web.addClasses(EditArtistTest.class);
+ return er;
+ }
@Override
protected void prepareDBUnitOperations()
{
+ setDatabase("HSQL");
+ setDatasourceJndiName("java:/jboss/seamdiscsDatasource");
+
beforeTestOperations.add(
new DataSetOperation("org/jboss/seam/example/seamdiscs/test/BaseData.xml")
);
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/EditDiscTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/EditDiscTest.java 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/EditDiscTest.java 2012-06-06 14:24:38 UTC (rev 14840)
@@ -13,19 +13,40 @@
import javax.faces.model.DataModel;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.example.seamdiscs.model.Artist;
import org.jboss.seam.example.seamdiscs.model.Disc;
-import org.jboss.seam.mock.DBUnitSeamTest;
-import org.testng.annotations.Test;
+import org.jboss.seam.mock.DBJUnitSeamTest;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.runner.RunWith;
+import org.junit.Test;
/**
* @author Pete Muir
*
*/
-public class EditDiscTest extends DBUnitSeamTest{
-
+(a)RunWith(Arquillian.class)
+public class EditDiscTest extends DBJUnitSeamTest{
+
+ @Deployment(name="EditDiscTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = Deployments.seamdiscsDeployment();
+ WebArchive web = er.getAsType(WebArchive.class, "seamdiscs-web.war");
+ web.addClasses(EditDiscTest.class);
+ return er;
+ }
+
@Override
protected void prepareDBUnitOperations() {
+ setDatabase("HSQL");
+ setDatasourceJndiName("java:/jboss/seamdiscsDatasource");
+
beforeTestOperations.add(
new DataSetOperation("org/jboss/seam/example/seamdiscs/test/BaseData.xml")
);
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/LoginTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/LoginTest.java 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/java/org/jboss/seam/example/seamdiscs/test/LoginTest.java 2012-06-06 14:24:38 UTC (rev 14840)
@@ -5,17 +5,38 @@
import static org.jboss.seam.example.seamdiscs.test.TestStrings.WRONG_PASSWORD;
import static org.jboss.seam.example.seamdiscs.test.TestStrings.WRONG_USERNAME;
-import org.jboss.seam.mock.DBUnitSeamTest;
-import org.testng.annotations.Test;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.mock.DBJUnitSeamTest;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.runner.RunWith;
+import org.junit.Test;
/**
* @author Pete Muir
*
*/
-public class LoginTest extends DBUnitSeamTest {
-
+(a)RunWith(Arquillian.class)
+public class LoginTest extends DBJUnitSeamTest {
+
+ @Deployment(name="LoginTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = Deployments.seamdiscsDeployment();
+ WebArchive web = er.getAsType(WebArchive.class, "seamdiscs-web.war");
+ web.addClasses(LoginTest.class);
+ return er;
+ }
+
@Override
protected void prepareDBUnitOperations() {
+ setDatabase("HSQL");
+ setDatasourceJndiName("java:/jboss/seamdiscsDatasource");
+
beforeTestOperations.add(
new DataSetOperation("org/jboss/seam/example/seamdiscs/test/BaseData.xml")
);
Deleted: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources/seam.properties
===================================================================
Added: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/arquillian.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/arquillian.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/arquillian.xml 2012-06-06 14:24:38 UTC (rev 14840)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://jboss.org/schema/arquillian"
+ xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+ <engine>
+ <property name="deploymentExportPath">target/</property>
+ </engine>
+
+ <container qualifier="jboss" default="true">
+ <configuration>
+ <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property>
+ <property name="jbossHome">target/jboss-as-${version.jbossas7}</property>
+ </configuration>
+ </container>
+
+</arquillian>
Deleted: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/testng.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/testng.xml 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/testng.xml 2012-06-06 14:24:38 UTC (rev 14840)
@@ -1,39 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="SeamDiscs" verbose="2" parallel="false">
- <test name="SeamDiscs Artist Tests">
-
- <parameter name="datasourceJndiName" value="java:/seamdiscsDatasource"/>
- <parameter name="database" value="HSQL" />
-
- <classes>
- <class name="org.jboss.seam.example.seamdiscs.test.DisplayArtistTest" />
- <class name="org.jboss.seam.example.seamdiscs.test.EditArtistTest" />
- </classes>
-
- </test>
-
- <test name="SeamDiscs Disc Tests">
-
- <parameter name="datasourceJndiName" value="java:/seamdiscsDatasource"/>
- <parameter name="database" value="HSQL" />
- <parameter name="binaryDir" value="" />
-
- <classes>
- <class name="org.jboss.seam.example.seamdiscs.test.DisplayDiscTest" />
- <class name="org.jboss.seam.example.seamdiscs.test.EditDiscTest" />
- </classes>
-
- </test>
-
- <test name="SeamDiscs Login Test">
-
- <parameter name="datasourceJndiName" value="java:/seamdiscsDatasource"/>
- <parameter name="database" value="HSQL" />
- <parameter name="binaryDir" value="" />
-
- <classes>
- <class name="org.jboss.seam.example.seamdiscs.test.LoginTest" />
- </classes>
-
- </test>
-</suite>
Added: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/web.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/src/test/resources-integration/web.xml 2012-06-06 14:24:38 UTC (rev 14840)
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+ <listener>
+ <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
+ </listener>
+
+</web-app>
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/pom.xml 2012-06-06 14:21:12 UTC (rev 14839)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-web/pom.xml 2012-06-06 14:24:38 UTC (rev 14840)
@@ -72,6 +72,7 @@
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
12 years, 6 months
- 1
- 0
Seam SVN: r14839 - branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-06-06 10:21:12 -0400 (Wed, 06 Jun 2012)
New Revision: 14839
Modified:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java
Log:
JBSEAM-4986 attempt to fix it by not using FactoryFinder to get the MockApplication instance
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java 2012-06-05 22:18:31 UTC (rev 14838)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java 2012-06-06 14:21:12 UTC (rev 14839)
@@ -987,7 +987,11 @@
protected void setupClass() throws Exception
{
servletContext = ServletLifecycle.getServletContext();
- applicationFactory = (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
+
+ // FactoryFinder cannot be reliably used, as something could have called getFactory sooner
+ //applicationFactory = (ApplicationFactory) FactoryFinder.getFactory(FactoryFinder.APPLICATION_FACTORY);
+ applicationFactory = new MockApplicationFactory();
+
application = applicationFactory.getApplication();
conversationViewRootAttributes = new HashMap<String, Map>();
seamFilter = createSeamFilter();
12 years, 6 months
- 1
- 0
Seam SVN: r14838 - branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-05 18:18:31 -0400 (Tue, 05 Jun 2012)
New Revision: 14838
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml
Log:
JBSEAM-4975 fixed correct puJndiName
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml 2012-06-05 22:09:49 UTC (rev 14837)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml 2012-06-05 22:18:31 UTC (rev 14838)
@@ -67,9 +67,7 @@
<property name="ejbJndiPattern" value="${project.name}/#{ejbName}/local"/>
<property name="seamBootstrapsPu" value="false"/>
<property name="seamEmfRef" value="#{null}"/>
- <condition property="puJndiName" value="java:comp/env/${project.name}/pu" else="java:/${project.name}EntityManagerFactory">
- <available file="${jboss.home}/lib/jboss-vfs.jar"/> <!-- JBoss AS >= 5.0 -->
- </condition>
+ <property name="puJndiName" value="java:/${project.name}EntityManagerFactory"/>
<filterset id="persistence">
<filter token="transactionManagerLookupClass" value="${transactionManagerLookupClass}"/>
12 years, 6 months
- 1
- 0
Seam SVN: r14837 - branches/community/Seam_2_3.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-05 18:09:49 -0400 (Tue, 05 Jun 2012)
New Revision: 14837
Modified:
branches/community/Seam_2_3/pom.xml
Log:
move functional-tests module from all to default module set
Modified: branches/community/Seam_2_3/pom.xml
===================================================================
--- branches/community/Seam_2_3/pom.xml 2012-06-05 22:09:41 UTC (rev 14836)
+++ branches/community/Seam_2_3/pom.xml 2012-06-05 22:09:49 UTC (rev 14837)
@@ -492,10 +492,10 @@
</build>
<modules>
- <module>bom</module>
- <module>jboss-seam</module>
- <module>jboss-seam-ui</module>
- <module>jboss-seam-debug</module>
+ <module>bom</module>
+ <module>jboss-seam</module>
+ <module>jboss-seam-ui</module>
+ <module>jboss-seam-debug</module>
<module>jboss-seam-gen</module>
<module>jboss-seam-excel</module>
<module>jboss-seam-flex</module>
@@ -507,7 +507,8 @@
<module>jboss-seam-wicket</module>
<module>jboss-seam-ioc</module>
<module>jboss-seam-jul</module>
- <module>seam-integration-tests</module>
+ <module>functional-tests</module>
+ <module>seam-integration-tests</module>
</modules>
<profiles>
@@ -522,7 +523,6 @@
<id>all</id>
<modules>
<module>seam-reference-guide</module>
- <module>functional-tests</module>
<module>examples-ee6</module>
<module>distribution</module>
</modules>
12 years, 6 months
- 1
- 0
Seam SVN: r14836 - branches/community/Seam_2_3/jboss-seam-gen/dist.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-05 18:09:41 -0400 (Tue, 05 Jun 2012)
New Revision: 14836
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml
Log:
JBSEAM-4959 default driver is H2
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml 2012-06-05 13:11:16 UTC (rev 14835)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml 2012-06-05 22:09:41 UTC (rev 14836)
@@ -311,7 +311,7 @@
<condition property="database.type.default" value="${old.database.type}">
<isset property="old.database.type"/>
</condition>
- <property name="database.type.default" value="hsql"/>
+ <property name="database.type.default" value="h2"/>
<input addproperty="database.type.new"
message="What kind of database are you using? [${database.type.default}]"
validargs="hsql,mysql,derby,oracle,postgres,mssql,db2,sybase,enterprisedb,h2"
@@ -459,12 +459,12 @@
<equals arg1="${database.type.new}" arg2="enterprisedb"/>
</condition>
- <!-- finally, default them to HSQL -->
+ <!-- finally, default them to H2 -->
- <property name="hibernate.dialect.default" value="org.hibernate.dialect.HSQLDialect"/>
- <property name="hibernate.connection.driver_class.default" value="org.hsqldb.jdbcDriver"/>
- <property name="hibernate.connection.dataSource_class.default" value="org.hsqldb.jdbc.jdbcDataSource"/>
- <property name="hibernate.connection.url.default" value="jdbc:hsqldb:."/>
+ <property name="hibernate.dialect.default" value="org.hibernate.dialect.H2Dialect"/>
+ <property name="hibernate.connection.driver_class.default" value="org.h2.Driver"/>
+ <property name="hibernate.connection.dataSource_class.default" value="org.h2.jdbcx.JdbcDataSource"/>
+ <property name="hibernate.connection.url.default" value="jdbc:h2:."/>
<property name="driver.jar.default" value=""/>
<input addproperty="driver.jar.new"
@@ -601,7 +601,7 @@
<condition property="has.license.jar">
<not><equals arg1="${driver.license.jar.new}" arg2=""/></not>
</condition>
- <copy todir="${jboss.home.new}/server/${jboss.domain.new}/lib" overwrite="true">
+ <copy todir="${jboss.home.new}/${jboss.domain.new}/deployments" overwrite="true">
<fileset file="${driver.jar.new}">
<include name="${driver.jar.new}"/>
</fileset>
12 years, 6 months
- 1
- 0
Seam SVN: r14835 - in branches/community/Seam_2_3: bom and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-06-05 09:11:16 -0400 (Tue, 05 Jun 2012)
New Revision: 14835
Modified:
branches/community/Seam_2_3/bom/pom.xml
branches/community/Seam_2_3/examples-ee6/pom.xml
branches/community/Seam_2_3/pom.xml
Log:
update arquillian to 1.0.1.Final
Modified: branches/community/Seam_2_3/bom/pom.xml
===================================================================
--- branches/community/Seam_2_3/bom/pom.xml 2012-06-04 22:59:49 UTC (rev 14834)
+++ branches/community/Seam_2_3/bom/pom.xml 2012-06-05 13:11:16 UTC (rev 14835)
@@ -43,7 +43,7 @@
<version.junit>4.8.2</version.junit>
<version.testng>5.14.10</version.testng>
<version.richfaces>4.2.2.Final</version.richfaces>
- <version.arquillian_core>1.0.0.Final</version.arquillian_core>
+ <version.arquillian_core>1.0.1.Final</version.arquillian_core>
<!-- ***************** -->
Modified: branches/community/Seam_2_3/examples-ee6/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-06-04 22:59:49 UTC (rev 14834)
+++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-06-05 13:11:16 UTC (rev 14835)
@@ -330,21 +330,6 @@
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-managed</artifactId>
<scope>test</scope>
- <!-- Workaround for shrinkwrap BOM forcing runtime scope -->
- <exclusions>
- <exclusion>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-spi</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/pom.xml
===================================================================
--- branches/community/Seam_2_3/pom.xml 2012-06-04 22:59:49 UTC (rev 14834)
+++ branches/community/Seam_2_3/pom.xml 2012-06-05 13:11:16 UTC (rev 14835)
@@ -44,7 +44,7 @@
<pdf.name>${project.artifactId}.pdf</pdf.name>
<!-- Version string properties -->
- <version.arquillian_core>1.0.0.Final</version.arquillian_core>
+ <version.arquillian_core>1.0.1.Final</version.arquillian_core>
<version.wicket>1.4.14</version.wicket>
<version.drools>5.1.1</version.drools>
<version.testng>5.14.10</version.testng>
12 years, 6 months
- 1
- 0
Seam SVN: r14834 - branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-06-04 18:59:49 -0400 (Mon, 04 Jun 2012)
New Revision: 14834
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list
Log:
Added ecj which was required for drools which was causing the issue with JBT
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list 2012-06-04 20:02:24 UTC (rev 14833)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/deployed-jars-ear.list 2012-06-04 22:59:49 UTC (rev 14834)
@@ -6,6 +6,7 @@
drools-compiler.jar
drools-api.jar
drools-core.jar
+ecj.jar
groovy-all.jar
jboss-el.jar
jboss-seam-remoting.jar
12 years, 6 months
- 1
- 0
Seam SVN: r14833 - in branches/community/Seam_2_3: distribution/src/main/assembly and 1 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-06-04 16:02:24 -0400 (Mon, 04 Jun 2012)
New Revision: 14833
Modified:
branches/community/Seam_2_3/distribution/src/main/assembly/copyright.txt
branches/community/Seam_2_3/distribution/src/main/assembly/lgpl.txt
branches/community/Seam_2_3/jboss-seam-gen/dist/README
branches/community/Seam_2_3/release-process.txt
Log:
JBSEAM-4982 updates to text files in distribution
Modified: branches/community/Seam_2_3/distribution/src/main/assembly/copyright.txt
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/copyright.txt 2012-06-04 16:17:44 UTC (rev 14832)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/copyright.txt 2012-06-04 20:02:24 UTC (rev 14833)
@@ -1,5 +1,6 @@
-JBoss Seam is Copyright 2005-2011, JBoss by Red Hat and individual
-contributors. It is licensed under the GNU LGPL except where otherwise
+Seam is Copyright 2005-2012, JBoss, Home of Professional Open Source.
+Red Hat, Inc., and individual contributorsi as indicated above.
+It is licensed under the GNU LGPL except where otherwise
noted in the source file's header.
A summary of the individual contributors is given below. Any omission should
@@ -28,5 +29,19 @@
danielc.roth Daniel Roth
myoungstrom Michael Youngstrom
myuan Michael Yuan
+maschmid Marek Schmidt
+mgencur Martin Gencur
+dhinojosa Daniel Hinojosa
+alessandrolt Alessandro Lazarotti
+stan.silvert(a)jboss.com Stan Silvert
+tom.baeyens(a)jboss.com Tom Baeyens
+oskutka(a)redhat.com Odnrej Skutka
+smendenh(a)redhat.com Samuel Mendenhall
+denis.forveille Denis Forveille
+tsurdilovic Tihomir Surdilovic
+kpiwko(a)redhat.com Karel Piwko
+sboscarine Steven Boscarine
+sannegrinovero Sanne Grinovero
+swd847 Stuart Douglas
------------------------------------------------------------------------
-* JBoss is a registered trademark of Red Hat Middleware LLC
+* JBoss is a registered trademark of Red Hat, Inc.
Modified: branches/community/Seam_2_3/distribution/src/main/assembly/lgpl.txt
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/lgpl.txt 2012-06-04 16:17:44 UTC (rev 14832)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/lgpl.txt 2012-06-04 20:02:24 UTC (rev 14833)
@@ -1,8 +1,8 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -10,7 +10,7 @@
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -55,7 +55,7 @@
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -111,8 +111,8 @@
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
+
+ GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
@@ -158,7 +158,7 @@
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -216,7 +216,7 @@
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -267,7 +267,7 @@
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -329,7 +329,7 @@
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -370,7 +370,7 @@
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -422,7 +422,7 @@
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -432,7 +432,7 @@
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,8 +455,8 @@
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
- END OF TERMS AND CONDITIONS
-
+ END OF TERMS AND CONDITIONS
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
@@ -485,7 +485,7 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
@@ -501,4 +501,3 @@
That's all there is to it!
-
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/README
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/README 2012-06-04 16:17:44 UTC (rev 14832)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/README 2012-06-04 20:02:24 UTC (rev 14833)
@@ -6,9 +6,7 @@
generate source code. Ant is not required to be on your path to
use this script.
- JBoss AS must be installed to deploy the project. If you use EJB3
- components, the JBoss server must have EJB 3 capabilities.
- (JBoss AS 5.1 is strongly recommended)
+ JBoss AS must be installed to deploy the project (JBoss AS 7.1.1 is strongly recommended).
SYNOPSIS
seam COMMAND
Modified: branches/community/Seam_2_3/release-process.txt
===================================================================
--- branches/community/Seam_2_3/release-process.txt 2012-06-04 16:17:44 UTC (rev 14832)
+++ branches/community/Seam_2_3/release-process.txt 2012-06-04 20:02:24 UTC (rev 14833)
@@ -36,12 +36,12 @@
- Clean your local maven repository
- ex. "~/.m2"
- <TODO document way to set local repo settings for clean build />
- - Go to jboss-seam-parent and run "mvn clean verify -s ../build/settings.xml" with these changes
+ - Go to root and run "mvn clean verify -s ../build/settings.xml -Pall,distribution -Darquillian=jbossas-managed-7" with these changes
- This should build, and test without a problem.
- - Run "mvn dependency:tree -s ../build/settings.xml -DoutputFile=../dependency-report.txt"
+ - Run "mvn dependency:tree -s ../build/settings.xml -DoutputFile=../dependency-report.txt -DappendOutput=true"
- Review for snapshot dependencies
-Staging Maven artifacts - UPDATE from tomboy note - TODO
+Staging Maven artifacts
------------------------
* Maven release procedure.
- Run mvn deploy -DrepositoryId=jboss-releases-repository -Durl=https://repository.jboss.org/nexus/service/local/staging/deploy/maven2 -s settings-staging.xml
@@ -111,44 +111,52 @@
- Manually look over for any glaring differences or errors.
- Delete "../tmp" if you wish
-* check that the following files/directories exist in the dist "ls -1"
- bootstrap
+* check that the following files/directories exist in the distribution/target/*.zip or *.tar.gz "ls -1"
build
- changelog.txt
-??? dependency-report.txt
+ clustering-howto.txt
+ copyright.txt
doc
- examples
extras
+ changelog.txt
lgpl.txt
lib
readme.txt
seam
- seam-gen
seam.bat
+ seam-gen
seam2migration.txt
seam21migration.txt
- src
+ seam23migration.txt
-* check that the following source directories exist in the dist "ls -1 src"
---------------------- TODO - rewrite --------------------------
- debug
- excel
- gen
- interop
- ioc
- mail
- main
- pdf
- remoting
- resteasy
- rss
- test
- wicket
+* check that the following source directories exist in the distribution/target/jboss-seam-<version>-src.zip "ls -1"
+ bom
+ build
+ distribution
+ eclipse-code-formatter-profile.xml
+ examples-ee6
+ functional-tests
+ jboss-seam
+ jboss-seam-debug
+ jboss-seam-excel
+ jboss-seam-flex
+ jboss-seam-gen
+ jboss-seam-ioc
+ jboss-seam-jul
+ jboss-seam-mail
+ jboss-seam-pdf
+ jboss-seam-remoting
+ jboss-seam-resteasy
+ jboss-seam-rss
+ jboss-seam-ui
+ jboss-seam-wicket
+ pom.xml
+ release-process.txt
+ seam-integration-tests
+ seam-reference-guide
* Archive reports
- run these in the dist directory
find . -name *.jar > ../releaselogs/jarlist.txt
-??? find . -name *.sar > ../releaselogs/sarlist.txt
find . -name *.war > ../releaselogs/warlist.txt
find . -name *.ear > ../releaselogs/earlist.txt
find . -name *.zip > ../releaselogs/ziplist.txt
@@ -158,12 +166,12 @@
- <TODO: list expected items or provide listing in svn/>
* Built source verification, dependency report & test suite
- - Clean our your local maven repository
+ - Clean your local maven repository
- ex. "rm -Rf ~/.m2"
- - <TODO document way to set local repo settings for clean build/>
+ - take build/settings.xml and set <localRepository>/path/to/local/repo</localRepository>
** Source verification **
- - Go to jboss-seam-parent and run "mvn clean install -s ../build/settings.xml > ../releaselogs/x.x.x.XX.sourcebuild.txt"
+ - Go to root of checked out directory and run "mvn clean install -s ../build/settings.xml -Pall,distribution > ../releaselogs/x.x.x.XX.sourcebuild.txt"
- diff the original and the built versions of the $DIST directories
- only difference should be build related
- <TODO: list expected differences/>
@@ -172,8 +180,7 @@
- Should be no differences except version of Maven and/or jdk versions
** Dependency report **
- - "ant dependencyReport > ../releaselogs/x.x.x.XX.dependencybuild.txt"
- - run "cp ./dependency-report.txt ../releaselogs"
+ - mvn dependency:tree -Pall -DoutputFile= ../releaselogs/x.x.x.XX.dependencybuild.txt -DappendOutput=true
- Review for snapshot dependencies
- there should be none.
- Compare with real jar versions from META-INF/MANIFEST.MF
@@ -183,8 +190,7 @@
- "mvn clean verify > ../releaselogs/x.x.x.XX.testallreport.txt"
- check ../releaselogs/x.x.x.XX.testallreport.txt
- There should be no failures or errors.
- - run "cp -R test-output ../releaselogs"
- - run "cp -R test-report ../releaselogs"
+ - run "find . -type d -name surefire-reports -exec cp -R {} ../releaselogs \;"
** Compare the original distribtion to the one used for the testing.
- Review changes in thirdparty jars, directories, and files.
@@ -206,12 +212,14 @@
* For these examples verify the following:
- readme.txt is accurate
- mvn clean package -P<container-profile> - more details in example root
- - mvn jboss:hard-deploy (while export JBOSS_HOME=<installation_path>)
- - mvn clean verify
+ - mvn jboss-as:deploy (while export JBOSS_HOME=<installation_path>)
+ - mvn clean verify -Darquillian=jbossas-managed-7
+ or
+ - mvn clean verify -Darquillian=jbossas-remote-7
* Examples with "(tutorial)" are discussed in the reference guide tutorial.
- document should be validated as well
- including tomcat deployments
-* JBoss 5.1.0 examples
+* JBoss AS 7.1.1 examples
- blog (tutorial)
- booking (tutorial)
- contactlist
@@ -240,27 +248,7 @@
- todo (tutorial)
- ui
- wicket (you should verify both buildtime instrumentation and runtime instrumentation)
-* Tomcat 6 examples
- - Note: use JBoss embedded unless specified differently
- - blog (tutorial)
- - booking (tutorial)
- - dvdstore (tutorial)
- - hibernate (tutorial)
- - hibernate (tutorial) without embedded
- - jpa
- - jpa without embedded
- - messages (tutorial)
- - numberguess (tutorial)
- - registration (tutorial)
- - seambay
- - seampay
- - todo (tutorial)
-* GlassFish v2.1 examples
- - jee5
- - jpa
- - hibernate
-
Functional tests of Seam examples
---------------------------------
The functionality of most examples can be verified by automated tests. There are also jobs
@@ -268,7 +256,7 @@
Set JBOSS_HOME or CATALINA_HOME environment property for automatic deployment of example for ftesting.
-* JBoss 5.1.0 examples
+* JBoss 7.1.1 examples
The following examples are tested automatically:
* blog (tutorial)
@@ -314,54 +302,22 @@
All automated tests are executed from src/test/ftest directory.
* To run the automated tests:
- mvn clean verify -Pjbossas51,ftest-jbossas
+ mvn clean verify -Pftest-jbossas
* To test examples manually:
cd <example_name>
mvn clean package;
- export JBOSS_HOME=<installation-path-to-jboss-as-5.1>
- cd <example>-{ear,war} jboss:hard-deploy
+ export JBOSS_HOME=<installation-path-to-jboss-as-7.1.1>
+ cd <example>-{ear,war} jboss-as:deploy
...test manually
- mvn jboss:hard-undeploy
-
-* Tomcat 6 examples (with JBoss embedded)
- The following examples are tested (automatically):
-
- * blog (tutorial)
- * booking (tutorial)
- * dvdstore (tutorial)
- * hibernate (tutorial)
- * jpa
- * messages (tutorial)
- * numberguess (tutorial)
- * registration (tutorial)
- * seambay
- * seampay
- * todo (tutorial)
-
-* Tomcat 6 examples (without JBoss embedded)
- The following examples are tested (automatically):
-
- * hibernate (tutorial)
- * jpa
-
-All automated tests are executed from examples directory.
-* To run the automated tests:
- mvn clean verify -Ptomcat,ftest-tomcat
-
-Most of the examples can be tested automatically also with JBoss 4.x. However there are exceptions
-(the newest functional test were tested only on JBoss 5.x and later). The automated test can
-be executed with JBoss 4.x if there is defined jbossas42 <example_name>/pom.xml
-
- * To run the automated tests with JBoss 4.x:
- mvn clean verify -Pjbossas42,ftest-jbossas
+ mvn jboss-as:undeploy
-Testing of Cluster - TODO update for 2.3.0
+Testing of Cluster - TODO update
------------------
Currently testing of cluster environment is done through one automated test of booking example.
The main goal of this test is to simulate recovery from breakdown.
This test should be executed autonomously (not as a part of test bundle).
To run the test follow these steps:
-1) Specify jboss5.home property in src/test/ftest/ftest.properties to point to your JBoss server folder
+1) Specify jboss.home property in src/test/ftest/ftest.properties to point to your JBoss server folder
2) Create second "all" configuration of your JBossAS instance (name it for instance "all2")
3) Start first (master) instance of JBossAS:
JBOSS_HOME/bin/run.sh -c all -g DocsPartition -u 239.255.101.101 -b localhost -Djboss.messaging.ServerPeerID=1
@@ -372,13 +328,13 @@
5) Go to src/test/ftest directory and run:
ant test -Dtest=booking -Dcluster=true
-** A booking example is configured to run in cluster only on JBoss server. **
+** A booking example is configured to run in cluster only on JBoss AS. **
-JBDS and seam-gen verification - TODO update for 2.3.0
+JBDS and seam-gen verification
------------------------------
These tests use a stable version of MySQL and the latest release of JBDS. Be sure
-to use the latest stable release of tools (2.1.1.GA at the time of writing), and
+to use the latest stable release of tools (3.3.0.GA at the time of writing), and
to also apply the JBoss tools provided WTP patch. <TODO: update is version changes
behavior>
@@ -407,7 +363,7 @@
this you should first remove/rename your maven repository (document
option to set this as a property). Then either disable networking, or
lock down a firewall on the test machine so that no requests are allowed
- out. Then test the various seam-gen targets. JBoss-as may not start in
+ out. Then test the various seam-gen targets. JBoss AS may not start in
the configuration so testing the live app may need to be done after
executing the various seam-gen targets. This does not have to be
done for each test below but the different targets should be verified./>
@@ -424,15 +380,6 @@
- test both generated pages
- run seam test
- run "ant validate" in seam-gen project directory
-* seam-gen IceFaces EAR test
- - run seam with setup create-project and explode
- - during setup choose to use icefaces
- - during setup choose an EAR project
- - verify basic functionality
- - run seam generate-entities restart
- - test the basic functionality of the app (CRUD on each table)
- - run seam test
- - run "ant validate" in seam-gen project directory
* seam-gen WAR
- run seam with setup create-project and explode
- during setup choose a WAR project
@@ -465,7 +412,7 @@
* JBDS - test a subset of the examples with testNG plugin.
- See "/readme.txt" and "/examples/readme.txt" for details.
-Portlet Bridge Verification - TODO update for 2.3.0
+Portlet Bridge Verification
--------------------------
* Use the latest released version of the JBoss Portlet Bridge (PBR) and GateIn.
- for PBR source distribution is preferred
@@ -524,16 +471,15 @@
--------------
* When ready for the release
- checkout a clean version of the tag in a new/clean directory.
-??? - run "mvn clean install -Pdistribution -Dbuild.translations=true > ../releaselogs/x.x.x.XX.finaldistbuild.txt"
+ - run "mvn clean install -Pall,distribution -Dbuild.translations=true > ../releaselogs/x.x.x.XX.finaldistbuild.txt"
- diff this to the one used for testing
* Follow instructions for sourceforge upload
- Create md5 files for the ".zip" and ".tar.gz" files
- - <QUESTION: do we want to create md5 files for the archives/>
+ - Create md5 files for the archives
- upload the .zip and .tar.gz and md5 files
- - FTP to your SF users "/incoming" directory
-* Login to sourceforge.org and go to jboss.org project
+* Login to sourceforge.org and go to http://sourceforge.net/projects/jboss/ project
- Under admin tab click on "file releases"
- Add a release to the "JBoss Seam" project
- Set "Status" to "hidden"
@@ -543,7 +489,7 @@
- Keep everything hidden for now.
* Upload the "seam-reference-guide/target/*.war" file content to "docs.jboss.com/seam/<NEW VERSION>"
- - Note: this can take a long time.
+ - Note: you need to setup SSH key for that- contact jboss.org team if you didn't have it
* Create draft of the documentation and download pages on seamframework.org
- documentation points to "docs.jboss.com"
@@ -574,13 +520,13 @@
- jboss.org news
- TheServerSide.com
-Update Demos
+Update Demos (out of date - probably create openshift deployment)
------------
* This step is not needed for every point release:
* Upload the booking and dvdstore examples to demo.jboss.com
* <TODO more information on what is needed>
-* <QUESTION: is this really a part of the process or is it out of date/>
+
Notes
-----
* To reapply a tag:
12 years, 6 months
- 1
- 0