Author: ilgrosso Date: Tue May 20 07:23:43 2014 New Revision: 1596124 URL: http://svn.apache.org/r1596124 Log: Partially reverting bad commit: CXF's Spring XSD is not yet updated
Modified: syncope/trunk/ (props changed) syncope/trunk/core/src/main/resources/restContext.xml Propchange: syncope/trunk/ ------------------------------------------------------------------------------ Reverse-merged /syncope/branches/1_1_X:r1595137-1596118 Modified: syncope/trunk/core/src/main/resources/restContext.xml URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/restContext.xml?rev=1596124&r1=1596123&r2=1596124&view=diff ============================================================================== --- syncope/trunk/core/src/main/resources/restContext.xml (original) +++ syncope/trunk/core/src/main/resources/restContext.xml Tue May 20 07:23:43 2014 @@ -25,7 +25,7 @@ under the License. xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxrs - file:///home/ilgrosso/work/cxf/rt/frontend/jaxrs/src/main/resources/schemas/jaxrs.xsd + http://cxf.apache.org/schemas/jaxrs.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/aop @@ -89,7 +89,24 @@ under the License. <bean id="addETagFilter" class="org.apache.syncope.core.services.AddETagFilter"/> - <jaxrs:server id="restContainer" address="/" basePackages="org.apache.syncope.common.services, org.apache.syncope.core.services" staticSubresourceResolution="true"> + <jaxrs:server id="restContainer" address="/" staticSubresourceResolution="true"> + <jaxrs:serviceBeans> + <ref bean="connectorServiceImpl"/> + <ref bean="configurationServiceImpl"/> + <ref bean="entitlementServiceImpl"/> + <ref bean="loggerServiceImpl"/> + <ref bean="notificationServiceImpl"/> + <ref bean="policyServiceImpl"/> + <ref bean="reportServiceImpl"/> + <ref bean="resourceServiceImpl"/> + <ref bean="roleServiceImpl"/> + <ref bean="schemaServiceImpl"/> + <ref bean="taskServiceImpl"/> + <ref bean="userServiceImpl"/> + <ref bean="userSelfServiceImpl"/> + <ref bean="workflowServiceImpl"/> + <ref bean="userWorkflowServiceImpl"/> + </jaxrs:serviceBeans> <jaxrs:resourceComparator> <bean id="queryResourceInfoComparator" class="org.apache.syncope.core.rest.utils.QueryResourceInfoComparator"/> </jaxrs:resourceComparator>