[xwiki-notifications] r6609 - in xwiki-products/xwiki-enterprise/tags: . xwiki-enterprise-1.2-rc-2 xwiki-enterprise-1.2-rc-2/database xwiki-enterprise-1.2-rc-2/database/hsqldb xwiki-enterprise-1.2-rc-2/distribution xwiki-enterprise-1.2-rc-2/distribution/hsqldb xwiki-enterprise-1.2-rc-2/distribution-test xwiki-enterprise-1.2-rc-2/distribution-test/selenium-tests xwiki-enterprise-1.2-rc-2/distribution-test/xmlrpc-tests xwiki-enterprise-1.2-rc-2/installers xwiki-enterprise-1.2-rc-2/installers/generic xwiki-enterprise-1.2-rc-2/installers/windows xwiki-enterprise-1.2-rc-2/web xwiki-enterprise-1.2-rc-2/wiki

vmassol (SVN) notifications at xwiki.org
Thu Jan 3 12:00:50 CET 2008


Author: vmassol
Date: 2008-01-03 12:00:50 +0100 (Thu, 03 Jan 2008)
New Revision: 6609

Added:
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/selenium-tests/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/xmlrpc-tests/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/generic/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/windows/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/web/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/web/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/wiki/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/wiki/pom.xml
Removed:
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/selenium-tests/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/xmlrpc-tests/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/hsqldb/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/generic/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/windows/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/web/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/web/pom.xml
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/wiki/
   xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/wiki/pom.xml
Log:
[maven-release-plugin]  copy for tag xwiki-enterprise-1.2-rc-2

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2 (from rev 6593, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2)

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database (from rev 6592, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/database)

Deleted: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/hsqldb/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/database/hsqldb/pom.xml	2008-01-02 15:59:23 UTC (rev 6592)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/hsqldb/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -1,96 +0,0 @@
-<?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-enterprise-database</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-enterprise-database-hsqldb</artifactId>
-  <name>XWiki Products - Enterprise - Database - HSQLDB</name>
-  <packaging>pom</packaging>
-  <description>XWiki Products - Enterprise - Database - HSQLDB</description>
-  <!-- Required for the exec:exec plugin execution below. Doesn't seem to work as an exec plugin
-       dependency -->
-  <dependencies>
-    <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.8.0.7</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <!-- Step 1: Copy and filter the Hibernate config file which will be used by the packager
-           plugin -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <configuration>
-          <properties>
-            <xwikiDbConnectionUrl>jdbc:hsqldb:file:${project.build.directory}/database/xwiki_db;shutdown=true</xwikiDbConnectionUrl>
-          </properties>
-        </configuration>
-      </plugin>
-      <!-- Step 2: Expand the XAR file -->
-      <plugin>
-        <groupId>com.xpn.xwiki.platform</groupId>
-        <artifactId>xwiki-build-xar-plugin</artifactId>
-      </plugin>
-      <!-- Step 3: Import the XAR content into the Database -->
-      <plugin>
-        <groupId>com.xpn.xwiki.platform</groupId>
-        <artifactId>xwiki-packager</artifactId>
-      </plugin>
-      <!-- Step 4: Zip the generated database -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-      </plugin>
-      <!-- Useful for debugging. Starts a GUI admin application to browse the HSQL DB -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <configuration>
-          <executable>java</executable>
-          <arguments>
-            <argument>-classpath</argument>
-            <!-- automatically creates the classpath using all project dependencies,
-                 also adding the project build directory -->
-            <classpath />
-            <argument>org.hsqldb.util.DatabaseManager</argument>
-            <argument>-driver</argument>
-            <argument>org.hsqldb.jdbcDriver</argument>
-            <argument>-url</argument>
-            <argument>jdbc:hsqldb:target/database/xwiki_db</argument>
-            <argument>-user</argument>
-            <argument>sa</argument>
-          </arguments>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/hsqldb/pom.xml (from rev 6608, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/database/hsqldb/pom.xml)
===================================================================
--- xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/hsqldb/pom.xml	                        (rev 0)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/hsqldb/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -0,0 +1,96 @@
+<?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-enterprise-database</artifactId>
+    <version>1.2-rc-2</version>
+  </parent>
+  <artifactId>xwiki-enterprise-database-hsqldb</artifactId>
+  <name>XWiki Products - Enterprise - Database - HSQLDB</name>
+  <packaging>pom</packaging>
+  <description>XWiki Products - Enterprise - Database - HSQLDB</description>
+  <!-- Required for the exec:exec plugin execution below. Doesn't seem to work as an exec plugin
+       dependency -->
+  <dependencies>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.8.0.7</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <!-- Step 1: Copy and filter the Hibernate config file which will be used by the packager
+           plugin -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <configuration>
+          <properties>
+            <xwikiDbConnectionUrl>jdbc:hsqldb:file:${project.build.directory}/database/xwiki_db;shutdown=true</xwikiDbConnectionUrl>
+          </properties>
+        </configuration>
+      </plugin>
+      <!-- Step 2: Expand the XAR file -->
+      <plugin>
+        <groupId>com.xpn.xwiki.platform</groupId>
+        <artifactId>xwiki-build-xar-plugin</artifactId>
+      </plugin>
+      <!-- Step 3: Import the XAR content into the Database -->
+      <plugin>
+        <groupId>com.xpn.xwiki.platform</groupId>
+        <artifactId>xwiki-packager</artifactId>
+      </plugin>
+      <!-- Step 4: Zip the generated database -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+      </plugin>
+      <!-- Useful for debugging. Starts a GUI admin application to browse the HSQL DB -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <configuration>
+          <executable>java</executable>
+          <arguments>
+            <argument>-classpath</argument>
+            <!-- automatically creates the classpath using all project dependencies,
+                 also adding the project build directory -->
+            <classpath />
+            <argument>org.hsqldb.util.DatabaseManager</argument>
+            <argument>-driver</argument>
+            <argument>org.hsqldb.jdbcDriver</argument>
+            <argument>-url</argument>
+            <argument>jdbc:hsqldb:target/database/xwiki_db</argument>
+            <argument>-user</argument>
+            <argument>sa</argument>
+          </arguments>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file

Deleted: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/database/pom.xml	2008-01-02 15:59:23 UTC (rev 6592)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -1,161 +0,0 @@
-<?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-enterprise-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-enterprise-database</artifactId>
-  <name>XWiki Products - Enterprise - Database - Parent POM</name>
-  <packaging>pom</packaging>
-  <description>XWiki Products - Enterprise - Database - Parent POM</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.xpn.xwiki.products</groupId>
-      <artifactId>xwiki-enterprise-wiki</artifactId>
-      <version>${pom.version}</version>
-      <type>xar</type>
-    </dependency>
-  </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <!-- Step 1: Copy and filter the Hibernate config file which will be used by the packager
-       plugin -->
-        <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>
-        <!-- Step 2: Expand the XAR file -->
-        <plugin>
-          <groupId>com.xpn.xwiki.platform</groupId>
-          <artifactId>xwiki-build-xar-plugin</artifactId>
-          <version>${platform.tools.version}</version>
-          <configuration>
-            <groupId>com.xpn.xwiki.products</groupId>
-            <artifactId>xwiki-enterprise-wiki</artifactId>
-            <outputDirectory>${project.build.directory}/xar</outputDirectory>
-          </configuration>
-          <executions>
-            <execution>
-              <phase>prepare-package</phase>
-              <goals>
-                <goal>unxar</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <!-- Step 3: Import the XAR content into the Database -->
-        <plugin>
-          <groupId>com.xpn.xwiki.platform</groupId>
-          <artifactId>xwiki-packager</artifactId>
-          <version>${platform.tools.version}</version>
-          <configuration>
-            <sourceDirectory>${project.build.directory}/xar</sourceDirectory>
-            <hibernateConfig>
-              ${project.build.directory}/maven-shared-archive-resources/hibernate.cfg.xml
-            </hibernateConfig>
-          </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>${xwiki.db.jdbc.groupId}</groupId>
-              <artifactId>${xwiki.db.jdbc.artifactId}</artifactId>
-              <version>${xwiki.db.jdbc.version}</version>
-            </dependency>
-          </dependencies>
-          <executions>
-            <execution>
-              <phase>prepare-package</phase>
-              <goals>
-                <goal>import</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <!-- Step 4: Zip the generated database (for embedded databases only) -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <configuration>
-            <descriptors>
-              <descriptor>${basedir}/src/assemble/database.xml</descriptor>
-            </descriptors>
-          </configuration>
-          <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>derby</id>
-      <modules>
-        <module>derby</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>pgsql</id>
-      <modules>
-        <module>pgsql</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>mysql</id>
-      <modules>
-        <module>mysql</module>
-      </modules>
-    </profile>
-  </profiles>
-</project>
\ No newline at end of file

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/pom.xml (from rev 6608, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/database/pom.xml)
===================================================================
--- xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/pom.xml	                        (rev 0)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/database/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -0,0 +1,161 @@
+<?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-enterprise-parent</artifactId>
+    <version>1.2-rc-2</version>
+  </parent>
+  <artifactId>xwiki-enterprise-database</artifactId>
+  <name>XWiki Products - Enterprise - Database - Parent POM</name>
+  <packaging>pom</packaging>
+  <description>XWiki Products - Enterprise - Database - Parent POM</description>
+  <dependencies>
+    <dependency>
+      <groupId>com.xpn.xwiki.products</groupId>
+      <artifactId>xwiki-enterprise-wiki</artifactId>
+      <version>${pom.version}</version>
+      <type>xar</type>
+    </dependency>
+  </dependencies>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <!-- Step 1: Copy and filter the Hibernate config file which will be used by the packager
+       plugin -->
+        <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>
+        <!-- Step 2: Expand the XAR file -->
+        <plugin>
+          <groupId>com.xpn.xwiki.platform</groupId>
+          <artifactId>xwiki-build-xar-plugin</artifactId>
+          <version>${platform.tools.version}</version>
+          <configuration>
+            <groupId>com.xpn.xwiki.products</groupId>
+            <artifactId>xwiki-enterprise-wiki</artifactId>
+            <outputDirectory>${project.build.directory}/xar</outputDirectory>
+          </configuration>
+          <executions>
+            <execution>
+              <phase>prepare-package</phase>
+              <goals>
+                <goal>unxar</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <!-- Step 3: Import the XAR content into the Database -->
+        <plugin>
+          <groupId>com.xpn.xwiki.platform</groupId>
+          <artifactId>xwiki-packager</artifactId>
+          <version>${platform.tools.version}</version>
+          <configuration>
+            <sourceDirectory>${project.build.directory}/xar</sourceDirectory>
+            <hibernateConfig>
+              ${project.build.directory}/maven-shared-archive-resources/hibernate.cfg.xml
+            </hibernateConfig>
+          </configuration>
+          <dependencies>
+            <dependency>
+              <groupId>${xwiki.db.jdbc.groupId}</groupId>
+              <artifactId>${xwiki.db.jdbc.artifactId}</artifactId>
+              <version>${xwiki.db.jdbc.version}</version>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <phase>prepare-package</phase>
+              <goals>
+                <goal>import</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <!-- Step 4: Zip the generated database (for embedded databases only) -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <configuration>
+            <descriptors>
+              <descriptor>${basedir}/src/assemble/database.xml</descriptor>
+            </descriptors>
+          </configuration>
+          <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>derby</id>
+      <modules>
+        <module>derby</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>pgsql</id>
+      <modules>
+        <module>pgsql</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>mysql</id>
+      <modules>
+        <module>mysql</module>
+      </modules>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution (from rev 6592, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution)

Deleted: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/hsqldb/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution/hsqldb/pom.xml	2008-01-02 15:59:23 UTC (rev 6592)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/hsqldb/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -1,62 +0,0 @@
-<?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-enterprise</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-enterprise-hsqldb</artifactId>
-  <name>XWiki Products - Enterprise - Distribution - HSQLDB</name>
-  <packaging>pom</packaging>
-  <description>XWiki Products - Enterprise - Distribution - HSQLDB</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.xpn.xwiki.products</groupId>
-      <artifactId>xwiki-enterprise-database-${xwiki.db}</artifactId>
-      <version>${pom.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>

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/hsqldb/pom.xml (from rev 6608, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution/hsqldb/pom.xml)
===================================================================
--- xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/hsqldb/pom.xml	                        (rev 0)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/hsqldb/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -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-enterprise</artifactId>
+    <version>1.2-rc-2</version>
+  </parent>
+  <artifactId>xwiki-enterprise-hsqldb</artifactId>
+  <name>XWiki Products - Enterprise - Distribution - HSQLDB</name>
+  <packaging>pom</packaging>
+  <description>XWiki Products - Enterprise - Distribution - HSQLDB</description>
+  <dependencies>
+    <dependency>
+      <groupId>com.xpn.xwiki.products</groupId>
+      <artifactId>xwiki-enterprise-database-${xwiki.db}</artifactId>
+      <version>${pom.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>

Deleted: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution/pom.xml	2008-01-02 15:59:23 UTC (rev 6592)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -1,121 +0,0 @@
-<?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-enterprise-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-enterprise</artifactId>
-  <name>XWiki Products - Enterprise - Distribution - Parent POM</name>
-  <packaging>pom</packaging>
-  <description>XWiki Products - Enterprise - Distribution - Parent POM</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.xpn.xwiki.products</groupId>
-      <artifactId>xwiki-enterprise-web</artifactId>
-      <version>${pom.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 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>
-              <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>derby</id>
-      <modules>
-        <module>derby</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>pgsql</id>
-      <modules>
-        <module>pgsql</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>mysql</id>
-      <modules>
-        <module>mysql</module>
-      </modules>
-    </profile>
-  </profiles>
-</project>
\ No newline at end of file

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/pom.xml (from rev 6608, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution/pom.xml)
===================================================================
--- xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/pom.xml	                        (rev 0)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -0,0 +1,121 @@
+<?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-enterprise-parent</artifactId>
+    <version>1.2-rc-2</version>
+  </parent>
+  <artifactId>xwiki-enterprise</artifactId>
+  <name>XWiki Products - Enterprise - Distribution - Parent POM</name>
+  <packaging>pom</packaging>
+  <description>XWiki Products - Enterprise - Distribution - Parent POM</description>
+  <dependencies>
+    <dependency>
+      <groupId>com.xpn.xwiki.products</groupId>
+      <artifactId>xwiki-enterprise-web</artifactId>
+      <version>${pom.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 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>
+              <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>derby</id>
+      <modules>
+        <module>derby</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>pgsql</id>
+      <modules>
+        <module>pgsql</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>mysql</id>
+      <modules>
+        <module>mysql</module>
+      </modules>
+    </profile>
+  </profiles>
+</project>
\ No newline at end of file

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test (from rev 6592, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test)

Deleted: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/pom.xml	2008-01-02 15:59:23 UTC (rev 6592)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -1,199 +0,0 @@
-<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-enterprise-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-enterprise-test</artifactId>
-  <name>XWiki Products - Enterprise - Functional Tests</name>
-  <packaging>pom</packaging>
-  <description>XWiki Products - Enterprise - Functional Tests</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.xpn.xwiki.platform</groupId>
-      <artifactId>xwiki-shared-test</artifactId>
-      <version>${platform.tools.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <testSourceDirectory>src/test/it</testSourceDirectory>
-    <pluginManagement>
-      <plugins>
-        <!--  Force compilation of tests as the packaging being pom tests won't be compiled
-          with the default pom lifecycle -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <executions>
-            <execution>
-              <goals>
-                <goal>testCompile</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <!--  Force copy of test resources file as the packaging being pom resource files won't
-          be copied with the default pom lifecycle -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <executions>
-            <execution>
-              <!--phase>process-test-resources</phase-->
-              <goals>
-                <goal>testResources</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <!-- Create jar containing integration tests which will be installed -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <executions>
-            <execution>
-              <goals>
-                <goal>test-jar</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <!-- Unpack the XWiki application -->
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>dependency-maven-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>unzip-application</id>
-              <phase>pre-integration-test</phase>
-              <goals>
-                <goal>unpack</goal>
-              </goals>
-              <configuration>
-                <artifactItems>
-                  <artifactItem>
-                    <groupId>com.xpn.xwiki.products</groupId>
-                    <artifactId>xwiki-enterprise-${xwiki.db}</artifactId>
-                    <version>${pom.version}</version>
-                    <type>zip</type>
-                  </artifactItem>
-                </artifactItems>
-                <outputDirectory>${project.build.directory}</outputDirectory>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <!-- Start XWiki, Execute the tests and Stop XWiki.
-          Note: To execute a single test case run mvn install -Dpattern=<test name>
-          For example: mvn install -Dpattern=DeletePageTest
-          For example: mvn install -Dpattern=.*Wysiwyg.*
-        -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <executions>
-            <execution>
-              <phase>integration-test</phase>
-              <goals>
-                <goal>test</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <includes>
-              <include>**/AllTests.java</include>
-            </includes>
-            <systemProperties>
-              <property>
-                <name>pattern</name>
-                <value>${pattern}</value>
-              </property>
-              <property>
-                <name>xwikiPort</name>
-                <value>${port}</value>
-              </property>
-              <property>
-                <name>xwikiExecutionDirectory</name>
-                <value>${basedir}/target/xwiki-enterprise-${xwiki.db}-${pom.version}</value>
-              </property>
-              <property>
-                <name>xwikiExecutionStartCommand</name>
-                <value>${xwikiExecutionStartCommand}</value>
-              </property>
-              <property>
-                <name>xwikiExecutionStopCommand</name>
-                <value>${xwikiExecutionStopCommand}</value>
-              </property>
-              <property>
-                <name>debug</name>
-                <value>${debug}</value>
-              </property>
-              <!-- TODO: Find way to have maven merge properties and move this to the selenium-tests module -->
-              <property>
-                <name>browser</name>
-                <value>${browser}</value>
-              </property>
-              <!-- Used only in xml-rpc tests -->
-              <property>
-                <name>pathToXWikiXar</name>
-                <value>com/xpn/xwiki/products/xwiki-enterprise-wiki/${pom.version}/xwiki-enterprise-wiki-${pom.version}.xar</value>
-              </property>
-            </systemProperties>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <properties>
-    <!-- This is to allow users to override this property on the command line to choose what
-      test to run. For example to run only the DeletePageTest you would type:
-      mvn install -DPattern=DeletePageTest
-    -->
-    <pattern>.*</pattern>
-    <port>8080</port>
-  </properties>
-  <profiles>
-    <profile>
-      <id>unix</id>
-      <activation>
-        <os>
-          <family>unix</family>
-        </os>
-      </activation>
-      <properties>
-        <xwikiExecutionStartCommand>sh -f start_xwiki.sh ${port}</xwikiExecutionStartCommand>
-        <xwikiExecutionStopCommand>sh -f stop_xwiki.sh</xwikiExecutionStopCommand>
-      </properties>
-    </profile>
-    <profile>
-      <id>mac</id>
-      <activation>
-        <os>
-          <family>mac</family>
-        </os>
-      </activation>
-      <properties>
-        <xwikiExecutionStartCommand>sh -f start_xwiki.sh ${port}</xwikiExecutionStartCommand>
-        <xwikiExecutionStopCommand>sh -f stop_xwiki.sh</xwikiExecutionStopCommand>
-      </properties>
-    </profile>
-    <profile>
-      <id>windows</id>
-      <activation>
-        <os>
-          <family>windows</family>
-        </os>
-      </activation>
-      <properties>
-        <xwikiExecutionStartCommand>cmd /c start_xwiki.bat ${port}</xwikiExecutionStartCommand>
-        <xwikiExecutionStopCommand>cmd /c stop_xwiki.bat</xwikiExecutionStopCommand>
-      </properties>
-    </profile>
-  </profiles>
-  <modules>
-    <module>xmlrpc-tests</module>
-    <module>selenium-tests</module>
-  </modules>
-</project>
\ No newline at end of file

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/pom.xml (from rev 6608, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/pom.xml)
===================================================================
--- xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/pom.xml	                        (rev 0)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -0,0 +1,199 @@
+<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-enterprise-parent</artifactId>
+    <version>1.2-rc-2</version>
+  </parent>
+  <artifactId>xwiki-enterprise-test</artifactId>
+  <name>XWiki Products - Enterprise - Functional Tests</name>
+  <packaging>pom</packaging>
+  <description>XWiki Products - Enterprise - Functional Tests</description>
+  <dependencies>
+    <dependency>
+      <groupId>com.xpn.xwiki.platform</groupId>
+      <artifactId>xwiki-shared-test</artifactId>
+      <version>${platform.tools.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <testSourceDirectory>src/test/it</testSourceDirectory>
+    <pluginManagement>
+      <plugins>
+        <!--  Force compilation of tests as the packaging being pom tests won't be compiled
+          with the default pom lifecycle -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <executions>
+            <execution>
+              <goals>
+                <goal>testCompile</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <!--  Force copy of test resources file as the packaging being pom resource files won't
+          be copied with the default pom lifecycle -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <executions>
+            <execution>
+              <!--phase>process-test-resources</phase-->
+              <goals>
+                <goal>testResources</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <!-- Create jar containing integration tests which will be installed -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <executions>
+            <execution>
+              <goals>
+                <goal>test-jar</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <!-- Unpack the XWiki application -->
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>dependency-maven-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>unzip-application</id>
+              <phase>pre-integration-test</phase>
+              <goals>
+                <goal>unpack</goal>
+              </goals>
+              <configuration>
+                <artifactItems>
+                  <artifactItem>
+                    <groupId>com.xpn.xwiki.products</groupId>
+                    <artifactId>xwiki-enterprise-${xwiki.db}</artifactId>
+                    <version>${pom.version}</version>
+                    <type>zip</type>
+                  </artifactItem>
+                </artifactItems>
+                <outputDirectory>${project.build.directory}</outputDirectory>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <!-- Start XWiki, Execute the tests and Stop XWiki.
+          Note: To execute a single test case run mvn install -Dpattern=<test name>
+          For example: mvn install -Dpattern=DeletePageTest
+          For example: mvn install -Dpattern=.*Wysiwyg.*
+        -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <executions>
+            <execution>
+              <phase>integration-test</phase>
+              <goals>
+                <goal>test</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <includes>
+              <include>**/AllTests.java</include>
+            </includes>
+            <systemProperties>
+              <property>
+                <name>pattern</name>
+                <value>${pattern}</value>
+              </property>
+              <property>
+                <name>xwikiPort</name>
+                <value>${port}</value>
+              </property>
+              <property>
+                <name>xwikiExecutionDirectory</name>
+                <value>${basedir}/target/xwiki-enterprise-${xwiki.db}-${pom.version}</value>
+              </property>
+              <property>
+                <name>xwikiExecutionStartCommand</name>
+                <value>${xwikiExecutionStartCommand}</value>
+              </property>
+              <property>
+                <name>xwikiExecutionStopCommand</name>
+                <value>${xwikiExecutionStopCommand}</value>
+              </property>
+              <property>
+                <name>debug</name>
+                <value>${debug}</value>
+              </property>
+              <!-- TODO: Find way to have maven merge properties and move this to the selenium-tests module -->
+              <property>
+                <name>browser</name>
+                <value>${browser}</value>
+              </property>
+              <!-- Used only in xml-rpc tests -->
+              <property>
+                <name>pathToXWikiXar</name>
+                <value>com/xpn/xwiki/products/xwiki-enterprise-wiki/${pom.version}/xwiki-enterprise-wiki-${pom.version}.xar</value>
+              </property>
+            </systemProperties>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  <properties>
+    <!-- This is to allow users to override this property on the command line to choose what
+      test to run. For example to run only the DeletePageTest you would type:
+      mvn install -DPattern=DeletePageTest
+    -->
+    <pattern>.*</pattern>
+    <port>8080</port>
+  </properties>
+  <profiles>
+    <profile>
+      <id>unix</id>
+      <activation>
+        <os>
+          <family>unix</family>
+        </os>
+      </activation>
+      <properties>
+        <xwikiExecutionStartCommand>sh -f start_xwiki.sh ${port}</xwikiExecutionStartCommand>
+        <xwikiExecutionStopCommand>sh -f stop_xwiki.sh</xwikiExecutionStopCommand>
+      </properties>
+    </profile>
+    <profile>
+      <id>mac</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <properties>
+        <xwikiExecutionStartCommand>sh -f start_xwiki.sh ${port}</xwikiExecutionStartCommand>
+        <xwikiExecutionStopCommand>sh -f stop_xwiki.sh</xwikiExecutionStopCommand>
+      </properties>
+    </profile>
+    <profile>
+      <id>windows</id>
+      <activation>
+        <os>
+          <family>windows</family>
+        </os>
+      </activation>
+      <properties>
+        <xwikiExecutionStartCommand>cmd /c start_xwiki.bat ${port}</xwikiExecutionStartCommand>
+        <xwikiExecutionStopCommand>cmd /c stop_xwiki.bat</xwikiExecutionStopCommand>
+      </properties>
+    </profile>
+  </profiles>
+  <modules>
+    <module>xmlrpc-tests</module>
+    <module>selenium-tests</module>
+  </modules>
+</project>
\ No newline at end of file

Deleted: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/selenium-tests/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/selenium-tests/pom.xml	2008-01-02 15:59:23 UTC (rev 6592)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/selenium-tests/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -1,109 +0,0 @@
-<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-enterprise-test</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-enterprise-test-selenium</artifactId>
-  <name>XWiki Products - Enterprise - Functional Selenium Tests</name>
-  <packaging>pom</packaging>
-  <description>XWiki Products - Enterprise - Functional Selenium Tests</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.openqa.selenium.client-drivers</groupId>
-      <artifactId>selenium-java-client-driver</artifactId>
-      <version>0.9.2</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <!-- Step 1: Compile the JUnit Selenium Tests -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <!-- Step 2: Create jar containing integration tests which will be installed -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <!-- Step 3: Unpack the application -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>dependency-maven-plugin</artifactId>
-      </plugin>
-      <!-- Step 4: Start Selenium -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>selenium-maven-plugin</artifactId>
-        <version>1.0-beta-2</version>
-        <executions>
-          <execution>
-            <id>start-selenium</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>start-server</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <background>true</background>
-          <multiWindow>true</multiWindow>
-          <port>4444</port>
-        </configuration>
-      </plugin>
-      <!-- Step 5: Start XWiki, Execute the tests and Stop XWiki -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>firefox</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <browser>*firefox</browser>
-      </properties>
-    </profile>
-    <profile>
-      <id>iexplore</id>
-      <properties>
-        <browser>*iexplore</browser>
-      </properties>
-    </profile>
-    <profile>
-      <id>konqueror</id>
-      <properties>
-        <browser>*konqueror</browser>
-      </properties>
-    </profile>
-    <profile>
-      <id>otherbrowser</id>
-      <properties>
-        <browser>*custom ${browserPath}</browser>
-      </properties>
-    </profile>
-  </profiles>
-  <repositories>
-    <repository>
-      <id>openqa.org</id>
-      <name>Openqa Repository</name>
-      <url>http://maven.openqa.org</url>
-      <layout>default</layout>
-      <snapshots>
-        <enabled>true</enabled>
-        <updatePolicy>daily</updatePolicy>
-        <checksumPolicy>ignore</checksumPolicy>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-</project>
\ No newline at end of file

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/selenium-tests/pom.xml (from rev 6608, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/selenium-tests/pom.xml)
===================================================================
--- xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/selenium-tests/pom.xml	                        (rev 0)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/selenium-tests/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -0,0 +1,109 @@
+<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-enterprise-test</artifactId>
+    <version>1.2-rc-2</version>
+  </parent>
+  <artifactId>xwiki-enterprise-test-selenium</artifactId>
+  <name>XWiki Products - Enterprise - Functional Selenium Tests</name>
+  <packaging>pom</packaging>
+  <description>XWiki Products - Enterprise - Functional Selenium Tests</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.openqa.selenium.client-drivers</groupId>
+      <artifactId>selenium-java-client-driver</artifactId>
+      <version>0.9.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <!-- Step 1: Compile the JUnit Selenium Tests -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <!-- Step 2: Create jar containing integration tests which will be installed -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+      <!-- Step 3: Unpack the application -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>dependency-maven-plugin</artifactId>
+      </plugin>
+      <!-- Step 4: Start Selenium -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
+        <version>1.0-beta-2</version>
+        <executions>
+          <execution>
+            <id>start-selenium</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start-server</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <background>true</background>
+          <multiWindow>true</multiWindow>
+          <port>4444</port>
+        </configuration>
+      </plugin>
+      <!-- Step 5: Start XWiki, Execute the tests and Stop XWiki -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>firefox</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <browser>*firefox</browser>
+      </properties>
+    </profile>
+    <profile>
+      <id>iexplore</id>
+      <properties>
+        <browser>*iexplore</browser>
+      </properties>
+    </profile>
+    <profile>
+      <id>konqueror</id>
+      <properties>
+        <browser>*konqueror</browser>
+      </properties>
+    </profile>
+    <profile>
+      <id>otherbrowser</id>
+      <properties>
+        <browser>*custom ${browserPath}</browser>
+      </properties>
+    </profile>
+  </profiles>
+  <repositories>
+    <repository>
+      <id>openqa.org</id>
+      <name>Openqa Repository</name>
+      <url>http://maven.openqa.org</url>
+      <layout>default</layout>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>daily</updatePolicy>
+        <checksumPolicy>ignore</checksumPolicy>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+</project>
\ No newline at end of file

Deleted: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/xmlrpc-tests/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/xmlrpc-tests/pom.xml	2008-01-02 15:59:23 UTC (rev 6592)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/xmlrpc-tests/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -1,77 +0,0 @@
-<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-enterprise-test</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-enterprise-test-xmlrpc</artifactId>
-  <name>XWiki Products - Enterprise - Functional XMLRPC Tests</name>
-  <packaging>pom</packaging>
-  <description>XWiki Products - Enterprise - Functional XMLRPC Tests</description>
-  <dependencies>
-    <dependency>
-      <groupId>com.xpn.xwiki.platform</groupId>
-      <artifactId>xwiki-core</artifactId>
-      <version>${platform.core.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>xmlrpc</groupId>
-      <artifactId>xmlrpc-client</artifactId>
-      <version>3.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.w3c.css</groupId>
-      <artifactId>css-validator</artifactId>
-      <version>2.1-20070528</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <!-- Step 1: Compile the JUnit XMLRPC Tests and copy test resources files -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-      </plugin>
-      <!-- Step 2: Create jar containing integration tests which will be installed -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-      <!-- Step 3: Unpack the application -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>dependency-maven-plugin</artifactId>
-      </plugin>
-      <!-- Step 4: Start XWiki, Execute the tests and Stop XWiki -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration> 
-          <!-- Display report on screen when all tests are completed -->  
-          <useFile>false</useFile>
-          <reportFormat>plain</reportFormat>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/xmlrpc-tests/pom.xml (from rev 6608, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/distribution-test/xmlrpc-tests/pom.xml)
===================================================================
--- xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/xmlrpc-tests/pom.xml	                        (rev 0)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/distribution-test/xmlrpc-tests/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -0,0 +1,77 @@
+<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-enterprise-test</artifactId>
+    <version>1.2-rc-2</version>
+  </parent>
+  <artifactId>xwiki-enterprise-test-xmlrpc</artifactId>
+  <name>XWiki Products - Enterprise - Functional XMLRPC Tests</name>
+  <packaging>pom</packaging>
+  <description>XWiki Products - Enterprise - Functional XMLRPC Tests</description>
+  <dependencies>
+    <dependency>
+      <groupId>com.xpn.xwiki.platform</groupId>
+      <artifactId>xwiki-core</artifactId>
+      <version>${platform.core.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlrpc</groupId>
+      <artifactId>xmlrpc-client</artifactId>
+      <version>3.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.w3c.css</groupId>
+      <artifactId>css-validator</artifactId>
+      <version>2.1-20070528</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <!-- Step 1: Compile the JUnit XMLRPC Tests and copy test resources files -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+      </plugin>
+      <!-- Step 2: Create jar containing integration tests which will be installed -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+      </plugin>
+      <!-- Step 3: Unpack the application -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>dependency-maven-plugin</artifactId>
+      </plugin>
+      <!-- Step 4: Start XWiki, Execute the tests and Stop XWiki -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration> 
+          <!-- Display report on screen when all tests are completed -->  
+          <useFile>false</useFile>
+          <reportFormat>plain</reportFormat>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers (from rev 6592, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/installers)

Deleted: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/generic/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/installers/generic/pom.xml	2008-01-02 15:59:23 UTC (rev 6592)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/generic/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -1,190 +0,0 @@
-<?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-enterprise-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-enterprise-installer-generic</artifactId>
-  <name>XWiki Products - Enterprise - Installers - Generic</name>
-  <packaging>pom</packaging>
-  <description>XWiki Products - Enterprise - Installers - Generic</description>
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <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-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>com.xpn.xwiki.platform</groupId>
-                  <artifactId>xwiki-jetty-resources</artifactId>
-                  <version>${platform.tools.version}</version>
-                  <outputDirectory>${project.build.directory}/container</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>com.xpn.xwiki.products</groupId>
-                  <artifactId>xwiki-enterprise-web</artifactId>
-                  <version>${pom.version}</version>
-                  <type>war</type>
-                  <outputDirectory>${project.build.directory}/container/webapps/xwiki</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>com.xpn.xwiki.products</groupId>
-                  <artifactId>xwiki-enterprise-database-${xwiki.db}</artifactId>
-                  <version>${pom.version}</version>
-                  <type>zip</type>
-                  <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>
-            <id>copy</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>${xwiki.db.jdbc.groupId}</groupId>
-                  <artifactId>${xwiki.db.jdbc.artifactId}</artifactId>
-                  <version>${xwiki.db.jdbc.version}</version>
-                  <outputDirectory>${project.build.directory}/container/webapps/xwiki/WEB-INF/lib</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>izpack-maven-plugin</artifactId>
-        <version>1.0-20070710-dev</version>
-        <configuration>
-          <izpackConfig>${project.build.directory}/classes/install.xml</izpackConfig>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>izpack</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Use the Maven build-helper plugin to attach the generated installer JAR to this
-           project's main artifact -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/${pom.groupId}-${pom.artifactId}-${pom.version}-installer.jar</file>
-                  <type>jar</type>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <properties>
-    <xwiki.hibernate>${project.build.directory}/maven-shared-archive-resources/hibernate.cfg.xml</xwiki.hibernate>
-    <xwiki.license>${project.build.directory}/maven-shared-archive-resources/LICENCE.txt</xwiki.license>
-    <xwiki.readme>${project.build.directory}/classes/README.html</xwiki.readme>
-    <xwiki.container>${project.build.directory}/container</xwiki.container>
-    <xwiki.database>${project.build.directory}/database</xwiki.database>
-    <xwiki.png>${project.build.directory}/classes/images/xwiki.png</xwiki.png>
-    <xwiki.border1.png>${project.build.directory}/classes/images/border1.png</xwiki.border1.png>
-    <xwiki.border2.png>${project.build.directory}/classes/images/border2.png</xwiki.border2.png>
-    <xwiki.border3.png>${project.build.directory}/classes/images/border3.png</xwiki.border3.png>
-    <xwiki.border4.png>${project.build.directory}/classes/images/border4.png</xwiki.border4.png>
-    <xwiki.border5.png>${project.build.directory}/classes/images/border5.png</xwiki.border5.png>
-    <xwiki.border6.png>${project.build.directory}/classes/images/border6.png</xwiki.border6.png>
-    <xwiki.border7.png>${project.build.directory}/classes/images/border7.png</xwiki.border7.png>
-    <xwiki.border8.png>${project.build.directory}/classes/images/border8.png</xwiki.border8.png>
-    <xwiki.core.png>${project.build.directory}/classes/images/core.png</xwiki.core.png>
-    <xwiki.shortcutSpec.windows>${project.build.directory}/classes/shortcutSpec_windows.xml</xwiki.shortcutSpec.windows>
-    <xwiki.shortcutSpec.unix>${project.build.directory}/classes/shortcutSpec_unix.xml</xwiki.shortcutSpec.unix>
-    <xwiki.shortcut.icon.unix>${project.build.directory}/classes/images/xe.png</xwiki.shortcut.icon.unix>
-    <xwiki.shortcut.icon.windows>${project.build.directory}/classes/images/xe.ico</xwiki.shortcut.icon.windows>
-  </properties>
-</project>

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/generic/pom.xml (from rev 6608, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/installers/generic/pom.xml)
===================================================================
--- xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/generic/pom.xml	                        (rev 0)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/generic/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -0,0 +1,214 @@
+<?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-enterprise-parent</artifactId>
+    <version>1.2-rc-2</version>
+  </parent>
+  <artifactId>xwiki-enterprise-installer-generic</artifactId>
+  <name>XWiki Products - Enterprise - Installers - Generic</name>
+  <packaging>pom</packaging>
+  <description>XWiki Products - Enterprise - Installers - Generic</description>
+  <build>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <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-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>com.xpn.xwiki.platform</groupId>
+                  <artifactId>xwiki-jetty-resources</artifactId>
+                  <version>${platform.tools.version}</version>
+                  <outputDirectory>${project.build.directory}/container</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>com.xpn.xwiki.products</groupId>
+                  <artifactId>xwiki-enterprise-web</artifactId>
+                  <version>${pom.version}</version>
+                  <type>war</type>
+                  <outputDirectory>${project.build.directory}/container/webapps/xwiki</outputDirectory>
+                  <!-- Exclude default Hibernate config file since we're instead using one with the
+                       selected database configuration defined.
+                       NOTE: This is only supported by version 2.0-alpha-5 and above of the Dependency plugin which is
+                       why we are using the AntRun plugin below to remove the Hibernate config file. Uncomment when
+                       the 2.0-alpha-5 release is out. -->
+                  <!--excludes>**/hibernate.cfg.xml</excludes-->
+                </artifactItem>
+                <artifactItem>
+                  <groupId>com.xpn.xwiki.products</groupId>
+                  <artifactId>xwiki-enterprise-database-${xwiki.db}</artifactId>
+                  <version>${pom.version}</version>
+                  <type>zip</type>
+                  <outputDirectory>${project.build.directory}/database</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${xwiki.db.jdbc.groupId}</groupId>
+                  <artifactId>${xwiki.db.jdbc.artifactId}</artifactId>
+                  <version>${xwiki.db.jdbc.version}</version>
+                  <outputDirectory>${project.build.directory}/container/webapps/xwiki/WEB-INF/lib</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <!-- The Dependency plugin only supports excluding files in version 2.0-alpha-5 and above and at this time the
+             latest released version is 2.0-alpha-4. Thus we need to perform this hack to remove the Hibernate
+             config file. We want to remove it since we want to use one we provide that has the HSQLDB database set
+             up by default. Remove this when version 2.0-alpha-5 is released. -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <delete file="${project.build.directory}/container/webapps/xwiki/WEB-INF/hibernate.cfg.xml" />
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>izpack-maven-plugin</artifactId>
+        <version>1.0-20070710-dev</version>
+        <configuration>
+          <izpackConfig>${project.build.directory}/classes/install.xml</izpackConfig>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>izpack</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Use the Maven build-helper plugin to attach the generated installer JAR to this
+           project's main artifact -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${project.build.directory}/${pom.groupId}-${pom.artifactId}-${pom.version}-installer.jar</file>
+                  <type>jar</type>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <properties>
+    <xwiki.hibernate>${project.build.directory}/maven-shared-archive-resources/hibernate.cfg.xml</xwiki.hibernate>
+    <xwiki.license>${project.build.directory}/maven-shared-archive-resources/LICENCE.txt</xwiki.license>
+    <xwiki.readme>${project.build.directory}/classes/README.html</xwiki.readme>
+    <xwiki.container>${project.build.directory}/container</xwiki.container>
+    <xwiki.database>${project.build.directory}/database</xwiki.database>
+    <xwiki.png>${project.build.directory}/classes/images/xwiki.png</xwiki.png>
+    <xwiki.border1.png>${project.build.directory}/classes/images/border1.png</xwiki.border1.png>
+    <xwiki.border2.png>${project.build.directory}/classes/images/border2.png</xwiki.border2.png>
+    <xwiki.border3.png>${project.build.directory}/classes/images/border3.png</xwiki.border3.png>
+    <xwiki.border4.png>${project.build.directory}/classes/images/border4.png</xwiki.border4.png>
+    <xwiki.border5.png>${project.build.directory}/classes/images/border5.png</xwiki.border5.png>
+    <xwiki.border6.png>${project.build.directory}/classes/images/border6.png</xwiki.border6.png>
+    <xwiki.border7.png>${project.build.directory}/classes/images/border7.png</xwiki.border7.png>
+    <xwiki.border8.png>${project.build.directory}/classes/images/border8.png</xwiki.border8.png>
+    <xwiki.core.png>${project.build.directory}/classes/images/core.png</xwiki.core.png>
+    <xwiki.shortcutSpec.windows>${project.build.directory}/classes/shortcutSpec_windows.xml</xwiki.shortcutSpec.windows>
+    <xwiki.shortcutSpec.unix>${project.build.directory}/classes/shortcutSpec_unix.xml</xwiki.shortcutSpec.unix>
+    <xwiki.shortcut.icon.unix>${project.build.directory}/classes/images/xe.png</xwiki.shortcut.icon.unix>
+    <xwiki.shortcut.icon.windows>${project.build.directory}/classes/images/xe.ico</xwiki.shortcut.icon.windows>
+  </properties>
+</project>

Deleted: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/installers/pom.xml	2008-01-02 15:59:23 UTC (rev 6592)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -1,40 +0,0 @@
-<?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-enterprise-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-enterprise-installers</artifactId>
-  <name>XWiki Products - Enterprise - Installers - Parent POM</name>
-  <packaging>pom</packaging>
-  <description>XWiki Products - Enterprise - Installers - Parent POM</description>
-  <modules>
-    <module>generic</module>
-    <module>windows</module>
-  </modules>
-</project>

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/pom.xml (from rev 6608, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/installers/pom.xml)
===================================================================
--- xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/pom.xml	                        (rev 0)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -0,0 +1,40 @@
+<?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-enterprise-parent</artifactId>
+    <version>1.2-rc-2</version>
+  </parent>
+  <artifactId>xwiki-enterprise-installers</artifactId>
+  <name>XWiki Products - Enterprise - Installers - Parent POM</name>
+  <packaging>pom</packaging>
+  <description>XWiki Products - Enterprise - Installers - Parent POM</description>
+  <modules>
+    <module>generic</module>
+    <module>windows</module>
+  </modules>
+</project>

Deleted: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/windows/pom.xml
===================================================================
--- xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/installers/windows/pom.xml	2008-01-02 15:59:23 UTC (rev 6592)
+++ xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/windows/pom.xml	2008-01-03 11:00:50 UTC (rev 6609)
@@ -1,194 +0,0 @@
-<?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-enterprise-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-  <artifactId>xwiki-enterprise-installer-windows</artifactId>
-  <name>XWiki Products - Enterprise - Installers - Windows</name>
-  <packaging>pom</packaging>
-  <description>XWiki Products - Enterprise - Installers - Windows</description>
-  <dependencies>
-    <!-- Even though this dependency is defined in Launch4J's pom.xml we still need it to
-         construct the correct maven.compile.classpath for executing the Launch4J Ant task below -->
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>1.2</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>launch4j</groupId>
-                  <artifactId>launch4j</artifactId>
-                  <version>3.0.0-pre2</version>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>com.xpn.xwiki.products</groupId>
-                  <artifactId>xwiki-enterprise-installer-generic</artifactId>
-                  <version>${pom.version}</version>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-          <execution>
-            <id>unpack</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>launch4j</groupId>
-                  <artifactId>launch4j</artifactId>
-                  <version>3.0.0-pre2</version>
-                  <classifier>${launch4jOs}</classifier>
-                  <type>zip</type>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <!-- Dependency plugin discards file permissions so we need to set them back
-                     manually. See http://jira.codehaus.org/browse/MDEP-109 -->
-                <chmod file="${project.build.directory}/dependency/bin/windres" perm="ugo+rx" />
-                <chmod file="${project.build.directory}/dependency/bin/ld" perm="ugo+rx" />
-                
-                <property name="classpath.compile" refid="maven.compile.classpath" />
-                <taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask" classpath="${classpath.compile}:${project.build.directory}/dependency/launch4j-3.0.0-pre2.jar" />
-                <launch4j configFile="${project.build.directory}/classes/launch4j.xml" />
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>      
-      <!-- Use the Maven build-helper plugin to attach the generated installer EXE to this
-           project's main artifact -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.directory}/${pom.artifactId}-${pom.version}.exe</file>
-                  <type>exe</type>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>unix</id>
-      <activation>
-        <os>
-          <family>unix</family>
-        </os>        
-      </activation>
-      <properties>
-        <launch4jOs>linux</launch4jOs>
-      </properties>
-    </profile>
-    <profile>
-      <id>mac</id>
-      <activation>
-        <os>
-          <family>mac</family>
-        </os>        
-      </activation>
-      <properties>
-        <launch4jOs>macosx</launch4jOs>
-      </properties>
-    </profile>
-    <profile>
-      <id>windows</id>
-      <activation>
-        <os>
-          <family>windows</family>
-        </os>        
-      </activation>
-      <properties>
-        <launch4jOs>win32</launch4jOs>
-      </properties>
-    </profile>
-  </profiles>
-</project>

Copied: xwiki-products/xwiki-enterprise/tags/xwiki-enterprise-1.2-rc-2/installers/windows/pom.xml (from rev 6608, xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.2/