Repository: olingo-odata4 Updated Branches: refs/heads/olingo-266-ref a7301b210 -> 6e76ea9cc
[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/d474c9c8 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d474c9c8 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d474c9c8 Branch: refs/heads/olingo-266-ref Commit: d474c9c8a89a0a59f2363c49c85259ed50579997 Parents: a7301b2 Author: Stephan Klevenz <[email protected]> Authored: Wed May 14 12:30:35 2014 +0200 Committer: Stephan Klevenz <[email protected]> Committed: Wed May 14 12:30:35 2014 +0200 ---------------------------------------------------------------------- lib/server-tecsvc/pom.xml | 13 ++ lib/server-tecsvc/src/main/version/version.html | 28 +++ .../src/main/webapp/META-INF/MANIFEST.MF | 13 ++ .../src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/img/OlingoOrangeTM.png | Bin 0 -> 113360 bytes lib/server-tecsvc/src/main/webapp/index.html | 32 ---- lib/server-tecsvc/src/main/webapp/index.jsp | 173 +++++++++++++++++++ 7 files changed, 228 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d474c9c8/lib/server-tecsvc/pom.xml ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/pom.xml b/lib/server-tecsvc/pom.xml index 99ca965..cf367d7 100644 --- a/lib/server-tecsvc/pom.xml +++ b/lib/server-tecsvc/pom.xml @@ -35,6 +35,19 @@ </parent> <build> + + <resources> + <resource> + <directory>src/main/version</directory> + <filtering>true</filtering> + <targetPath>../${project.build.finalName}/gen</targetPath> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d474c9c8/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 new file mode 100644 index 0000000..dc64ee6 --- /dev/null +++ b/lib/server-tecsvc/src/main/version/version.html @@ -0,0 +1,28 @@ +<!-- + 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"> +<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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d474c9c8/lib/server-tecsvc/src/main/webapp/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/webapp/META-INF/MANIFEST.MF b/lib/server-tecsvc/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 0000000..b5f16fd --- /dev/null +++ b/lib/server-tecsvc/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Implementation-Vendor: The Apache Software Foundation +Implementation-Title: olingo-server-test +Implementation-Version: 0.1.0-SNAPSHOT +Implementation-Vendor-Id: org.apache.olingo +Built-By: d036242 +Build-Jdk: 1.7.0_45 +Specification-Vendor: The Apache Software Foundation +Specification-Title: olingo-server-test +Created-By: Apache Maven 3.0.5 +Specification-Version: 0.1.0-SNAPSHOT +Archiver-Version: Plexus Archiver + http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d474c9c8/lib/server-tecsvc/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/webapp/WEB-INF/web.xml b/lib/server-tecsvc/src/main/webapp/WEB-INF/web.xml index a5e5154..3c68d16 100644 --- a/lib/server-tecsvc/src/main/webapp/WEB-INF/web.xml +++ b/lib/server-tecsvc/src/main/webapp/WEB-INF/web.xml @@ -25,7 +25,7 @@ <display-name>Apache Olingo OData 4.0 Technical Service</display-name> <welcome-file-list> - <welcome-file>index.html</welcome-file> + <welcome-file>index.jsp</welcome-file> </welcome-file-list> <servlet> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d474c9c8/lib/server-tecsvc/src/main/webapp/img/OlingoOrangeTM.png ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/webapp/img/OlingoOrangeTM.png b/lib/server-tecsvc/src/main/webapp/img/OlingoOrangeTM.png new file mode 100644 index 0000000..4878e8a Binary files /dev/null and b/lib/server-tecsvc/src/main/webapp/img/OlingoOrangeTM.png differ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d474c9c8/lib/server-tecsvc/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/webapp/index.html b/lib/server-tecsvc/src/main/webapp/index.html deleted file mode 100644 index 7773c60..0000000 --- a/lib/server-tecsvc/src/main/webapp/index.html +++ /dev/null @@ -1,32 +0,0 @@ -<html> -<!-- - 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> - <h1>Olingo OData 4.0</h1> - <hr> - <h2>Technical Service</h2> - <lu> - <li><a href="odata.svc/">Service Document</a></li> - <li><a href="odata.svc/$metadata">Metadata</a></li> - </lu> - -</body> - -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d474c9c8/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 new file mode 100644 index 0000000..6c4a95e --- /dev/null +++ b/lib/server-tecsvc/src/main/webapp/index.jsp @@ -0,0 +1,173 @@ +<%@ page language="java" contentType="text/html; UTF-8" + pageEncoding="UTF-8"%> + +<!-- + 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. +--> + +<!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> + +</header> + +<body> + <div> + <h1> + Olingo OData 4.0 <img height="100" align="right" + src="img/OlingoOrangeTM.png" /> + </h1> + </div> + <hr> + <h2>Technical Service</h2> + <lu> + <li><a href="odata.svc/">Service Document</a></li> + <li><a href="odata.svc/$metadata">Metadata</a></li> + </lu> + +<hr> + + <div class="code"> + <% + String version = "gen/version.html"; + + try { + %> + <jsp:include page='<%=version%>' /> + <% + } catch (Exception e) { + %> + <p>IDE Build</p> + <% + } + %> + </div> + + +</body> + +</html> \ No newline at end of file
