Permalink
Browse files

changed manifest so that java -jar fitnesse.jar will work. Also chang…

…ed UserGuide. Added 'code' style.
  • Loading branch information...
1 parent cda0472 commit ec9e44df328cf3940e58bd5c8b338aa4f2fcf1b9 unclebob committed Jan 12, 2009
Showing with 58 additions and 1,036 deletions.
  1. +18 −14 FitNesseRoot/FitNesse/DownloadingAndInstallingFitNesse/content.txt
  2. +6 −4 FitNesseRoot/FitNesse/DownloadingAndInstallingFitNesse/properties.xml
  3. +0 −19 FitNesseRoot/FitNesse/FitNesseWontStart/content.txt
  4. +6 −4 FitNesseRoot/FitNesse/FitNesseWontStart/properties.xml
  5. +1 −1 FitNesseRoot/FrontPage/content.txt
  6. +7 −2 FitNesseRoot/files/css/fitnesse_base.css
  7. 0 {extra → FitNesseRoot/files}/images/FitNesseInstallerLogo.png
  8. 0 {extra → FitNesseRoot/files}/images/FitNesseLogo.psd
  9. 0 {extra → FitNesseRoot/files}/images/unused/FitNesseLogoIcon.jpg
  10. 0 {extra → FitNesseRoot/files}/images/unused/FitNesseLogoMedium.jpg
  11. 0 {extra → FitNesseRoot/files}/images/unused/ball.gif
  12. 0 {extra → FitNesseRoot/files}/images/unused/runArrow.gif
  13. 0 {extra → FitNesseRoot/files}/javascript/AllTests.html
  14. 0 {extra → FitNesseRoot/files}/javascript/ClientSideSortTest.html
  15. 0 {extra → FitNesseRoot/files}/javascript/CollapsableWidgetTest.html
  16. 0 {extra → FitNesseRoot/files}/javascript/SpreadsheetTranslatorTest.html
  17. 0 {extra → FitNesseRoot/files}/javascript/jsUnitTestLink.js
  18. +1 −1 FitNesseRoot/properties
  19. +3 −1 build.xml
  20. +0 −1 extra/css/fitnesse.css
  21. +0 −515 extra/css/fitnesse_base.css
  22. +0 −11 extra/css/fitnesse_print.css
  23. BIN extra/images/FitNesseLogo.gif
  24. BIN extra/images/FitNesseLogoMedium.jpg
  25. BIN extra/images/collapsableClosed.gif
  26. BIN extra/images/collapsableOpen.gif
  27. BIN extra/images/executionStatus/error.gif
  28. BIN extra/images/executionStatus/ok.gif
  29. BIN extra/images/executionStatus/output.gif
  30. BIN extra/images/folder.gif
  31. BIN extra/images/importedPage.jpg
  32. BIN extra/images/virtualPage.jpg
  33. +0 −154 extra/javascript/SpreadsheetTranslator.js
  34. +0 −181 extra/javascript/clientSideSort.js
  35. +0 −86 extra/javascript/fitnesse.js
  36. +0 −31 extra/javascript/spreadsheetSupport.js
  37. +11 −6 extra/release/README.txt
  38. +1 −1 extra/release/run.bat
  39. +3 −3 extra/release/run.sh
  40. BIN fitnesse.jar
  41. BIN fitnesse20080702.zip
  42. BIN fitnesse20080812.zip
  43. BIN fitnesse20081115.zip
  44. BIN fitnesse20081201.zip
  45. BIN fitnesse_src20080702.zip
  46. BIN fitnesse_src20080703.zip
  47. BIN fitnesse_src20080812.zip
  48. BIN fitnesse_src20081115.zip
  49. BIN fitnesse_src20081201.zip
  50. +1 −1 src/fitnesse/FitNesseVersion.java
View
32 FitNesseRoot/FitNesse/DownloadingAndInstallingFitNesse/content.txt
@@ -1,20 +1,24 @@
!2 Downloading and Installing FitNesse
It really takes very little time and effort to get FitNesse running on your machine.
- 1 Go to http://fitnesse.org/FitNesse.DownLoad and click on "'''Full Distribution'''". Save the fitnesse.zip to some directory. Let's call that directory ''root''.
- 2 Unzip fitnesse.zip.
- * This should create a ''fitnesse'' directory below ''root'' with the following files and folders:
- * !-FitNesseRoot-!, README.txt, dotnet, license.txt, fitnesse.jar, run.bat, run.sh
- 3 Now go to the ''root''/fitnesse folder and double-click run.bat
- * If you have nothing running on port 80 on your machine, you should see a message similar to the following:
- * Fitnesse (''date code'') Started...
- * on port 80
- * using path '.'
- * using dir '!-FitNesseRoot-!'
- * Not logging.
- * If you don't see this, check out FitNesseWontStart.
- 4 Start up a browser and go to http://localhost
- * ''or if you had to edit run.bat in step 3 then go to http://localhost:8080.''
+ 1 Go to !style_code(http://fitnesse.org/FitNesse.DownLoad) and click on "'''Full Distribution'''". Save the !style_code(fitnesse.zip) to some directory. Let's call that directory ''root''.
+ 2 Unzip !style_code(fitnesse.zip).
+ * This should create a !style_code(''fitnesse'') directory below ''root'' with the following files and folders:
+ * !style_code(!-FitNesseRoot-!, README.txt, dotnet, license.txt, fitnesse.jar, run.bat, run.sh)
+ 3 Now go to the !style_code(''root''/fitnesse) folder and type !style_code(java -jar fitnesse.jar)
+ * If you have nothing running on port 80 on your machine, you should see a message similar to the following:
+ * !style_code(Fitnesse (''date code'')) !style_code( Started...)
+ * !style_code(on port 80)
+ * !style_code(using path '.')
+ * !style_code(using dir '!-FitNesseRoot-!')
+ * !style_code(Not logging.)
+ * If you don't see this, you may have something running on port 80 already,
+ * So try the command !style_code(java -jar fitnesse.jar -p 8080)
+ * If you are still having trouble then check out FitNesseWontStart.
+
+ 4 Start up a browser and go to !style_code(http://localhost)
+ * ''or if you had to edit run.bat in step 3 then go to !style_code(http://localhost:8080).''
5 The main FitNesse screen should come up. That's it. You're ready to start using FitNesse.
+ 6 By the way, the !style_code(run.sh) and !style_code(run.bat) commands, and their !style_code(stop) counterparts are helpful little scripts you can use to start and stop !-FitNesse-! should you so desire. But typing !style_code(java -jar fitnesse.jar) really isn't that hard...
!2 Learning More
If you have not yet done so, check out the TwoMinuteExample. To learn more about what FitNesse acceptance testing is all about, see AcceptanceTests. If you are ready to start creating FitNesse pages and test tables, check out EditingFitNessePages and CreatingTestTables.
View
10 FitNesseRoot/FitNesse/DownloadingAndInstallingFitNesse/properties.xml
@@ -1,7 +1,9 @@
<?xml version="1.0"?>
<properties>
- <Files/>
- <LastModified>20081020135112</LastModified>
- <RecentChanges/>
- <WhereUsed/>
+ <Files/>
+ <LastModified>20090112110153</LastModified>
+ <RecentChanges/>
+ <WhereUsed/>
+ <saveId>1231779713382</saveId>
+ <ticketId>8338125105170590131</ticketId>
</properties>
View
19 FitNesseRoot/FitNesse/FitNesseWontStart/content.txt
@@ -1,22 +1,3 @@
-!2 What to Do if Port 80 Is Already In Use
-If you see the message:
-
-''!-FitNesse-! cannot be started...''
-
-Then port 80 is already in use by another web server running on your machine (e.g., perhaps by Microsoft's IIS server). In this case, do the following:
-!3 Windows
- * Edit the '''run.bat''' command to look like this (using port 8080):
- * java -cp fitnesse.jar fitnesse.FitNesse -p 8080 %1 %2 %3 %4 %5
- * Save '''run.bat'''
- * Double-click '''run.bat''' again.
- * Return to DownloadingAndInstallingFitNesse.
-
-!3 Linux, Unix, Mac OS X
- * Edit the '''run.sh''' command to look like this (using port 8080):
- * java ${jvm_args[*]} fitnesse.FitNesse -p 8080 ${fitnesse_args[*]}
- * Or, just invoke '''run.sh''' with the "-p port_number" argument from the command line.
- * Return to DownloadingAndInstallingFitNesse.
-
!2 What to Do If You Have the Wrong Java Runtime Environment
FitNesse requires version 1.5 or later of the Java Runtime Environment (JRE).
If you see the messages:
View
10 FitNesseRoot/FitNesse/FitNesseWontStart/properties.xml
@@ -1,7 +1,9 @@
<?xml version="1.0"?>
<properties>
- <Files/>
- <LastModified>20081020135108</LastModified>
- <RecentChanges/>
- <WhereUsed/>
+ <Files/>
+ <LastModified>20090112105825</LastModified>
+ <RecentChanges/>
+ <WhereUsed/>
+ <saveId>1231779505627</saveId>
+ <ticketId>6403239398945555238</ticketId>
</properties>
View
2 FitNesseRoot/FrontPage/content.txt
@@ -10,4 +10,4 @@ To add your first "page", click the [[Edit][FrontPage?edit]] button and add a [[
| [[User Guide][FitNesse.UserGuide]]|''Answer the rest of your questions here.''|
| [[Acceptance Tests][FitNesse.SuiteAcceptanceTests]]|''FitNesse's suite of Acceptance Tests''|
-!note Release v20081230
+!note Release v20090112
View
9 FitNesseRoot/files/css/fitnesse_base.css
@@ -88,7 +88,7 @@ h1 {
}
h2 {
- font-size: 1.4 emx;
+ font-size: 1.4em;
}
h3 {
@@ -285,7 +285,7 @@ span.page_title {
}
.caps, .resultsHeader {
- font-size: 1 empx;
+ font-size: 1em;
font-variant: small-caps;
}
@@ -314,6 +314,11 @@ span.page_title {
text-decoration: line-through;
}
+.code {
+ font-family: monaco, 'Lucida Sans Typewriter';
+ font-size: 12px;
+}
+
.virtual {
background-image: url( "/files/images/virtualPage.jpg" );
background-position: center top;
View
0 extra/images/FitNesseInstallerLogo.png → ...ot/files/images/FitNesseInstallerLogo.png
File renamed without changes
View
0 extra/images/FitNesseLogo.psd → FitNesseRoot/files/images/FitNesseLogo.psd
File renamed without changes
View
0 extra/images/unused/FitNesseLogoIcon.jpg → .../files/images/unused/FitNesseLogoIcon.jpg
File renamed without changes
View
0 extra/images/unused/FitNesseLogoMedium.jpg → ...iles/images/unused/FitNesseLogoMedium.jpg
File renamed without changes
View
0 extra/images/unused/ball.gif → FitNesseRoot/files/images/unused/ball.gif
File renamed without changes
View
0 extra/images/unused/runArrow.gif → ...esseRoot/files/images/unused/runArrow.gif
File renamed without changes
View
0 extra/javascript/AllTests.html → FitNesseRoot/files/javascript/AllTests.html
File renamed without changes.
View
0 extra/javascript/ClientSideSortTest.html → .../files/javascript/ClientSideSortTest.html
File renamed without changes.
View
0 extra/javascript/CollapsableWidgetTest.html → ...les/javascript/CollapsableWidgetTest.html
File renamed without changes.
View
0 ...javascript/SpreadsheetTranslatorTest.html → ...javascript/SpreadsheetTranslatorTest.html
File renamed without changes.
View
0 extra/javascript/jsUnitTestLink.js → ...seRoot/files/javascript/jsUnitTestLink.js
File renamed without changes.
View
2 FitNesseRoot/properties
@@ -1,5 +1,5 @@
#FitNesse properties
-#Sat Jan 10 10:02:39 CST 2009
+#Mon Jan 12 10:40:57 CST 2009
WikiImportFormatUpdate=applied
PropertiesToXmlUpdate=applied
FilesAttributeUpdate=applied
View
4 build.xml
@@ -100,6 +100,8 @@
<include name="tasks.properties"/>
<manifest>
<attribute name="Built-By" value="Object Mentor, Inc."/>
+ <attribute name="Main-Class" value="fitnesse.FitNesse"/>
+ <attribute name="Class-Path" value="lib/htmlparser.jar"/>
</manifest>
</jar>
</target>
@@ -108,7 +110,7 @@
<delete dir="classes/files"/>
<mkdir dir="classes/files"/>
<copy todir="classes/files">
- <fileset dir="extra">
+ <fileset dir="FitNesseRoot/files">
<include name="images/**/*.gif"/>
<include name="images/**/*.jpg"/>
<include name="css/*.css"/>
View
1 extra/css/fitnesse.css
@@ -1 +0,0 @@
-@import url( "/files/css/fitnesse_base.css" );
View
515 extra/css/fitnesse_base.css
@@ -1,515 +0,0 @@
-/**********
-
- Global effects
-
-**********/
-
-body {
- margin: 0px;
- padding: 0px;
- font-family: 'Lucida Grande', 'Bitstream Vera Sans', 'trebuchet ms', verdana, tahoma, arial, sans-serif;
- font-size: 1em;
- background-color: #FAFAFE;
-}
-
-ul, ol {
- padding-left: 0;
- margin: 0;
- list-style-position: inside;
-}
-
-ul {
- padding-left: 1em;
- text-indent: -1em;
-}
-
-ol {
- padding-left: 1.3em;
- text-indent: -1.3em;
-}
-
-a:link, a:visited, a:hover, a:active {
- background: transparent;
-}
-
-a:link {
- color: #2E2EB2;
-}
-
-a:visited {
- color: #606099;
-}
-
-a:hover {
- color: #8989D9;
- text-decoration: none;
-}
-
-a:active {
- color: #FF8000;
-}
-
-table, td, th {
- border: solid #777777;
-}
-
-table {
- background: #F8F8F8;
- margin: 5px;
- padding: 0px;
- border-width: 1px 0px 0px 1px;
-}
-
-td, th {
- border-width: 0px 1px 1px 0px;
- padding: 5px;
-}
-
-table.confirmation-form {
- border: solid 1px #C6CCB7;
- padding: 5px;
- margin: 5px;
-}
-
-td.confirmation-form, th.confirmation-form {
- vertical-align: middle;
- border: solid 0px #C6CCB7;
- padding: 0px;
- margin: 0px;
-}
-
-h1, h2, h3, h4 {
- font-family: Helvetica, sans-serif;
- font-variant: small-caps;
-}
-
-h1 {
- font-size: 1.6em;
-}
-
-h2 {
- font-size: 1.4 emx;
-}
-
-h3 {
- font-size: 1.2em;
-}
-
-h4 {
- font-size: 1em;
- font-style: italic;
-}
-
-textarea {
- width: 100%;
-}
-
-textarea.pageContent {
- font-family: monaco, 'Lucida Sans Typewriter';
- font-size: 12px;
- height: 100%;
- rows: 40;
- columns: 70;
-}
-
-pre {
-/* font-size: 1.5em;*/
-}
-
-img {
- border: 0px;
-}
-
-/**********
-
- Structural
-
-**********/
-
-div.sidebar {
- background: #D9DFC9;
- margin: 0px;
- padding: 5px;
- position: fixed;
- top: 0px;
- left: 0px;
- width: 130px;
- height: 1000px;
- border-right: 1px dotted #C6CCB7;
-}
-
-div.art_niche {
- margin: 0px;
- padding: 0px 0px 5px 0px;
- position: relative;
- top: 0px;
- left: 0px;
- height: 90px;
- border-bottom: solid 1px #984D00;
- background-image: url( "/files/images/FitNesseLogo.gif" );
- background-repeat: no-repeat;
- background-position: center;
-}
-
-div.actions {
- margin: 0px;
- padding-top: 5px;
- padding-botton: 5px;
-}
-
-div.mainbar {
- margin: 0px;
- position: absolute;
- top: 0px;
- left: 145px;
- width: 85%;
-}
-
-div.header {
- margin: 0px;
- padding: 5px;
- height: 90px;
- border-bottom: 1px solid #984D00;
-}
-
-div.footer {
- margin: 0px;
- padding: 5px; /* Use same color as border color for div.header. */
- border-top: 1px solid #984D00;
- font-size: 12px;
- text-align: center;
-}
-
-div.contents {
- margin: 2px;
- padding: 2px;
- border: 1px solid #F0F0F0;
-}
-
-div.nested-contents {
- margin: 2px;
- padding: 2px;
- border: 0px solid #F0F0F0;
-}
-
-hr {
-/* Use same color as border color for div.header. */
- color: #984D00; /* for IE */
- background-color: #984D00; /* for other browsers */
- height: 1;
-}
-
-div.main {
- margin: 0px;
- padding: 5px;
-}
-
-div.properties {
- height: 150px;
- width: 100%;
- margin: 5px;
- padding: 5px;
- border: solid 1px #C6CCB7;
-}
-
-div.virtual-wiki-properties {
- height: 80px;
- width: 100%;
- margin: 5px;
- padding: 5px;
- border: solid 1px #C6CCB7;
-}
-
-#execution-status {
- position: absolute;
- top: 0px;
- right: 0px;
- width: 100px;
- height: 90px;
- margin: 5px;
- text-align: center;
-}
-
-#test-summary {
- width: 99%;
- top: 105px;
- padding: 2px 2px 2px 5px;
- margin: 0px 0px 5px 0px;
- font-size: 1.2em;
- border: solid black 1px;
-}
-
-.actions a:link, .actions a:visited {
- display: block;
- margin: 0px;
- line-height: 2.2em;
- text-indent: .5em;
- color: black;
- font-family: sans-serif, verdana, tahoma, arial, sans-serif;
- font-size: 14px;
- background-color: #F8F6D3;
- text-decoration: none;
- border: solid 1px #8D8360;
-}
-
-.actions a:hover {
- color: #3D4529;
- background-color: #DEDDBD;
-}
-
-.header a:link {
- font-weight: bold;
-}
-
-/**********
-
- Miscellaneous formatting
-
-**********/
-
-.note {
- font-size: 12px;
- color: #818181;
-}
-
-.page_title {
- font-size: 2.5em;
-}
-
-span.page_title {
-}
-
-.page_type {
- font-size: 1.2px;
- font-variant: small-caps;
-}
-
-.caps, .resultsHeader {
- font-size: 1 empx;
- font-variant: small-caps;
-}
-
-.resultsHeader, .resultsRow2 {
- background-color: #EFEFEF;
-}
-
-.resultsRow1 {
- background-color: #FFFFFF;
-}
-
-.centered {
- margin: 5px;
- text-align: center;
-}
-
-.right {
- float: right;
-}
-
-.left {
- float: left;
-}
-
-.strike {
- text-decoration: line-through;
-}
-
-.virtual {
- background-image: url( "/files/images/virtualPage.jpg" );
- background-position: center top;
- background-repeat: no-repeat;
-}
-
-.imported {
- background-image: url( "/files/images/importedPage.jpg" );
- background-position: center top;
- background-repeat: no-repeat;
-}
-
-.meta {
- color: #BF8660;
- font-style: italic;
-}
-
-.included, .setup, .teardown, .collapse_rim {
- background: #F9F9F9;
- margin: 5px 0px 5px 0px;
- padding: 2px 2px 2px 2px;
- border: 1px dotted #909090;
-}
-
-.setup, .teardown {
- background: #FFFFF0;
- border-color: #FF8000;
-}
-
-.included {
- background: #F9F9FF;
- border-color: #2E2EB2;
-}
-
-.collapse_rim {
- border-color: #BF8660;
-}
-
-.alternating_row_1, .alternating_row_2 {
- display: block;
- height: 1.5em;
- width: 100%;
-}
-
-.alternating_row_1, .alternating_block_1 {
- background-color: #EFEFEF;
-}
-
-.alternating_row_2, .alternating_block_2 {
- background-color: #FFFFFF;
-}
-
-.alternating_block_1, .alternating_block_2 {
- border: solid 1px #DFD4A7;
-}
-
-div.collapsable {
- margin: 0px 0px 0px 15px;
- display: block;
-}
-
-div.collapsable-contents {
- margin: 0px 0px 0px 15px;
- display: block;
-}
-
-div.invisible {
- line-height: 0px;
- margin: 0px 0px 0px 0px;
- display: none;
- visibility: hidden;
-}
-
-.pageHelp {
- color: #CC6600;
- font-size: 0.7em;
- font-style: italic;
- margin-left: 1.5em;
-}
-
-.hidden {
- display: none;
-}
-
-.toc1 ul {
- list-style-type: disc;
- color: black;
-}
-
-.toc3 ul {
- list-style-type: disc;
- color: gray;
-}
-
-.toc2 ul, .toc4 ul, .toc5 ul, .toc6 ul {
- list-style-type: circle;
-}
-
-table {
- padding: 0;
- margin: 0;
-}
-
-/**********
-
- Page Specific
-
-**********/
-
-div.edit_buttons {
-}
-
-div.nav_break {
- font-size: .3em;
-}
-
-div.merge_new {
- float: left;
- font-size: 1.4em;
- width: 49%;
-}
-
-div.merge_old {
- float: right;
- font-size: 1.4em;
- width: 49%;
-}
-
-.test_summary_link {
- text-align: right;
-}
-
-.test_summary_results {
- padding: 0px 5px 0px 5px;
- text-align: left;
-}
-
-.suite_summary {
- margin: 5px;
- margin-left: auto;
- margin-right: auto;
- text-align: center;
-}
-
-.test_output_name {
- margin-top: 10px;
- background-color: #DFD4A7;
- font-size: 1.5em;
- text-indent: 1em;
-}
-
-table.dirListing {
- background: transparent;
- margin: 2px;
- padding: 0px;
- border: 0px;
- width: 99%;
- font-size: 1.0em;
-}
-
-.dirListing td, .dirListing th {
- border: 0px;
- padding: 1px 3px 1px 3px;
-}
-
-/**********
-
- Used in FIT
-
-**********/
-
-.pass {
- background-color: #AAFFAA;
-}
-
-.fail {
- background-color: #FFAAAA;
-}
-
-.error {
- background-color: #FFFFAA;
-}
-
-.ignore {
- background-color: #CCCCCC;
-}
-
-.fit_stacktrace {
- font-size: 0.7em;
-}
-
-.fit_label {
- font-style: italic;
- color: #C08080;
-}
-
-.fit_grey {
- color: #808080;
-}
View
11 extra/css/fitnesse_print.css
@@ -1,11 +0,0 @@
-@import url( "/files/css/fitnesse_base.css" );
-
-div.sidebar {
- display: none;
-}
-
-div.mainbar {
- position: relative;
- left: 0px;
- width: 100%;
-}
View
BIN extra/images/FitNesseLogo.gif
Deleted file not rendered
View
BIN extra/images/FitNesseLogoMedium.jpg
Deleted file not rendered
View
BIN extra/images/collapsableClosed.gif
Deleted file not rendered
View
BIN extra/images/collapsableOpen.gif
Deleted file not rendered
View
BIN extra/images/executionStatus/error.gif
Deleted file not rendered
View
BIN extra/images/executionStatus/ok.gif
Deleted file not rendered
View
BIN extra/images/executionStatus/output.gif
Deleted file not rendered
View
BIN extra/images/folder.gif
Deleted file not rendered
View
BIN extra/images/importedPage.jpg
Deleted file not rendered
View
BIN extra/images/virtualPage.jpg
Deleted file not rendered
View
154 extra/javascript/SpreadsheetTranslator.js
@@ -1,154 +0,0 @@
-// Copyright (C) 2004 by Alain Bienvenue. All rights reserved.
-// Released under the terms of the GNU General Public License version 2 or later.
-
-function SpreadsheetTranslator()
-{
- this.currentLine;
- this.rows;
- this.fitNesseTables;
-
- this.isImplicitTableStart = function(index)
- {
- if (this.rows[index][0].match("^[A-Za-z][0-9A-Za-z]*\\.[A-Za-z][0-9A-Za-z]*"))
- {
- return true;
- }
- var i;
- for (i = index; i < this.rows.length; i++)
- {
- if ((this.rows[i][0] == '!') || this.lineSize(this.rows[i]) == 0)
- {
- return false;
- }
- if (this.lineSize(this.rows[i]) > 1)
- {
- return true;
- }
- }
- return false;
- }
-
- this.isExplicitTableStart = function(rows, index)
- {
- return (rows[index][0] == "!");
- }
-
- this.isNotTableLine = function(currentLine, columnsToSkip)
- {
- var row = this.rows[currentLine];
- if (this.lineSize(row) == 0)
- {
- return true;
- }
-
- var i;
- for (i = 0; i < columnsToSkip; i++)
- {
- if (row[i] != '')
- {
- return true;
- }
- }
- return false;
- }
-
- this.lineSize = function(row)
- {
- var x;
- for (x = row.length - 1; x >= 0; x--)
- {
- if (row[x] != '') return x + 1;
- }
- return 0;
- }
-
- this.parseExcelTable = function(excelTable)
- {
- var table = this.removeCarriageReturns(excelTable);
- var lines = table.split("\n");
- this.rows = new Array;
- for (i = 0; i < lines.length; i++)
- {
- this.rows[i] = lines[i].split("\t");
- }
- }
-
-
- this.removeCarriageReturns = function(str)
- {
- return str.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
- }
-
- this.getFitNesseTables = function()
- {
- this.currentLine = 0;
- this.fitNesseTables = new String();
- while (this.currentLine < this.rows.length)
- {
- if (this.isExplicitTableStart(this.rows, this.currentLine))
- {
- this.processTable(1);
- }
- else if (this.isImplicitTableStart(this.currentLine))
- {
- if (this.rows[this.currentLine][0] == '')
- {
- this.processTable(1);
- }
- else
- {
- this.processTable(0);
- }
- }
- else
- {
- this.fitNesseTables += "\n" + this.rows[this.currentLine][0];
- }
- this.currentLine++;
- }
- return this.fitNesseTables.substring(1);
- }
-
-
- this.processTable = function(columnsToSkip)
- {
- var tableFirstLine = this.currentLine;
- var tableSize;
-
- while (this.currentLine < this.rows.length)
- {
- var row = this.rows[this.currentLine];
- if (this.currentLine > tableFirstLine && this.isNotTableLine(this.currentLine, columnsToSkip))
- {
- this.currentLine--;
- return;
- }
-
- this.fitNesseTables += "\n";
- var lineSize = 0;
- if (this.currentLine == tableFirstLine)
- {
- this.fitNesseTables += "!";
- lineSize = this.lineSize(row);
- }
- else if (this.currentLine == tableFirstLine + 1)
- {
- lineSize = this.lineSize(row);
- tableSize = lineSize;
- }
- else
- {
- lineSize = Math.max(tableSize, this.lineSize(row));
- lineSize = Math.min(lineSize, row.length);
- }
-
- this.fitNesseTables += "|";
- var j;
- for (j = columnsToSkip; j < lineSize; j++)
- {
- this.fitNesseTables += row[j] + "|";
- }
- this.currentLine++;
- }
- }
-}
View
181 extra/javascript/clientSideSort.js
@@ -1,181 +0,0 @@
-TableSorter = function(id, dateParser)
-{
- this.id = id;
- this.table = document.getElementById(id);
- this.activeSort = null;
- this.dateParser = dateParser;
-
- this.getSortDirection = function(sortCol)
- {
- if (this.activeSort == null || this.activeSort.column != sortCol)
- this.activeSort = new SortReference(sortCol, "asc");
- else
- {
- if (this.activeSort.direction == "asc")
- this.activeSort.direction = "dsc";
- else
- this.activeSort.direction = "asc";
- }
- return this.activeSort.direction;
- }
-
- this.sort = function(sortCol, datatype)
- {
- var rowDataArray = new TableRowDataArray(this.id);
- rowDataArray.setSortCol(sortCol);
- var direction = this.getSortDirection(sortCol);
- if (datatype == 'number')
- rowDataArray.sort(new NumericComparator());
- else if (datatype == 'date')
- rowDataArray.sort(new DateComparator(this.dateParser));
- else
- rowDataArray.sort();
- if (direction == "dsc")
- rowDataArray.reverse();
- rowDataArray.rebuildTable();
- }
- return this;
-}
-
-TableRowData = function(cols)
-{
- this.cols = cols;
- this.sortCol = 0;
- this.setSortCol = function(col)
- {
- this.sortCol = col;
- }
- this.toString = function()
- {
- return this.cols[this.sortCol];
- }
-}
-
-TableRowDataArray = function(id)
-{
- this.arr = new Array();
- this.arr.table = document.getElementById(id);
- this.arr.cssClasses = new Array();
-
- var tbody = this.arr.table.tBodies[0];
- var rows = tbody.rows;
- for (var row = 0; row < rows.length; row++)
- {
- this.arr.cssClasses.push(rows[row].className);
- var cells = rows[row].cells;
- var cellTextArray = new Array();
- for (var j = 0; j < cells.length; j++)
- cellTextArray.push(cells[j].innerHTML);
- this.arr.push(new TableRowData(cellTextArray));
- }
-
- this.arr.rebuildTable = function()
- {
- var tbody = this.table.tBodies[0];
- var mybody = tbody.cloneNode(false);
- for (var row = 0; row < this.length; row++)
- {
- var tr = document.createElement("tr");
- tr.className = this.cssClasses[row];
- for (var i = 0; i < this[row].cols.length; i++)
- {
- var td = document.createElement("td");
- td.innerHTML = this[row].cols[i];
- tr.appendChild(td);
- }
- mybody.appendChild(tr);
- }
- this.table.replaceChild(mybody, tbody);
- }
-
- this.arr.setSortCol = function(sortCol)
- {
- for (var i = 0; i < this.length; i++)
- {
- this[i].setSortCol(sortCol);
- }
- }
- return this.arr;
-}
-
-SortReference = function (column, direction)
-{
- this.column = column;
- this.direction = direction;
-}
-
-
-NumericComparator = function()
-{
- function compare(a, b)
- {
- a = parseInt(a);
- b = parseInt(b);
- if (a > b)
- return 1;
- if (a < b)
- return -1;
- return 0;
- }
- return compare;
-}
-
-DateComparator = function(dateParser)
-{
- this.compare = function(x, y)
- {
- x = dateParser.parse(x).getTime();
- y = dateParser.parse(y).getTime();
- if (x > y)
- return 1;
- if (x < y)
- return -1;
- return 0;
- }
- return this.compare;
-}
-
-DateParser = function(re, a, b, c, d, e, f)
-{
- this.re = re;
- this.a = a;
- this.b = b;
- this.c = c;
- this.d = d || -1;
- this.e = e || -1;
- this.f = f || -1;
- this.parseMonth = function(month)
- {
- month = month.toLowerCase();
- months = "jan,feb,mar,apr,may,jun,jul,aug,sep,oct,nov,dec".split(',');
- for (var i = 0; i < months.length; i++)
- {
- if (month == months[i])
- {
- return i;
- }
- }
- }
-
- this.parse = function(dateStr)
- {
- value = dateStr.toString().toLowerCase();
- if (this.re.test(value))
- {
- matches = this.re.exec(value);
- year = parseInt(matches[a]);
- if (parseInt(matches[b]))
- month = parseInt(matches[b] - 1);
- else
- month = this.parseMonth(matches[b]);
- day = parseInt(matches[c]);
- hour = d > 0 ? parseInt(matches[d]) : 0;
- minute = e > 0 ? parseInt(matches[e]) : 0;
- second = f > 0 ? parseInt(matches[f]) : 0;
- date = new Date(year, month, day, hour, minute, second);
- return date;
- }
- }
-
- return this;
-}
View
86 extra/javascript/fitnesse.js
@@ -1,86 +0,0 @@
-var collapsableOpenCss = "collapsable";
-var collapsableClosedCss = "hidden";
-var collapsableOpenImg = "/files/images/collapsableOpen.gif";
-var collapsableClosedImg = "/files/images/collapsableClosed.gif";
-
-function toggleCollapsable(id)
-{
- var div = document.getElementById(id);
- var img = document.getElementById("img" + id);
- if (div.className.indexOf(collapsableClosedCss) != -1)
- {
- div.className = collapsableOpenCss;
- img.src = collapsableOpenImg;
- }
- else
- {
- div.className = collapsableClosedCss;
- img.src = collapsableClosedImg;
- }
-}
-
-function expandOrCollapseAll(cssClass)
-{
- divs = document.getElementsByTagName("div");
- for (i = 0; i < divs.length; i++)
- {
- div = divs[i];
- if (div.className == cssClass)
- {
- toggleCollapsable(div.id);
- }
- }
-}
-
-function collapseAll()
-{
- expandOrCollapseAll(collapsableOpenCss);
-}
-
-function expandAll()
-{
- expandOrCollapseAll(collapsableClosedCss);
-}
-
-function symbolicLinkRename(linkName, resource)
-{
- var newName = document.symbolics[linkName].value.replace(/ +/g, '');
-
- if (newName.length > 0)
- window.location = resource + '?responder=symlink&rename=' + linkName + '&newname=' + newName;
- else
- alert('Enter a new name first.');
-}
-
-// Allow ctrl-s to save the changes.
-// Currently this alone appears to work on OS X. For windows (and linux??) use alt-s, which doesn't work on OS X!
-formToSubmit = null;
-function enableSaveOnControlS(control, formToSubmit)
-{
- formToSubmit = formToSubmit;
- if (document.addEventListener)
- {
- document.addEventListener("keypress", keypress, false);
- }
- else if (document.attachEvent)
- {
- document.attachEvent("onkeypress", keypress);
- }
- else
- {
- document.onkeypress = keypress;
- }
-
-}
-function keypress(e)
-{
- if (!e) e = event;
- if (e.keyIdentifier == "U+0053" || e.keyIdentifier == "U+0060")
- {
- suppressdefault(e, formToSubmit.keypress.checked);
- if (formToSubmit != null)
- {
- formToSubmit.submit
- }
- }
-}
View
31 extra/javascript/spreadsheetSupport.js
@@ -1,31 +0,0 @@
-// Copyright (C) 2004 by Alain Bienvenue. All rights reserved.
-// Released under the terms of the GNU General Public License version 2 or later.
-
-function SelectionSpreadsheetToWiki(textArea)
-{
- var translator = new SpreadsheetTranslator();
- translator.parseExcelTable(textArea.value);
- textArea.value = translator.getFitNesseTables();
- textArea.focus();
-}
-
-function SelectionWikiToSpreadsheet(textArea)
-{
- var selection = textArea.value;
- selection = selection.replace(/\r\n/g, '\n');
- selection = selection.replace(/\r/g, '\n');
- selection = selection.replace(/\|\n/g, '\n'); // remove the last | at the end of the line
- selection = selection.replace(/\|/g, '\t'); // replace all remaining | with \t
- textArea.value = selection;
- textArea.focus();
-}
-
-
-title = "This function will convert the text from spreadsheet format to FitNesse format.";
-
-document.write("<input type='button' value='Spreadsheet to FitNesse' onClick='SelectionSpreadsheetToWiki(document.f.pageContent)' title='" + title + "'>");
-document.write("&nbsp;");
-
-title = "This function will convert the text from FitNesse format to spreadsheet.";
-document.write("<input type='button' value='FitNesse to Spreadsheet' onClick='SelectionWikiToSpreadsheet(document.f.pageContent)'>");
-
View
17 extra/release/README.txt
@@ -10,10 +10,16 @@ INSTALATION:
Unzip distribution to a reasonable location.
RUNNING FITNESSE:
-Windows:
+ cd fitnesse
+ java -jar fitnesse.jar
+
+Convenience Scripts to start FitNesse
+ Windows:
Double-click run.bat.
-Unix, Linux, Mac OS X:
- Run run.sh.
+
+ Unix, Linux, Mac OS X:
+ make run
+ ./run
If port 80 is already in use or restricted, run with the arguments
"-p number", where "number" is an open port number (e.g., 8080).
@@ -25,10 +31,9 @@ http://localhost:number, if not using port 80.
Enjoy!
- Object Mentor
- fitnesse@objectmentor.com
+ unclebob@@objectmentor.com
-Please visit www.fitnesse.org for questions or comments.
+Please visit fitnesse.org for questions or comments.
View
2 extra/release/run.bat
@@ -1,4 +1,4 @@
-java -cp fitnesse.jar fitnesse.FitNesse %1 %2 %3 %4 %5
+java -jar fitnesse.jar %1 %2 %3 %4 %5
pause
View
6 extra/release/run.sh
@@ -42,10 +42,10 @@ do
esac
shift
done
-jvm_args[${#jvm_args[*]}]="-cp"
+jvm_args[${#jvm_args[*]}]="-jar"
jvm_args[${#jvm_args[*]}]="fitnesse.jar"
-echo java ${jvm_args[*]} fitnesse.FitNesse ${fitnesse_args[*]}
-java ${jvm_args[*]} fitnesse.FitNesse ${fitnesse_args[*]}
+echo java ${jvm_args[*]} ${fitnesse_args[*]}
+java ${jvm_args[*]} ${fitnesse_args[*]}
View
BIN fitnesse.jar
Binary file not shown.
View
BIN fitnesse20080702.zip
Binary file not shown.
View
BIN fitnesse20080812.zip
Binary file not shown.
View
BIN fitnesse20081115.zip
Binary file not shown.
View
BIN fitnesse20081201.zip
Binary file not shown.
View
BIN fitnesse_src20080702.zip
Binary file not shown.
View
BIN fitnesse_src20080703.zip
Binary file not shown.
View
BIN fitnesse_src20080812.zip
Binary file not shown.
View
BIN fitnesse_src20081115.zip
Binary file not shown.
View
BIN fitnesse_src20081201.zip
Binary file not shown.
View
2 src/fitnesse/FitNesseVersion.java
@@ -4,6 +4,6 @@
class FitNesseVersion {
public String toString() {
- return "v20081230";
+ return "v20090112";
}
}

0 comments on commit ec9e44d

Please sign in to comment.