Author: jvelociter
Date: 2007-10-10 17:51:53 +0200 (Wed, 10 Oct 2007)
New Revision: 5357
Modified:
xwiki-products/xwiki-watch/trunk/pom.xml
xwiki-products/xwiki-watch/trunk/web/pom.xml
Log:
XWATCH-68: Added xwiki standard web dependency and configuration injection to
the web module. Update the parent POM to build database and distribution modules
Modified: xwiki-products/xwiki-watch/trunk/pom.xml
===================================================================
--- xwiki-products/xwiki-watch/trunk/pom.xml 2007-10-10 15:48:52 UTC (rev
5356)
+++ xwiki-products/xwiki-watch/trunk/pom.xml 2007-10-10 15:51:53 UTC (rev
5357)
@@ -51,6 +51,8 @@
<modules>
<module>web</module>
<module>wiki</module>
+ <module>database</module>
+ <module>distribution</module>
</modules>
<build>
<extensions>
Modified: xwiki-products/xwiki-watch/trunk/web/pom.xml
===================================================================
--- xwiki-products/xwiki-watch/trunk/web/pom.xml 2007-10-10 15:48:52 UTC
(rev 5356)
+++ xwiki-products/xwiki-watch/trunk/web/pom.xml 2007-10-10 15:51:53 UTC
(rev 5357)
@@ -79,7 +79,13 @@
<version>${platform.web.version}</version>
<classifier>sources</classifier>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>com.xpn.xwiki.platform</groupId>
+ <artifactId>xwiki-web-standard</artifactId>
+ <version>${platform.web.version}</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<!-- Download and unpack the GWT compiler -->
@@ -136,10 +142,59 @@
</goals>
</execution>
</executions>
+ </plugin>
+ <!-- Inject XWiki's configuration (only xwiki.cfg, not
hibernate.cfg.xml) -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- The remote resources plugin adds its output directory as a
resource directory
+ so that the Maven resources plugin copies these resources to
target/classes.
+ However copying them to target/classes will make them appear
in WEB-INF/classes
+ in the generated WAR since the WAR plugin copies resources in
target/classes in
+ WEB-INF/classes. Thus to prevent this we're binding this
execution to a phase
+ that comes after the execution of the resources plugin (which
executes in the
+ process-resources phase). Thus this remote resources plugin
will execute just
+ after the resources plugin and the resources won't be copied,
which is why we're
+ adding a webResource configuration element below in the WAR
plugin's
+ configuration. -->
+ <phase>process-resources</phase>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle>
+ </resourceBundles>
+ <properties>
+ <xwikiCfgPlugins>
+ com.xpn.xwiki.plugin.feed.FeedPlugin,
+ com.xpn.xwiki.plugin.zipexplorer.ZipExplorerPlugin
+ </xwikiCfgPlugins>
+ </properties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+
<directory>${project.build.directory}/maven-shared-archive-resources</directory>
+ <targetPath>WEB-INF</targetPath>
+ <includes>
+ <include>xwiki.cfg</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
</plugin>
</plugins>
</build>
- <profiles>
+ <profiles>
<profile>
<id>linux</id>
<activation>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
