Author: tmortagne
Date: 2007-11-17 12:30:40 +0100 (Sat, 17 Nov 2007)
New Revision: 5989
Removed:
xwiki-products/xwiki-enterprise-manager/trunk/web-database/
Modified:
xwiki-products/xwiki-enterprise-manager/trunk/distribution/derby/src/assemble/application.xml
xwiki-products/xwiki-enterprise-manager/trunk/distribution/hsqldb/src/assemble/application.xml
xwiki-products/xwiki-enterprise-manager/trunk/distribution/mysql/src/assemble/application-no-database.xml
xwiki-products/xwiki-enterprise-manager/trunk/distribution/pgsql/src/assemble/application-no-database.xml
xwiki-products/xwiki-enterprise-manager/trunk/distribution/pom.xml
xwiki-products/xwiki-enterprise-manager/trunk/pom.xml
Log:
Remove web-database project.
Modified:
xwiki-products/xwiki-enterprise-manager/trunk/distribution/derby/src/assemble/application.xml
===================================================================
---
xwiki-products/xwiki-enterprise-manager/trunk/distribution/derby/src/assemble/application.xml
2007-11-17 10:16:45 UTC (rev 5988)
+++
xwiki-products/xwiki-enterprise-manager/trunk/distribution/derby/src/assemble/application.xml
2007-11-17 11:30:40 UTC (rev 5989)
@@ -32,10 +32,15 @@
not specified -->
<outputFileNameMapping></outputFileNameMapping>
<includes>
-
<include>com.xpn.xwiki.products:xwiki-enterprise-manager-web-${xwiki.db}</include>
+ <include>com.xpn.xwiki.products:xwiki-enterprise-manager-web</include>
</includes>
<outputDirectory>webapps/xwiki</outputDirectory>
<unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/hibernate.cfg.xml</exclude>
+ </excludes>
+ </unpackOptions>
</dependencySet>
<!-- Copy sh files so that we can set their permissions. This is required
since the
Assembly plugin looses file permissions.
@@ -75,6 +80,13 @@
</unpackOptions>
</dependencySet>
<dependencySet>
+ <includes>
+ <include>${xwiki.db.jdbc.groupId}:${xwiki.db.jdbc.artifactId}</include>
+ </includes>
+ <outputDirectory>webapps/xwiki/WEB-INF/lib</outputDirectory>
+ <unpack>false</unpack>
+ </dependencySet>
+ <dependencySet>
<!-- This shouldn't be required but there's a bug in version 2.2-beta-1
of the Assembly
plugin where the artifact name will be used instead of / if
outputFileNameMapping is
not specified -->
@@ -86,4 +98,10 @@
<unpack>true</unpack>
</dependencySet>
</dependencySets>
+ <files>
+ <file>
+
<source>${basedir}/target/maven-shared-archive-resources/hibernate.cfg.xml</source>
+ <outputDirectory>webapps/xwiki/WEB-INF</outputDirectory>
+ </file>
+ </files>
</assembly>
Modified:
xwiki-products/xwiki-enterprise-manager/trunk/distribution/hsqldb/src/assemble/application.xml
===================================================================
---
xwiki-products/xwiki-enterprise-manager/trunk/distribution/hsqldb/src/assemble/application.xml
2007-11-17 10:16:45 UTC (rev 5988)
+++
xwiki-products/xwiki-enterprise-manager/trunk/distribution/hsqldb/src/assemble/application.xml
2007-11-17 11:30:40 UTC (rev 5989)
@@ -32,10 +32,15 @@
not specified -->
<outputFileNameMapping></outputFileNameMapping>
<includes>
-
<include>com.xpn.xwiki.products:xwiki-enterprise-manager-web-${xwiki.db}</include>
+ <include>com.xpn.xwiki.products:xwiki-enterprise-manager-web</include>
</includes>
<outputDirectory>webapps/xwiki</outputDirectory>
<unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/hibernate.cfg.xml</exclude>
+ </excludes>
+ </unpackOptions>
</dependencySet>
<!-- Copy sh files so that we can set their permissions. This is required
since the
Assembly plugin looses file permissions.
@@ -75,6 +80,13 @@
</unpackOptions>
</dependencySet>
<dependencySet>
+ <includes>
+ <include>${xwiki.db.jdbc.groupId}:${xwiki.db.jdbc.artifactId}</include>
+ </includes>
+ <outputDirectory>webapps/xwiki/WEB-INF/lib</outputDirectory>
+ <unpack>false</unpack>
+ </dependencySet>
+ <dependencySet>
<!-- This shouldn't be required but there's a bug in version 2.2-beta-1
of the Assembly
plugin where the artifact name will be used instead of / if
outputFileNameMapping is
not specified -->
@@ -86,4 +98,10 @@
<unpack>true</unpack>
</dependencySet>
</dependencySets>
+ <files>
+ <file>
+
<source>${basedir}/target/maven-shared-archive-resources/hibernate.cfg.xml</source>
+ <outputDirectory>webapps/xwiki/WEB-INF</outputDirectory>
+ </file>
+ </files>
</assembly>
Modified:
xwiki-products/xwiki-enterprise-manager/trunk/distribution/mysql/src/assemble/application-no-database.xml
===================================================================
---
xwiki-products/xwiki-enterprise-manager/trunk/distribution/mysql/src/assemble/application-no-database.xml
2007-11-17 10:16:45 UTC (rev 5988)
+++
xwiki-products/xwiki-enterprise-manager/trunk/distribution/mysql/src/assemble/application-no-database.xml
2007-11-17 11:30:40 UTC (rev 5989)
@@ -32,10 +32,15 @@
not specified -->
<outputFileNameMapping></outputFileNameMapping>
<includes>
-
<include>com.xpn.xwiki.products:xwiki-enterprise-manager-web-${xwiki.db}</include>
+ <include>com.xpn.xwiki.products:xwiki-enterprise-manager-web</include>
</includes>
<outputDirectory>webapps/xwiki</outputDirectory>
<unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/hibernate.cfg.xml</exclude>
+ </excludes>
+ </unpackOptions>
</dependencySet>
<!-- Copy sh files so that we can set their permissions. This is required
since the
Assembly plugin looses file permissions.
@@ -74,5 +79,18 @@
</excludes>
</unpackOptions>
</dependencySet>
+ <dependencySet>
+ <includes>
+ <include>${xwiki.db.jdbc.groupId}:${xwiki.db.jdbc.artifactId}</include>
+ </includes>
+ <outputDirectory>webapps/xwiki/WEB-INF/lib</outputDirectory>
+ <unpack>false</unpack>
+ </dependencySet>
</dependencySets>
+ <files>
+ <file>
+
<source>${basedir}/target/maven-shared-archive-resources/hibernate.cfg.xml</source>
+ <outputDirectory>webapps/xwiki/WEB-INF/</outputDirectory>
+ </file>
+ </files>
</assembly>
Modified:
xwiki-products/xwiki-enterprise-manager/trunk/distribution/pgsql/src/assemble/application-no-database.xml
===================================================================
---
xwiki-products/xwiki-enterprise-manager/trunk/distribution/pgsql/src/assemble/application-no-database.xml
2007-11-17 10:16:45 UTC (rev 5988)
+++
xwiki-products/xwiki-enterprise-manager/trunk/distribution/pgsql/src/assemble/application-no-database.xml
2007-11-17 11:30:40 UTC (rev 5989)
@@ -32,10 +32,15 @@
not specified -->
<outputFileNameMapping></outputFileNameMapping>
<includes>
-
<include>com.xpn.xwiki.products:xwiki-enterprise-manager-web-${xwiki.db}</include>
+ <include>com.xpn.xwiki.products:xwiki-enterprise-manager-web</include>
</includes>
<outputDirectory>webapps/xwiki</outputDirectory>
<unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/hibernate.cfg.xml</exclude>
+ </excludes>
+ </unpackOptions>
</dependencySet>
<!-- Copy sh files so that we can set their permissions. This is required
since the
Assembly plugin looses file permissions.
@@ -74,5 +79,18 @@
</excludes>
</unpackOptions>
</dependencySet>
+ <dependencySet>
+ <includes>
+ <include>${xwiki.db.jdbc.groupId}:${xwiki.db.jdbc.artifactId}</include>
+ </includes>
+ <outputDirectory>webapps/xwiki/WEB-INF/lib</outputDirectory>
+ <unpack>false</unpack>
+ </dependencySet>
</dependencySets>
+ <files>
+ <file>
+
<source>${basedir}/target/maven-shared-archive-resources/hibernate.cfg.xml</source>
+ <outputDirectory>webapps/xwiki/WEB-INF/</outputDirectory>
+ </file>
+ </files>
</assembly>
Modified: xwiki-products/xwiki-enterprise-manager/trunk/distribution/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise-manager/trunk/distribution/pom.xml
2007-11-17 10:16:45 UTC (rev 5988)
+++ xwiki-products/xwiki-enterprise-manager/trunk/distribution/pom.xml
2007-11-17 11:30:40 UTC (rev 5989)
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>com.xpn.xwiki.products</groupId>
- <artifactId>xwiki-enterprise-manager-web-${xwiki.db}</artifactId>
+ <artifactId>xwiki-enterprise-manager-web</artifactId>
<version>${pom.version}</version>
<type>war</type>
</dependency>
@@ -45,12 +45,37 @@
<artifactId>xwiki-jetty-resources</artifactId>
<version>${platform.tools.version}</version>
</dependency>
+ <!-- Add the database JAR so that it's included in the expanded WAR since
it's not included
+ by default in the Platform WAR. -->
+ <dependency>
+ <groupId>${xwiki.db.jdbc.groupId}</groupId>
+ <artifactId>${xwiki.db.jdbc.artifactId}</artifactId>
+ <version>${xwiki.db.jdbc.version}</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
+ <!-- Inject Hibernate's configuration for the specified database -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -93,4 +118,4 @@
</modules>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Modified: xwiki-products/xwiki-enterprise-manager/trunk/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise-manager/trunk/pom.xml 2007-11-17
10:16:45 UTC (rev 5988)
+++ xwiki-products/xwiki-enterprise-manager/trunk/pom.xml 2007-11-17
11:30:40 UTC (rev 5989)
@@ -43,7 +43,6 @@
</scm>
<modules>
<module>web</module>
- <module>web-database</module>
<module>wikis</module>
<module>database</module>
<module>distribution</module>
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
