You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/11/22 12:41:33 UTC
svn commit: r1544498 [2/2] - in /syncope/trunk: ./
archetype/src/main/resources/archetype-resources/console/
archetype/src/main/resources/archetype-resources/core/
client/src/main/java/org/apache/syncope/client/
common/src/main/java/org/apache/syncope/...
Added: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html?rev=1544498&view=auto
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html (added)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html Fri Nov 22 11:41:32 2013
@@ -0,0 +1,57 @@
+<!--
+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.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:head>
+ <link rel="stylesheet" type="text/css" href="css/codemirror.css" />
+ <link rel="stylesheet" type="text/css" href="css/codemirror_default_theme.css" />
+
+ <script type="text/javascript" src="scripts/codemirror.js"></script>
+ <script type="text/javascript" src="scripts/xmlpure.js"></script>
+ <script type="text/javascript">
+ function updateTextArea(editor) {
+ document.getElementById("workflowDefArea").value = editor.getValue();
+ }
+ </script>
+ <script>
+ window.onunload = refreshParent;
+ function refreshParent() {
+ if (window.opener.location.toString().indexOf('#workflow') === -1) {
+ window.opener.location = window.opener.location + "#workflow";
+ }
+ window.opener.location.reload();
+ }
+ </script>
+ </wicket:head>
+ <wicket:extend>
+ <form wicket:id="workflowDefForm">
+ <textarea wicket:id="workflowDefArea" id="workflowDefArea" style="width: 100%; height: 350px;">
+ </textarea>
+ <div style="margin: 10px">
+ <input type="submit"
+ class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="apply"
+ onclick="window.close();"/>
+ </div>
+ </form>
+ <script>
+ var editor = CodeMirror.fromTextArea(document.getElementById("workflowDefArea"),
+ {mode: {name: "xmlpure"}, lineNumbers: true, onChange: updateTextArea});
+ </script>
+ </wicket:extend>
+</html>
Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Added: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.properties?rev=1544498&view=auto
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.properties (added)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.properties Fri Nov 22 11:41:32 2013
@@ -0,0 +1,17 @@
+# 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.
+submit=Save
Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Added: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties?rev=1544498&view=auto
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties (added)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties Fri Nov 22 11:41:32 2013
@@ -0,0 +1,17 @@
+# 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.
+submit=Salva
Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_it.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Added: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties?rev=1544498&view=auto
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties (added)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties Fri Nov 22 11:41:32 2013
@@ -0,0 +1,17 @@
+# 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.
+submit=Salvar
Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/XMLEditorPopupPage_pt_BR.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Added: syncope/trunk/console/src/main/resources/oryx.debug.js.patch
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/oryx.debug.js.patch?rev=1544498&view=auto
==============================================================================
--- syncope/trunk/console/src/main/resources/oryx.debug.js.patch (added)
+++ syncope/trunk/console/src/main/resources/oryx.debug.js.patch Fri Nov 22 11:41:32 2013
@@ -0,0 +1,101 @@
+# 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.
+1866c1866,1867
+< ORYX.CONFIG.ROOT_PATH = "../editor/"; //TODO: Remove last slash!!
+---
+> /*
+> ORYX.CONFIG.ROOT_PATH = "../editor/";
+1868a1870,1875
+> */
+> BASE_PATH = window.location.toString().substr(0, window.location.toString().indexOf('/wicket'));
+>
+> ORYX.CONFIG.ROOT_PATH = BASE_PATH + "/activiti-modeler/editor/"
+> ORYX.CONFIG.EXPLORER_PATH = BASE_PATH + "/activiti-modeler/explorer"
+> ORYX.CONFIG.LIBS_PATH = BASE_PATH + "/activiti-modeler/libs"
+1879c1886
+< ORYX.CONFIG.PLUGINS_CONFIG = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor/plugins";
+---
+> ORYX.CONFIG.PLUGINS_CONFIG = ORYX.CONFIG.ROOT_PATH + "plugins.xml";
+2417c2424
+< ORYX.Log.error("A plugin is not providing a name. Ingnoring this plugin.");
+---
+> ORYX.Log.error("A plugin is not providing a name. Ignoring this plugin.");
+8472,8474c8479,8481
+< this._baseUrl = "../editor/stencilsets/bpmn2.0/";
+< this._source = "../stencilsets/bpmn2.0/bpmn2.0.json";
+< new Ajax.Request("../service/editor/stencilset", {
+---
+> this._baseUrl = ORYX.CONFIG.ROOT_PATH + "stencilsets/bpmn2.0/";
+> this._source = ORYX.CONFIG.ROOT_PATH + "stencilsets/bpmn2.0/bpmn2.0.json";
+> new Ajax.Request(ORYX.CONFIG.ROOT_PATH + "stencilset.json", {
+11200a11208
+> modelUrl = BASE_PATH + "/workflowDefGET";
+11568c11576
+< "<img src='../explorer/src/img/signavio/smoky/logo2.png' border=\"0\" usemap=\"#kisbpmmap\"/>" +
+---
+> "<img src='"+ORYX.CONFIG.EXPLORER_PATH+"/src/img/signavio/smoky/logo2.png' border=\"0\" usemap=\"#kisbpmmap\"/>" +
+11576,11577c11584,11585
+< "<a href=\""+ORYX.CONFIG.WEB_URL+"\" target=\"_self\" title=\"close modeler\">" +
+< "<img src='../editor/images/close_button.png' border=\"0\" />" +
+---
+> "<a href=\"#\" title=\"close modeler\" onclick=\"window.close();\">" +
+> "<img src='"+ORYX.CONFIG.ROOT_PATH+"images/close_button.png' border=\"0\" />" +
+18332c18339
+< var sloading = "height:16px;width:16px;margin-bottom:-4px;background: transparent url(../libs/ext-2.0.2/resources/images/default/tree/loading.gif) no-repeat center;"
+---
+> var sloading = "height:16px;width:16px;margin-bottom:-4px;background: transparent url("+ORYX.CONFIG.LIBS_PATH+"/ext-2.0.2/resources/images/default/tree/loading.gif) no-repeat center;"
+21911c21918
+< icon: '../editor/images/add.png',
+---
+> icon: ORYX.CONFIG.ROOT_PATH + 'images/add.png',
+21924c21931
+< icon: '../editor/images/delete.png',
+---
+> icon: ORYX.CONFIG.ROOT_PATH + 'images/delete.png',
+22451c22458
+< icon: '../editor/images/add.png',
+---
+> icon: ORYX.CONFIG.ROOT_PATH + 'images/add.png',
+22464c22471
+< icon: '../editor/images/delete.png',
+---
+> icon: ORYX.CONFIG.ROOT_PATH + 'images/delete.png',
+22524c22531
+< icon: '../editor/images/add.png',
+---
+> icon: ORYX.CONFIG.ROOT_PATH + 'images/add.png',
+22537c22544
+< icon: '../editor/images/delete.png',
+---
+> icon: ORYX.CONFIG.ROOT_PATH + 'images/delete.png',
+24531,24532c24537,24538
+< '<p><label for="edit_model_title">' + ORYX.I18N.Save.dialogLabelTitle + '</label><input type="text" class="text" name="title" value="{title}" id="edit_model_title" onfocus="this.className = \'text activated\'" onblur="this.className = \'text\'"/></p>',
+< '<p><label for="edit_model_summary">' + ORYX.I18N.Save.dialogLabelDesc + '</label><textarea rows="5" name="summary" id="edit_model_summary" onfocus="this.className = \'activated\'" onblur="this.className = \'\'">{summary}</textarea></p>',
+---
+> '<p><label for="edit_model_title">' + ORYX.I18N.Save.dialogLabelTitle + '</label><input type="text" class="text" name="title" value="{title}" id="edit_model_title" onfocus="this.className = \'text activated\'" onblur="this.className = \'text\'" readonly=\"readonly\"/></p>',
+> '<p><label for="edit_model_summary">' + ORYX.I18N.Save.dialogLabelDesc + '</label><textarea rows="5" name="summary" id="edit_model_summary" onfocus="this.className = \'activated\'" onblur="this.className = \'\'" readonly=\"readonly\">{summary}</textarea></p>',
+24813,24814c24819
+<
+< new Ajax.Request("../service/model/" + modelMeta.modelId + "/json", {
+---
+> new Ajax.Request(BASE_PATH + "/workflowDefGET", {
+24876a24882
+> saveUri = BASE_PATH + "/workflowDefPUT";
+24884c24890
+< headers : {'Accept':"application/json", 'Content-Type':'charset=UTF-8'},
+---
+> headers : {'Accept':"application/json", 'Content-Type':'application/json'},
Added: syncope/trunk/console/src/main/webapp/img/modeler.png
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/img/modeler.png?rev=1544498&view=auto
==============================================================================
Binary file - no diff available.
Propchange: syncope/trunk/console/src/main/webapp/img/modeler.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: syncope/trunk/console/src/main/webapp/img/xml.png
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/img/xml.png?rev=1544498&view=auto
==============================================================================
Binary file - no diff available.
Propchange: syncope/trunk/console/src/main/webapp/img/xml.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Modified: syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1544498&r1=1544497&r2=1544498&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Fri Nov 22 11:41:32 2013
@@ -424,7 +424,6 @@ under the License.
<copy todir="${cargo.run.dir}/WEB-INF/classes" includeEmptyDirs="false">
<fileset dir="${project.build.directory}/test-classes">
<exclude name="**/*.class" />
- <exclude name="restClientContext.xml" />
</fileset>
</copy>
</target>
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserSelfServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserSelfServiceImpl.java?rev=1544498&r1=1544497&r2=1544498&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserSelfServiceImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserSelfServiceImpl.java Fri Nov 22 11:41:32 2013
@@ -19,6 +19,7 @@
package org.apache.syncope.core.services;
import java.net.URI;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import org.apache.syncope.common.mod.UserMod;
import org.apache.syncope.common.services.UserSelfService;
@@ -36,7 +37,7 @@ public class UserSelfServiceImpl extends
@Override
public Response getOptions() {
- return Response.ok().header("Allow", "GET,POST,OPTIONS,HEAD").
+ return Response.ok().header(HttpHeaders.ALLOW, "GET,POST,OPTIONS,HEAD").
header(RESTHeaders.SELFREGISTRATION_ALLOWED, controller.isSelfRegistrationAllowed()).
build();
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserServiceImpl.java?rev=1544498&r1=1544497&r2=1544498&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserServiceImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/UserServiceImpl.java Fri Nov 22 11:41:32 2013
@@ -20,6 +20,7 @@ package org.apache.syncope.core.services
import java.net.URI;
import java.util.List;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import org.apache.syncope.common.mod.StatusMod;
import org.apache.syncope.common.mod.UserMod;
@@ -45,14 +46,14 @@ public class UserServiceImpl extends Abs
@Override
public Response getUsername(final Long userId) {
- return Response.ok().header("Allow", "GET,POST,OPTIONS,HEAD").
+ return Response.ok().header(HttpHeaders.ALLOW, "GET,POST,OPTIONS,HEAD").
header(RESTHeaders.USERNAME, controller.getUsername(userId)).
build();
}
@Override
public Response getUserId(final String username) {
- return Response.ok().header("Allow", "GET,POST,OPTIONS,HEAD").
+ return Response.ok().header(HttpHeaders.ALLOW, "GET,POST,OPTIONS,HEAD").
header(RESTHeaders.USER_ID, controller.getUserId(username)).
build();
}
@@ -93,7 +94,7 @@ public class UserServiceImpl extends Abs
public UserTO read(final Long userId) {
return controller.read(userId);
}
-
+
@Override
public List<UserTO> search(final NodeCond searchCondition) throws InvalidSearchConditionException {
return controller.search(searchCondition);
Modified: 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=1544498&r1=1544497&r2=1544498&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/services/WorkflowServiceImpl.java Fri Nov 22 11:41:32 2013
@@ -25,6 +25,7 @@ import org.apache.syncope.common.types.R
import org.apache.syncope.core.rest.controller.WorkflowController;
import org.springframework.beans.factory.annotation.Autowired;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.StreamingOutput;
@@ -32,6 +33,10 @@ import javax.ws.rs.core.StreamingOutput;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.syncope.common.services.WorkflowService;
import org.apache.syncope.common.types.AttributableType;
+import org.apache.syncope.common.types.RESTHeaders;
+import org.apache.syncope.core.rest.controller.WorkflowController;
+import org.apache.syncope.core.workflow.ActivitiDetector;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
@@ -44,6 +49,32 @@ public class WorkflowServiceImpl extends
private WorkflowController controller;
@Override
+ public Response getOptions(final AttributableType kind) {
+ String key = null;
+ String value = null;
+ switch (kind) {
+ case USER:
+ key = RESTHeaders.ACTIVITI_USER_ENABLED;
+ value = Boolean.toString(ActivitiDetector.isActivitiEnabledForUsers());
+ break;
+
+ case ROLE:
+ key = RESTHeaders.ACTIVITI_ROLE_ENABLED;
+ value = Boolean.toString(ActivitiDetector.isActivitiEnabledForRoles());
+ break;
+
+ case MEMBERSHIP:
+ default:
+ }
+
+ Response.ResponseBuilder builder = Response.ok().header(HttpHeaders.ALLOW, "GET,POST,OPTIONS,HEAD");
+ if (key != null && value != null) {
+ builder.header(key, value);
+ }
+ return builder.build();
+ }
+
+ @Override
public Response exportDefinition(final AttributableType kind) {
final MediaType accept =
context.getHttpHeaders().getAcceptableMediaTypes().contains(MediaType.APPLICATION_JSON_TYPE)
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java?rev=1544498&r1=1544497&r2=1544498&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java Fri Nov 22 11:41:32 2013
@@ -32,8 +32,6 @@ import org.apache.commons.lang3.StringUt
import org.apache.syncope.common.mod.AttributeMod;
import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.common.types.AttributeSchemaType;
-import static org.apache.syncope.common.types.IntMappingType.RoleVirtualSchema;
-import static org.apache.syncope.common.types.IntMappingType.UserVirtualSchema;
import org.apache.syncope.core.connid.PasswordGenerator;
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowAdapter.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowAdapter.java?rev=1544498&r1=1544497&r2=1544498&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowAdapter.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowAdapter.java Fri Nov 22 11:41:32 2013
@@ -74,8 +74,6 @@ public interface WorkflowAdapter {
* @param workflowId workflow id.
* @param name form name.
* @return forms (if present), otherwise an empty list.
- * @throws NotFoundException definition not found exception
- * @throws WorkflowException workflow exception
*/
List<WorkflowFormTO> getForms(String workflowId, String name);
Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java?rev=1544498&r1=1544497&r2=1544498&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/WorkflowTestITCase.java Fri Nov 22 11:41:32 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.core.rest;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
@@ -33,6 +34,16 @@ import org.junit.Test;
public class WorkflowTestITCase extends AbstractTest {
+ @Test
+ public void isActivitiEnabled() {
+ assertEquals(ActivitiDetector.isActivitiEnabledForUsers(),
+ adminClient.isActivitiEnabledFor(AttributableType.USER));
+ assertEquals(ActivitiDetector.isActivitiEnabledForRoles(),
+ adminClient.isActivitiEnabledFor(AttributableType.ROLE));
+ assertEquals(false,
+ adminClient.isActivitiEnabledFor(AttributableType.MEMBERSHIP));
+ }
+
private void exportDefinition(final AttributableType type) throws IOException {
Response response = workflowService.exportDefinition(type);
assertTrue(response.getMediaType().toString().
Modified: syncope/trunk/core/src/test/resources/noopworkflow/stripActivitiFromContent.xsl
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/noopworkflow/stripActivitiFromContent.xsl?rev=1544498&r1=1544497&r2=1544498&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/noopworkflow/stripActivitiFromContent.xsl (original)
+++ syncope/trunk/core/src/test/resources/noopworkflow/stripActivitiFromContent.xsl Fri Nov 22 11:41:32 2013
@@ -20,6 +20,14 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
+ <xsl:template match="entry">
+ <xsl:if test="not(starts-with(@key, 'ACT_'))">
+ <entry>
+ <xsl:apply-templates select="node()|@*|comment()"/>
+ </entry>
+ </xsl:if>
+ </xsl:template>
+
<xsl:template match="node()|@*|comment()">
<xsl:if test="not(starts-with(local-name(), 'ACT_'))">
<xsl:copy>
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1544498&r1=1544497&r2=1544498&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Fri Nov 22 11:41:32 2013
@@ -346,6 +346,7 @@ under the License.
<bundles.directory>${project.build.directory}/bundles</bundles.directory>
<connid.location>file:${bundles.directory}/</connid.location>
<log.directory>${project.build.directory}/log</log.directory>
+ <activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
<cargo.servlet.port>9080</cargo.servlet.port>
<cargo.tomcat.ajp.port>9889</cargo.tomcat.ajp.port>
@@ -469,6 +470,12 @@ under the License.
<artifactId>activiti-json-converter</artifactId>
<version>${activiti.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.activiti</groupId>
+ <artifactId>activiti-webapp-explorer2</artifactId>
+ <version>${activiti.version}</version>
+ <type>war</type>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>