syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbernha...@apache.org
Subject svn commit: r1420798 [1/2] - in /syncope/branches/cxf: ./ common/.externalToolBuilders/ common/src/main/java/org/apache/syncope/controller/ common/src/main/java/org/apache/syncope/exceptions/ common/src/main/java/org/apache/syncope/services/ common/src...
Date Wed, 12 Dec 2012 16:04:37 GMT
Author: jbernhardt
Date: Wed Dec 12 16:04:19 2012
New Revision: 1420798

URL: http://svn.apache.org/viewvc?rev=1420798&view=rev
Log:
[SYNCOPE-231] 
Fixed most issues with UserTestITCase

Added:
    syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/
    syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/ContextAware.java
    syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/InvalidSearchConditionException.java
    syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/RoleService.java
    syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/UnauthorizedRoleException.java
    syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/UserService.java
Removed:
    syncope/branches/cxf/common/src/main/java/org/apache/syncope/controller/
Modified:
    syncope/branches/cxf/common/.externalToolBuilders/Maven_Ant_Builder.launch
    syncope/branches/cxf/common/src/main/java/org/apache/syncope/exceptions/RestHttpStatusCodeMapper.java
    syncope/branches/cxf/common/src/main/java/org/apache/syncope/to/PropagationTaskTO.java
    syncope/branches/cxf/core/pom.xml
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserRequestDataBinder.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java
    syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java
    syncope/branches/cxf/core/src/main/resources/META-INF/orm.xml
    syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java
    syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/UserTest.java
    syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AbstractRoleTestITCase.java
    syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AbstractUserTestITCase.java
    syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/RoleJsonTestITCase.java
    syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/RoleXmlTestITCase.java
    syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/UserJsonTestITCase.java
    syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/UserXmlTestITCase.java
    syncope/branches/cxf/pom.xml

Modified: syncope/branches/cxf/common/.externalToolBuilders/Maven_Ant_Builder.launch
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/common/.externalToolBuilders/Maven_Ant_Builder.launch?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/common/.externalToolBuilders/Maven_Ant_Builder.launch (original)
+++ syncope/branches/cxf/common/.externalToolBuilders/Maven_Ant_Builder.launch Wed Dec 12 16:04:19 2012
@@ -1,24 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-  <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
-  <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-  <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="syncope-common"/>
-  <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/maven-eclipse.xml"/>
-  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}"/>
-  <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-  <booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
-  <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&apos;1.0&apos;?&gt;&lt;launchConfigurationWorkingSet editPageId=&apos;org.eclipse.ui.resourceWorkingSetPage&apos; factoryID=&apos;org.eclipse.ui.internal.WorkingSetFactory&apos; label=&apos;workingSet&apos; name=&apos;workingSet&apos;&gt;&lt;item factoryID=&apos;org.eclipse.ui.internal.model.ResourceFactory&apos; path=&apos;syncope-common&apos; type=&apos;4&apos;/&gt;&lt;/launchConfigurationWorkingSet&gt;}"/>
-  <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-  <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-  <booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
-  <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-  <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-  <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-    <listEntry value="1"/>
-  </listAttribute>
-  <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-    <listEntry value="/syncope-common/maven-eclipse.xml"/>
-  </listAttribute>
-</launchConfiguration>
\ No newline at end of file
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/syncope-common"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="syncope-common"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version='1.0'?&gt;&lt;launchConfigurationWorkingSet editPageId='org.eclipse.ui.resourceWorkingSetPage' factoryID='org.eclipse.ui.internal.WorkingSetFactory' label='workingSet' name='workingSet'&gt;&lt;item factoryID='org.eclipse.ui.internal.model.ResourceFactory' path='syncope-common' type='4'/&gt;&lt;/launchConfigurationWorkingSet&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/maven-eclipse.xml"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>

Modified: syncope/branches/cxf/common/src/main/java/org/apache/syncope/exceptions/RestHttpStatusCodeMapper.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/common/src/main/java/org/apache/syncope/exceptions/RestHttpStatusCodeMapper.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/common/src/main/java/org/apache/syncope/exceptions/RestHttpStatusCodeMapper.java (original)
+++ syncope/branches/cxf/common/src/main/java/org/apache/syncope/exceptions/RestHttpStatusCodeMapper.java Wed Dec 12 16:04:19 2012
@@ -9,8 +9,9 @@ import javax.ws.rs.ext.Provider;
 import org.apache.cxf.jaxrs.client.ResponseExceptionMapper;
 import org.apache.http.HttpStatus;
 import org.apache.syncope.NotFoundException;
-import org.apache.syncope.controller.UnauthorizedRoleException;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.validation.InvalidEntityException;
+import org.apache.syncope.validation.SyncopeClientCompositeErrorException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.security.access.AccessDeniedException;
 
@@ -38,7 +39,7 @@ public class RestHttpStatusCodeMapper im
         if (e instanceof UnauthorizedRoleException)
             return Response.status(Response.Status.UNAUTHORIZED)
                     .entity(errorMsg).type(MediaType.TEXT_PLAIN_TYPE).build();
-        if (e instanceof InvalidEntityException || e instanceof DataIntegrityViolationException)
+        if (e instanceof InvalidEntityException || e instanceof DataIntegrityViolationException || e instanceof SyncopeClientCompositeErrorException)
             return Response.status(Response.Status.BAD_REQUEST).entity(errorMsg)
                     .type(MediaType.TEXT_PLAIN_TYPE).build();
 

Added: syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/ContextAware.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/ContextAware.java?rev=1420798&view=auto
==============================================================================
--- syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/ContextAware.java (added)
+++ syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/ContextAware.java Wed Dec 12 16:04:19 2012
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+package org.apache.syncope.services;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+public interface ContextAware {
+
+    @Context
+    public void setUriInfo(UriInfo ui);
+}

Added: syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/InvalidSearchConditionException.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/InvalidSearchConditionException.java?rev=1420798&view=auto
==============================================================================
--- syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/InvalidSearchConditionException.java (added)
+++ syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/InvalidSearchConditionException.java Wed Dec 12 16:04:19 2012
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+package org.apache.syncope.services;
+
+public class InvalidSearchConditionException extends Exception {
+
+    private static final long serialVersionUID = 4142899085950398109L;
+
+    public InvalidSearchConditionException() {
+        super();
+    }
+
+    public InvalidSearchConditionException(String string) {
+        super(string);
+    }
+}

Added: syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/RoleService.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/RoleService.java?rev=1420798&view=auto
==============================================================================
--- syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/RoleService.java (added)
+++ syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/RoleService.java Wed Dec 12 16:04:19 2012
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+package org.apache.syncope.services;
+
+import java.util.List;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Response;
+
+import org.apache.syncope.NotFoundException;
+import org.apache.syncope.mod.RoleMod;
+import org.apache.syncope.to.RoleTO;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+
+@Path("/roles")
+public interface RoleService {
+
+    @GET
+    @Path("/{roleId}")
+    @PreAuthorize("isAuthenticated()")
+    @Transactional(readOnly = true)
+    public RoleTO read(@PathParam("roleId") final Long roleId) throws NotFoundException,
+            UnauthorizedRoleException;
+
+    @GET
+    @Path("/{roleId}/parent")
+    @PreAuthorize("hasRole('ROLE_READ')")
+    @Transactional(readOnly = true)
+    public RoleTO parent(@PathParam("roleId") final Long roleId) throws NotFoundException,
+            UnauthorizedRoleException;
+
+    @GET
+    @Path("/{roleId}/children")
+    @PreAuthorize("hasRole('ROLE_READ')")
+    @Transactional(readOnly = true)
+    public List<RoleTO> children(@PathParam("roleId") final Long roleId) throws NotFoundException;
+
+    @GET
+    @PreAuthorize("hasRole('ROLE_READ')")
+    @Transactional(readOnly = true)
+    public List<RoleTO> list();
+
+    @POST
+    @Path("/")
+    @PreAuthorize("hasRole('ROLE_CREATE')")
+    public Response create(final RoleTO roleTO)
+            throws UnauthorizedRoleException;
+
+    @POST
+    @Path("/{roleId}")
+    @PreAuthorize("hasRole('ROLE_UPDATE')")
+    public RoleTO update(@PathParam("roleId") final Long roleId, final RoleMod roleMod)
+            throws NotFoundException, UnauthorizedRoleException;
+
+    @DELETE
+    @Path("/{roleId}")
+    @PreAuthorize("hasRole('ROLE_DELETE')")
+    public Response delete(@PathParam("roleId") final Long roleId) throws NotFoundException,
+            UnauthorizedRoleException;
+
+}
\ No newline at end of file

Added: syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/UnauthorizedRoleException.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/UnauthorizedRoleException.java?rev=1420798&view=auto
==============================================================================
--- syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/UnauthorizedRoleException.java (added)
+++ syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/UnauthorizedRoleException.java Wed Dec 12 16:04:19 2012
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+package org.apache.syncope.services;
+
+import java.util.Collections;
+import java.util.Set;
+
+public class UnauthorizedRoleException extends Exception {
+
+    private static final long serialVersionUID = -7794737282296676827L;
+
+    private final Set<Long> roleIds;
+
+    public UnauthorizedRoleException(final Set<Long> roleIds) {
+        super("Missing entitlement for role(s) " + roleIds);
+        this.roleIds = roleIds;
+    }
+
+    public UnauthorizedRoleException(final Long roleId) {
+        this(Collections.singleton(roleId));
+    }
+
+    public Set<Long> getRoleIds() {
+        return roleIds;
+    }
+}

Added: syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/UserService.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/UserService.java?rev=1420798&view=auto
==============================================================================
--- syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/UserService.java (added)
+++ syncope/branches/cxf/common/src/main/java/org/apache/syncope/services/UserService.java Wed Dec 12 16:04:19 2012
@@ -0,0 +1,175 @@
+/*
+ * 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.
+ */
+package org.apache.syncope.services;
+
+import java.util.List;
+import java.util.Set;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Response;
+
+import org.apache.syncope.NotFoundException;
+import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.propagation.PropagationException;
+import org.apache.syncope.search.NodeCond;
+import org.apache.syncope.to.UserTO;
+import org.apache.syncope.to.WorkflowFormTO;
+import org.apache.syncope.workflow.WorkflowException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
+
+@Path("/user")
+public interface UserService {
+
+    @GET
+    @PreAuthorize("hasRole('USER_READ')")
+    @Transactional(readOnly = true)
+    public abstract Boolean verifyPassword(@QueryParam("uname") String username,
+            @QueryParam("pw") final String password);
+
+    @GET
+    @Path("/count")
+    @PreAuthorize("hasRole('USER_LIST')")
+    @Transactional(readOnly = true, rollbackFor = { Throwable.class })
+    public abstract int count();
+
+    @POST
+    @Path("/count")
+    @PreAuthorize("hasRole('USER_READ')")
+    @Transactional(readOnly = true, rollbackFor = { Throwable.class })
+    public abstract int searchCount(final NodeCond searchCondition) throws InvalidSearchConditionException;
+
+    @GET
+    @PreAuthorize("hasRole('USER_LIST')")
+    @Transactional(readOnly = true, rollbackFor = { Throwable.class })
+    public abstract List<UserTO> list();
+
+    @GET
+    @PreAuthorize("hasRole('USER_LIST')")
+    @Transactional(readOnly = true, rollbackFor = { Throwable.class })
+    public abstract List<UserTO> list(@QueryParam("page") final int page,
+            @QueryParam("size") @DefaultValue("25") final int size);
+
+    @GET
+    @Path("/{userId}")
+    @PreAuthorize("hasRole('USER_READ')")
+    @Transactional(readOnly = true, rollbackFor = { Throwable.class })
+    public abstract UserTO read(@PathParam("userId") final Long userId) throws NotFoundException,
+            UnauthorizedRoleException;
+
+    @GET
+    @PreAuthorize("hasRole('USER_READ')")
+    @Transactional(readOnly = true, rollbackFor = { Throwable.class })
+    public abstract UserTO read(@QueryParam("uname") final String username) throws NotFoundException,
+            UnauthorizedRoleException;
+
+    @POST
+    @Path("search")
+    @PreAuthorize("hasRole('USER_READ')")
+    @Transactional(readOnly = true, rollbackFor = { Throwable.class })
+    public abstract List<UserTO> search(final NodeCond searchCondition)
+            throws InvalidSearchConditionException;
+
+    @POST
+    @Path("search")
+    @PreAuthorize("hasRole('USER_READ')")
+    @Transactional(readOnly = true, rollbackFor = { Throwable.class })
+    public abstract List<UserTO> search(final NodeCond searchCondition, @QueryParam("page") final int page,
+            @QueryParam("size") @DefaultValue("25") final int size) throws InvalidSearchConditionException;
+
+    @POST
+    @Path("/")
+    @PreAuthorize("hasRole('USER_CREATE')")
+    public abstract Response create(final UserTO userTO) throws PropagationException,
+            UnauthorizedRoleException, WorkflowException, NotFoundException;
+
+    @POST
+    @Path("/{userId}")
+    @PreAuthorize("hasRole('USER_UPDATE')")
+    public abstract UserTO update(@PathParam("userId") final Long userId, final UserMod userMod) throws NotFoundException, PropagationException,
+            UnauthorizedRoleException, WorkflowException;
+
+    @PUT
+    @Path("/user/{userId}/status/active")
+    @PreAuthorize("hasRole('USER_UPDATE')")
+    @Transactional(rollbackFor = { Throwable.class })
+    public abstract UserTO activate(@PathParam("userId") final Long userId,
+            @FormParam("token") final String token,
+            @FormParam("resourceNames") final Set<String> resourceNames,
+            @FormParam("performLocally") @DefaultValue("true") final Boolean performLocally,
+            @FormParam("performRemotely") @DefaultValue("true") final Boolean performRemotely)
+            throws WorkflowException, NotFoundException, UnauthorizedRoleException, PropagationException;
+
+    @DELETE
+    @Path("/user/{userId}/status/active")
+    @PreAuthorize("hasRole('USER_UPDATE')")
+    @Transactional(rollbackFor = { Throwable.class })
+    public abstract UserTO suspend(@PathParam("userId") final Long userId,
+            @FormParam("resourceNames") final Set<String> resourceNames,
+            @FormParam("performLocally") @DefaultValue("true") final Boolean performLocally,
+            @FormParam("performRemotely") @DefaultValue("true") final Boolean performRemotely)
+            throws NotFoundException, WorkflowException, UnauthorizedRoleException, PropagationException;
+
+    @DELETE
+    @Path("/{userId}")
+    @PreAuthorize("hasRole('USER_DELETE')")
+    public abstract Response delete(@PathParam("userId") final Long userId) throws NotFoundException,
+            WorkflowException, PropagationException, UnauthorizedRoleException;
+
+    @POST
+    @Path("/workflow/task/{taskId}/execute")
+    @PreAuthorize("hasRole('USER_UPDATE')")
+    public abstract UserTO executeWorkflow(@PathParam("taskId") final String taskId, final UserTO userTO)
+            throws WorkflowException, NotFoundException, UnauthorizedRoleException, PropagationException;
+
+    @GET
+    @Path("/workflow/form")
+    @PreAuthorize("hasRole('WORKFLOW_FORM_LIST')")
+    @Transactional(readOnly = true, rollbackFor = { Throwable.class })
+    public abstract List<WorkflowFormTO> getForms();
+
+    @GET
+    @Path("/{userId}/workflow/form")
+    @PreAuthorize("hasRole('WORKFLOW_FORM_READ') and hasRole('USER_READ')")
+    @Transactional(rollbackFor = { Throwable.class })
+    public abstract WorkflowFormTO getFormForUser(@PathParam("userId") final Long userId)
+            throws UnauthorizedRoleException, NotFoundException, WorkflowException;
+
+    @POST
+    @Path("/workflow/task/{taskId}/claim")
+    @PreAuthorize("hasRole('WORKFLOW_FORM_CLAIM')")
+    @Transactional(rollbackFor = { Throwable.class })
+    public abstract WorkflowFormTO claimForm(@PathParam("taskId") final String taskId)
+            throws NotFoundException, WorkflowException;
+
+    @POST
+    @Path("/workflow/form")
+    @PreAuthorize("hasRole('WORKFLOW_FORM_SUBMIT')")
+    @Transactional(rollbackFor = { Throwable.class })
+    public abstract UserTO submitForm(final WorkflowFormTO form) throws NotFoundException, WorkflowException,
+            PropagationException, UnauthorizedRoleException;
+}
\ No newline at end of file

Modified: syncope/branches/cxf/common/src/main/java/org/apache/syncope/to/PropagationTaskTO.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/common/src/main/java/org/apache/syncope/to/PropagationTaskTO.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/common/src/main/java/org/apache/syncope/to/PropagationTaskTO.java (original)
+++ syncope/branches/cxf/common/src/main/java/org/apache/syncope/to/PropagationTaskTO.java Wed Dec 12 16:04:19 2012
@@ -18,12 +18,14 @@
  */
 package org.apache.syncope.to;
 
+import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.syncope.types.PropagationMode;
 import org.apache.syncope.types.PropagationOperation;
 
 @XmlType
+@XmlRootElement
 public class PropagationTaskTO extends TaskTO {
 
     private static final long serialVersionUID = 386450127003321197L;

Modified: syncope/branches/cxf/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/pom.xml?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/pom.xml (original)
+++ syncope/branches/cxf/core/pom.xml Wed Dec 12 16:04:19 2012
@@ -531,9 +531,10 @@ under the License.
                      <cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
                      <cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
 
-              <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs>-->
+              <!--cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs-->
                      <cargo.jvmargs>-noverify ${javaagent} -Drebel.spring_plugin=false
-                        -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs>
+                        -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m
+                        -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs>
                   </properties>
                   <configfiles>
                      <configfile>

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/persistence/dao/UserDAO.java Wed Dec 12 16:04:19 2012
@@ -23,7 +23,7 @@ import java.util.Set;
 import org.apache.syncope.core.persistence.beans.ExternalResource;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.persistence.beans.user.UAttrValue;
-import org.apache.syncope.controller.InvalidSearchConditionException;
+import org.apache.syncope.services.InvalidSearchConditionException;
 import org.apache.syncope.validation.InvalidEntityException;
 
 public interface UserDAO extends DAO {

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java Wed Dec 12 16:04:19 2012
@@ -51,7 +51,7 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.dao.SchemaDAO;
 import org.apache.syncope.core.persistence.dao.TaskDAO;
 import org.apache.syncope.core.persistence.dao.UserDAO;
-import org.apache.syncope.controller.InvalidSearchConditionException;
+import org.apache.syncope.services.InvalidSearchConditionException;
 
 @Repository
 public class UserDAOImpl extends AbstractDAOImpl implements UserDAO {

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java Wed Dec 12 16:04:19 2012
@@ -27,9 +27,6 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.syncope.NotFoundException;
-import org.apache.syncope.controller.ContextAware;
-import org.apache.syncope.controller.RoleService;
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.audit.AuditManager;
 import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
@@ -38,6 +35,9 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.rest.data.RoleDataBinder;
 import org.apache.syncope.core.util.EntitlementUtil;
 import org.apache.syncope.mod.RoleMod;
+import org.apache.syncope.services.ContextAware;
+import org.apache.syncope.services.RoleService;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.RoleTO;
 import org.apache.syncope.types.AuditElements.Category;
 import org.apache.syncope.types.AuditElements.Result;

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java Wed Dec 12 16:04:19 2012
@@ -31,10 +31,6 @@ import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.collections.keyvalue.DefaultMapEntry;
 import org.apache.syncope.NotFoundException;
-import org.apache.syncope.controller.ContextAware;
-import org.apache.syncope.controller.InvalidSearchConditionException;
-import org.apache.syncope.controller.UnauthorizedRoleException;
-import org.apache.syncope.controller.UserService;
 import org.apache.syncope.core.audit.AuditManager;
 import org.apache.syncope.core.notification.NotificationManager;
 import org.apache.syncope.core.persistence.beans.PropagationTask;
@@ -52,6 +48,10 @@ import org.apache.syncope.core.workflow.
 import org.apache.syncope.mod.UserMod;
 import org.apache.syncope.propagation.PropagationException;
 import org.apache.syncope.search.NodeCond;
+import org.apache.syncope.services.ContextAware;
+import org.apache.syncope.services.InvalidSearchConditionException;
+import org.apache.syncope.services.UnauthorizedRoleException;
+import org.apache.syncope.services.UserService;
 import org.apache.syncope.to.MembershipTO;
 import org.apache.syncope.to.PropagationTO;
 import org.apache.syncope.to.UserTO;

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/controller/UserRequestController.java Wed Dec 12 16:04:19 2012
@@ -23,7 +23,6 @@ import java.util.List;
 import javax.persistence.RollbackException;
 
 import org.apache.syncope.NotFoundException;
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.audit.AuditManager;
 import org.apache.syncope.core.persistence.beans.SyncopeConf;
 import org.apache.syncope.core.persistence.beans.UserRequest;
@@ -31,6 +30,7 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.dao.UserRequestDAO;
 import org.apache.syncope.core.rest.data.UserRequestDataBinder;
 import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.UserRequestTO;
 import org.apache.syncope.to.UserTO;
 import org.apache.syncope.types.AuditElements.Category;

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserDataBinder.java Wed Dec 12 16:04:19 2012
@@ -24,7 +24,6 @@ import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.syncope.NotFoundException;
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.persistence.beans.AbstractAttr;
 import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
 import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
@@ -44,6 +43,7 @@ import org.apache.syncope.core.util.Conn
 import org.apache.syncope.core.util.EntitlementUtil;
 import org.apache.syncope.mod.MembershipMod;
 import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.MembershipTO;
 import org.apache.syncope.to.UserTO;
 import org.apache.syncope.types.AttributableType;

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserRequestDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserRequestDataBinder.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserRequestDataBinder.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/rest/data/UserRequestDataBinder.java Wed Dec 12 16:04:19 2012
@@ -21,11 +21,11 @@ package org.apache.syncope.core.rest.dat
 import javax.persistence.RollbackException;
 
 import org.apache.syncope.NotFoundException;
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.persistence.beans.UserRequest;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.persistence.dao.UserDAO;
 import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.UserRequestTO;
 import org.apache.syncope.to.UserTO;
 import org.springframework.beans.BeanUtils;

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHanlder.java Wed Dec 12 16:04:19 2012
@@ -42,8 +42,6 @@ import org.apache.syncope.propagation.Pr
 import org.apache.syncope.core.propagation.PropagationManager;
 import org.apache.syncope.core.propagation.PropagationTaskExecutor;
 import org.apache.syncope.core.quartz.AbstractTaskJob;
-import org.apache.syncope.controller.InvalidSearchConditionException;
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.rest.data.UserDataBinder;
 import org.apache.syncope.core.util.ConnObjectUtil;
 import org.apache.syncope.core.util.EntitlementUtil;
@@ -54,6 +52,8 @@ import org.apache.syncope.mod.UserMod;
 import org.apache.syncope.search.AttributeCond;
 import org.apache.syncope.search.NodeCond;
 import org.apache.syncope.search.SyncopeUserCond;
+import org.apache.syncope.services.InvalidSearchConditionException;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.UserTO;
 import org.apache.syncope.types.ConflictResolutionAction;
 import org.apache.syncope.types.SyncPolicySpec;

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/util/ConnObjectUtil.java Wed Dec 12 16:04:19 2012
@@ -29,7 +29,6 @@ import java.util.Set;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.syncope.NotFoundException;
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.init.ConnInstanceLoader;
 import org.apache.syncope.core.persistence.beans.AbstractAttributable;
 import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
@@ -44,6 +43,7 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.propagation.ConnectorFacadeProxy;
 import org.apache.syncope.core.rest.data.UserDataBinder;
 import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.AbstractAttributableTO;
 import org.apache.syncope.to.AttributeTO;
 import org.apache.syncope.to.ConnObjectTO;

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/AbstractUserWorkflowAdapter.java Wed Dec 12 16:04:19 2012
@@ -23,12 +23,12 @@ import org.apache.syncope.workflow.Workf
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.init.WorkflowLoader;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.persistence.dao.UserDAO;
 import org.apache.syncope.core.rest.data.UserDataBinder;
 import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.UserTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/ActivitiUserWorkflowAdapter.java Wed Dec 12 16:04:19 2012
@@ -56,12 +56,12 @@ import org.activiti.engine.runtime.Proce
 import org.activiti.engine.task.Task;
 import org.apache.commons.collections.keyvalue.DefaultMapEntry;
 import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.init.ActivitiWorkflowLoader;
 import org.apache.syncope.core.init.WorkflowLoader;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.propagation.PropagationByResource;
 import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.UserTO;
 import org.apache.syncope.to.WorkflowDefinitionTO;
 import org.apache.syncope.to.WorkflowFormPropertyTO;

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/NoOpUserWorkflowAdapter.java Wed Dec 12 16:04:19 2012
@@ -25,10 +25,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.collections.keyvalue.DefaultMapEntry;
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.propagation.PropagationByResource;
 import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.UserTO;
 import org.apache.syncope.to.WorkflowDefinitionTO;
 import org.apache.syncope.to.WorkflowFormTO;

Modified: syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java (original)
+++ syncope/branches/cxf/core/src/main/java/org/apache/syncope/core/workflow/UserWorkflowAdapter.java Wed Dec 12 16:04:19 2012
@@ -23,11 +23,11 @@ import org.apache.syncope.workflow.Workf
 import java.util.List;
 import java.util.Map;
 
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.init.SpringContextInitializer;
 import org.apache.syncope.core.init.WorkflowLoader;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.mod.UserMod;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.UserTO;
 import org.apache.syncope.to.WorkflowDefinitionTO;
 import org.apache.syncope.to.WorkflowFormTO;

Modified: syncope/branches/cxf/core/src/main/resources/META-INF/orm.xml
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/main/resources/META-INF/orm.xml?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/main/resources/META-INF/orm.xml (original)
+++ syncope/branches/cxf/core/src/main/resources/META-INF/orm.xml Wed Dec 12 16:04:19 2012
@@ -85,7 +85,7 @@ under the License.
     <attributes>
       <id name="id">
         <generated-value generator="SEQ_RAttr" strategy="TABLE"/>
-        <table-generator name="SEQ_RAttr" pk-column-value="SEQ_RAttr" initial-value="1000"/>
+        <table-generator name="SEQ_RAttr" pk-column-value="SEQ_RAttr" initial-value="1100"/>
       </id>
     </attributes>
   </entity>

Modified: syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java (original)
+++ syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/notification/NotificationTest.java Wed Dec 12 16:04:19 2012
@@ -34,7 +34,6 @@ import javax.mail.Session;
 import javax.mail.Store;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.syncope.controller.UserService;
 import org.apache.syncope.core.persistence.beans.Entitlement;
 import org.apache.syncope.core.persistence.beans.Notification;
 import org.apache.syncope.core.persistence.beans.NotificationTask;
@@ -47,6 +46,7 @@ import org.apache.syncope.core.rest.Abst
 import org.apache.syncope.core.rest.controller.TaskController;
 import org.apache.syncope.search.MembershipCond;
 import org.apache.syncope.search.NodeCond;
+import org.apache.syncope.services.UserService;
 import org.apache.syncope.to.MembershipTO;
 import org.apache.syncope.to.NotificationTaskTO;
 import org.apache.syncope.to.UserTO;

Modified: syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/UserTest.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/UserTest.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/UserTest.java (original)
+++ syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/persistence/dao/UserTest.java Wed Dec 12 16:04:19 2012
@@ -26,10 +26,10 @@ import java.util.Set;
 import org.apache.syncope.core.AbstractTest;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.persistence.beans.user.UAttrValue;
-import org.apache.syncope.controller.InvalidSearchConditionException;
 import org.apache.syncope.core.util.EntitlementUtil;
 import org.apache.syncope.core.util.IncompatiblePolicyException;
 import org.apache.syncope.core.util.PasswordGenerator;
+import org.apache.syncope.services.InvalidSearchConditionException;
 import org.apache.syncope.types.CipherAlgorithm;
 import org.apache.syncope.validation.InvalidEntityException;
 import org.junit.Test;

Modified: syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AbstractRoleTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AbstractRoleTestITCase.java?rev=1420798&r1=1420797&r2=1420798&view=diff
==============================================================================
--- syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AbstractRoleTestITCase.java (original)
+++ syncope/branches/cxf/core/src/test/java/org/apache/syncope/core/rest/AbstractRoleTestITCase.java Wed Dec 12 16:04:19 2012
@@ -33,10 +33,10 @@ import javax.ws.rs.core.Response;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.http.HttpStatus;
 import org.apache.syncope.NotFoundException;
-import org.apache.syncope.controller.RoleService;
-import org.apache.syncope.controller.UnauthorizedRoleException;
 import org.apache.syncope.mod.AttributeMod;
 import org.apache.syncope.mod.RoleMod;
+import org.apache.syncope.services.RoleService;
+import org.apache.syncope.services.UnauthorizedRoleException;
 import org.apache.syncope.to.AttributeTO;
 import org.apache.syncope.to.RoleTO;
 import org.apache.syncope.to.UserTO;
@@ -48,8 +48,8 @@ public abstract class AbstractRoleTestIT
 
     @Test
     public void crud() throws NotFoundException, UnauthorizedRoleException {
-        String parentRoleName = "testParentRole-" + UUID.randomUUID().toString().substring(0, 12);
-        String childRoleName = "testChildRole-" + UUID.randomUUID().toString().substring(0, 12);
+        String parentRoleName = "testParentRole-" + UUID.randomUUID().toString();
+        String childRoleName = "testChildRole-" + UUID.randomUUID().toString();
         long parentRoleId;
         long childRoleId;
 
@@ -234,7 +234,7 @@ public abstract class AbstractRoleTestIT
 
         RoleMod roleMod = new RoleMod();
         roleMod.setId(roleId);
-        String newRoleName = "finalRole-" + UUID.randomUUID().toString().substring(0, 8);
+        String newRoleName = "finalRole-" + UUID.randomUUID().toString();
         roleMod.setName(newRoleName);
         roleMod.addAttributeToBeUpdated(attributeMod);
 
@@ -256,7 +256,7 @@ public abstract class AbstractRoleTestIT
 
     @Test
     public void updateRemovingVirAttribute() throws UnauthorizedRoleException, NotFoundException {
-        String roleName = "withvirtual-" + UUID.randomUUID().toString().substring(0, 8);
+        String roleName = "withvirtual-" + UUID.randomUUID().toString();
         RoleTO roleTO = new RoleTO();
         roleTO.setName(roleName);
         roleTO.setParent(8L);
@@ -290,7 +290,7 @@ public abstract class AbstractRoleTestIT
 
     @Test
     public void updateRemovingDerAttribute() throws UnauthorizedRoleException, NotFoundException {
-        String roleName = "withderived-" + UUID.randomUUID().toString().substring(0, 8);
+        String roleName = "withderived-" + UUID.randomUUID().toString();
         RoleTO roleTO = new RoleTO();
         roleTO.setName(roleName);
         roleTO.setParent(8L);
@@ -364,7 +364,7 @@ public abstract class AbstractRoleTestIT
     @Test
     public void issue178() throws UnauthorizedRoleException, NotFoundException {
         RoleTO roleTO = new RoleTO();
-        String roleName = "torename-" + UUID.randomUUID().toString().substring(0, 8);
+        String roleName = "torename-" + UUID.randomUUID().toString();
         roleTO.setName(roleName);
 
         Response response = roleService.create(roleTO);
@@ -397,7 +397,7 @@ public abstract class AbstractRoleTestIT
     @Test
     public void issue228() throws UnauthorizedRoleException, NotFoundException {
         RoleTO roleTO = new RoleTO();
-        String roleName = "issue228-" + UUID.randomUUID().toString().substring(0, 12);
+        String roleName = "issue228-" + UUID.randomUUID().toString();
         roleTO.setName(roleName);
         roleTO.setParent(8L);
         roleTO.setInheritAccountPolicy(false);



Mime
View raw message