You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2009/05/30 11:19:00 UTC
svn commit: r780213 - in /cxf/trunk/rt/frontend/jaxrs/src/main:
java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java
java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java resources/schemas/jaxrs.xsd
Author: ningjiang
Date: Sat May 30 09:18:58 2009
New Revision: 780213
URL: http://svn.apache.org/viewvc?rev=780213&view=rev
Log:
CXF-2247 added the support of setting the ServiceClass from <jaxrs:server>
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java?rev=780213&r1=780212&r2=780213&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java Sat May 30 09:18:58 2009
@@ -139,6 +139,10 @@
public List<Class> getResourceClasses() {
return serviceFactory.getResourceClasses();
}
+
+ public void setServiceClass(Class clazz) {
+ serviceFactory.setResourceClasses(clazz);
+ }
public void setResourceClasses(List<Class> classes) {
serviceFactory.setResourceClasses(classes);
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java?rev=780213&r1=780212&r2=780213&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/InvocationHandlerAware.java Sat May 30 09:18:58 2009
@@ -19,8 +19,8 @@
package org.apache.cxf.jaxrs.client;
/**
- * Utiliy interface which helps to retrieve
- * the invoiation handler from a CGLIB proxy
+ * Utility interface which helps to retrieve
+ * the invocation handler from a CGLIB proxy
*
*/
public interface InvocationHandlerAware {
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java?rev=780213&r1=780212&r2=780213&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java Sat May 30 09:18:58 2009
@@ -51,7 +51,7 @@
import org.apache.cxf.jaxrs.provider.JAXBElementProvider;
/**
- * Utiliity class for manipulating XML response using XPath and XSLT
+ * Utility class for manipulating XML response using XPath and XSLT
*
*/
public class XMLSource {
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd?rev=780213&r1=780212&r2=780213&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd Sat May 30 09:18:58 2009
@@ -42,7 +42,7 @@
<xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="properties" type="beans:mapType" minOccurs="0"/>
- <xsd:element name="serviceBeans" type="xsd:anyType" minOccurs="0"/>
+ <xsd:element name="serviceBeans" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="modelBeans" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="model" type="model" minOccurs="0"/>
<xsd:element name="providers" type="xsd:anyType" minOccurs="0"/>
@@ -53,8 +53,7 @@
<xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
<xsd:attribute name="address" type="xsd:string" />
<xsd:attribute name="bus" type="xsd:string" />
- <xsd:attribute name="serviceClass" type="xsd:string"/>
- <xsd:attribute name="serviceBeans" type="xsd:string"/>
+ <xsd:attribute name="serviceClass" type="xsd:string"/>
<xsd:attribute name="modelRef" type="xsd:string" />
<xsd:attribute name="staticSubresourceResolution" type="xsd:boolean" />
</xsd:extension>