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 2017/03/24 15:41:36 UTC
[1/2] syncope git commit: Fixing multiple execs behavior of -Pall for
generated projects
Repository: syncope
Updated Branches:
refs/heads/2_0_X aba209444 -> 1ffca5e7b
refs/heads/master 3800c63d1 -> 6c920e4fe
Fixing multiple execs behavior of -Pall for generated projects
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1ffca5e7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1ffca5e7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1ffca5e7
Branch: refs/heads/2_0_X
Commit: 1ffca5e7b242bc8b03c91e7c8d593aaca0fc3eb2
Parents: aba2094
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Mar 24 16:41:20 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Mar 24 16:41:20 2017 +0100
----------------------------------------------------------------------
.../resources/archetype-resources/enduser/pom.xml | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/1ffca5e7/archetype/src/main/resources/archetype-resources/enduser/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/archetype-resources/enduser/pom.xml b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
index ee220bc..2f7f2a6 100644
--- a/archetype/src/main/resources/archetype-resources/enduser/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
@@ -176,16 +176,24 @@ under the License.
classpathref="maven.plugin.classpath"/>
<if>
+ <not>
+ <available file="../core/target/test-classes/backup/MasterContent.xml"/>
+ </not>
+ <then>
+ <mkdir dir="../core/target/test-classes/backup"/>
+ <copy file="../core/target/test-classes/domains/MasterContent.xml"
+ todir="../core/target/test-classes/backup"/>
+ </then>
+ </if>
+ <if>
<available file="../core/target/syncope/WEB-INF/lib/activiti-engine-${activiti.version}.jar"/>
<then>
- <xslt basedir="../core/target/test-classes/domains"
+ <xslt basedir="../core/target/test-classes/backup"
includes="MasterContent.xml"
- destdir="../core/target"
+ destdir="../core/target/test-classes/domains"
extension=".xml"
force="true"
style="../core/src/test/resources/addActivitiToContent.xsl"/>
- <move file="../core/target/MasterContent.xml"
- tofile="../core/target/test-classes/domains/MasterContent.xml"/>
</then>
</if>
</target>
[2/2] syncope git commit: Fixing multiple execs behavior of -Pall for
generated projects
Posted by il...@apache.org.
Fixing multiple execs behavior of -Pall for generated projects
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6c920e4f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6c920e4f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6c920e4f
Branch: refs/heads/master
Commit: 6c920e4fe6116535be68a8715c3b32848a498d32
Parents: 3800c63
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Fri Mar 24 16:41:20 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Fri Mar 24 16:41:28 2017 +0100
----------------------------------------------------------------------
.../resources/archetype-resources/enduser/pom.xml | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/6c920e4f/archetype/src/main/resources/archetype-resources/enduser/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/archetype-resources/enduser/pom.xml b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
index 99ed1df..4e3cc2a 100644
--- a/archetype/src/main/resources/archetype-resources/enduser/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
@@ -176,16 +176,24 @@ under the License.
classpathref="maven.plugin.classpath"/>
<if>
+ <not>
+ <available file="../core/target/test-classes/backup/MasterContent.xml"/>
+ </not>
+ <then>
+ <mkdir dir="../core/target/test-classes/backup"/>
+ <copy file="../core/target/test-classes/domains/MasterContent.xml"
+ todir="../core/target/test-classes/backup"/>
+ </then>
+ </if>
+ <if>
<available file="../core/target/syncope/WEB-INF/lib/activiti-engine-${activiti.version}.jar"/>
<then>
- <xslt basedir="../core/target/test-classes/domains"
+ <xslt basedir="../core/target/test-classes/backup"
includes="MasterContent.xml"
- destdir="../core/target"
+ destdir="../core/target/test-classes/domains"
extension=".xml"
force="true"
style="../core/src/test/resources/addActivitiToContent.xsl"/>
- <move file="../core/target/MasterContent.xml"
- tofile="../core/target/test-classes/domains/MasterContent.xml"/>
</then>
</if>
</target>