You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2017/10/06 10:02:19 UTC
[1/4] aries-jax-rs-whiteboard git commit: Restore DefaultWeb
Repository: aries-jax-rs-whiteboard
Updated Branches:
refs/heads/master 5629d40f0 -> 10b51ef88
Restore DefaultWeb
This reverts commit f8f6baa1535707fbd0bb895659378194d9e94525.
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/aa6eaa0e
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/aa6eaa0e
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/aa6eaa0e
Branch: refs/heads/master
Commit: aa6eaa0e58dd9bacfa9277b388ba6f09673e65f5
Parents: 5629d40
Author: Carlos Sierra <cs...@apache.org>
Authored: Fri Oct 6 11:12:27 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Oct 6 11:59:07 2017 +0200
----------------------------------------------------------------------
.../jax/rs/whiteboard/internal/DefaultWeb.java | 105 +++++++++++++++++++
1 file changed, 105 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/aa6eaa0e/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/DefaultWeb.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/DefaultWeb.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/DefaultWeb.java
new file mode 100644
index 0000000..711ee90
--- /dev/null
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/DefaultWeb.java
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ */
+
+package org.apache.aries.jax.rs.whiteboard.internal;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.CacheControl;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+
+@Path("/")
+public class DefaultWeb {
+
+ @GET
+ @Produces(MediaType.TEXT_HTML)
+ public Response home(){
+ CacheControl cc = new CacheControl();
+ cc.setMaxAge(86400);
+ cc.setPrivate(true);
+
+ ResponseBuilder builder = Response.ok(
+ getClass().getResourceAsStream("/static/index.html"));
+ builder.cacheControl(cc);
+
+ return builder.build();
+ }
+
+ @GET
+ @Path("/css")
+ @Produces("text/css")
+ public Response css() {
+ CacheControl cc = new CacheControl();
+ cc.setMaxAge(86400);
+ cc.setPrivate(true);
+
+ ResponseBuilder builder = Response.ok(
+ getClass().getResourceAsStream("/static/style.css"));
+ builder.cacheControl(cc);
+
+ return builder.build();
+ }
+
+ @GET
+ @Path("/github")
+ @Produces("text/css")
+ public Response github() {
+ CacheControl cc = new CacheControl();
+ cc.setMaxAge(86400);
+ cc.setPrivate(true);
+
+ ResponseBuilder builder = Response.ok(
+ getClass().getResourceAsStream("/static/highlight/styles/github.css"));
+ builder.cacheControl(cc);
+
+ return builder.build();
+ }
+
+ @GET
+ @Path("/highlight")
+ @Produces("text/javascript")
+ public Response highlight() {
+ CacheControl cc = new CacheControl();
+ cc.setMaxAge(86400);
+ cc.setPrivate(true);
+
+ ResponseBuilder builder = Response.ok(
+ getClass().getResourceAsStream("/static/highlight/highlight.pack.js"));
+ builder.cacheControl(cc);
+
+ return builder.build();
+ }
+
+ @GET
+ @Path("/logo")
+ @Produces("image/gif")
+ public Response logo() {
+ CacheControl cc = new CacheControl();
+ cc.setMaxAge(86400);
+ cc.setPrivate(true);
+
+ ResponseBuilder builder = Response.ok(
+ getClass().getResourceAsStream("/static/Arieslogo_Horizontal.gif"));
+ builder.cacheControl(cc);
+
+ return builder.build();
+ }
+
+}
\ No newline at end of file
[4/4] aries-jax-rs-whiteboard git commit: Add service id to FailureDTO
Posted by cs...@apache.org.
Add service id to FailureDTO
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/10b51ef8
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/10b51ef8
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/10b51ef8
Branch: refs/heads/master
Commit: 10b51ef88c16a5c478647f0d467e2c0a41abc073
Parents: 090114d
Author: Carlos Sierra <cs...@apache.org>
Authored: Wed Oct 4 14:25:42 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Oct 6 12:00:10 2017 +0200
----------------------------------------------------------------------
.../aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/10b51ef8/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
index 8643e0a..1e72f6b 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java
@@ -458,6 +458,8 @@ public class AriesJaxRSServiceRuntime implements JaxRSServiceRuntime {
failedApplicationDTO.name = nameProperty == null ?
generateApplicationName(serviceReference::getProperty) :
nameProperty.toString();
+ failedApplicationDTO.serviceId =
+ (long)serviceReference.getProperty("service.id");
failedApplicationDTO.failureReason = reason;
[2/4] aries-jax-rs-whiteboard git commit: Fix comparator
Posted by cs...@apache.org.
Fix comparator
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/299633db
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/299633db
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/299633db
Branch: refs/heads/master
Commit: 299633db1d4bdb794a4c8f983a7c643bc70b47c7
Parents: aa6eaa0
Author: Carlos Sierra <cs...@apache.org>
Authored: Fri Oct 6 11:43:53 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Oct 6 11:59:29 2017 +0200
----------------------------------------------------------------------
.../jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/299633db/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
index d73e1ee..c77da95 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/CXFJaxRsServiceRegistrator.java
@@ -146,11 +146,11 @@ public class CXFJaxRsServiceRegistrator {
}
if (rp1 instanceof ServiceReferenceResourceProvider) {
- return 1;
+ return -1;
}
if (rp2 instanceof ServiceReferenceResourceProvider) {
- return -1;
+ return 1;
}
return 0;
[3/4] aries-jax-rs-whiteboard git commit: Add DefaultWeb as a static
resource
Posted by cs...@apache.org.
Add DefaultWeb as a static resource
unless configuration specifies otherwise
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo
Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/090114d0
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/090114d0
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/090114d0
Branch: refs/heads/master
Commit: 090114d0ace7da6c90c94a23b0d21c89443fae0c
Parents: 299633d
Author: Carlos Sierra <cs...@apache.org>
Authored: Fri Oct 6 11:53:19 2017 +0200
Committer: Carlos Sierra <cs...@apache.org>
Committed: Fri Oct 6 11:59:29 2017 +0200
----------------------------------------------------------------------
.../jax/rs/whiteboard/internal/Whiteboard.java | 23 +++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/090114d0/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
----------------------------------------------------------------------
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
index 7af9ec2..7a9d179 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/Whiteboard.java
@@ -60,6 +60,7 @@ import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -419,7 +420,27 @@ public class Whiteboard {
return properties;
}).flatMap(properties ->
register(
- Application.class, new DefaultApplication(), properties));
+ Application.class,
+ new DefaultApplication() {
+
+ @Override
+ public Set<Object> getSingletons() {
+ Object defaultApplication = _configurationMap.get(
+ "org.apache.aries.jax.rs.whiteboard.default." +
+ "application");
+
+ if (defaultApplication == null ||
+ Boolean.parseBoolean(defaultApplication.toString())) {
+
+ return Collections.singleton(new DefaultWeb());
+ }
+ else {
+ return Collections.emptySet();
+ }
+ }
+
+ },
+ properties));
}
private ServiceRegistration<?>