Author: bimargulies
Date: Sun Oct 12 04:49:02 2008
New Revision: 703791
URL: http://svn.apache.org/viewvc?rev=703791&view=rev
Log:
Very first cut at Aegis+JAX-RS.
Added:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java
(with props)
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisElementProvider.java
(with props)
Modified:
cxf/trunk/rt/frontend/jaxrs/pom.xml
Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=703791&r1=703790&r2=703791&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Sun Oct 12 04:49:02 2008
@@ -79,6 +79,13 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-databinding-aegis</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
Added:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java?rev=703791&view=auto
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java
(added)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java
Sun Oct 12 04:49:02 2008
@@ -0,0 +1,156 @@
+/**
+ * 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.cxf.jaxrs.provider;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.logging.Logger;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.xml.XMLConstants;
+import javax.xml.transform.Source;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+
+import org.apache.cxf.aegis.AegisContext;
+import org.apache.cxf.common.logging.LogUtils;
+
+public abstract class AbstractAegisProvider
+ implements MessageBodyReader<Object>, MessageBodyWriter<Object> {
+
+ private static final Logger LOG =
LogUtils.getL7dLogger(AbstractAegisProvider.class);
+
+ private static final String CLASSPATH_PREFIX = "classpath:";
+
+ private static Map<Class<?>, AegisContext> classContexts = new
WeakHashMap<Class<?>, AegisContext>();
+
+ @Context protected ContextResolver<AegisContext> resolver;
+ private Schema schema;
+
+ public boolean isWriteable(Class<?> type, Type genericType, Annotation[]
anns) {
+ return isSupported(type, genericType, anns);
+ }
+
+ public boolean isReadable(Class<?> type, Type genericType, Annotation[]
annotations) {
+ return isSupported(type, genericType, annotations);
+ }
+
+ public void setSchemas(List<String> locations) {
+ schema = createSchema(locations);
+ }
+
+ public long getSize(Object o) {
+ return -1;
+ }
+
+ protected AegisContext getAegisContext(Class<?> type, Type genericType) {
+
+ if (resolver != null) {
+ AegisContext context = resolver.getContext(type);
+ // it's up to the resolver to keep its contexts in a map
+ if (context != null) {
+ return context;
+ }
+ }
+
+ return getClassContext(type);
+ }
+
+ private AegisContext getClassContext(Class<?> type) {
+ synchronized (classContexts) {
+ AegisContext context = classContexts.get(type);
+ if (context == null) {
+ context = new AegisContext();
+ Set<Class<?>> rootClasses = new HashSet<Class<?>>();
+ context.setRootClasses(rootClasses);
+ context.initialize();
+ classContexts.put(type, context);
+ }
+ return context;
+ }
+ }
+
+ /**
+ * For Aegis, it's not obvious to me how we'd decide that a type was
hopeless.
+ * @param type
+ * @param genericType
+ * @param annotations
+ * @return
+ */
+ protected boolean isSupported(Class<?> type, Type genericType,
Annotation[] annotations) {
+ return true;
+ }
+
+ private Schema createSchema(List<String> locations) {
+
+ SchemaFactory factory =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ Schema s = null;
+ try {
+ List<Source> sources = new ArrayList<Source>();
+ for (String loc : locations) {
+ InputStream is = null;
+ if (loc.startsWith(CLASSPATH_PREFIX)) {
+ String path = loc.substring(CLASSPATH_PREFIX.length() + 1);
+ is = getClass().getClassLoader().getResourceAsStream(path);
+ if (is == null) {
+ LOG.warning("No schema resource " + loc + " is
available on classpath");
+ return null;
+ }
+ } else {
+ File f = new File(loc);
+ if (!f.exists()) {
+ LOG.warning("No schema resource " + loc + " is
available on local disk");
+ return null;
+ }
+ is = new FileInputStream(f);
+ }
+
+ Reader r = new BufferedReader(
+ new InputStreamReader(is, "UTF-8"));
+ sources.add(new StreamSource(r));
+ }
+ s = factory.newSchema(sources.toArray(new Source[]{}));
+ } catch (Exception ex) {
+ LOG.warning("Validation will be disabled, failed to create schema
: " + ex.getMessage());
+ }
+ return s;
+
+ }
+
+ protected Schema getSchema() {
+ return schema;
+ }
+}
Propchange:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractAegisProvider.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisElementProvider.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisElementProvider.java?rev=703791&view=auto
==============================================================================
---
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisElementProvider.java
(added)
+++
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisElementProvider.java
Sun Oct 12 04:49:02 2008
@@ -0,0 +1,71 @@
+/**
+ * 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.cxf.jaxrs.provider;
+
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.Provider;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.cxf.aegis.AegisContext;
+import org.apache.cxf.aegis.AegisReader;
+import org.apache.cxf.aegis.AegisWriter;
+import org.apache.cxf.staxutils.StaxUtils;
+
[EMAIL PROTECTED]
+public final class AegisElementProvider extends AbstractAegisProvider {
+
+ public Object readFrom(Class<Object> type, Type genericType, Annotation[]
annotations, MediaType m,
+ MultivaluedMap<String, String> headers, InputStream is)
+ throws IOException {
+ AegisContext context = getAegisContext(type, genericType);
+ AegisReader<XMLStreamReader> aegisReader =
context.createXMLStreamReader();
+ XMLStreamReader xmlStreamReader = StaxUtils.createXMLStreamReader(is);
+ try {
+ return aegisReader.read(xmlStreamReader);
+ } catch (Exception e) {
+ throw new WebApplicationException(e);
+ }
+ }
+
+
+ public void writeTo(Object obj, Class<?> type, Type genericType,
Annotation[] anns,
+ MediaType m, MultivaluedMap<String, Object> headers, OutputStream os)
+ throws IOException {
+ AegisContext context = getAegisContext(type, genericType);
+ AegisWriter<XMLStreamWriter> aegisWriter =
context.createXMLStreamWriter();
+ XMLStreamWriter xmlStreamWriter = StaxUtils.createXMLStreamWriter(os);
+ try {
+ aegisWriter.write(obj, null, false, xmlStreamWriter, null);
+
+ } catch (Exception e) {
+ throw new WebApplicationException(e);
+ }
+ }
+}
Propchange:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisElementProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AegisElementProvider.java
------------------------------------------------------------------------------
svn:keywords = Rev Date