You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/05/19 15:28:05 UTC
[16/50] [abbrv] git commit: [OLINGO-266] pimp index.jsp
[OLINGO-266] pimp index.jsp
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/d3e30749
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d3e30749
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d3e30749
Branch: refs/heads/master
Commit: d3e3074993edfc5f665876b057178de82067aed1
Parents: 7f5a119
Author: Stephan Klevenz <st...@sap.com>
Authored: Fri May 16 17:31:54 2014 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Mon May 19 14:27:05 2014 +0200
----------------------------------------------------------------------
lib/server-tecsvc/src/main/version/version.html | 35 ++++--
.../src/main/webapp/css/olingo.css | 121 +++++++++++++++++++
.../src/main/webapp/gen/version.html | 43 +++++++
lib/server-tecsvc/src/main/webapp/index.jsp | 119 ++----------------
.../olingo/server/core/ODataHandlerTest.java | 2 -
5 files changed, 197 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d3e30749/lib/server-tecsvc/src/main/version/version.html
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/version/version.html b/lib/server-tecsvc/src/main/version/version.html
index dc64ee6..d0b9d02 100644
--- a/lib/server-tecsvc/src/main/version/version.html
+++ b/lib/server-tecsvc/src/main/version/version.html
@@ -16,13 +16,28 @@
specific language governing permissions and limitations
under the License.
-->
-<table border="1">
-<tr><td>name</td><td>${name}</td></tr>
-<tr><td>version</td><td>${version}</td></tr>
-<tr><td>olingo version</td><td>${olingo.version}</td></tr>
-<tr><td>timestamp</td><td>${timestamp}</td></tr>
-<tr><td>basedir</td><td>${basedir}</td></tr>
-<tr><td>project.build.finalName</td><td>${project.build.finalName}</td></tr>
-<tr><td>build server</td><td>${env.HOSTNAME}</td></tr>
-<tr><td>user</td><td>${env.USER}</td></tr>
-</table>
\ No newline at end of file
+
+<table border="1" rules="groups">
+ <thead>
+ <tr>
+ <th colspan=2>Version Information</th>
+ </tr>
+ </thead>
+
+ <tfoot>
+ <tr>
+ <td colspan=2><a href="http://olingo.apache.org" target="self">Apache
+ Olingo</a></td>
+ </tr>
+ </tfoot>
+
+ <tbody>
+ <td>name</td>
+ <td>${name}</td>
+ </tr>
+ <tr>
+ <td>version</td>
+ <td>${version}</td>
+ </tr>
+ </tbody>
+</table>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d3e30749/lib/server-tecsvc/src/main/webapp/css/olingo.css
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/webapp/css/olingo.css b/lib/server-tecsvc/src/main/webapp/css/olingo.css
new file mode 100644
index 0000000..6e3aa7f
--- /dev/null
+++ b/lib/server-tecsvc/src/main/webapp/css/olingo.css
@@ -0,0 +1,121 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+*/
+body {
+ font-family: Arial, sans-serif;
+ font-size: 13px;
+ line-height: 18px;
+ color: orange
+ background-color: #ffffff;
+}
+
+a {
+ color: blue;
+ text-decoration: none;
+}
+
+a:focus {
+ outline: thin dotted #4076cb;
+ outline-offset: -1px;
+}
+
+/* a:hover,a:active { */
+/* outline: 0; */
+/* } */
+
+/* a:hover { */
+/* color: #404a7e; */
+/* text-decoration: underline; */
+/* } */
+
+h1,h2,h3,h4,h5,h6 {
+ margin: 9px 0;
+ font-family: inherit;
+ font-weight: bold;
+ line-height: 1;
+ color: orange;
+}
+
+h1 {
+ font-size: 36px;
+ line-height: 40px;
+}
+
+h2 {
+ font-size: 30px;
+ line-height: 40px;
+}
+
+h3 {
+ font-size: 24px;
+ line-height: 40px;
+}
+
+h4 {
+ font-size: 18px;
+ line-height: 20px;
+}
+
+h5 {
+ font-size: 14px;
+ line-height: 20px;
+}
+
+h6 {
+ font-size: 12px;
+ line-height: 20px;
+}
+
+.logo {
+ float: right;
+}
+
+ul {
+ padding: 0;
+ margin: 0 0 9px 25px;
+}
+
+ul ul {
+ margin-bottom: 0;
+}
+
+li {
+ line-height: 18px;
+}
+
+hr {
+ margin: 9px 0;
+ border: 0;
+ border-top: 1px solid #cccccc;
+ border-bottom: 1px solid #ffffff;
+}
+
+/* table { */
+/* border-collapse: collapse; */
+/* border-spacing: 2px; */
+/* } */
+
+/* th,td { */
+/* border: 1px solid; */
+/* padding: 2px; */
+/* } */
+
+.version {
+ font-family: "Courier New", monospace;
+ font-size: 9px;
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d3e30749/lib/server-tecsvc/src/main/webapp/gen/version.html
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/webapp/gen/version.html b/lib/server-tecsvc/src/main/webapp/gen/version.html
new file mode 100644
index 0000000..d0b9d02
--- /dev/null
+++ b/lib/server-tecsvc/src/main/webapp/gen/version.html
@@ -0,0 +1,43 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<table border="1" rules="groups">
+ <thead>
+ <tr>
+ <th colspan=2>Version Information</th>
+ </tr>
+ </thead>
+
+ <tfoot>
+ <tr>
+ <td colspan=2><a href="http://olingo.apache.org" target="self">Apache
+ Olingo</a></td>
+ </tr>
+ </tfoot>
+
+ <tbody>
+ <td>name</td>
+ <td>${name}</td>
+ </tr>
+ <tr>
+ <td>version</td>
+ <td>${version}</td>
+ </tr>
+ </tbody>
+</table>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d3e30749/lib/server-tecsvc/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/webapp/index.jsp b/lib/server-tecsvc/src/main/webapp/index.jsp
index 6c4a95e..22173bf 100644
--- a/lib/server-tecsvc/src/main/webapp/index.jsp
+++ b/lib/server-tecsvc/src/main/webapp/index.jsp
@@ -20,126 +20,23 @@
under the License.
-->
-<!DOCTYPE html>
+<!DOCTYPE html>
<html>
<header>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Apache Olingo - OData 4.0</title>
- <style type="text/css">
-body {
- font-family: Arial, sans-serif;
- font-size: 13px;
- line-height: 18px;
- color: blue;
- background-color: #ffffff;
-}
-
-a {
- color: blue;
- text-decoration: none;
-}
-
-a:focus {
- outline: thin dotted #4076cb;
- outline-offset: -1px;
-}
-
-a:hover,a:active {
- outline: 0;
-}
-
-a:hover {
- color: #404a7e;
- text-decoration: underline;
-}
-
-h1,h2,h3,h4,h5,h6 {
- margin: 9px 0;
- font-family: inherit;
- font-weight: bold;
- line-height: 1;
- color: blue;
-}
-
-h1 {
- font-size: 36px;
- line-height: 40px;
-}
-
-h2 {
- font-size: 30px;
- line-height: 40px;
-}
-
-h3 {
- font-size: 24px;
- line-height: 40px;
-}
-
-h4 {
- font-size: 18px;
- line-height: 20px;
-}
-
-h5 {
- font-size: 14px;
- line-height: 20px;
-}
-
-h6 {
- font-size: 12px;
- line-height: 20px;
-}
-
-.logo {
- float: right;
-}
-
-ul {
- padding: 0;
- margin: 0 0 9px 25px;
-}
-
-ul ul {
- margin-bottom: 0;
-}
-
-li {
- line-height: 18px;
-}
-
-hr {
- margin: 18px 0;
- border: 0;
- border-top: 1px solid #cccccc;
- border-bottom: 1px solid #ffffff;
-}
-
-table {
- border-collapse: collapse;
- border-spacing: 10px;
-}
-
-th,td {
- border: 1px solid;
- padding: 20px;
-}
-
-.code {
- font-family: "Courier New", monospace;
- font-size: 13px;
- line-height: 18px;
-}
-</style>
+ <link type="text/css" rel="stylesheet" href="css/olingo.css">
</header>
<body>
<div>
<h1>
- Olingo OData 4.0 <img height="100" align="right"
- src="img/OlingoOrangeTM.png" />
+ Olingo OData 4.0
+ <div class="logo">
+ <img height="100" align="right" src="img/OlingoOrangeTM.png" />
+ </div>
</h1>
</div>
<hr>
@@ -149,9 +46,9 @@ th,td {
<li><a href="odata.svc/$metadata">Metadata</a></li>
</lu>
-<hr>
+ <hr>
- <div class="code">
+<div class="version">
<%
String version = "gen/version.html";
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d3e30749/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
index 3636c2b..18400d8 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java
@@ -79,8 +79,6 @@ public class ODataHandlerTest {
assertNotNull(response.getContent());
String doc = IOUtils.toString(response.getContent());
- System.out.println(doc);
-
assertTrue(doc.contains("<edmx:Edmx Version=\"4.0\""));
}