Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B802D9679 for ; Sun, 4 Dec 2011 14:15:51 +0000 (UTC) Received: (qmail 77608 invoked by uid 500); 4 Dec 2011 14:15:51 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 77550 invoked by uid 500); 4 Dec 2011 14:15:51 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 77543 invoked by uid 99); 4 Dec 2011 14:15:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Dec 2011 14:15:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Dec 2011 14:15:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C12A223888D2 for ; Sun, 4 Dec 2011 14:15:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1210114 - in /cxf/trunk: rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Date: Sun, 04 Dec 2011 14:15:28 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111204141528.C12A223888D2@eris.apache.org> Author: sergeyb Date: Sun Dec 4 14:15:28 2011 New Revision: 1210114 URL: http://svn.apache.org/viewvc?rev=1210114&view=rev Log: [CXF-3950] Adding basic processing of href attributes if any Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java?rev=1210114&r1=1210113&r2=1210114&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java Sun Dec 4 14:15:28 2011 @@ -348,11 +348,7 @@ public class JAXBElementProvider extends protected static void setNamespaceMapper(Marshaller ms, Map map) throws Exception { NamespaceMapper nsMapper = new NamespaceMapper(map); - try { - ms.setProperty("com.sun.xml.bind.namespacePrefixMapper", nsMapper); - } catch (PropertyException ex) { - ms.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper", nsMapper); - } + setMarshallerProp(ms, nsMapper, "namespacePrefixMapper"); } protected void marshal(Object obj, Class cls, Type genericType, @@ -381,16 +377,26 @@ public class JAXBElementProvider extends XMLInstruction pi = AnnotationUtils.getAnnotation(anns, XMLInstruction.class); if (pi != null) { String value = pi.value(); - // Should we even consider adding a base URI here ? - // Relative references may be resolved OK, to be verified - try { - ms.setProperty("com.sun.xml.bind.xmlHeaders", value); - } catch (PropertyException ex) { - ms.setProperty("com.sun.xml.internal.bind.xmlHeaders", value); + int ind = value.indexOf("href='"); + if (ind > 0 && getContext() != null) { + String relRef = value.substring(ind + 6, value.length() - 3); + String absRef = + getContext().getUriInfo().getBaseUriBuilder().path(relRef).build().toString(); + value = value.substring(0, ind + 6) + absRef + "'?>"; } + setMarshallerProp(ms, value, "xmlHeaders"); } } + private static void setMarshallerProp(Marshaller ms, Object value, String name) throws Exception { + try { + ms.setProperty("com.sun.xml.bind." + name, value); + } catch (PropertyException ex) { + ms.setProperty("com.sun.xml.internal.bind." + name, value); + } + + } + protected void addAttachmentMarshaller(Marshaller ms) { Collection attachments = getAttachments(true); if (attachments != null) { Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1210114&r1=1210113&r2=1210114&view=diff ============================================================================== --- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java (original) +++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Sun Dec 4 14:15:28 2011 @@ -135,15 +135,14 @@ public class JAXRSClientServerBookTest e @Test public void testProcessingInstruction() throws Exception { - - String endpointAddress = - "http://localhost:" + PORT + "/bookstore/name-in-query"; + String base = "http://localhost:" + PORT; + String endpointAddress = base + "/bookstore/name-in-query"; WebClient wc = WebClient.create(endpointAddress); String name = "Many spaces"; wc.query("name", name); String content = wc.get(String.class); assertTrue(content.contains("")); - assertTrue(content.contains("")); + assertTrue(content.contains("")); } @Test