You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/04/10 17:40:46 UTC
svn commit: r1586343 - in /syncope/trunk: ./
core/src/main/java/org/apache/syncope/core/audit/
core/src/main/java/org/apache/syncope/core/connid/
core/src/main/java/org/apache/syncope/core/persistence/beans/
core/src/main/java/org/apache/syncope/core/p...
Author: ilgrosso
Date: Thu Apr 10 15:40:45 2014
New Revision: 1586343
URL: http://svn.apache.org/r1586343
Log:
Merge from 1_1_X
Added:
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/jexl/
- copied from r1586317, syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/util/jexl/
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/jexl/JexlUtil.java
- copied, changed from r1586317, syncope/trunk/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java
Removed:
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/audit/AuditConnectionFactory.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerAttr.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
syncope/trunk/core/src/main/resources/syncopeContext.xml
syncope/trunk/core/src/test/resources/persistenceTestEnv.xml
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1586225-1586317
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/audit/AuditConnectionFactory.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/audit/AuditConnectionFactory.java?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/audit/AuditConnectionFactory.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/audit/AuditConnectionFactory.java Thu Apr 10 15:40:45 2014
@@ -20,7 +20,6 @@ package org.apache.syncope.core.audit;
import java.io.InputStream;
import java.sql.Connection;
-import java.sql.SQLException;
import java.util.Properties;
import javax.naming.Context;
import javax.naming.InitialContext;
@@ -105,14 +104,12 @@ public class AuditConnectionFactory {
// 3. Initializes the chosen datasource
ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
- populator.setScripts(new Resource[] {new ClassPathResource("/audit/" + initSQLScript)});
+ populator.setScripts(new Resource[] { new ClassPathResource("/audit/" + initSQLScript) });
// forces no statement separation
populator.setSeparator("XXXXXXXXXXXXXXXXX");
Connection conn = DataSourceUtils.getConnection(datasource);
try {
populator.populate(conn);
- } catch (SQLException e) {
- throw new IllegalStateException("Could not init the Audit datasource", e);
} finally {
DataSourceUtils.releaseConnection(conn, datasource);
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java Thu Apr 10 15:40:45 2014
@@ -59,7 +59,7 @@ import org.apache.syncope.core.rest.data
import org.apache.syncope.core.util.ApplicationContextProvider;
import org.apache.syncope.core.util.AttributableUtil;
import org.apache.syncope.core.util.InvalidPasswordPolicySpecException;
-import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.core.util.jexl.JexlUtil;
import org.apache.syncope.core.util.MappingUtil;
import org.apache.syncope.core.util.SecureRandomUtil;
import org.apache.syncope.core.util.VirAttrCache;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerAttr.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerAttr.java?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerAttr.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerAttr.java Thu Apr 10 15:40:45 2014
@@ -25,7 +25,7 @@ import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import org.apache.commons.jexl2.JexlContext;
import org.apache.commons.jexl2.MapContext;
-import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.core.util.jexl.JexlUtil;
@MappedSuperclass
public abstract class AbstractDerAttr extends AbstractBaseBean {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java Thu Apr 10 15:40:45 2014
@@ -32,7 +32,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
import org.apache.syncope.core.persistence.dao.UserDAO;
import org.apache.syncope.core.propagation.DefaultPropagationActions;
-import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.core.util.jexl.JexlUtil;
import org.identityconnectors.framework.common.objects.Attribute;
import org.identityconnectors.framework.common.objects.AttributeBuilder;
import org.identityconnectors.framework.common.objects.AttributeUtil;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java Thu Apr 10 15:40:45 2014
@@ -49,7 +49,7 @@ import org.apache.syncope.core.rest.data
import org.apache.syncope.core.rest.data.RoleDataBinder;
import org.apache.syncope.core.rest.data.UserDataBinder;
import org.apache.syncope.core.util.AttributableUtil;
-import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.core.util.jexl.JexlUtil;
import org.apache.syncope.core.util.MappingUtil;
import org.apache.syncope.core.workflow.WorkflowResult;
import org.identityconnectors.framework.common.objects.Attribute;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/AbstractAttributableDataBinder.java Thu Apr 10 15:40:45 2014
@@ -84,7 +84,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.validation.attrvalue.InvalidAttrValueException;
import org.apache.syncope.core.propagation.PropagationByResource;
import org.apache.syncope.core.util.AttributableUtil;
-import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.core.util.jexl.JexlUtil;
import org.apache.syncope.core.util.MappingUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/ResourceDataBinder.java Thu Apr 10 15:40:45 2014
@@ -49,7 +49,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.ConnInstanceDAO;
import org.apache.syncope.core.persistence.dao.NotFoundException;
import org.apache.syncope.core.persistence.dao.PolicyDAO;
-import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.core.util.jexl.JexlUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/SchemaDataBinder.java Thu Apr 10 15:40:45 2014
@@ -33,7 +33,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
import org.apache.syncope.core.persistence.dao.SchemaDAO;
import org.apache.syncope.core.util.AttributableUtil;
-import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.core.util.jexl.JexlUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java Thu Apr 10 15:40:45 2014
@@ -46,7 +46,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.NotFoundException;
import org.apache.syncope.core.persistence.dao.ResourceDAO;
import org.apache.syncope.core.persistence.dao.TaskExecDAO;
-import org.apache.syncope.core.util.JexlUtil;
+import org.apache.syncope.core.util.jexl.JexlUtil;
import org.apache.syncope.core.util.TaskUtil;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java Thu Apr 10 15:40:45 2014
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.core.util;
+import org.apache.syncope.core.util.jexl.JexlUtil;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collection;
Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/jexl/JexlUtil.java (from r1586317, syncope/trunk/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/jexl/JexlUtil.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/util/jexl/JexlUtil.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java&r1=1586317&r2=1586343&rev=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/JexlUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/jexl/JexlUtil.java Thu Apr 10 15:40:45 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.core.util;
+package org.apache.syncope.core.util.jexl;
import java.beans.IntrospectionException;
import java.beans.Introspector;
@@ -40,6 +40,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
+import org.apache.syncope.core.util.DataFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,14 +55,18 @@ public final class JexlUtil {
*/
private static final Logger LOG = LoggerFactory.getLogger(JexlUtil.class);
- private static final String[] IGNORE_FIELDS = {"password", "clearPassword", "serialVersionUID", "class"};
+ private static final String[] IGNORE_FIELDS = { "password", "clearPassword", "serialVersionUID", "class" };
private static JexlEngine jexlEngine;
private static JexlEngine getEngine() {
synchronized (LOG) {
if (jexlEngine == null) {
- jexlEngine = ApplicationContextProvider.getApplicationContext().getBean(JexlEngine.class);
+ jexlEngine = new JexlEngine(new ClassFreeUberspectImpl(null), null, null, null);
+ jexlEngine.setClassLoader(new EmptyClassLoader());
+ jexlEngine.setCache(512);
+ jexlEngine.setLenient(true);
+ jexlEngine.setSilent(false);
}
}
Modified: syncope/trunk/core/src/main/resources/syncopeContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/syncopeContext.xml?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/syncopeContext.xml (original)
+++ syncope/trunk/core/src/main/resources/syncopeContext.xml Thu Apr 10 15:40:45 2014
@@ -109,12 +109,6 @@ under the License.
<task:executor id="connectorExecutor" pool-size="10"/>
<bean id="xStream" class="com.thoughtworks.xstream.XStream"/>
-
- <bean id="jexlEngine" class="org.apache.commons.jexl2.JexlEngine">
- <property name="cache" value="512"/>
- <property name="lenient" value="true"/>
- <property name="silent" value="false"/>
- </bean>
<bean id="virAttrCache" class="org.apache.syncope.core.util.VirAttrCache" scope="singleton">
<constructor-arg value="60"/>
Modified: syncope/trunk/core/src/test/resources/persistenceTestEnv.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/persistenceTestEnv.xml?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/persistenceTestEnv.xml (original)
+++ syncope/trunk/core/src/test/resources/persistenceTestEnv.xml Thu Apr 10 15:40:45 2014
@@ -69,12 +69,5 @@ under the License.
</property>
</bean>
- <bean id="jexlEngine" class="org.apache.commons.jexl2.JexlEngine">
- <property name="cache" value="512"/>
- <property name="lenient" value="true"/>
- <property name="silent" value="false"/>
- </bean>
- <bean id="jexlUtil" class="org.apache.syncope.core.util.JexlUtil"/>
-
<import resource="persistenceContext.xml"/>
</beans>
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1586343&r1=1586342&r2=1586343&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Thu Apr 10 15:40:45 2014
@@ -322,8 +322,8 @@ under the License.
<aspectj.version>1.7.4</aspectj.version>
<cxf.version>3.0.0-milestone2</cxf.version>
- <spring.version>4.0.2.RELEASE</spring.version>
- <spring-security.version>3.2.0.RELEASE</spring-security.version>
+ <spring.version>4.0.3.RELEASE</spring.version>
+ <spring-security.version>3.2.3.RELEASE</spring-security.version>
<jackson.version>2.3.2</jackson.version>
<xstream.version>1.4.7</xstream.version>
<velocity.version>1.7</velocity.version>
@@ -340,7 +340,7 @@ under the License.
<groovy.version>2.2.2</groovy.version>
- <h2.version>1.3.175</h2.version>
+ <h2.version>1.3.176</h2.version>
<log4j.version>2.0-rc1</log4j.version>
<slf4j.version>1.7.6</slf4j.version>