Author: jvelociter
Date: 2007-10-10 17:48:52 +0200 (Wed, 10 Oct 2007)
New Revision: 5356
Added:
xwiki-products/xwiki-watch/trunk/distribution/
xwiki-products/xwiki-watch/trunk/distribution/hsqldb/
xwiki-products/xwiki-watch/trunk/distribution/hsqldb/pom.xml
xwiki-products/xwiki-watch/trunk/distribution/hsqldb/src/
xwiki-products/xwiki-watch/trunk/distribution/hsqldb/src/assemble/
xwiki-products/xwiki-watch/trunk/distribution/hsqldb/src/assemble/application.xml
xwiki-products/xwiki-watch/trunk/distribution/mysql/
xwiki-products/xwiki-watch/trunk/distribution/mysql/pom.xml
xwiki-products/xwiki-watch/trunk/distribution/mysql/src/
xwiki-products/xwiki-watch/trunk/distribution/mysql/src/assemble/
xwiki-products/xwiki-watch/trunk/distribution/mysql/src/assemble/application-no-database.xml
xwiki-products/xwiki-watch/trunk/distribution/pom.xml
Log:
XWATCH-70: created a distribution module with hsqldb (with embed enterprise +
watch XAR) and mysql (no database) target distributions
Added: xwiki-products/xwiki-watch/trunk/distribution/hsqldb/pom.xml
===================================================================
--- xwiki-products/xwiki-watch/trunk/distribution/hsqldb/pom.xml
(rev 0)
+++ xwiki-products/xwiki-watch/trunk/distribution/hsqldb/pom.xml
2007-10-10 15:48:52 UTC (rev 5356)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ *
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<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-distribution</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>xwiki-watch-distribution-hsqldb</artifactId>
+ <name>XWiki Products - Watch - Distribution - HSQLDB</name>
+ <packaging>pom</packaging>
+ <description>XWiki Products - Watch - Distribution - HSQLDB</description>
+ <dependencies>
+ <dependency>
+ <groupId>com.xpn.xwiki.products</groupId>
+ <artifactId>xwiki-watch-database-${xwiki.db}</artifactId>
+ <version>${version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <!-- Inject Hibernate's configuration for the specified database -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/application.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added:
xwiki-products/xwiki-watch/trunk/distribution/hsqldb/src/assemble/application.xml
===================================================================
---
xwiki-products/xwiki-watch/trunk/distribution/hsqldb/src/assemble/application.xml
(rev 0)
+++
xwiki-products/xwiki-watch/trunk/distribution/hsqldb/src/assemble/application.xml
2007-10-10 15:48:52 UTC (rev 5356)
@@ -0,0 +1,107 @@
+<!--
+ *
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<assembly>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <dependencySets>
+ <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 -->
+ <outputFileNameMapping></outputFileNameMapping>
+ <includes>
+ <include>com.xpn.xwiki.products:xwiki-watch</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.
+ See http://jira.codehaus.org/browse/MASSEMBLY-238 -->
+ <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 -->
+ <outputFileNameMapping></outputFileNameMapping>
+ <includes>
+ <include>com.xpn.xwiki.platform:xwiki-jetty-resources</include>
+ </includes>
+ <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>**/*.sh</include>
+ </includes>
+ </unpackOptions>
+ <fileMode>755</fileMode>
+ </dependencySet>
+ <!-- Copy all other files (excluding sh files). See above for details. -->
+ <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 -->
+ <outputFileNameMapping></outputFileNameMapping>
+ <includes>
+ <include>com.xpn.xwiki.platform:xwiki-jetty-resources</include>
+ </includes>
+ <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/*.sh</exclude>
+ </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>
+ <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 -->
+ <outputFileNameMapping></outputFileNameMapping>
+ <includes>
+
<include>com.xpn.xwiki.products:xwiki-watch-database-${xwiki.db}</include>
+ </includes>
+ <outputDirectory>/database</outputDirectory>
+ <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>
Added: xwiki-products/xwiki-watch/trunk/distribution/mysql/pom.xml
===================================================================
--- xwiki-products/xwiki-watch/trunk/distribution/mysql/pom.xml
(rev 0)
+++ xwiki-products/xwiki-watch/trunk/distribution/mysql/pom.xml 2007-10-10
15:48:52 UTC (rev 5356)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ *
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<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-distribution</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>xwiki-watch-distribution-mysql</artifactId>
+ <name>XWiki Products - Watch - Distribution - MySQL</name>
+ <packaging>pom</packaging>
+ <description>XWiki Products - Watch - Distribution - MySQL</description>
+ <build>
+ <plugins>
+ <!-- Inject Hibernate's configuration for the specified database -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/application-no-database.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added:
xwiki-products/xwiki-watch/trunk/distribution/mysql/src/assemble/application-no-database.xml
===================================================================
---
xwiki-products/xwiki-watch/trunk/distribution/mysql/src/assemble/application-no-database.xml
(rev 0)
+++
xwiki-products/xwiki-watch/trunk/distribution/mysql/src/assemble/application-no-database.xml
2007-10-10 15:48:52 UTC (rev 5356)
@@ -0,0 +1,96 @@
+<!--
+ *
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<assembly>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <dependencySets>
+ <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 -->
+ <outputFileNameMapping></outputFileNameMapping>
+ <includes>
+ <include>com.xpn.xwiki.products:xwiki-watch</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.
+ See http://jira.codehaus.org/browse/MASSEMBLY-238 -->
+ <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 -->
+ <outputFileNameMapping></outputFileNameMapping>
+ <includes>
+ <include>com.xpn.xwiki.platform:xwiki-jetty-resources</include>
+ </includes>
+ <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <includes>
+ <include>**/*.sh</include>
+ </includes>
+ </unpackOptions>
+ <fileMode>755</fileMode>
+ </dependencySet>
+ <!-- Copy all other files (excluding sh files). See above for details. -->
+ <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 -->
+ <outputFileNameMapping></outputFileNameMapping>
+ <includes>
+ <include>com.xpn.xwiki.platform:xwiki-jetty-resources</include>
+ </includes>
+ <outputDirectory>/</outputDirectory>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>**/*.sh</exclude>
+ </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>
Added: xwiki-products/xwiki-watch/trunk/distribution/pom.xml
===================================================================
--- xwiki-products/xwiki-watch/trunk/distribution/pom.xml
(rev 0)
+++ xwiki-products/xwiki-watch/trunk/distribution/pom.xml 2007-10-10
15:48:52 UTC (rev 5356)
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ *
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+-->
+
+<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-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>xwiki-watch-distribution</artifactId>
+ <name>XWiki Products - Watch - Distribution - Parent POM</name>
+ <packaging>pom</packaging>
+ <description>XWiki Products - Watch - Distribution - Parent POM</description>
+ <dependencies>
+ <dependency>
+ <groupId>com.xpn.xwiki.products</groupId>
+ <artifactId>xwiki-watch</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>com.xpn.xwiki.platform</groupId>
+ <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 XEM 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
(hibernate.cfg.xml) -->
+ <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>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <profile>
+ <id>hsqldb</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>hsqldb</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>mysql</id>
+ <modules>
+ <module>mysql</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
