Author: rmannibucau
Date: Tue Jun 19 07:56:18 2018
New Revision: 1833785
URL: http://svn.apache.org/viewvc?rev=1833785&view=rev
Log:
MEECROWAVE-112 openwebbeans 2.0.6, MEECROWAVE-117 xbean 4.8, MEECROWAVE-106 cxf
3.2.5 + spec api implicit exclusion
Modified:
openwebbeans/meecrowave/trunk/integration-tests/sse/src/main/java/org/apache/meecrowave/tests/sse/NewsService.java
openwebbeans/meecrowave/trunk/integration-tests/sse/src/test/java/org/apache/meecrowave/tests/sse/SSETest.java
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2RevokeTokenService.java
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2TokenService.java
openwebbeans/meecrowave/trunk/pom.xml
Modified:
openwebbeans/meecrowave/trunk/integration-tests/sse/src/main/java/org/apache/meecrowave/tests/sse/NewsService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/sse/src/main/java/org/apache/meecrowave/tests/sse/NewsService.java?rev=1833785&r1=1833784&r2=1833785&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/integration-tests/sse/src/main/java/org/apache/meecrowave/tests/sse/NewsService.java
(original)
+++
openwebbeans/meecrowave/trunk/integration-tests/sse/src/main/java/org/apache/meecrowave/tests/sse/NewsService.java
Tue Jun 19 07:56:18 2018
@@ -38,10 +38,9 @@ import javax.ws.rs.sse.SseEventSink;
@ApplicationScoped
public class NewsService {
- AtomicInteger newsCounter = new AtomicInteger();
+ private final AtomicInteger newsCounter = new AtomicInteger();
@GET
- @Path("/")
public Response news() {
JsonObject news = Json.createObjectBuilder().add("news",
"online").build();
return Response.status(Response.Status.OK).entity(news).build();
Modified:
openwebbeans/meecrowave/trunk/integration-tests/sse/src/test/java/org/apache/meecrowave/tests/sse/SSETest.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/integration-tests/sse/src/test/java/org/apache/meecrowave/tests/sse/SSETest.java?rev=1833785&r1=1833784&r2=1833785&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/integration-tests/sse/src/test/java/org/apache/meecrowave/tests/sse/SSETest.java
(original)
+++
openwebbeans/meecrowave/trunk/integration-tests/sse/src/test/java/org/apache/meecrowave/tests/sse/SSETest.java
Tue Jun 19 07:56:18 2018
@@ -44,10 +44,8 @@ public class SSETest {
public static final MeecrowaveRule CONTAINER = new MeecrowaveRule(new
Meecrowave.Builder()
.randomHttpPort()
.excludePackages("org.atmosphere")
- .cxfServletParam("transportId",
"http://cxf.apache.org/transports/http/sse";)
//.cxfServletParam("jaxrs.scope", "singleton")
-
.cxfServletParam("org.atmosphere.container.JSR356AsyncSupport.mappingPath",
"/*").
-
includePackages(NewsService.class.getPackage().getName()), "");
+
.includePackages(NewsService.class.getPackage().getName()), "");
public static final Client client =
ClientBuilder.newBuilder().register(JsrProvider.class).build();
Modified:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java?rev=1833785&r1=1833784&r2=1833785&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java
Tue Jun 19 07:56:18 2018
@@ -214,6 +214,7 @@ public class KnownJarsFilter implements
add("mbean-annotation-api-");
add("meecrowave-maven-");
add("meecrowave-gradle-");
+ add("meecrowave-specs-api-");
add("mimepull-");
add("mina-");
add("mqtt-client-");
Modified:
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java?rev=1833785&r1=1833784&r2=1833785&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
Tue Jun 19 07:56:18 2018
@@ -26,9 +26,11 @@ import org.apache.webbeans.configurator.
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.intercept.InterceptorsManager;
import org.apache.webbeans.servlet.WebBeansConfigurationListener;
+import org.apache.webbeans.spi.ContextsService;
import org.apache.webbeans.web.context.WebConversationFilter;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.configurator.BeanConfigurator;
@@ -71,13 +73,19 @@ public class OWBAutoSetup implements Ser
}
private void doContextInitialized(final ServletContextEvent event) {
+ final WebBeansContext instance = WebBeansContext.getInstance();
try {
- final WebBeansContext instance = WebBeansContext.getInstance();
customizeContext(instance);
} catch (final IllegalStateException ise) {
// lifecycle not supporting it
}
- super.contextInitialized(event);
+ final ContextsService contextsService =
instance.getContextsService();
+ contextsService.startContext(RequestScoped.class, event);
+ try {
+ super.contextInitialized(event);
+ } finally {
+ contextsService.endContext(RequestScoped.class, event);
+ }
}
private void customizeContext(final WebBeansContext instance) {
Modified:
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java?rev=1833785&r1=1833784&r2=1833785&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
Tue Jun 19 07:56:18 2018
@@ -52,13 +52,13 @@ import org.apache.cxf.rs.security.oauth2
import org.apache.cxf.rs.security.oauth2.provider.OAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.services.AbstractTokenService;
+import org.apache.cxf.rs.security.oauth2.services.AccessTokenService;
import org.apache.cxf.rs.security.oauth2.services.RedirectionBasedGrantService;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
import org.apache.meecrowave.Meecrowave;
import org.apache.meecrowave.oauth2.data.RefreshTokenEnabledProvider;
import org.apache.meecrowave.oauth2.provider.JCacheCodeDataProvider;
-import org.apache.meecrowave.oauth2.resource.OAuth2TokenService;
import javax.annotation.PostConstruct;
import javax.crypto.spec.SecretKeySpec;
@@ -100,7 +100,7 @@ public class OAuth2Configurer {
@Inject
private JCacheConfigurer jCacheConfigurer;
- private Consumer<OAuth2TokenService> tokenServiceConsumer;
+ private Consumer<AccessTokenService> tokenServiceConsumer;
private Consumer<RedirectionBasedGrantService>
redirectionBasedGrantServiceConsumer;
private Consumer<AbstractTokenService> abstractTokenServiceConsumer;
private OAuth2Options configuration;
@@ -315,7 +315,7 @@ public class OAuth2Configurer {
abstractTokenServiceConsumer.accept(service);
}
- public void accept(final OAuth2TokenService service) {
+ public void accept(final AccessTokenService service) {
tokenServiceConsumer.accept(service);
}
Modified:
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java?rev=1833785&r1=1833784&r2=1833785&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
Tue Jun 19 07:56:18 2018
@@ -18,22 +18,67 @@
*/
package org.apache.meecrowave.oauth2.resource;
-import
org.apache.cxf.rs.security.oauth2.services.AuthorizationCodeGrantService;
-import org.apache.meecrowave.oauth2.configuration.OAuth2Configurer;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static javax.ws.rs.core.MediaType.APPLICATION_XHTML_XML;
+import static javax.ws.rs.core.MediaType.APPLICATION_XML;
+import static javax.ws.rs.core.MediaType.TEXT_HTML;
+import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
-import javax.annotation.PostConstruct;
import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Typed;
import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+
+import
org.apache.cxf.rs.security.oauth2.services.AuthorizationCodeGrantService;
+import org.apache.cxf.rs.security.oauth2.services.RedirectionBasedGrantService;
+import org.apache.meecrowave.oauth2.configuration.OAuth2Configurer;
@RequestScoped
@Path("authorize")
public class OAuth2AuthorizationCodeGrantService extends
AuthorizationCodeGrantService {
+
+ @Inject
+ private LazyImpl delegate;
+
@Inject
private OAuth2Configurer configurer;
- @PostConstruct
- private void init() {
- configurer.accept(this);
+ @Override
+ @GET
+ @Produces({ APPLICATION_XHTML_XML, TEXT_HTML, APPLICATION_XML,
APPLICATION_JSON })
+ public Response authorize() {
+ return getDelegate().authorize();
+ }
+
+ @Override
+ @GET
+ @Path("decision")
+ public Response authorizeDecision() {
+ return getDelegate().authorizeDecision();
+ }
+
+ @Override
+ @POST
+ @Path("decision")
+ @Consumes(APPLICATION_FORM_URLENCODED)
+ public Response authorizeDecisionForm(MultivaluedMap<String, String>
params) {
+ return getDelegate().authorizeDecisionForm(params);
+ }
+
+ private RedirectionBasedGrantService getDelegate() {
+ delegate.setMessageContext(getMessageContext());
+ configurer.accept(delegate);
+ return delegate;
+ }
+
+ @RequestScoped
+ @Typed(LazyImpl.class)
+ static class LazyImpl extends AuthorizationCodeGrantService {
}
}
Modified:
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2RevokeTokenService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2RevokeTokenService.java?rev=1833785&r1=1833784&r2=1833785&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2RevokeTokenService.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2RevokeTokenService.java
Tue Jun 19 07:56:18 2018
@@ -18,12 +18,14 @@
*/
package org.apache.meecrowave.oauth2.resource;
-import org.apache.cxf.rs.security.oauth2.common.Client;
-import org.apache.cxf.rs.security.oauth2.services.TokenRevocationService;
-import org.apache.meecrowave.oauth2.configuration.OAuth2Configurer;
+import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import javax.annotation.PostConstruct;
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Typed;
import javax.inject.Inject;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
@@ -31,38 +33,57 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
-import java.util.List;
-import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import org.apache.cxf.rs.security.oauth2.common.Client;
+import org.apache.cxf.rs.security.oauth2.services.TokenRevocationService;
+import org.apache.meecrowave.oauth2.configuration.OAuth2Configurer;
@Path("revoke")
-@RequestScoped
-public class OAuth2RevokeTokenService extends TokenRevocationService
implements OAuth2Application.Defaults {
+@ApplicationScoped
+public class OAuth2RevokeTokenService extends TokenRevocationService {
@Inject
private OAuth2Configurer configurer;
- @PostConstruct
- private void init() {
- configurer.accept(this);
- }
+ @Inject
+ private LayImpl delegate;
@POST
@Override
@Consumes(APPLICATION_FORM_URLENCODED)
@Produces(APPLICATION_JSON)
public Response handleTokenRevocation(final MultivaluedMap<String, String>
params) {
- return super.handleTokenRevocation(params);
+ return getDelegate().handleTokenRevocation(params);
}
- @Override // don't fail without a client
- protected Client getClientFromBasicAuthScheme(final MultivaluedMap<String,
String> params) {
- final List<String> authorization =
getMessageContext().getHttpHeaders().getRequestHeader("Authorization");
- if (authorization == null || authorization.isEmpty()) {
- if (!configurer.getConfiguration().isForceClient()) {
- return DEFAULT_CLIENT;
+ private TokenRevocationService getDelegate() {
+ delegate.setMessageContext(getMessageContext());
+ configurer.accept(delegate);
+ return delegate;
+ }
+
+ @RequestScoped
+ @Typed(LayImpl.class)
+ static class LayImpl extends TokenRevocationService implements
OAuth2Application.Defaults {
+ @Inject
+ private OAuth2Configurer configurer;
+
+ @POST
+ @Override
+ @Consumes(APPLICATION_FORM_URLENCODED)
+ @Produces(APPLICATION_JSON)
+ public Response handleTokenRevocation(final MultivaluedMap<String,
String> params) {
+ return super.handleTokenRevocation(params);
+ }
+
+ @Override // don't fail without a client
+ protected Client getClientFromBasicAuthScheme(final
MultivaluedMap<String, String> params) {
+ final List<String> authorization =
getMessageContext().getHttpHeaders().getRequestHeader("Authorization");
+ if (authorization == null || authorization.isEmpty()) {
+ if (!configurer.getConfiguration().isForceClient()) {
+ return DEFAULT_CLIENT;
+ }
}
+ return super.getClientFromBasicAuthScheme(params);
}
- return super.getClientFromBasicAuthScheme(params);
}
}
Modified:
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2TokenService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2TokenService.java?rev=1833785&r1=1833784&r2=1833785&view=diff
==============================================================================
---
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2TokenService.java
(original)
+++
openwebbeans/meecrowave/trunk/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2TokenService.java
Tue Jun 19 07:56:18 2018
@@ -18,12 +18,14 @@
*/
package org.apache.meecrowave.oauth2.resource;
-import org.apache.cxf.rs.security.oauth2.common.Client;
-import org.apache.cxf.rs.security.oauth2.services.AccessTokenService;
-import org.apache.meecrowave.oauth2.configuration.OAuth2Configurer;
+import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import javax.annotation.PostConstruct;
+import java.util.List;
+
+import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Typed;
import javax.inject.Inject;
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
@@ -31,37 +33,48 @@ import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
-import java.util.List;
-import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import org.apache.cxf.rs.security.oauth2.common.Client;
+import org.apache.cxf.rs.security.oauth2.services.AccessTokenService;
+import org.apache.meecrowave.oauth2.configuration.OAuth2Configurer;
@Path("token")
-@RequestScoped
+@ApplicationScoped
public class OAuth2TokenService extends AccessTokenService implements
OAuth2Application.Defaults {
@Inject
private OAuth2Configurer configurer;
- @PostConstruct
- private void init() {
- configurer.accept(this);
- }
+ @Inject
+ private LazyImpl delegate;
@POST
@Consumes(APPLICATION_FORM_URLENCODED)
@Produces(APPLICATION_JSON)
public Response handleTokenRequest(final MultivaluedMap<String, String>
params) {
- return super.handleTokenRequest(params);
+ return getDelegate().handleTokenRequest(params);
+ }
+
+ private AccessTokenService getDelegate() {
+ delegate.setMessageContext(getMessageContext());
+ configurer.accept(delegate);
+ return delegate;
}
- @Override // don't fail without a client
- protected Client getClientFromBasicAuthScheme(final MultivaluedMap<String,
String> params) {
- final List<String> authorization =
getMessageContext().getHttpHeaders().getRequestHeader("Authorization");
- if (authorization == null || authorization.isEmpty()) {
- if (!configurer.getConfiguration().isForceClient()) {
- return DEFAULT_CLIENT;
+ @RequestScoped
+ @Typed(LazyImpl.class)
+ static class LazyImpl extends AccessTokenService implements
OAuth2Application.Defaults {
+ @Inject
+ private OAuth2Configurer configurer;
+
+ @Override // don't fail without a client
+ protected Client getClientFromBasicAuthScheme(final
MultivaluedMap<String, String> params) {
+ final List<String> authorization =
getMessageContext().getHttpHeaders().getRequestHeader("Authorization");
+ if (authorization == null || authorization.isEmpty()) {
+ if (!configurer.getConfiguration().isForceClient()) {
+ return DEFAULT_CLIENT;
+ }
}
+ return super.getClientFromBasicAuthScheme(params);
}
- return super.getClientFromBasicAuthScheme(params);
}
}
Modified: openwebbeans/meecrowave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/pom.xml?rev=1833785&r1=1833784&r2=1833785&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/pom.xml (original)
+++ openwebbeans/meecrowave/trunk/pom.xml Tue Jun 19 07:56:18 2018
@@ -50,8 +50,8 @@
<junit.version>4.12</junit.version>
<tomcat.version>9.0.8</tomcat.version>
- <openwebbeans.version>2.0.5</openwebbeans.version>
- <cxf.version>3.2.4</cxf.version>
+ <openwebbeans.version>2.0.6</openwebbeans.version>
+ <cxf.version>3.2.5</cxf.version>
<johnzon.version>1.1.7</johnzon.version>
<log4j2.version>2.11.0</log4j2.version>
<deltaspike.version>1.8.1</deltaspike.version>
@@ -61,7 +61,7 @@
<h2.version>1.4.196</h2.version>
<dbcp2.version>2.3.0</dbcp2.version>
<commons-cli.version>1.4</commons-cli.version>
- <xbean.version>4.7</xbean.version>
+ <xbean.version>4.8</xbean.version>
</properties>
<modules>
