Author: ilgrosso
Date: Tue May 20 07:04:05 2014
New Revision: 1596120
URL: http://svn.apache.org/r1596120
Log:
Various dependency upgrades, including CXF 3.0.0
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java
syncope/trunk/core/src/main/resources/restContext.xml
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1595137-1596118
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java?rev=1596120&r1=1596119&r2=1596120&view=diff
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SearchCondVisitor.java
Tue May 20 07:04:05 2014
@@ -72,7 +72,8 @@ public class SearchCondVisitor extends A
String name = getRealPropertyName(sc.getStatement().getProperty());
SpecialAttr specialAttrName = SpecialAttr.fromString(name);
- String value =
SearchUtils.toSqlWildcardString(sc.getStatement().getValue().toString(), false);
+ String value =
SearchUtils.toSqlWildcardString(sc.getStatement().getValue().toString(), false).
+ replaceAll("\\\\_", "_");
SpecialAttr specialAttrValue = SpecialAttr.fromString(value);
AttributeCond attributeCond = createAttributeCond(name);
Modified: syncope/trunk/core/src/main/resources/restContext.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/restContext.xml?rev=1596120&r1=1596119&r2=1596120&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/restContext.xml (original)
+++ syncope/trunk/core/src/main/resources/restContext.xml Tue May 20 07:04:05
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
- http://cxf.apache.org/schemas/jaxrs.xsd
+
file:///home/ilgrosso/work/cxf/rt/frontend/jaxrs/src/main/resources/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,24 +89,7 @@ under the License.
<bean id="addETagFilter"
class="org.apache.syncope.core.services.AddETagFilter"/>
- <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:server id="restContainer" address="/"
basePackages="org.apache.syncope.common.services,
org.apache.syncope.core.services" staticSubresourceResolution="true">
<jaxrs:resourceComparator>
<bean id="queryResourceInfoComparator"
class="org.apache.syncope.core.rest.utils.QueryResourceInfoComparator"/>
</jaxrs:resourceComparator>
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1596120&r1=1596119&r2=1596120&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue May 20 07:04:05 2014
@@ -319,10 +319,10 @@ under the License.
<activiti.version>5.15.1</activiti.version>
- <aspectj.version>1.7.4</aspectj.version>
+ <aspectj.version>1.8.0</aspectj.version>
- <cxf.version>3.0.0-milestone2</cxf.version>
- <spring.version>4.0.3.RELEASE</spring.version>
+ <cxf.version>3.0.0</cxf.version>
+ <spring.version>4.0.4.RELEASE</spring.version>
<spring-security.version>3.2.3.RELEASE</spring-security.version>
<jackson.version>2.3.3</jackson.version>
<xstream.version>1.4.7</xstream.version>
@@ -336,15 +336,15 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <wicket.version>6.14.0</wicket.version>
+ <wicket.version>6.15.0</wicket.version>
- <groovy.version>2.2.2</groovy.version>
+ <groovy.version>2.3.1</groovy.version>
- <h2.version>1.3.176</h2.version>
+ <h2.version>1.4.178</h2.version>
<log4j.version>2.0-rc1</log4j.version>
<slf4j.version>1.7.7</slf4j.version>
- <disruptor.version>3.2.0</disruptor.version>
+ <disruptor.version>3.2.1</disruptor.version>
<junit.version>4.11</junit.version>
<selenium.version>2.41.0</selenium.version>
