Author: vmassol
Date: 2007-11-18 23:04:23 +0100 (Sun, 18 Nov 2007)
New Revision: 6001
Modified:
xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
xwiki-products/xwiki-enterprise/trunk/installers/generic/src/main/resources/install.xml
Log:
Fix bug in generic installer introduced when the new WE web/ module was added.
Also for some reason the correct hibernate file was not getting copied.
Modified: xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
2007-11-17 14:27:26 UTC (rev 6000)
+++ xwiki-products/xwiki-enterprise/trunk/installers/generic/pom.xml
2007-11-18 22:04:23 UTC (rev 6001)
@@ -64,9 +64,9 @@
<outputDirectory>${project.build.directory}/container</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>com.xpn.xwiki.platform</groupId>
- <artifactId>xwiki-web-standard</artifactId>
- <version>${platform.web.version}</version>
+ <groupId>com.xpn.xwiki.products</groupId>
+ <artifactId>xwiki-enterprise-web</artifactId>
+ <version>${version}</version>
<type>war</type>
<outputDirectory>${project.build.directory}/container/webapps/xwiki</outputDirectory>
</artifactItem>
@@ -78,9 +78,6 @@
<outputDirectory>${project.build.directory}/database</outputDirectory>
</artifactItem>
</artifactItems>
- <!-- Exclude default Hibernate config file since we're instead
using one with the
- selected database configuration defined -->
- <excludes>**/hibernate.cfg.xml</excludes>
</configuration>
</execution>
<execution>
Modified:
xwiki-products/xwiki-enterprise/trunk/installers/generic/src/main/resources/install.xml
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/installers/generic/src/main/resources/install.xml
2007-11-17 14:27:26 UTC (rev 6000)
+++
xwiki-products/xwiki-enterprise/trunk/installers/generic/src/main/resources/install.xml
2007-11-18 22:04:23 UTC (rev 6001)
@@ -52,7 +52,7 @@
<file src="${xwiki.readme}" targetdir="$INSTALL_PATH"/>
<file src="${xwiki.license}" targetdir="$INSTALL_PATH"/>
<fileset dir="${xwiki.container}" targetdir="$INSTALL_PATH"
override="true"/>
- <file src="${xwiki.hibernate}"
targetdir="$INSTALL_PATH/webapps/xwiki/WEB-INF"/>
+ <file src="${xwiki.hibernate}"
targetdir="$INSTALL_PATH/webapps/xwiki/WEB-INF" override="true"/>
<!-- Set execute permissions for .sh files -->
<executable targetfile="$INSTALL_PATH/start_xwiki.sh" stage="never"/>
<executable targetfile="$INSTALL_PATH/stop_xwiki.sh" stage="never"/>
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
