[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ò <[email protected]> Authored: Fri Mar 27 10:52:15 2015 +0100 Committer: Francesco Chicchiriccò <[email protected]> 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>
