You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by cs...@apache.org on 2013/01/17 15:23:46 UTC
svn commit: r1434683 - in /syncope/trunk/core: ./
src/main/java/org/apache/syncope/core/init/
src/main/java/org/apache/syncope/core/persistence/beans/
src/main/java/org/apache/syncope/core/persistence/dao/impl/
src/main/java/org/apache/syncope/core/per...
Author: cschneider
Date: Thu Jan 17 14:23:46 2013
New Revision: 1434683
URL: http://svn.apache.org/viewvc?rev=1434683&view=rev
Log:
SYNCOPE-241 Move SyncActions and SyncResult back into core.sync. Create impl package to avoid cycles. Improve ContentLoader to optionally load activiti properties
Added:
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java
- copied, changed from r1434638, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncActions.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java
- copied, changed from r1434638, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncResult.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPMembershipSyncActions.java
- copied, changed from r1434638, syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java
- copied, changed from r1434638, syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
- copied, changed from r1434638, syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java
syncope/trunk/core/src/main/resources/activiticontent.xml (with props)
Removed:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncActions.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncResult.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java
syncope/trunk/core/src/test/resources/noopworkflow/stripActivitiFromContent.xsl
Modified:
syncope/trunk/core/pom.xml
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncTask.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ContentLoader.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ResourceDAOImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncTaskValidator.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/sync/DefaultSyncActions.java
syncope/trunk/core/src/main/resources/content.xml
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/impl/TestDbInitializer.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Modified: syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Thu Jan 17 14:23:46 2013
@@ -852,41 +852,6 @@ under the License.
</execution>
</executions>
</plugin>
-
- <!-- Strip Activiti-related entries from content.xml -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <phase>process-test-resources</phase>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <forceCreation>true</forceCreation>
- <transformationSets>
- <transformationSet>
- <dir>${project.build.directory}/test-classes</dir>
- <includes>
- <include>content.xml</include>
- </includes>
- <outputDir>${project.build.directory}/test-classes/</outputDir>
- <stylesheet>${basedir}/src/test/resources/noopworkflow/stripActivitiFromContent.xsl</stylesheet>
- <outputProperties>
- <outputProperty>
- <name>indent</name>
- <value>yes</value>
- </outputProperty>
- </outputProperties>
- </transformationSet>
- </transformationSets>
- </configuration>
- </plugin>
-
</plugins>
<testResources>
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java Thu Jan 17 14:23:46 2013
@@ -25,13 +25,13 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.syncope.core.persistence.beans.SyncActions;
import org.apache.syncope.core.persistence.validation.attrvalue.Validator;
import org.apache.syncope.core.propagation.PropagationActions;
import org.apache.syncope.core.report.Reportlet;
import org.apache.syncope.core.notification.NotificationJob;
import org.apache.syncope.core.report.ReportJob;
-import org.apache.syncope.core.sync.SyncJob;
+import org.apache.syncope.core.sync.SyncActions;
+import org.apache.syncope.core.sync.impl.SyncJob;
import org.quartz.Job;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java Thu Jan 17 14:23:46 2013
@@ -27,7 +27,6 @@ import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
import org.apache.syncope.core.persistence.beans.Report;
import org.apache.syncope.core.persistence.beans.SchedTask;
-import org.apache.syncope.core.persistence.beans.SyncActions;
import org.apache.syncope.core.persistence.beans.SyncTask;
import org.apache.syncope.core.persistence.beans.Task;
import org.apache.syncope.core.persistence.dao.ConfDAO;
@@ -35,9 +34,10 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.TaskDAO;
import org.apache.syncope.core.quartz.AbstractTaskJob;
import org.apache.syncope.core.sync.DefaultSyncActions;
+import org.apache.syncope.core.sync.SyncActions;
import org.apache.syncope.core.notification.NotificationJob;
import org.apache.syncope.core.report.ReportJob;
-import org.apache.syncope.core.sync.SyncJob;
+import org.apache.syncope.core.sync.impl.SyncJob;
import org.apache.syncope.core.util.ApplicationContextProvider;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncTask.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncTask.java?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncTask.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncTask.java Thu Jan 17 14:23:46 2013
@@ -80,7 +80,7 @@ public class SyncTask extends SchedTask
public SyncTask() {
super();
- super.setJobClassName("org.apache.syncope.core.sync.SyncJob");
+ super.setJobClassName("org.apache.syncope.core.sync.impl.SyncJob");
}
@Override
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ContentLoader.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ContentLoader.java?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ContentLoader.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ContentLoader.java Thu Jan 17 14:23:46 2013
@@ -47,10 +47,8 @@ public class ContentLoader {
private static final String VIEWS_FILE = "/views.xml";
private static final String INDEXES_FILE = "/indexes.xml";
private static final String CONTENT_FILE = "/content.xml";
+ private static final String ACTIVITY_CONTENT_FILE = "/activiticontent.xml";
- /**
- * Logger.
- */
private static final Logger LOG = LoggerFactory.getLogger(ContentLoader.class);
@Autowired
@@ -78,7 +76,10 @@ public class ContentLoader {
deleteActivitiProperties(conn);
}
closeConnection(conn);
- loadDefaultContent();
+ loadDefaultContent(CONTENT_FILE);
+ if (activitiEnabledForUsers) {
+ loadDefaultContent(ACTIVITY_CONTENT_FILE);
+ }
}
private boolean isDataPresent(Connection conn) {
@@ -169,11 +170,11 @@ public class ContentLoader {
}
}
- private void loadDefaultContent() {
+ private void loadDefaultContent(String contentPath) {
SAXParserFactory factory = SAXParserFactory.newInstance();
try {
SAXParser parser = factory.newSAXParser();
- parser.parse(getClass().getResourceAsStream(CONTENT_FILE), importExport);
+ parser.parse(getClass().getResourceAsStream(contentPath), importExport);
LOG.debug("Default content successfully loaded");
} catch (Exception e) {
LOG.error("While loading default content", e);
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ResourceDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ResourceDAOImpl.java?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ResourceDAOImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/ResourceDAOImpl.java Thu Jan 17 14:23:46 2013
@@ -87,7 +87,7 @@ public class ResourceDAOImpl extends Abs
/**
* This method has an explicit Transactional annotation because it is called by SyncJob.
*
- * @see org.apache.syncope.core.sync.SyncJob
+ * @see org.apache.syncope.core.sync.impl.SyncJob
*
* @param resource entity to be merged
* @return the same entity, updated
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncTaskValidator.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncTaskValidator.java?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncTaskValidator.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/SyncTaskValidator.java Thu Jan 17 14:23:46 2013
@@ -21,8 +21,8 @@ package org.apache.syncope.core.persiste
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.core.persistence.beans.SyncActions;
import org.apache.syncope.core.persistence.beans.SyncTask;
+import org.apache.syncope.core.sync.SyncActions;
import org.apache.syncope.types.EntityViolationType;
public class SyncTaskValidator extends AbstractValidator implements ConstraintValidator<SyncTaskCheck, SyncTask> {
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=1434683&r1=1434682&r2=1434683&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 Jan 17 14:23:46 2013
@@ -45,7 +45,7 @@ import org.springframework.transaction.a
* Simple action for propagating role memberships to LDAP groups, when the same resource is configured for both users
* and roles.
*
- * @see org.apache.syncope.core.sync.LDAPMembershipSyncActions
+ * @see org.apache.syncope.core.sync.impl.LDAPMembershipSyncActions
*/
public class LDAPMembershipPropagationActions extends DefaultPropagationActions {
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java Thu Jan 17 14:23:46 2013
@@ -21,8 +21,6 @@ package org.apache.syncope.core.sync;
import java.util.List;
import org.apache.syncope.client.mod.AbstractAttributableMod;
import org.apache.syncope.client.to.AbstractAttributableTO;
-import org.apache.syncope.core.persistence.beans.SyncActions;
-import org.apache.syncope.core.persistence.beans.SyncResult;
import org.identityconnectors.framework.common.objects.SyncDelta;
import org.identityconnectors.framework.common.objects.SyncResultsHandler;
import org.quartz.JobExecutionException;
Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java (from r1434638, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncActions.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncActions.java&r1=1434638&r2=1434683&rev=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncActions.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java Thu Jan 17 14:23:46 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.core.persistence.beans;
+package org.apache.syncope.core.sync;
import java.util.List;
import org.apache.syncope.client.mod.AbstractAttributableMod;
Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java (from r1434638, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncResult.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncResult.java&r1=1434638&r2=1434683&rev=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/SyncResult.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncResult.java Thu Jan 17 14:23:46 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.core.persistence.beans;
+package org.apache.syncope.core.sync;
import java.util.Collection;
import org.apache.commons.lang.StringUtils;
Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPMembershipSyncActions.java (from r1434638, syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPMembershipSyncActions.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPMembershipSyncActions.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java&r1=1434638&r2=1434683&rev=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/LDAPMembershipSyncActions.java Thu Jan 17 14:23:46 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.core.sync;
+package org.apache.syncope.core.sync.impl;
import java.util.Collections;
import java.util.HashMap;
@@ -30,7 +30,6 @@ import org.apache.syncope.client.to.Role
import org.apache.syncope.core.notification.NotificationManager;
import org.apache.syncope.core.persistence.beans.ExternalResource;
import org.apache.syncope.core.persistence.beans.PropagationTask;
-import org.apache.syncope.core.persistence.beans.SyncResult;
import org.apache.syncope.core.persistence.beans.SyncTask;
import org.apache.syncope.core.persistence.beans.membership.Membership;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
@@ -40,6 +39,8 @@ import org.apache.syncope.core.propagati
import org.apache.syncope.core.propagation.PropagationTaskExecutor;
import org.apache.syncope.core.propagation.SyncopeConnector;
import org.apache.syncope.core.propagation.impl.PropagationManager;
+import org.apache.syncope.core.sync.DefaultSyncActions;
+import org.apache.syncope.core.sync.SyncResult;
import org.apache.syncope.core.util.AttributableUtil;
import org.apache.syncope.core.workflow.WorkflowResult;
import org.apache.syncope.core.workflow.user.UserWorkflowAdapter;
Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java (from r1434638, syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java&r1=1434638&r2=1434683&rev=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java Thu Jan 17 14:23:46 2013
@@ -16,15 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.core.sync;
+package org.apache.syncope.core.sync.impl;
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.core.persistence.beans.Entitlement;
import org.apache.syncope.core.persistence.beans.ExternalResource;
-import org.apache.syncope.core.persistence.beans.SyncActions;
import org.apache.syncope.core.persistence.beans.SyncPolicy;
-import org.apache.syncope.core.persistence.beans.SyncResult;
import org.apache.syncope.core.persistence.beans.SyncTask;
import org.apache.syncope.core.persistence.beans.TaskExec;
import org.apache.syncope.core.persistence.beans.role.RMapping;
@@ -34,6 +32,8 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.propagation.ConnectorFactory;
import org.apache.syncope.core.propagation.SyncopeConnector;
import org.apache.syncope.core.quartz.AbstractTaskJob;
+import org.apache.syncope.core.sync.SyncActions;
+import org.apache.syncope.core.sync.SyncResult;
import org.apache.syncope.core.util.ApplicationContextProvider;
import org.apache.syncope.core.util.EntitlementUtil;
import org.apache.syncope.types.ConflictResolutionAction;
Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java (from r1434638, syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java&r1=1434638&r2=1434683&rev=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java Thu Jan 17 14:23:46 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.core.sync;
+package org.apache.syncope.core.sync.impl;
import java.util.ArrayList;
import java.util.Collection;
@@ -40,8 +40,6 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
import org.apache.syncope.core.persistence.beans.AbstractSchema;
import org.apache.syncope.core.persistence.beans.PropagationTask;
-import org.apache.syncope.core.persistence.beans.SyncActions;
-import org.apache.syncope.core.persistence.beans.SyncResult;
import org.apache.syncope.core.persistence.beans.SyncTask;
import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
@@ -58,6 +56,9 @@ import org.apache.syncope.core.propagati
import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
import org.apache.syncope.core.rest.data.RoleDataBinder;
import org.apache.syncope.core.rest.data.UserDataBinder;
+import org.apache.syncope.core.sync.SyncActions;
+import org.apache.syncope.core.sync.SyncResult;
+import org.apache.syncope.core.sync.SyncResult.Status;
import org.apache.syncope.core.util.AttributableUtil;
import org.apache.syncope.core.util.EntitlementUtil;
import org.apache.syncope.core.util.NotFoundException;
Added: syncope/trunk/core/src/main/resources/activiticontent.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/activiticontent.xml?rev=1434683&view=auto
==============================================================================
--- syncope/trunk/core/src/main/resources/activiticontent.xml (added)
+++ syncope/trunk/core/src/main/resources/activiticontent.xml Thu Jan 17 14:23:46 2013
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+
+-->
+<dataset>
+ <ACT_GE_PROPERTY NAME_="schema.version" VALUE_="${activiti.version}" REV_="1"/>
+ <ACT_GE_PROPERTY NAME_="schema.history" VALUE_="create(${activiti.version})" REV_="1"/>
+ <ACT_GE_PROPERTY NAME_="next.dbid" VALUE_="1" REV_="1"/>
+ <ACT_GE_PROPERTY NAME_="historyLevel" VALUE_="1" REV_="1"/>
+</dataset>
Propchange: syncope/trunk/core/src/main/resources/activiticontent.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: syncope/trunk/core/src/main/resources/content.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/content.xml?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/content.xml (original)
+++ syncope/trunk/core/src/main/resources/content.xml Thu Jan 17 14:23:46 2013
@@ -122,8 +122,4 @@ under the License.
<Entitlement name="AUDIT_ENABLE"/>
<Entitlement name="AUDIT_DISABLE"/>
- <ACT_GE_PROPERTY NAME_="schema.version" VALUE_="${activiti.version}" REV_="1"/>
- <ACT_GE_PROPERTY NAME_="schema.history" VALUE_="create(${activiti.version})" REV_="1"/>
- <ACT_GE_PROPERTY NAME_="next.dbid" VALUE_="1" REV_="1"/>
- <ACT_GE_PROPERTY NAME_="historyLevel" VALUE_="1" REV_="1"/>
</dataset>
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/impl/TestDbInitializer.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/impl/TestDbInitializer.java?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/impl/TestDbInitializer.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/impl/TestDbInitializer.java Thu Jan 17 14:23:46 2013
@@ -40,6 +40,6 @@ public class TestDbInitializer implement
@Override
public void afterPropertiesSet() throws Exception {
- contentLoader.load(true);
+ contentLoader.load(false);
}
}
\ No newline at end of file
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java Thu Jan 17 14:23:46 2013
@@ -42,8 +42,8 @@ import org.apache.syncope.client.to.Sync
import org.apache.syncope.client.to.TaskExecTO;
import org.apache.syncope.client.to.TaskTO;
import org.apache.syncope.client.to.UserTO;
-import org.apache.syncope.core.sync.SyncJob;
import org.apache.syncope.core.sync.TestSyncActions;
+import org.apache.syncope.core.sync.impl.SyncJob;
import org.apache.syncope.core.workflow.ActivitiDetector;
import org.apache.syncope.types.IntMappingType;
import org.apache.syncope.types.PropagationTaskExecStatus;
Modified: syncope/trunk/core/src/test/resources/content.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1434683&r1=1434682&r2=1434683&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Thu Jan 17 14:23:46 2013
@@ -626,26 +626,26 @@ under the License.
xmlAttributes="%3Cset%3E%0A++%3Corg.identityconnectors.framework.common.objects.Name%3E%0A++++%3Cname%3E__NAME__%3C%2Fname%3E%0A++++%3Cvalue+class%3D%22java.util.Collections%24UnmodifiableRandomAccessList%22+resolves-to%3D%22java.util.Collections%24UnmodifiableList%22%3E%0A++++++%3Cc+class%3D%22list%22%3E%0A++++++++%3Cstring%3EuserId%3C%2Fstring%3E%0A++++++%3C%2Fc%3E%0A++++++%3Clist+reference%3D%22..%2Fc%22%2F%3E%0A++++%3C%2Fvalue%3E%0A++%3C%2Forg.identityconnectors.framework.common.objects.Name%3E%0A++%3Corg.identityconnectors.framework.common.objects.Attribute%3E%0A++++%3Cname%3E__PASSWORD__%3C%2Fname%3E%0A++++%3Cvalue+class%3D%22java.util.Collections%24UnmodifiableRandomAccessList%22+resolves-to%3D%22java.util.Collections%24UnmodifiableList%22%3E%0A++++++%3Cc+class%3D%22list%22%3E%0A++++++++%3Corg.identityconnectors.common.security.GuardedString%3E%0A++++++++++%3C__readOnly%3Efalse%3C%2F__readOnly%3E%0A++++++++++%3C__disposed%3Efalse%3C%2F__disposed%3E%0A+++++++++
+%3C__encryptedBytes%3EQTOgwEhIHqtAI%2FYlgDhYc37esEF8VLDMU2IY1ciltrg%3D%3C%2F__encryptedBytes%3E%0A++++++++++%3C__base64SHA1Hash%3EW5%2FrwtdCnI8gAnIUhKcahMEnMMc%3D%3C%2F__base64SHA1Hash%3E%0A++++++++%3C%2Forg.identityconnectors.common.security.GuardedString%3E%0A++++++%3C%2Fc%3E%0A++++++%3Clist+reference%3D%22..%2Fc%22%2F%3E%0A++++%3C%2Fvalue%3E%0A++%3C%2Forg.identityconnectors.framework.common.objects.Attribute%3E%0A++%3Corg.identityconnectors.framework.common.objects.Attribute%3E%0A++++%3Cname%3Etype%3C%2Fname%3E%0A++++%3Cvalue+class%3D%22java.util.Collections%24UnmodifiableRandomAccessList%22+resolves-to%3D%22java.util.Collections%24UnmodifiableList%22%3E%0A++++++%3Cc+class%3D%22list%22%3E%0A++++++++%3Cstring%3Etype%3C%2Fstring%3E%0A++++++%3C%2Fc%3E%0A++++++%3Clist+reference%3D%22..%2Fc%22%2F%3E%0A++++%3C%2Fvalue%3E%0A++%3C%2Forg.identityconnectors.framework.common.objects.Attribute%3E%0A%3C%2Fset%3E"/>
<Task DTYPE="SyncTask" id="4" name="CSV Task" resource_name="resource-csv"
performCreate="1" performUpdate="1" performDelete="1" syncStatus="1" fullReconciliation="0"
- jobClassName="org.apache.syncope.core.sync.SyncJob"/>
+ jobClassName="org.apache.syncope.core.sync.impl.SyncJob"/>
<Task DTYPE="SchedTask" id="5" name="SampleJob Task" jobClassName="org.apache.syncope.core.quartz.SampleJob" cronExpression="0 0 0 1 * ?"/>
<Task DTYPE="PropagationTask" id="6" propagationMode="TWO_PHASES" propagationOperation="UPDATE"
objectClassName="__ACCOUNT__" resource_name="ws-target-resource-nopropagation" subjectType="USER" subjectId="1"
xmlAttributes="%3Cset%3E%0A++%3Corg.identityconnectors.framework.common.objects.Attribute%3E%0A++++%3Cname%3E__PASSWORD__%3C%2Fname%3E%0A++++%3Cvalue+class%3D%22java.util.Collections%24UnmodifiableRandomAccessList%22+resolves-to%3D%22java.util.Collections%24UnmodifiableList%22%3E%0A++++++%3Cc+class%3D%22list%22%3E%0A++++++++%3Corg.identityconnectors.common.security.GuardedString%3E%0A++++++++++%3Creadonly%3Efalse%3C%2Freadonly%3E%0A++++++++++%3Cdisposed%3Efalse%3C%2Fdisposed%3E%0A++++++++++%3CencryptedBytes%3Em9nh2US0Sa6m%2BcXccCq0Xw%3D%3D%3C%2FencryptedBytes%3E%0A++++++++%3C%2Forg.identityconnectors.common.security.GuardedString%3E%0A++++++%3C%2Fc%3E%0A++++++%3Clist+reference%3D%22..%2Fc%22%2F%3E%0A++++%3C%2Fvalue%3E%0A++%3C%2Forg.identityconnectors.framework.common.objects.Attribute%3E%0A++%3Corg.identityconnectors.framework.common.objects.Name%3E%0A++++%3Cname%3E__NAME__%3C%2Fname%3E%0A++++%3Cvalue+class%3D%22java.util.Collections%24UnmodifiableRandomAccessList%22
+resolves-to%3D%22java.util.Collections%24UnmodifiableList%22%3E%0A++++++%3Cc+class%3D%22list%22%3E%0A++++++++%3Cstring%3EuserId%3C%2Fstring%3E%0A++++++%3C%2Fc%3E%0A++++++%3Clist+reference%3D%22..%2Fc%22%2F%3E%0A++++%3C%2Fvalue%3E%0A++%3C%2Forg.identityconnectors.framework.common.objects.Name%3E%0A++%3Corg.identityconnectors.framework.common.objects.Attribute%3E%0A++++%3Cname%3Efullname%3C%2Fname%3E%0A++++%3Cvalue+class%3D%22java.util.Collections%24UnmodifiableRandomAccessList%22+resolves-to%3D%22java.util.Collections%24UnmodifiableList%22%3E%0A++++++%3Cc+class%3D%22list%22%3E%0A++++++++%3Cstring%3Efullname%3C%2Fstring%3E%0A++++++%3C%2Fc%3E%0A++++++%3Clist+reference%3D%22..%2Fc%22%2F%3E%0A++++%3C%2Fvalue%3E%0A++%3C%2Forg.identityconnectors.framework.common.objects.Attribute%3E%0A++%3Corg.identityconnectors.framework.common.objects.Attribute%3E%0A++++%3Cname%3Etype%3C%2Fname%3E%0A++++%3Cvalue+class%3D%22java.util.Collections%24UnmodifiableRandomAccessList%22+resolves-to%3D%22
java.util.Collections%24UnmodifiableList%22%3E%0A++++++%3Cc+class%3D%22list%22%3E%0A++++++++%3Cstring%3Etype%3C%2Fstring%3E%0A++++++%3C%2Fc%3E%0A++++++%3Clist+reference%3D%22..%2Fc%22%2F%3E%0A++++%3C%2Fvalue%3E%0A++%3C%2Forg.identityconnectors.framework.common.objects.Attribute%3E%0A%3C%2Fset%3E"/>
<Task DTYPE="SyncTask" id="7" name="TestDB Task" resource_name="resource-testdb"
performCreate="1" performUpdate="1" performDelete="0" syncStatus="1" fullReconciliation="1"
- jobClassName="org.apache.syncope.core.sync.SyncJob"/>
+ jobClassName="org.apache.syncope.core.sync.impl.SyncJob"/>
<Task DTYPE="NotificationTask" id="8" sender="admin@prova.org" subject="Notification for SYNCOPE-81"
textBody="NOTIFICATION-81" htmlBody="NOTIFICATION-81" traceLevel="ALL"/>
<Task DTYPE="SyncTask" id="9" name="TestDB2 Task" resource_name="resource-testdb2"
performCreate="1" performUpdate="1" performDelete="0" syncStatus="1" fullReconciliation="1"
- jobClassName="org.apache.syncope.core.sync.SyncJob"/>
+ jobClassName="org.apache.syncope.core.sync.impl.SyncJob"/>
<Task DTYPE="SyncTask" id="10" name="TestDB Sync Task" resource_name="resource-db-sync"
fullReconciliation="1" performCreate="1" performDelete="1" performUpdate="1" syncStatus="0"
- jobClassName="org.apache.syncope.core.sync.SyncJob"/>
+ jobClassName="org.apache.syncope.core.sync.impl.SyncJob"/>
<Task DTYPE="SyncTask" id="11" name="LDAP Sync Task" resource_name="resource-ldap"
fullReconciliation="1" performCreate="1" performDelete="1" performUpdate="1" syncStatus="0"
- actionsClassName="org.apache.syncope.core.sync.LDAPMembershipSyncActions"
- jobClassName="org.apache.syncope.core.sync.SyncJob"/>
+ actionsClassName="org.apache.syncope.core.sync.impl.LDAPMembershipSyncActions"
+ jobClassName="org.apache.syncope.core.sync.impl.SyncJob"/>
<NotificationTask_recipients notificationtask_id="8" address="recipient@prova.org"/>
@@ -769,9 +769,5 @@ under the License.
<ReportExec Report_id="1" id="1" status="SUCCESS" startDate="2012-02-26 15:40:04" endDate="2012-02-26 15:41:04"/>
<SyncopeLogger logName="syncope.audit.authentication.getEntitlements.success" logLevel="DEBUG" logType="AUDIT"/>
-
- <ACT_GE_PROPERTY NAME_="schema.version" VALUE_="${activiti.version}" REV_="1"/>
- <ACT_GE_PROPERTY NAME_="schema.history" VALUE_="create(${activiti.version})" REV_="1"/>
- <ACT_GE_PROPERTY NAME_="next.dbid" VALUE_="1" REV_="1"/>
- <ACT_GE_PROPERTY NAME_="historyLevel" VALUE_="1" REV_="1"/>
+
</dataset>