You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2020/04/05 17:16:38 UTC
[aries-jax-rs-whiteboard] branch master updated (7be5ee8 -> f77e6c4)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git.
from 7be5ee8 Document configuration properties (thanks to Ray)
new 14b8aca [ARIES-1968] use released version
new f77e6c4 remove unused legacy resources
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
jax-rs.whiteboard/README | 7 --
.../main/resources/static/Arieslogo_Horizontal.gif | Bin 6029 -> 0 bytes
.../src/main/resources/static/highlight/LICENSE | 24 ----
.../resources/static/highlight/highlight.pack.js | 2 -
.../resources/static/highlight/styles/github.css | 99 ----------------
.../src/main/resources/static/index.html | 125 ---------------------
.../src/main/resources/static/style.css | 42 -------
pom.xml | 2 +-
8 files changed, 1 insertion(+), 300 deletions(-)
delete mode 100644 jax-rs.whiteboard/src/main/resources/static/Arieslogo_Horizontal.gif
delete mode 100644 jax-rs.whiteboard/src/main/resources/static/highlight/LICENSE
delete mode 100644 jax-rs.whiteboard/src/main/resources/static/highlight/highlight.pack.js
delete mode 100644 jax-rs.whiteboard/src/main/resources/static/highlight/styles/github.css
delete mode 100644 jax-rs.whiteboard/src/main/resources/static/index.html
delete mode 100644 jax-rs.whiteboard/src/main/resources/static/style.css
[aries-jax-rs-whiteboard] 02/02: remove unused legacy resources
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit f77e6c4743d7cc1b2f2734047b9cabecd20b9222
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Sun Apr 5 13:16:08 2020 -0400
remove unused legacy resources
---
jax-rs.whiteboard/README | 7 --
.../main/resources/static/Arieslogo_Horizontal.gif | Bin 6029 -> 0 bytes
.../src/main/resources/static/highlight/LICENSE | 24 ----
.../resources/static/highlight/highlight.pack.js | 2 -
.../resources/static/highlight/styles/github.css | 99 ----------------
.../src/main/resources/static/index.html | 125 ---------------------
.../src/main/resources/static/style.css | 42 -------
7 files changed, 299 deletions(-)
diff --git a/jax-rs.whiteboard/README b/jax-rs.whiteboard/README
index 2d351e0..0eb3849 100644
--- a/jax-rs.whiteboard/README
+++ b/jax-rs.whiteboard/README
@@ -1,9 +1,2 @@
Apache Aries JAX-RS Whiteboard
Copyright 2017 The Apache Software Foundation
-
-This product includes software by Ivan Sagalaev in [1] and by Vasily Polovnyov
-in [2]
-
-[1] resources/static/highlight
-[2] resources/static/highlight/styles/github.css
-
diff --git a/jax-rs.whiteboard/src/main/resources/static/Arieslogo_Horizontal.gif b/jax-rs.whiteboard/src/main/resources/static/Arieslogo_Horizontal.gif
deleted file mode 100644
index bd4fbea..0000000
Binary files a/jax-rs.whiteboard/src/main/resources/static/Arieslogo_Horizontal.gif and /dev/null differ
diff --git a/jax-rs.whiteboard/src/main/resources/static/highlight/LICENSE b/jax-rs.whiteboard/src/main/resources/static/highlight/LICENSE
deleted file mode 100644
index 422deb7..0000000
--- a/jax-rs.whiteboard/src/main/resources/static/highlight/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2006, Ivan Sagalaev
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of highlight.js nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/jax-rs.whiteboard/src/main/resources/static/highlight/highlight.pack.js b/jax-rs.whiteboard/src/main/resources/static/highlight/highlight.pack.js
deleted file mode 100644
index eab7747..0000000
--- a/jax-rs.whiteboard/src/main/resources/static/highlight/highlight.pack.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */
-!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";i [...]
\ No newline at end of file
diff --git a/jax-rs.whiteboard/src/main/resources/static/highlight/styles/github.css b/jax-rs.whiteboard/src/main/resources/static/highlight/styles/github.css
deleted file mode 100644
index 791932b..0000000
--- a/jax-rs.whiteboard/src/main/resources/static/highlight/styles/github.css
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-
-github.com style (c) Vasily Polovnyov <va...@whiteants.net>
-
-*/
-
-.hljs {
- display: block;
- overflow-x: auto;
- padding: 0.5em;
- color: #333;
- background: #f8f8f8;
-}
-
-.hljs-comment,
-.hljs-quote {
- color: #998;
- font-style: italic;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-subst {
- color: #333;
- font-weight: bold;
-}
-
-.hljs-number,
-.hljs-literal,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-tag .hljs-attr {
- color: #008080;
-}
-
-.hljs-string,
-.hljs-doctag {
- color: #d14;
-}
-
-.hljs-title,
-.hljs-section,
-.hljs-selector-id {
- color: #900;
- font-weight: bold;
-}
-
-.hljs-subst {
- font-weight: normal;
-}
-
-.hljs-type,
-.hljs-class .hljs-title {
- color: #458;
- font-weight: bold;
-}
-
-.hljs-tag,
-.hljs-name,
-.hljs-attribute {
- color: #000080;
- font-weight: normal;
-}
-
-.hljs-regexp,
-.hljs-link {
- color: #009926;
-}
-
-.hljs-symbol,
-.hljs-bullet {
- color: #990073;
-}
-
-.hljs-built_in,
-.hljs-builtin-name {
- color: #0086b3;
-}
-
-.hljs-meta {
- color: #999;
- font-weight: bold;
-}
-
-.hljs-deletion {
- background: #fdd;
-}
-
-.hljs-addition {
- background: #dfd;
-}
-
-.hljs-emphasis {
- font-style: italic;
-}
-
-.hljs-strong {
- font-weight: bold;
-}
diff --git a/jax-rs.whiteboard/src/main/resources/static/index.html b/jax-rs.whiteboard/src/main/resources/static/index.html
deleted file mode 100644
index d2ad805..0000000
--- a/jax-rs.whiteboard/src/main/resources/static/index.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!doctype 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.
--->
-
-<html lang="en">
-<head>
- <meta charset="utf-8">
-
- <title>Apache Aries JAX-RS Whiteboard</title>
- <meta name="description" content="Apache Aries JAX-RS Whiteboard">
- <meta name="author" content="The ASF">
-
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="stylesheet" href="css" media="all">
- <link rel="stylesheet" href="github" media="all">
-</head>
-
-<body>
- <script src="/highlight"></script>
- <script>hljs.initHighlightingOnLoad();</script>
-
- <div class="header">
- <img alt="Apache Aries" class="logo" src="logo">
-
- <h1>JAX-RS Whiteboard</h1>
- </div>
-
- <main role="main">
- <h2>Welcome to the <code>default</code> Application of the Aries JAX-RS Whiteboard</h2>
-
- <p>
- If you are seeing this page it means that you've successfully deployed the Aries JAX-RS Whiteboard!
- </p>
-
- <p>If you want more information about JAX-RS you can find out more about it <a href="http://docs.oracle.com/javaee/7/tutorial/jaxrs.htm#GIEPU">here</a>.
-
- <p>
- What you should do now is deploy an JAX-RS resource as an OSGi service.
- Let's take a look at a couple of examples which will use OSGi Declarative Services specification as the means of creating the OSGi services.</p>
-
- <p>The first example will simply add a resource (a.k.a. an endpoint).</p>
-
- <pre>
-<code class="java">
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-@Component(
- property = {
- JaxRSWhiteboardConstants.JAX_RS_APPLICATION_SELECT + "=(osgi.jaxrs.name=.default)",
- JaxRSWhiteboardConstants.JAX_RS_RESOURCE + "=true"
- },
- service = ExampleAddon.class
-)
-public class ExampleAddon {
-
- @GET
- @Path("/{name}")
- public String sayHello(@PathParam("name") String name) {
- return "Hello " + name;
- }
-
-}
-</code>
- </pre>
-
- <p>The next example is an <code>extension</code> which implements a <code>javax.ws.rs.container.ContainerRequestFilter</code>.
-
- <pre>
-<code class="java">
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.jaxrs.whiteboard.JaxRSWhiteboardConstants;
-
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-
-@Component(
- property = {
- JaxRSWhiteboardConstants.JAX_RS_APPLICATION_SELECT + "=(osgi.jaxrs.name=.default)",
- JaxRSWhiteboardConstants.JAX_RS_EXTENSION + "=true"
- }
-)
-@Provider
-public class ExampleFilter implements ContainerRequestFilter {
-
- @Override
- public void filter(ContainerRequestContext requestContext)
- throws IOException {
-
- System.out.println("FILTERED!");
- }
-
-}
-</code>
- </pre>
- </main>
-
- <footer role="contentinfo">
- <div>Apache Software Foundation!</div>
-
- <small>Copyright © <time datetime="2013">2017</time></small>
- </footer>
-</body>
-</html>
\ No newline at end of file
diff --git a/jax-rs.whiteboard/src/main/resources/static/style.css b/jax-rs.whiteboard/src/main/resources/static/style.css
deleted file mode 100644
index 0816086..0000000
--- a/jax-rs.whiteboard/src/main/resources/static/style.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-
-html,
-body {
- font-family: Helvetica, Tahoma, sans-serif;
- font-size: 14px;
- line-height: 1;
-}
-
-.header {
- background-color: #393f5a;
- color: #DCD5E2;
- height: 100px;
- position: relative;
-}
-
-.header img {
- float: left;
-}
-
-.header h1 {
- bottom: 10px;
- font-size: 3.3em;
- left: 260px;
- margin: 0;
- position: absolute;
-}
\ No newline at end of file
[aries-jax-rs-whiteboard] 01/02: [ARIES-1968] use released version
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git
commit 14b8acaf0d70069813ee7ffd1f9d9943305385d6
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Sun Apr 5 13:15:49 2020 -0400
[ARIES-1968] use released version
Signed-off-by: Raymond Auge <ro...@apache.org>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2c01e46..797528f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.2.13-SNAPSHOT</cxf.version>
+ <cxf.version>3.2.13</cxf.version>
<bnd.version>4.2.0</bnd.version>
<dsl.version>1.2.2</dsl.version>
</properties>