Author: ashakirin
Date: Thu Jan 31 12:07:56 2013
New Revision: 1440923
URL: http://svn.apache.org/viewvc?rev=1440923&view=rev
Log:
[SYNCOPE-231] Fixed broken build
Added:
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/WorkflowTestITCaseJAXRS.java
(with props)
Modified:
syncope/trunk/core/src/main/resources/restContext.xml
Added:
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java?rev=1440923&view=auto
==============================================================================
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java
(added)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java
Thu Jan 31 12:07:56 2013
@@ -0,0 +1,84 @@
+/*
+ * 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.core.services;
+
+import java.util.List;
+
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.syncope.common.services.WorkflowService;
+import org.apache.syncope.common.to.WorkflowDefinitionTO;
+import org.apache.syncope.common.types.AttributableType;
+import org.apache.syncope.common.util.CollectionWrapper;
+import org.apache.syncope.core.rest.controller.WorkflowController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class WorkflowServiceImpl implements WorkflowService, ContextAware {
+
+ @Autowired
+ private WorkflowController workflowController;
+
+ @Override
+ public WorkflowDefinitionTO getDefinition(final AttributableType kind) {
+ switch (kind) {
+ case USER:
+ return workflowController.getUserDefinition();
+ case ROLE:
+ return workflowController.getRoleDefinition();
+ default:
+ throw new BadRequestException();
+ }
+ }
+
+
+ @Override
+ public void updateDefinition(final AttributableType kind, final
WorkflowDefinitionTO definition) {
+ switch (kind) {
+ case USER:
+ workflowController.updateUserDefinition(definition);
+ break;
+ case ROLE:
+ workflowController.updateRoleDefinition(definition);
+ break;
+ default:
+ throw new BadRequestException();
+ }
+ }
+
+
+ @Override
+ public List<String> getDefinedTasks(final AttributableType kind) {
+ switch (kind) {
+ case USER:
+ return
CollectionWrapper.wrapStrings(workflowController.getDefinedUserTasks());
+ case ROLE:
+ return
CollectionWrapper.wrapStrings(workflowController.getDefinedUserTasks());
+ default:
+ throw new BadRequestException();
+ }
+ }
+
+ @Override
+ public void setUriInfo(final UriInfo ui) {
+ }
+
+}
Modified: syncope/trunk/core/src/main/resources/restContext.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/restContext.xml?rev=1440923&r1=1440922&r2=1440923&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/restContext.xml (original)
+++ syncope/trunk/core/src/main/resources/restContext.xml Thu Jan 31 12:07:56
2013
@@ -78,7 +78,7 @@ under the License.
<ref bean="schemaServiceImpl"/>
<ref bean="userRequestServiceImpl"/>
<ref bean="userServiceImpl"/>
- <!--<ref bean="workflowServiceImpl"/>-->
+ <ref bean="workflowServiceImpl"/>
</jaxrs:serviceBeans>
<jaxrs:resourceComparator>
<bean id="myServiceComparator"
class="org.apache.syncope.core.rest.utils.QueryResourceInfoComperator"/>
Added:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/WorkflowTestITCaseJAXRS.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/WorkflowTestITCaseJAXRS.java?rev=1440923&view=auto
==============================================================================
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/WorkflowTestITCaseJAXRS.java
(added)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/WorkflowTestITCaseJAXRS.java
Thu Jan 31 12:07:56 2013
@@ -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.core.rest.jaxrs;
+
+import org.apache.syncope.core.rest.WorkflowTestITCase;
+import org.junit.FixMethodOrder;
+import org.junit.runners.MethodSorters;
+
+@FixMethodOrder(MethodSorters.JVM)
+public class WorkflowTestITCaseJAXRS extends WorkflowTestITCase {
+
+ public WorkflowTestITCaseJAXRS() {
+ super();
+ setEnabledCXF(true);
+ }
+}
Propchange:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/jaxrs/WorkflowTestITCaseJAXRS.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
