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 2015/03/27 11:16:53 UTC
[1/3] syncope git commit: [SYNCOPE-655] #resolve
Repository: syncope
Updated Branches:
refs/heads/1_2_X 81b7ab4be -> 35b974c77
refs/heads/master f489d6e82 -> 16de3b8ef
[SYNCOPE-655] #resolve
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/35b974c7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/35b974c7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/35b974c7
Branch: refs/heads/1_2_X
Commit: 35b974c77973c525172db37acd06b1c0fb5982d7
Parents: 81b7ab4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 27 10:52:15 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 27 10:52:15 2015 +0100
----------------------------------------------------------------------
deb/console/pom.xml | 15 +++++++++++++++
deb/core/pom.xml | 19 +++++++++++++++++++
2 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/35b974c7/deb/console/pom.xml
----------------------------------------------------------------------
diff --git a/deb/console/pom.xml b/deb/console/pom.xml
index c4ec5f0..cf793a5 100644
--- a/deb/console/pom.xml
+++ b/deb/console/pom.xml
@@ -76,6 +76,14 @@ under the License.
</includes>
</resource>
<resource>
+ <directory>${project.basedir}/../../console/src/main/resources</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.directory}/overlay</targetPath>
+ <includes>
+ <include>consoleContext.xml</include>
+ </includes>
+ </resource>
+ <resource>
<directory>../..</directory>
<targetPath>META-INF</targetPath>
<includes>
@@ -130,11 +138,18 @@ under the License.
<include>NOTICE</include>
</includes>
</resource>
+ <resource>
+ <directory>${project.build.directory}/overlay</directory>
+ <targetPath>WEB-INF/classes</targetPath>
+ </resource>
</webResources>
<overlays>
<overlay>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-console</artifactId>
+ <excludes>
+ <exclude>WEB-INF/classes/consoleContext.xml</exclude>
+ </excludes>
</overlay>
</overlays>
</configuration>
http://git-wip-us.apache.org/repos/asf/syncope/blob/35b974c7/deb/core/pom.xml
----------------------------------------------------------------------
diff --git a/deb/core/pom.xml b/deb/core/pom.xml
index db69433..c0b2c7b 100644
--- a/deb/core/pom.xml
+++ b/deb/core/pom.xml
@@ -77,6 +77,16 @@ under the License.
</includes>
</resource>
<resource>
+ <directory>${project.basedir}/../../core/src/main/resources</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.directory}/overlay</targetPath>
+ <includes>
+ <include>coreContext.xml</include>
+ <include>persistenceContext.xml</include>
+ <include>workflowContext.xml</include>
+ </includes>
+ </resource>
+ <resource>
<directory>../..</directory>
<targetPath>META-INF</targetPath>
<includes>
@@ -149,11 +159,20 @@ under the License.
<include>NOTICE</include>
</includes>
</resource>
+ <resource>
+ <directory>${project.build.directory}/overlay</directory>
+ <targetPath>WEB-INF/classes</targetPath>
+ </resource>
</webResources>
<overlays>
<overlay>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
+ <excludes>
+ <exclude>WEB-INF/classes/coreContext.xml</exclude>
+ <exclude>WEB-INF/classes/persistenceContext.xml</exclude>
+ <exclude>WEB-INF/classes/workflowContext.xml</exclude>
+ </excludes>
</overlay>
</overlays>
</configuration>
[2/3] syncope git commit: [SYNCOPE-655] #resolve
Posted by il...@apache.org.
[SYNCOPE-655] #resolve
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/35b974c7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/35b974c7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/35b974c7
Branch: refs/heads/master
Commit: 35b974c77973c525172db37acd06b1c0fb5982d7
Parents: 81b7ab4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 27 10:52:15 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 27 10:52:15 2015 +0100
----------------------------------------------------------------------
deb/console/pom.xml | 15 +++++++++++++++
deb/core/pom.xml | 19 +++++++++++++++++++
2 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/35b974c7/deb/console/pom.xml
----------------------------------------------------------------------
diff --git a/deb/console/pom.xml b/deb/console/pom.xml
index c4ec5f0..cf793a5 100644
--- a/deb/console/pom.xml
+++ b/deb/console/pom.xml
@@ -76,6 +76,14 @@ under the License.
</includes>
</resource>
<resource>
+ <directory>${project.basedir}/../../console/src/main/resources</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.directory}/overlay</targetPath>
+ <includes>
+ <include>consoleContext.xml</include>
+ </includes>
+ </resource>
+ <resource>
<directory>../..</directory>
<targetPath>META-INF</targetPath>
<includes>
@@ -130,11 +138,18 @@ under the License.
<include>NOTICE</include>
</includes>
</resource>
+ <resource>
+ <directory>${project.build.directory}/overlay</directory>
+ <targetPath>WEB-INF/classes</targetPath>
+ </resource>
</webResources>
<overlays>
<overlay>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-console</artifactId>
+ <excludes>
+ <exclude>WEB-INF/classes/consoleContext.xml</exclude>
+ </excludes>
</overlay>
</overlays>
</configuration>
http://git-wip-us.apache.org/repos/asf/syncope/blob/35b974c7/deb/core/pom.xml
----------------------------------------------------------------------
diff --git a/deb/core/pom.xml b/deb/core/pom.xml
index db69433..c0b2c7b 100644
--- a/deb/core/pom.xml
+++ b/deb/core/pom.xml
@@ -77,6 +77,16 @@ under the License.
</includes>
</resource>
<resource>
+ <directory>${project.basedir}/../../core/src/main/resources</directory>
+ <filtering>true</filtering>
+ <targetPath>${project.build.directory}/overlay</targetPath>
+ <includes>
+ <include>coreContext.xml</include>
+ <include>persistenceContext.xml</include>
+ <include>workflowContext.xml</include>
+ </includes>
+ </resource>
+ <resource>
<directory>../..</directory>
<targetPath>META-INF</targetPath>
<includes>
@@ -149,11 +159,20 @@ under the License.
<include>NOTICE</include>
</includes>
</resource>
+ <resource>
+ <directory>${project.build.directory}/overlay</directory>
+ <targetPath>WEB-INF/classes</targetPath>
+ </resource>
</webResources>
<overlays>
<overlay>
<groupId>org.apache.syncope</groupId>
<artifactId>syncope-core</artifactId>
+ <excludes>
+ <exclude>WEB-INF/classes/coreContext.xml</exclude>
+ <exclude>WEB-INF/classes/persistenceContext.xml</exclude>
+ <exclude>WEB-INF/classes/workflowContext.xml</exclude>
+ </excludes>
</overlay>
</overlays>
</configuration>
[3/3] syncope git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Conflicts:
deb/console/pom.xml
deb/core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/16de3b8e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/16de3b8e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/16de3b8e
Branch: refs/heads/master
Commit: 16de3b8ef59f0e43dcfe5d35de86ca979ed505f6
Parents: f489d6e 35b974c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 27 11:16:42 2015 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 27 11:16:42 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------