Update NOTICE file to new layout, update documentation to match new style, delete redundant NOTICE and LICENSE files, prepare changelog for 1.0.1 release, and update dependencies to 1.1.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@650299 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/shell.tui/doc/apache-felix-shell-tui.html b/shell.tui/doc/apache-felix-shell-tui.html
index cad5ff9..254760e 100644
--- a/shell.tui/doc/apache-felix-shell-tui.html
+++ b/shell.tui/doc/apache-felix-shell-tui.html
@@ -1,37 +1,32 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html><head><title>Apache Felix</title>
+<html><head><title>Apache Felix - Apache Felix Shell TUI</title>
<link rel="stylesheet" href="apache-felix-shell-tui_files/site.css" type="text/css" media="all">
- <link rel="stylesheet" href="apache-felix-shell-tui_files/print.css" type="text/css" media="print">
- <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"></head><body linkifymax="0" linkifycurrent="0" linkifying="true">
- <div class="title">
- <img alt="Logo" src="apache-felix-shell-tui_files/apache-felix-small.png" align="right">
- </div>
+ <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"></head><body>
+ <div class="title"><div class="logo"><a href="http://felix.apache.org/site/index.html"><img alt="Apache Felix" src="apache-felix-shell-tui_files/logo.png" border="0"></a></div><div class="header"><a href="http://www.apache.org/"><img alt="Apache" src="apache-felix-shell-tui_files/apache.png" border="0"></a></div></div>
<div class="menu">
- <ul>
- <li><a href="http://cwiki.apache.org/FELIX/index.html">home</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/news.html">news</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/status.html">status</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/license.html">license</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/downloads.html">downloads</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/documentation.html">documentation</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/committers.html">committers</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/mailinglists.html">mailing lists</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/faq.html">faq</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/roadmap.html">roadmap</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/sourcecode.html">source code</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/codingstandards.html">coding standards</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/issuetracking.html">issue tracking</a></li>
- <li><a href="http://cwiki.apache.org/FELIX/dependencies.html">dependencies</a></li>
- </ul>
- </div>
+<ul>
+ <li><a href="http://felix.apache.org/site/news.html" title="news">news</a></li>
+ <li><a href="http://felix.apache.org/site/license.html" title="license">license</a></li>
+ <li><span class="nobr"><a href="http://felix.apache.org/site/downloads.cgi" title="Visit page outside Confluence" rel="nofollow">downloads<sup><img class="rendericon" src="apache-felix-shell-tui_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></li>
+ <li><a href="http://felix.apache.org/site/documentation.html" title="documentation">documentation</a></li>
+ <li><a href="http://felix.apache.org/site/mailinglists.html" title="mailinglists">mailing lists</a></li>
+ <li><a href="http://felix.apache.org/site/contributing.html" title="Contributing">contributing</a></li>
+ <li><span class="nobr"><a href="http://www.apache.org/" title="Visit page outside Confluence" rel="nofollow">asf<sup><img class="rendericon" src="apache-felix-shell-tui_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></li>
+ <li><span class="nobr"><a href="http://www.apache.org/foundation/sponsorship.html" title="Visit page outside Confluence" rel="nofollow">sponsorship<sup><img class="rendericon" src="apache-felix-shell-tui_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span></li>
+ <li><span class="nobr"><a href="http://www.apache.org/foundation/thanks.html" title="Visit page outside Confluence" rel="nofollow">sponsors<sup><img class="rendericon" src="apache-felix-shell-tui_files/linkext7.gif" alt="" align="absmiddle" border="0" height="7" width="7"></sup></a></span>
+<!-- ApacheCon Ad -->
+<iframe src="apache-felix-shell-tui_files/button.html" style="border-width: 0pt; float: left;" frameborder="0" height="135" scrolling="no" width="135"></iframe>
+<p style="height: 100px;">
+<!-- ApacheCon Ad -->
+</p></li></ul> </div>
<div class="main">
<h1><a name="ApacheFelixShellTUI-ApacheFelixShellTUI"></a>Apache Felix Shell TUI</h1>
-<p>The Apache Felix Shell TUI (Textual User Interface) sub-project provides a simple, text-based user interface for the <a href="http://cwiki.apache.org/FELIX/apache-felix-shell-service.html" title="Apache Felix Shell Service">Apache Felix Shell Service</a>.
+<p>The Apache Felix Shell TUI (Textual User Interface) sub-project provides a simple, text-based user interface for the <a href="http://felix.apache.org/site/apache-felix-shell-service.html" title="Apache Felix Shell Service">Apache Felix Shell Service</a>.
This bundle is not of much use by itself and should always be used in
conjunction with the shell service bundle. The shell service and shell
TUI bundles are used by the standard Felix launcher to provide a means
@@ -40,4 +35,4 @@
use a GUI interface or remote access interface for interacting with the
shell service.</p>
</div>
- </body></html>
\ No newline at end of file
+ </body></html>
diff --git a/shell.tui/doc/apache-felix-shell-tui_files/apache.png b/shell.tui/doc/apache-felix-shell-tui_files/apache.png
new file mode 100644
index 0000000..5132f65
--- /dev/null
+++ b/shell.tui/doc/apache-felix-shell-tui_files/apache.png
Binary files differ
diff --git a/shell.tui/doc/apache-felix-shell-tui_files/button.html b/shell.tui/doc/apache-felix-shell-tui_files/button.html
new file mode 100644
index 0000000..d6a5da8
--- /dev/null
+++ b/shell.tui/doc/apache-felix-shell-tui_files/button.html
@@ -0,0 +1,3 @@
+<html><head><!-- ads start --></head><body><a href="http://www.us.apachecon.com/us2008/" target="_blank"><img src="button_data/2008-usa-125x125.png" title="ApacheCon US 2008" border="0" height="125" width="125"></a>
+<!-- ads end -->
+</body></html>
\ No newline at end of file
diff --git a/shell.tui/doc/apache-felix-shell-tui_files/button_data/2008-usa-125x125.png b/shell.tui/doc/apache-felix-shell-tui_files/button_data/2008-usa-125x125.png
new file mode 100644
index 0000000..3d6008b
--- /dev/null
+++ b/shell.tui/doc/apache-felix-shell-tui_files/button_data/2008-usa-125x125.png
Binary files differ
diff --git a/shell.tui/doc/apache-felix-shell-tui_files/linkext7.gif b/shell.tui/doc/apache-felix-shell-tui_files/linkext7.gif
new file mode 100644
index 0000000..f2dd2dc
--- /dev/null
+++ b/shell.tui/doc/apache-felix-shell-tui_files/linkext7.gif
Binary files differ
diff --git a/shell.tui/doc/apache-felix-shell-tui_files/logo.png b/shell.tui/doc/apache-felix-shell-tui_files/logo.png
new file mode 100644
index 0000000..dccbddc
--- /dev/null
+++ b/shell.tui/doc/apache-felix-shell-tui_files/logo.png
Binary files differ
diff --git a/shell.tui/doc/apache-felix-shell-tui_files/site.css b/shell.tui/doc/apache-felix-shell-tui_files/site.css
index 66b6a1b..959ab0a 100644
--- a/shell.tui/doc/apache-felix-shell-tui_files/site.css
+++ b/shell.tui/doc/apache-felix-shell-tui_files/site.css
@@ -1,19 +1,25 @@
-body { background-color: #ffffff; color: #000000; font-family: Arial, sans-serif; }
-h1 { font-size: 130% }
-h2 { font-size: 125% }
-h3 { font-size: 120% }
-h4 { font-size: 115% }
-h5 { font-size: 110% }
-h6 { font-size: 105% }
-a { color: #880000 }
-a:visited { color: #880000 }
-a:hover { color: #cc4444 }
-.title { position: absolute; left: 1em; right: 1em; top: 10px; height: 52px; }
-.menu { position: absolute; top: 80px; left: 0.5em; width: 8em; border: solid 1px black; padding-left: 0.5em; padding-right: 0.5em }
-.menu ul { list-style: none; padding-left: 0pt}
-.main { position: absolute; top: 65px; left: 10.5em; right: 1em; }
-.code { background-color: #eeeeee; border: solid 1px black; padding: 0.5em; }
-.code-keyword { color: #880000; }
-.code-quote { color: #008800; }
-.code-object { color: #0000dd; }
-.code-java { margin: 0em; }
\ No newline at end of file
+/* @override http://felix.apache.org/site/media.data/site.css */
+
+body { background-color: #ffffff; color: #3b3b3b; font-family: Tahoma, Arial, sans-serif; font-size: 10pt; line-height: 140% }
+h1, h2, h3, h4, h5, h6 { font-weight: normal; color: #000000; line-height: 100%; margin-top: 0px}
+h1 { font-size: 200% }
+h2 { font-size: 175% }
+h3 { font-size: 150% }
+h4 { font-size: 140% }
+h5 { font-size: 130% }
+h6 { font-size: 120% }
+a { color: #1980af }
+a:visited { color: #1980af }
+a:hover { color: #1faae9 }
+.title { position: absolute; left: 1px; right: 1px; top:25px; height: 81px; background: url(http://felix.apache.org/site/media.data/gradient.png) repeat-x; background-position: bottom; }
+.logo { position: absolute; width: 15em; height: 81px; text-align: center; }
+.header { text-align: right; margin-right: 20pt; margin-top: 30pt;}
+.menu { border-top: 10px solid #f9bb00; position: absolute; top: 107px; left: 1px; width: 15em; bottom: 0px; padding: 0px; background-color: #fcfcfc }
+.menu ul { background-color: #fdf5d9; list-style: none; padding-left: 4em; margin-top: 0px; padding-top: 2em; padding-bottom: 2em; margin-left: 0px; color: #4a4a43}
+.menu a { text-decoration: none; color: #4a4a43 }
+.main { position: absolute; border-top: 10px solid #cde0ea; top: 107px; left: 15em; right: 1px; margin-left: 2px; padding-right: 4em; padding-left: 1em; padding-top: 1em;}
+.code { background-color: #eeeeee; border: solid 1px black; padding: 0.5em }
+.code-keyword { color: #880000 }
+.code-quote { color: #008800 }
+.code-object { color: #0000dd }
+.code-java { margin: 0em }
\ No newline at end of file
diff --git a/shell.tui/doc/changelog.txt b/shell.tui/doc/changelog.txt
index e0cd2a5..2e14e8f 100644
--- a/shell.tui/doc/changelog.txt
+++ b/shell.tui/doc/changelog.txt
@@ -1,3 +1,8 @@
+Changes from 1.0.0 to 1.0.1
+---------------------------
+
+* [2008-04-21] Re-release to make bytecode executable on jre 1.3.
+
Changes from 0.8.0-incubator to 1.0.0
-------------------------------------
