Repository: cxf Updated Branches: refs/heads/master 99eb3de3a -> 242ffb176
revert unwilling commit Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/242ffb17 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/242ffb17 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/242ffb17 Branch: refs/heads/master Commit: 242ffb176a1b2bea2be1762750f66af8d227ca2f Parents: 99eb3de Author: Freeman Fang <[email protected]> Authored: Tue Apr 1 14:55:37 2014 +0800 Committer: Freeman Fang <[email protected]> Committed: Tue Apr 1 14:55:37 2014 +0800 ---------------------------------------------------------------------- rt/pom.xml | 2 +- .../cxf/jaxrs/model/wadl/WadlGenerator.java | 24 +++++++------------- services/pom.xml | 1 + services/xkms/pom.xml | 1 + 4 files changed, 11 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/242ffb17/rt/pom.xml ---------------------------------------------------------------------- diff --git a/rt/pom.xml b/rt/pom.xml index 761cedc..1a7b0ad 100644 --- a/rt/pom.xml +++ b/rt/pom.xml @@ -49,7 +49,7 @@ <module>transports/http-netty/netty-server</module> <module>transports/http-netty/netty-client</module> <module>transports/jms</module> - <module>transports/websocket</module> + <module>transports/udp</module> <module>ws/policy</module> <module>ws/addr</module> <module>ws/security</module> http://git-wip-us.apache.org/repos/asf/cxf/blob/242ffb17/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java ---------------------------------------------------------------------- diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java index c72af89..a773a9f 100644 --- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java +++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java @@ -205,18 +205,6 @@ public class WadlGenerator implements ContainerRequestFilter { boolean isJson = type == MediaType.APPLICATION_JSON_TYPE; - StringBuilder sbMain = generateWADL(getBaseURI(m, ui), getResourcesList(m, ui), isJson, m, ui); - - m.getExchange().put(JAXRSUtils.IGNORE_MESSAGE_WRITERS, !isJson && ignoreMessageWriters); - Response r = Response.ok().type(type).entity(createResponseEntity(sbMain.toString(), isJson)).build(); - context.abortWith(r); - } - - public StringBuilder generateWADL(String baseURI, - List<ClassResourceInfo> cris, - boolean isJson, - Message m, - UriInfo ui) { StringBuilder sbMain = new StringBuilder(); sbMain.append("<application"); if (!isJson) { @@ -227,10 +215,11 @@ public class WadlGenerator implements ContainerRequestFilter { sbGrammars.append("<grammars>"); StringBuilder sbResources = new StringBuilder(); - sbResources.append("<resources base=\"").append(baseURI).append("\">"); + sbResources.append("<resources base=\"").append(getBaseURI(m, ui)).append("\">"); - - MessageBodyWriter<?> jaxbWriter = (m != null && useJaxbContextForQnames) + List<ClassResourceInfo> cris = getResourcesList(m, ui); + + MessageBodyWriter<?> jaxbWriter = useJaxbContextForQnames ? ServerProviderFactory.getInstance(m).getRegisteredJaxbWriter() : null; ResourceTypes resourceTypes = ResourceUtils.getAllRequestResponseTypes(cris, useJaxbContextForQnames, @@ -273,7 +262,10 @@ public class WadlGenerator implements ContainerRequestFilter { sbMain.append(sbGrammars.toString()); sbMain.append(sbResources.toString()); sbMain.append("</application>"); - return sbMain; + + m.getExchange().put(JAXRSUtils.IGNORE_MESSAGE_WRITERS, !isJson && ignoreMessageWriters); + Response r = Response.ok().type(type).entity(createResponseEntity(sbMain.toString(), isJson)).build(); + context.abortWith(r); } private Object createResponseEntity(String entity, boolean isJson) { http://git-wip-us.apache.org/repos/asf/cxf/blob/242ffb17/services/pom.xml ---------------------------------------------------------------------- diff --git a/services/pom.xml b/services/pom.xml index 34c3c09..f7b49d4 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -31,6 +31,7 @@ <version>3.0.0-SNAPSHOT</version> </parent> <modules> + <module>sts</module> <module>wsn</module> <module>ws-discovery</module> <module>xkms</module> http://git-wip-us.apache.org/repos/asf/cxf/blob/242ffb17/services/xkms/pom.xml ---------------------------------------------------------------------- diff --git a/services/xkms/pom.xml b/services/xkms/pom.xml index 14d6011..e7c9fa7 100644 --- a/services/xkms/pom.xml +++ b/services/xkms/pom.xml @@ -39,5 +39,6 @@ <module>xkms-features</module> <module>xkms-osgi</module> <module>xkms-war</module> + <module>xkms-itests</module> </modules> </project>
