Author: vmassol
Date: 2008-02-08 13:14:44 +0100 (Fri, 08 Feb 2008)
New Revision: 7388
Removed:
xwiki-platform/web/branches/xwiki-web-1.2/standard/src/main/webapp/skins/
Modified:
xwiki-platform/web/branches/xwiki-web-1.2/pom.xml
xwiki-platform/web/branches/xwiki-web-1.2/standard/pom.xml
Log:
XWIKI-2084: Use the new Skins modules and package Dodo, Finch and Albatross in
XE 1.2 branch
Modified: xwiki-platform/web/branches/xwiki-web-1.2/pom.xml
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.2/pom.xml 2008-02-08 11:44:22 UTC
(rev 7387)
+++ xwiki-platform/web/branches/xwiki-web-1.2/pom.xml 2008-02-08 12:14:44 UTC
(rev 7388)
@@ -42,6 +42,9 @@
<!-- Versions of XWiki dependencies used in Platform/Web modules -->
<platform.tools.version>1.7</platform.tools.version>
<platform.core.version>1.2-SNAPSHOT</platform.core.version>
+ <platform.skin.dodo.version>1.0</platform.skin.dodo.version>
+ <platform.skin.finch.version>1.0</platform.skin.finch.version>
+
<platform.skin.albatross.version>1.1-SNAPSHOT</platform.skin.albatross.version>
</properties>
<profiles>
<profile>
Modified: xwiki-platform/web/branches/xwiki-web-1.2/standard/pom.xml
===================================================================
--- xwiki-platform/web/branches/xwiki-web-1.2/standard/pom.xml 2008-02-08
11:44:22 UTC (rev 7387)
+++ xwiki-platform/web/branches/xwiki-web-1.2/standard/pom.xml 2008-02-08
12:14:44 UTC (rev 7388)
@@ -61,8 +61,46 @@
</properties>
</configuration>
</plugin>
+ <!-- Unpack the Skins we want to package -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.xpn.xwiki.platform.skins</groupId>
+ <artifactId>xwiki-skin-dodo</artifactId>
+ <version>${platform.skin.dodo.version}</version>
+ <type>zip</type>
+
<outputDirectory>${project.build.directory}/skins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.xpn.xwiki.platform.skins</groupId>
+ <artifactId>xwiki-skin-finch</artifactId>
+ <version>${platform.skin.finch.version}</version>
+ <type>zip</type>
+
<outputDirectory>${project.build.directory}/skins</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>com.xpn.xwiki.platform.skins</groupId>
+ <artifactId>xwiki-skin-albatross</artifactId>
+ <version>${platform.skin.albatross.version}</version>
+ <type>zip</type>
+
<outputDirectory>${project.build.directory}/skins</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<webResources>
@@ -79,6 +117,12 @@
<targetPath>WEB-INF</targetPath>
<filtering>true</filtering>
</resource>
+ <!-- Add the skins -->
+ <resource>
+ <directory>${project.build.directory}/skins</directory>
+ <targetPath>skins</targetPath>
+ <filtering>false</filtering>
+ </resource>
</webResources>
</configuration>
</plugin>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
