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 2014/08/05 13:55:03 UTC
svn commit: r1615916 - in /syncope/branches/1_2_X:
archetype/src/main/resources/archetype-resources/console/pom.xml
console/pom.xml
console/src/main/resources/oryx.debug.js-tokenValueMap.properties
console/src/main/resources/oryx.debug.js.patch
Author: ilgrosso
Date: Tue Aug 5 11:55:03 2014
New Revision: 1615916
URL: http://svn.apache.org/r1615916
Log:
[SYNCOPE-540] Using maven-replacer-plugin (instead of easier patch) for patching Activiti Modeler
Added:
syncope/branches/1_2_X/console/src/main/resources/oryx.debug.js-tokenValueMap.properties (with props)
Removed:
syncope/branches/1_2_X/console/src/main/resources/oryx.debug.js.patch
Modified:
syncope/branches/1_2_X/archetype/src/main/resources/archetype-resources/console/pom.xml
syncope/branches/1_2_X/console/pom.xml
Modified: syncope/branches/1_2_X/archetype/src/main/resources/archetype-resources/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/archetype/src/main/resources/archetype-resources/console/pom.xml?rev=1615916&r1=1615915&r2=1615916&view=diff
==============================================================================
--- syncope/branches/1_2_X/archetype/src/main/resources/archetype-resources/console/pom.xml (original)
+++ syncope/branches/1_2_X/archetype/src/main/resources/archetype-resources/console/pom.xml Tue Aug 5 11:55:03 2014
@@ -141,15 +141,6 @@ under the License.
<copy todir="${activiti-modeler.directory}/libs">
<fileset dir="${project.build.directory}/activiti-webapp-explorer2/libs"/>
</copy>
-
- <fixcrlf srcdir="${project.build.directory}/activiti-webapp-explorer2/editor/"
- includes="oryx.debug.js"
- eol="unix"/>
- <patch patchfile="${basedir}/src/main/resources/oryx.debug.js.patch"
- originalfile="${project.build.directory}/activiti-webapp-explorer2/editor/oryx.debug.js"
- destfile="${activiti-modeler.directory}/editor/oryx.debug.js"/>
-
- <delete dir="${project.build.directory}/activiti-webapp-explorer2"/>
</target>
</configuration>
<goals>
@@ -185,7 +176,26 @@ under the License.
</execution>
</executions>
</plugin>
-
+
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <file>${activiti-modeler.directory}/editor/oryx.debug.js</file>
+ <tokenValueMap>${basedir}/src/main/resources/oryx.debug.js-tokenValueMap.properties</tokenValueMap>
+ <unescape>true</unescape>
+ <regex>false</regex>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
Modified: syncope/branches/1_2_X/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/console/pom.xml?rev=1615916&r1=1615915&r2=1615916&view=diff
==============================================================================
--- syncope/branches/1_2_X/console/pom.xml (original)
+++ syncope/branches/1_2_X/console/pom.xml Tue Aug 5 11:55:03 2014
@@ -238,14 +238,6 @@ under the License.
<copy todir="${activiti-modeler.directory}/libs">
<fileset dir="${project.build.directory}/activiti-webapp-explorer2/libs"/>
</copy>
-
- <fixcrlf srcdir="${project.build.directory}/activiti-webapp-explorer2/editor/"
- includes="oryx.debug.js" eol="unix"/>
- <patch patchfile="${basedir}/src/main/resources/oryx.debug.js.patch"
- originalfile="${project.build.directory}/activiti-webapp-explorer2/editor/oryx.debug.js"
- destfile="${activiti-modeler.directory}/editor/oryx.debug.js"/>
-
- <delete dir="${project.build.directory}/activiti-webapp-explorer2"/>
</target>
</configuration>
<goals>
@@ -289,6 +281,25 @@ under the License.
</plugin>
<plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>replacer</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>replace</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <file>${activiti-modeler.directory}/editor/oryx.debug.js</file>
+ <tokenValueMap>${basedir}/src/main/resources/oryx.debug.js-tokenValueMap.properties</tokenValueMap>
+ <unescape>true</unescape>
+ <regex>false</regex>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<inherited>true</inherited>
Added: syncope/branches/1_2_X/console/src/main/resources/oryx.debug.js-tokenValueMap.properties
URL: http://svn.apache.org/viewvc/syncope/branches/1_2_X/console/src/main/resources/oryx.debug.js-tokenValueMap.properties?rev=1615916&view=auto
==============================================================================
--- syncope/branches/1_2_X/console/src/main/resources/oryx.debug.js-tokenValueMap.properties (added)
+++ syncope/branches/1_2_X/console/src/main/resources/oryx.debug.js-tokenValueMap.properties Tue Aug 5 11:55:03 2014
@@ -0,0 +1,35 @@
+# 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.
+ORYX.CONFIG.ROOT_PATH \= "../editor/"; //TODO: Remove last slash!!=BASE_PATH = window.location.toString().substr(0, window.location.toString().indexOf('/wicket'));\nORYX.CONFIG.ROOT_PATH = BASE_PATH + "/activiti-modeler/editor/";
+ORYX.CONFIG.EXPLORER_PATH \= "../explorer";=ORYX.CONFIG.EXPLORER_PATH = BASE_PATH + "/activiti-modeler/explorer";
+ORYX.CONFIG.LIBS_PATH \= "../libs";=ORYX.CONFIG.LIBS_PATH = BASE_PATH + "/activiti-modeler/libs";
+ORYX.CONFIG.SYNTAXCHECKER_URL \==ORYX.CONFIG.PLUGINS_CONFIG = ORYX.CONFIG.ROOT_PATH + "plugins.xml";\nORYX.CONFIG.SYNTAXCHECKER_URL =
+this._baseUrl \= "../editor/stencilsets/bpmn2.0/";=this._baseUrl = ORYX.CONFIG.ROOT_PATH + "stencilsets/bpmn2.0/";
+this._source \= "../stencilsets/bpmn2.0/bpmn2.0.json";=this._source = ORYX.CONFIG.ROOT_PATH + "stencilsets/bpmn2.0/bpmn2.0.json";
+"../service/editor/stencilset"=ORYX.CONFIG.ROOT_PATH + "stencilset.json"
+ORYX.Editor.createByUrl=modelUrl = BASE_PATH + "/workflowDefGET";\nORYX.Editor.createByUrl
+../explorer/src/img/signavio/smoky/logo2.png="+ORYX.CONFIG.EXPLORER_PATH+"/src/img/signavio/smoky/logo2.png
+<a href\=\\""+ORYX.CONFIG.WEB_URL+"\\" target\=\\"_self\\" title\=\\"close modeler\\">=<a href=\\"#\\" title=\\"close modeler\\" onclick=\\"window.close();\\">
+../editor/images/close_button.png="+ORYX.CONFIG.ROOT_PATH+"images/close_button.png
+height:16px;width:16px;margin-bottom:-4px;background: transparent url(../libs/ext-2.0.2/resources/images/default/tree/loading.gif) no-repeat center;=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;
+icon: '../editor/images/add.png',=icon: ORYX.CONFIG.ROOT_PATH + 'images/add.png',
+icon: '../editor/images/delete.png',=icon: ORYX.CONFIG.ROOT_PATH + 'images/delete.png',
+id\="edit_model_title"=id="edit_model_title" readonly="readonly"
+id\="edit_model_summary"=id="edit_model_summary" readonly="readonly"
+"../service/model/" + modelMeta.modelId + "/json"=BASE_PATH + "/workflowDefGET"
+// Send the request to the server.=saveUri = BASE_PATH + "/workflowDefPUT";\n// Send the request to the server.
+'Accept':"application/json", 'Content-Type':'charset\=UTF-8'='Accept':"application/json", 'Content-Type':'application/json'
\ No newline at end of file
Propchange: syncope/branches/1_2_X/console/src/main/resources/oryx.debug.js-tokenValueMap.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/branches/1_2_X/console/src/main/resources/oryx.debug.js-tokenValueMap.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id