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:59 UTC
svn commit: r1615917 - in /syncope/trunk: ./
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:58 2014
New Revision: 1615917
URL: http://svn.apache.org/r1615917
Log:
[SYNCOPE-540] Merge from 1_2_X
Added:
syncope/trunk/console/src/main/resources/oryx.debug.js-tokenValueMap.properties
- copied unchanged from r1615916, syncope/branches/1_2_X/console/src/main/resources/oryx.debug.js-tokenValueMap.properties
Removed:
syncope/trunk/console/src/main/resources/oryx.debug.js.patch
Modified:
syncope/trunk/ (props changed)
syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
syncope/trunk/console/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1615910-1615916
Modified: syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml?rev=1615917&r1=1615916&r2=1615917&view=diff
==============================================================================
--- syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml (original)
+++ syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml Tue Aug 5 11:55:58 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/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1615917&r1=1615916&r2=1615917&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Tue Aug 5 11:55:58 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>