Repository: syncope Updated Branches: refs/heads/master 8ae693218 -> 750247e6a
Re-aligning archetype with 2_0_X Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/750247e6 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/750247e6 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/750247e6 Branch: refs/heads/master Commit: 750247e6a73e3319868e9adb9a4380a70691c50c Parents: 8ae6932 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Wed Jun 28 11:11:43 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Wed Jun 28 11:11:43 2017 +0200 ---------------------------------------------------------------------- archetype/pom.xml | 1 + .../archetype-resources/console/pom.xml | 79 +++----------------- 2 files changed, 10 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/750247e6/archetype/pom.xml ---------------------------------------------------------------------- diff --git a/archetype/pom.xml b/archetype/pom.xml index 0833550..4b3e0ab 100644 --- a/archetype/pom.xml +++ b/archetype/pom.xml @@ -195,6 +195,7 @@ under the License. <targetPath>${project.build.outputDirectory}/archetype-resources/core/src/test/resources</targetPath> <includes> <include>connid.properties</include> + <include>userWorkflow.bpmn20.xml</include> </includes> </resource> <resource> http://git-wip-us.apache.org/repos/asf/syncope/blob/750247e6/archetype/src/main/resources/archetype-resources/console/pom.xml ---------------------------------------------------------------------- diff --git a/archetype/src/main/resources/archetype-resources/console/pom.xml b/archetype/src/main/resources/archetype-resources/console/pom.xml index dd942d8..2006755 100644 --- a/archetype/src/main/resources/archetype-resources/console/pom.xml +++ b/archetype/src/main/resources/archetype-resources/console/pom.xml @@ -103,80 +103,11 @@ under the License. <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.activiti</groupId> - <artifactId>activiti-webapp-explorer2</artifactId> - <type>war</type> - <scope>test</scope> - </dependency> </dependencies> <build> <finalName>syncope-console</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <inherited>true</inherited> - <executions> - <execution> - <id>setupActivitiModeler</id> - <phase>process-resources</phase> - <configuration> - <target> - <unzip src="${settings.localRepository}/org/activiti/activiti-webapp-explorer2/${activiti.version}/activiti-webapp-explorer2-${activiti.version}.war" - dest="${project.build.directory}/activiti-webapp-explorer2" /> - - <mkdir dir="${activiti-modeler.directory}" /> - <copy file="${project.build.directory}/activiti-webapp-explorer2/modeler.html" - todir="${activiti-modeler.directory}" /> - <replace file="${activiti-modeler.directory}/modeler.html" - token="</head>" - value="<script type="text/javascript">window.onunload = refreshParent; function refreshParent() { window.opener.location.reload(); }</script></head>"/> - <copy file="${project.build.directory}/activiti-webapp-explorer2/WEB-INF/classes/stencilset.json" - todir="${activiti-modeler.directory}" /> - - <mkdir dir="${activiti-modeler.directory}/editor-app" /> - <copy todir="${activiti-modeler.directory}/editor-app"> - <fileset dir="${project.build.directory}/activiti-webapp-explorer2/editor-app" /> - </copy> - <replaceregexp file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" - match="ORYX.CONFIG.ROOT_PATH =.*"editor/"; //TODO: Remove last slash!!" - replace="BASE_PATH = window.location.toString().substr(0, window.location.toString().indexOf('/wicket')); -ORYX.CONFIG.ROOT_PATH = BASE_PATH + "/activiti-modeler/editor-app/editor/";" - byline="true"/> - <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" - token="new Ajax.Request(ACTIVITI.CONFIG.contextRoot + '/editor/stencilset?version=' + Date.now(), {" - value="new Ajax.Request(window.location.toString().substr(0, window.location.toString().indexOf('/activiti-modeler')) + "/activiti-modeler/stencilset.json", {"/> - <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" - token="ORYX.Editor.createByUrl(modelUrl);" - value="modelUrl = BASE_PATH + "/workflowDefGET"; -ORYX.Editor.createByUrl(modelUrl);"/> - <replace file="${activiti-modeler.directory}/editor-app/editor/oryx.debug.js" - token="ORYX.Editor.createByUrl = function(modelUrl){" - value="modelUrl = BASE_PATH + "/workflowDefGET"; -ORYX.Editor.createByUrl = function(modelUrl){"/> - <replace file="${activiti-modeler.directory}/editor-app/configuration/toolbar-default-actions.js" - token="window.location.href = "./";" - value="window.close();"/> - - <copy file="${basedir}/src/main/resources/url-config.js" - todir="${activiti-modeler.directory}/editor-app/configuration" - overwrite="true" /> - <copy file="${basedir}/src/main/resources/save-model.html" - todir="${activiti-modeler.directory}/editor-app/popups" - overwrite="true" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <resources> <resource> <directory>src/main/resources</directory> @@ -192,7 +123,7 @@ ORYX.Editor.createByUrl = function(modelUrl){"/> </testResources> </build> - <profiles> + <profiles> <profile> <id>all</id> @@ -208,6 +139,13 @@ ORYX.Editor.createByUrl = function(modelUrl){"/> <artifactId>syncope-ext-saml2sp-client-console</artifactId> <version>${syncope.version}</version> </dependency> + + <dependency> + <groupId>org.activiti</groupId> + <artifactId>activiti-webapp-explorer2</artifactId> + <type>war</type> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -268,6 +206,7 @@ ORYX.CONFIG.ROOT_PATH = BASE_PATH + "/activiti-modeler/editor-app/editor/&q </executions> </plugin> </plugins> + <resources> <resource> <directory>src/main/resources</directory>
