Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 90835 invoked from network); 13 Aug 2010 01:20:45 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 13 Aug 2010 01:20:45 -0000 Received: (qmail 29335 invoked by uid 500); 13 Aug 2010 01:20:45 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 29275 invoked by uid 500); 13 Aug 2010 01:20:45 -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 29268 invoked by uid 99); 13 Aug 2010 01:20:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Aug 2010 01:20:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 13 Aug 2010 01:20:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1FF002388A38; Fri, 13 Aug 2010 01:19:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r985060 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/ rt/front... Date: Fri, 13 Aug 2010 01:19:26 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100813011927.1FF002388A38@eris.apache.org> Author: dkulp Date: Fri Aug 13 01:19:26 2010 New Revision: 985060 URL: http://svn.apache.org/viewvc?rev=985060&view=rev Log: Merged revisions 985059 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r985059 | dkulp | 2010-08-12 21:18:08 -0400 (Thu, 12 Aug 2010) | 3 lines [CXF-2939] Hold onto the JAXBContexts so the PermGen space doesn't go nuts. Do some test cleanups and other minor tweeks in jaxrs ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AtomPojoProviderTest.java cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericHandlerWriter.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java?rev=985060&r1=985059&r2=985060&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/CodeGeneratorProvider.java Fri Aug 13 01:19:26 2010 @@ -782,10 +782,6 @@ public class CodeGeneratorProvider imple throw new IllegalStateException("Unable to write generated Java files for schemas: " + e.getMessage(), e); } - List srcFiles = FileUtils.getFilesRecurse(src, ".+\\.java$"); - for (File f : srcFiles) { - System.out.println(f.getAbsolutePath()); - } } private List getSchemaElements(Element appElement) { Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java?rev=985060&r1=985059&r2=985060&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java Fri Aug 13 01:19:26 2010 @@ -37,7 +37,6 @@ import java.util.List; import java.util.Map; import java.util.ResourceBundle; import java.util.Set; -import java.util.WeakHashMap; import java.util.logging.Logger; import javax.ws.rs.WebApplicationException; @@ -85,16 +84,17 @@ public abstract class AbstractJAXBProvid implements MessageBodyReader, MessageBodyWriter { protected static final ResourceBundle BUNDLE = BundleUtils.getBundle(AbstractJAXBProvider.class); + private static final Logger LOG = LogUtils.getL7dLogger(AbstractJAXBProvider.class); - private static final String JAXB_DEFAULT_NAMESPACE = "##default"; private static final String JAXB_DEFAULT_NAME = "##default"; - private static Map packageContexts = new WeakHashMap(); - private static Map, JAXBContext> classContexts = new WeakHashMap, JAXBContext>(); + private static Map packageContexts = new HashMap(); + private static Map, JAXBContext> classContexts = new HashMap, JAXBContext>(); + - private static Set> collectionContextClasses = new HashSet>(); - private static JAXBContext collectionContext; + protected Set> collectionContextClasses = new HashSet>(); + protected JAXBContext collectionContext; protected Map jaxbElementClassMap; protected boolean unmarshalAsJaxbElement; Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java?rev=985060&r1=985059&r2=985060&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AtomPojoProvider.java Fri Aug 13 01:19:26 2010 @@ -514,7 +514,7 @@ public class AtomPojoProvider extends Ab } try { Unmarshaller um = - new JAXBElementProvider().getJAXBContext(cls, cls).createUnmarshaller(); + jaxbProvider.getJAXBContext(cls, cls).createUnmarshaller(); return um.unmarshal(new StringReader(entry.getContent())); } catch (Exception ex) { reportError("Object of type " + cls.getName() + " can not be deserialized from Entry", ex); Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java?rev=985060&r1=985059&r2=985060&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java Fri Aug 13 01:19:26 2010 @@ -79,6 +79,10 @@ public class JAXBElementProvider extends private boolean enableStreaming; private ValidationEventHandler eventHandler; + public JAXBElementProvider() { + + } + @Override public boolean isReadable(Class type, Type genericType, Annotation[] anns, MediaType mt) { Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java?rev=985060&r1=985059&r2=985060&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java Fri Aug 13 01:19:26 2010 @@ -477,7 +477,7 @@ public class URITemplateTest extends Ass @Test public void testEncodeLiteralCharactersNotVariable() { URITemplate ut = new URITemplate("a {digit:[0-9]} b"); - System.out.println(ut.encodeLiteralCharacters()); + //System.out.println(ut.encodeLiteralCharacters()); assertEquals("a%20{digit:[0-9]}%20b", ut.encodeLiteralCharacters()); } } Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AtomPojoProviderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AtomPojoProviderTest.java?rev=985060&r1=985059&r2=985060&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AtomPojoProviderTest.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AtomPojoProviderTest.java Fri Aug 13 01:19:26 2010 @@ -107,7 +107,7 @@ public class AtomPojoProviderTest extend ByteArrayOutputStream bos = new ByteArrayOutputStream(); MediaType mt = MediaType.valueOf("application/atom+xml;type=entry"); provider.writeTo(new Book("a"), Book.class, Book.class, new Annotation[]{}, mt, null, bos); - System.out.println(bos.toString()); + //System.out.println(bos.toString()); ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray()); Book book = (Book)provider.readFrom((Class)Book.class, Book.class, new Annotation[]{}, mt, null, bis); Modified: cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java?rev=985060&r1=985059&r2=985060&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java (original) +++ cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java Fri Aug 13 01:19:26 2010 @@ -215,17 +215,13 @@ public class FormEncodingProviderTest ex byte[] iso88591bytes = helloStringUTF16.getBytes("ISO-8859-1"); String helloStringISO88591 = new String(iso88591bytes, "ISO-8859-1"); - System.out.println(helloStringISO88591); - MultivaluedMap mvMap = (MultivaluedMap)ferp.readFrom((Class)MultivaluedMap.class, null, new Annotation[]{}, MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED + ";charset=ISO-8859-1"), null, new ByteArrayInputStream(iso88591bytes)); String value = mvMap.getFirst("name"); - - System.out.println(value); - + assertEquals(helloStringISO88591, "name=" + value); } @Test Modified: cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericHandlerWriter.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericHandlerWriter.java?rev=985060&r1=985059&r2=985060&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericHandlerWriter.java (original) +++ cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericHandlerWriter.java Fri Aug 13 01:19:26 2010 @@ -32,6 +32,11 @@ import org.apache.cxf.jaxrs.provider.JAX import org.apache.cxf.jaxrs.utils.InjectionUtils; public class GenericHandlerWriter implements MessageBodyWriter> { + JAXBElementProvider jaxb = new JAXBElementProvider(); + + public GenericHandlerWriter() { + + } public long getSize(GenericHandler t, Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { @@ -46,7 +51,6 @@ public class GenericHandlerWriter implem public void writeTo(GenericHandler o, Class c, Type t, Annotation[] anns, MediaType m, MultivaluedMap headers, OutputStream os) throws IOException, WebApplicationException { - JAXBElementProvider jaxb = new JAXBElementProvider(); jaxb.writeTo(o.getEntity(), o.getEntity().getClass(), InjectionUtils.getActualType(t), anns, m, headers, os); }