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/09/08 16:21:33 UTC
svn commit: r1623404 - in /syncope/trunk: ./ build-tools/ console/
core-upgrader/ core/ deb/console/ deb/core/ installer/ legal_ext/ standalone/
Author: ilgrosso
Date: Mon Sep 8 14:21:32 2014
New Revision: 1623404
URL: http://svn.apache.org/r1623404
Log:
[SYNCOPE_544] Merge from 1_2_X
Added:
syncope/trunk/build-tools/LICENSE
- copied unchanged from r1623403, syncope/branches/1_2_X/build-tools/LICENSE
syncope/trunk/build-tools/NOTICE
- copied unchanged from r1623403, syncope/branches/1_2_X/build-tools/NOTICE
syncope/trunk/console/LICENSE
- copied unchanged from r1623403, syncope/branches/1_2_X/console/LICENSE
syncope/trunk/console/NOTICE
- copied unchanged from r1623403, syncope/branches/1_2_X/console/NOTICE
syncope/trunk/core/LICENSE
- copied unchanged from r1623403, syncope/branches/1_2_X/core/LICENSE
syncope/trunk/core/NOTICE
- copied unchanged from r1623403, syncope/branches/1_2_X/core/NOTICE
syncope/trunk/installer/LICENSE
- copied unchanged from r1623403, syncope/branches/1_2_X/installer/LICENSE
syncope/trunk/installer/NOTICE
- copied unchanged from r1623403, syncope/branches/1_2_X/installer/NOTICE
syncope/trunk/standalone/LICENSE
- copied unchanged from r1623403, syncope/branches/1_2_X/standalone/LICENSE
syncope/trunk/standalone/NOTICE
- copied unchanged from r1623403, syncope/branches/1_2_X/standalone/NOTICE
Removed:
syncope/trunk/legal_ext/
Modified:
syncope/trunk/ (props changed)
syncope/trunk/build-tools/pom.xml
syncope/trunk/console/pom.xml
syncope/trunk/core-upgrader/pom.xml
syncope/trunk/core/pom.xml
syncope/trunk/deb/console/pom.xml
syncope/trunk/deb/core/pom.xml
syncope/trunk/installer/pom.xml
syncope/trunk/pom.xml
syncope/trunk/standalone/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_2_X:r1623397-1623403
Modified: syncope/trunk/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/build-tools/pom.xml?rev=1623404&r1=1623403&r2=1623404&view=diff
==============================================================================
--- syncope/trunk/build-tools/pom.xml (original)
+++ syncope/trunk/build-tools/pom.xml Mon Sep 8 14:21:32 2014
@@ -139,7 +139,32 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <inherited>true</inherited>
<configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>WEB-INF/web.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>META-INF/DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </webResources>
+ <packagingExcludes>WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/NOTICE*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
Modified: syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/console/pom.xml?rev=1623404&r1=1623403&r2=1623404&view=diff
==============================================================================
--- syncope/trunk/console/pom.xml (original)
+++ syncope/trunk/console/pom.xml Mon Sep 8 14:21:32 2014
@@ -414,6 +414,31 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+ <attachClasses>true</attachClasses>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>WEB-INF/web.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>META-INF/DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </webResources>
+ <packagingExcludes>WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/NOTICE*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
Modified: syncope/trunk/core-upgrader/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core-upgrader/pom.xml?rev=1623404&r1=1623403&r2=1623404&view=diff
==============================================================================
--- syncope/trunk/core-upgrader/pom.xml (original)
+++ syncope/trunk/core-upgrader/pom.xml Mon Sep 8 14:21:32 2014
@@ -28,7 +28,7 @@ under the License.
</parent>
<groupId>org.apache.syncope</groupId>
- <artifactId>core-upgrader</artifactId>
+ <artifactId>syncope-core-upgrader</artifactId>
<packaging>jar</packaging>
<name>Apache Syncope Core Upgrader</name>
Modified: syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1623404&r1=1623403&r2=1623404&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Mon Sep 8 14:21:32 2014
@@ -637,6 +637,32 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+ <attachClasses>true</attachClasses>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.jsp</include>
+ <include>WEB-INF/web.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>META-INF/DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </webResources>
+ <packagingExcludes>WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/NOTICE*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
Modified: syncope/trunk/deb/console/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/deb/console/pom.xml?rev=1623404&r1=1623403&r2=1623404&view=diff
==============================================================================
--- syncope/trunk/deb/console/pom.xml (original)
+++ syncope/trunk/deb/console/pom.xml Mon Sep 8 14:21:32 2014
@@ -123,7 +123,7 @@ under the License.
<attachClasses>false</attachClasses>
<webResources>
<resource>
- <directory>${basedir}/../../legal_ext</directory>
+ <directory>${basedir}/../../console</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>LICENSE</include>
@@ -200,8 +200,9 @@ under the License.
</mapper>
</data>
<data>
- <src>${basedir}/../../legal_ext</src>
+ <src>${basedir}/../../console</src>
<type>directory</type>
+ <includes>LICENSE,NOTICE</includes>
<mapper>
<type>perm</type>
<prefix>/usr/share/doc/apache-syncope-console</prefix>
Modified: syncope/trunk/deb/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/deb/core/pom.xml?rev=1623404&r1=1623403&r2=1623404&view=diff
==============================================================================
--- syncope/trunk/deb/core/pom.xml (original)
+++ syncope/trunk/deb/core/pom.xml Mon Sep 8 14:21:32 2014
@@ -142,7 +142,7 @@ under the License.
<attachClasses>false</attachClasses>
<webResources>
<resource>
- <directory>${basedir}/../../legal_ext</directory>
+ <directory>${basedir}/../../core</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>LICENSE</include>
@@ -239,8 +239,9 @@ under the License.
</mapper>
</data>
<data>
- <src>${basedir}/../../legal_ext</src>
+ <src>${basedir}/../../core</src>
<type>directory</type>
+ <includes>LICENSE,NOTICE</includes>
<mapper>
<type>perm</type>
<prefix>/usr/share/doc/apache-syncope</prefix>
Modified: syncope/trunk/installer/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/installer/pom.xml?rev=1623404&r1=1623403&r2=1623404&view=diff
==============================================================================
--- syncope/trunk/installer/pom.xml (original)
+++ syncope/trunk/installer/pom.xml Mon Sep 8 14:21:32 2014
@@ -51,6 +51,12 @@ under the License.
<dependency>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-compiler</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.incors</groupId>
+ <artifactId>kunstoff-laf</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.izpack</groupId>
@@ -168,7 +174,7 @@ under the License.
<resources>
<resource>
- <directory>../legal_ext</directory>
+ <directory>${basedir}</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>LICENSE</include>
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1623404&r1=1623403&r2=1623404&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon Sep 8 14:21:32 2014
@@ -1076,38 +1076,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
- <configuration>
- <attachClasses>true</attachClasses>
- <webResources>
- <resource>
- <directory>src/main/webapp</directory>
- <includes>
- <include>**/*.jsp</include>
- <include>WEB-INF/web.xml</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- <!--
- HACK: Include legal files explicity, otherwise they will end up in the wrong path
- or in another jar file in the war.
- -->
- <resource>
- <directory>${project.build.outputDirectory}</directory>
- <includes>
- <include>META-INF/DEPENDENCIES*</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/../legal_ext</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </resource>
- </webResources>
- <packagingExcludes>WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/NOTICE*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
- </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: syncope/trunk/standalone/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/standalone/pom.xml?rev=1623404&r1=1623403&r2=1623404&view=diff
==============================================================================
--- syncope/trunk/standalone/pom.xml (original)
+++ syncope/trunk/standalone/pom.xml Mon Sep 8 14:21:32 2014
@@ -93,8 +93,8 @@ under the License.
<!-- legal stuff -->
<copy file="${project.build.outputDirectory}/README" todir="${work.dir}"/>
- <copy file="../legal_ext/LICENSE" todir="${work.dir}"/>
- <copy file="../legal_ext/NOTICE" todir="${work.dir}"/>
+ <copy file="LICENSE" todir="${work.dir}"/>
+ <copy file="NOTICE" todir="${work.dir}"/>
<!-- Unzip Tomcat and remove docs and examples from webapps (space saving) -->
<unzip src="${settings.localRepository}/org/codehaus/cargo/cargo-container-archives/apache-tomcat-${tomcat.version}.zip"