Author: vmassol Date: 2008-02-20 15:22:48 +0100 (Wed, 20 Feb 2008) New Revision: 7874
Modified: xwiki-products/xwiki-watch/trunk/wikis/watch/pom.xml Log: XWATCH-108: Move Jetty resources in a jetty/ directory for the standalone distribution * The META-INF/ files were included in the XAR * Also fixed a few build isues and improved comments * Reformatted badly formatted code Modified: xwiki-products/xwiki-watch/trunk/wikis/watch/pom.xml =================================================================== --- xwiki-products/xwiki-watch/trunk/wikis/watch/pom.xml 2008-02-20 14:09:36 UTC (rev 7873) +++ xwiki-products/xwiki-watch/trunk/wikis/watch/pom.xml 2008-02-20 14:22:48 UTC (rev 7874) @@ -22,83 +22,56 @@ * --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>com.xpn.xwiki.products</groupId> - <artifactId>xwiki-watch-wikis</artifactId> - <version>1.0-SNAPSHOT</version> + <groupId>com.xpn.xwiki.products</groupId> + <artifactId>xwiki-watch-wikis</artifactId> + <version>1.0-SNAPSHOT</version> </parent> <artifactId>xwiki-watch-wikis-watch</artifactId> <name>XWiki Products - Watch - Wikis - Watch Wiki</name> <packaging>xar</packaging> <description>XWiki Watch Default Pages</description> - <dependencies> - <dependency> - <groupId>com.xpn.xwiki.products</groupId> - <artifactId>xwiki-watch-gwt</artifactId> - <version>${pom.version}</version> - <type>zip</type> - </dependency> - </dependencies> <build> - <plugins> + <plugins> + <!-- 1) copy the GWT zip to the target directory so that it can be added as an attachment + to the WatchCode.GWT document. This allows distributing Watch as a single XAR fil --> <plugin> - <groupId>com.xpn.xwiki.platform.tools</groupId> - <artifactId>xwiki-xar-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <phase>package</phase> + <phase>generate-resources</phase> <goals> - <goal>xar</goal> + <goal>copy</goal> </goals> <configuration> - <excludes> - <exclude>**/Translations.fr</exclude> - </excludes> + <artifactItems> + <artifactItem> + <groupId>com.xpn.xwiki.products</groupId> + <artifactId>xwiki-watch-gwt</artifactId> + <version>${pom.version}</version> + <type>zip</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/gwt</outputDirectory> + <destFileName>watch.zip</destFileName> + </artifactItem> + </artifactItems> </configuration> </execution> </executions> </plugin> - <!-- - copy the GWT zip to the target directory - --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.xpn.xwiki.products</groupId> - <artifactId>xwiki-watch-gwt</artifactId> - <version>${pom.version}</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/gwt</outputDirectory> - <destFileName>watch.zip</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <!-- - Attach watch JS-compiled code and resources zip - to WatchCode.GWT document. - --> + <!-- 2) Attach watch JS-compiled code and resources zip to WatchCode.GWT document. --> <plugin> <groupId>com.xpn.xwiki.platform.tools</groupId> <artifactId>xwiki-xmldoc-update-plugin</artifactId> - <version>${platform.tool.xmldoc.version}</version> + <version>${platform.tool.xmldoc.version}</version> <executions> <execution> - <phase>generate-resources</phase> - <id>attach-watch-zip</id> + <phase>process-resources</phase> <goals> <goal>attach</goal> </goals> @@ -109,6 +82,21 @@ </execution> </executions> </plugin> + <!-- 3) Generate the XAR (the xAr packaging does this but we need the definition below + to exclude translations since the Packager currently doesn't handle translated + resources and thus will fail in the database/ modules. --> + <plugin> + <groupId>com.xpn.xwiki.platform.tools</groupId> + <artifactId>xwiki-xar-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/Translations.fr</exclude> + <!-- Since we're excluding we also need to exclude the META-INF/ dir. It's a default + exclude but we're overriding it. --> + <exclude>**/META-INF/**</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> </project> _______________________________________________ notifications mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/notifications
