diff --git a/xwiki-platform-core/pom.xml b/xwiki-platform-core/pom.xml
index 4d204e49af850bca3e73ec130a3d90268a318301..9ef45734bc327602a08d6d27092d4a8cb2684c10 100644
--- a/xwiki-platform-core/pom.xml
+++ b/xwiki-platform-core/pom.xml
@@ -33,6 +33,11 @@
<name>XWiki Platform - Core - Parent POM</name>
<packaging>pom</packaging>
<description>XWiki Platform - Core - Parent POM</description>
+ <properties>
+ <gwt.version>2.1.1</gwt.version>
+ <gwt.maven.plugin.version>2.1.0-1</gwt.maven.plugin.version>
+ <smartgwt.version>2.0</smartgwt.version>
+ </properties>
<dependencyManagement>
<dependencies>
<!-- Standard dependencies used in several modules -->
@@ -61,6 +66,29 @@
<artifactId>jcommon</artifactId>
<version>1.0.15</version>
</dependency>
+ <!-- Standard dependencies used in GWT modules -->
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>${gwt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <version>${gwt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <version>${gwt.version}</version>
+ </dependency>
+ <dependency>
+ <!-- SmartGWT is used only for its tree widget. -->
+ <!-- If you remove or move this dependency don't forget to update the repository section at the bottom. -->
+ <groupId>com.smartgwt</groupId>
+ <artifactId>smartgwt</artifactId>
+ <version>${smartgwt.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
@@ -81,6 +109,49 @@
<artifactId>xwiki-platform-tool-xar-plugin</artifactId>
<version>${project.version}</version>
</plugin>
+ <plugin>
+ <!-- Default configuration for the GWT maven plugin -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gwt-maven-plugin</artifactId>
+ <version>${gwt.maven.plugin.version}</version>
+ <configuration>
+ <mode>htmlunit</mode>
+ <testTimeOut>600</testTimeOut>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!--
+ We exclude the GWT client tests because of http://jira.codehaus.org/browse/SUREFIRE-508 (Cannot run
+ GWTTestCases with Surefire). GWT client tests are currently run by gwt-maven-plugin.
+ -->
+ <excludes>
+ <exclude>**/gwt/**/client/**/*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <configuration>
+ <!--
+ Exclude GWT client code since otherwise it would mean they would get instrumented by Clover and GWT would
+ complain that it doesn't find the sources for Clover at runtime.
+ -->
+ <excludes>
+ <exclude>**/gwt/**/client/**/*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -203,6 +274,7 @@
<module>xwiki-platform-webdav</module>
<module>xwiki-platform-wiki-manager</module>
<module>xwiki-platform-workstream</module>
+ <module>xwiki-platform-wysiwyg</module>
<module>xwiki-platform-xml</module>
<module>xwiki-platform-xmlrpc</module>
</modules>
@@ -237,5 +309,29 @@
<xwiki.clirr.skip>false</xwiki.clirr.skip>
</properties>
</profile>
+ <profile>
+ <id>gwtTestManual</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>gwt-maven-plugin</artifactId>
+ <configuration>
+ <mode>manual</mode>
+ <productionMode>true</productionMode>
+ <style>DETAILED</style>
+ <!-- HACK: We inject the GWT arguments in the out parameter because we have no other option. -->
+ <out>target/www-test -port 54321 -codeServerPort 12345 -userAgents gecko1_8</out>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
+ <repositories>
+ <repository>
+ <id>smartgwt-maven</id>
+ <url>http://www.smartclient.com/maven2</url>
+ </repository>
+ </repositories>
</project>
diff --git a/xwiki-platform-core/xwiki-platform-gwt/pom.xml b/xwiki-platform-core/xwiki-platform-gwt/pom.xml
index 89946e6ccb203cfc69f3ac0623c25cbef2a9955e..30d61f1f4258b3d78b004f8db8464385c6c61548 100644
--- a/xwiki-platform-core/xwiki-platform-gwt/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-gwt/pom.xml
@@ -38,58 +38,17 @@
<module>xwiki-platform-gwt-dom</module>
<module>xwiki-platform-gwt-user</module>
</modules>
- <properties>
- <gwt.version>2.1.1</gwt.version>
- <gwt.maven.plugin.version>2.1.0-1</gwt.maven.plugin.version>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- <version>${gwt.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-dev</artifactId>
- <version>${gwt.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<!-- GWT core dependencies -->
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
- <version>${gwt.version}</version>
<scope>provided</scope>
</dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>gwt-maven-plugin</artifactId>
- <version>${gwt.maven.plugin.version}</version>
- <configuration>
- <mode>htmlunit</mode>
- <testTimeOut>600</testTimeOut>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -98,53 +57,7 @@
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!--
- We exclude the client tests because of http://jira.codehaus.org/browse/SUREFIRE-508 (Cannot run
- GWTTestCases with Surefire). GWT client tests are currently run by gwt-maven-plugin.
- -->
- <excludes>
- <exclude>**/client/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <!--
- Exclude Client code since otherwise it would mean they would get instrumented by Clover and GWT would
- complain that it doesn't find the sources for Clover at runtime.
- -->
- <excludes>
- <exclude>**/client/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>manual</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>gwt-maven-plugin</artifactId>
- <configuration>
- <mode>manual</mode>
- <productionMode>true</productionMode>
- <style>DETAILED</style>
- <!-- HACK: We inject the GWT arguments in the out parameter because we have no other option. -->
- <out>target/www-test -port 54321 -codeServerPort 12345 -userAgents gecko1_8</out>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/xwiki-platform-core/xwiki-platform-gwt/xwiki-platform-gwt-api/pom.xml b/xwiki-platform-core/xwiki-platform-gwt/xwiki-platform-gwt-api/pom.xml
index c43ccda6d8a7c5e482decbfdd1a96591b303c867..40485fb6eb1c830a772d3e1dbc281249edea875c 100644
--- a/xwiki-platform-core/xwiki-platform-gwt/xwiki-platform-gwt-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-gwt/xwiki-platform-gwt-api/pom.xml
@@ -27,7 +27,6 @@
<artifactId>xwiki-platform-gwt</artifactId>
<version>3.1-SNAPSHOT</version>
</parent>
- <groupId>com.xpn.xwiki.platform</groupId>
<artifactId>xwiki-platform-gwt-api</artifactId>
<name>XWiki Platform - GWT - XWiki API</name>
<packaging>jar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-web/pom.xml b/xwiki-platform-core/xwiki-platform-web/pom.xml
index 3a5a249b6a94bf52d3d5fa7fd2444ae4de0a13f3..b2c6804cb74a14c39642d2301dd6587f876dcf65 100644
--- a/xwiki-platform-core/xwiki-platform-web/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-web/pom.xml
@@ -45,13 +45,8 @@
</issueManagement>
<properties>
<!-- Used by gwt and wysiwyg modules -->
- <gwt.version>2.1.1</gwt.version>
- <gwt.maven.plugin.version>2.1.0-1</gwt.maven.plugin.version>
<smartgwt.version>2.0</smartgwt.version>
<!-- Versions of XWiki dependencies used in Platform/Web modules -->
- <commons.version>${project.version}</commons.version>
- <rendering.version>${project.version}</rendering.version>
- <platform.core.version>${project.version}</platform.core.version>
<platform.tool.configuration.version>1.46-SNAPSHOT</platform.tool.configuration.version>
<!-- Lock albatross version because it isn't developed anymore. -->
<platform.skin.albatross.version>1.30</platform.skin.albatross.version>
@@ -61,13 +56,6 @@
<clirr.previous.version>3.0</clirr.previous.version>
</properties>
<modules>
- <module>gwt</module>
- <module>xwiki-gwt-dom</module>
- <module>xwiki-gwt-user</module>
- <module>xwiki-gwt-wysiwyg-plugin-api</module>
- <module>xwiki-gwt-wysiwyg-client</module>
- <module>xwiki-gwt-wysiwyg-server</module>
- <module>xwiki-gwt-wysiwyg-war</module>
<module>standard</module>
</modules>
<build>
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb124fbb55784f1fcf9aafda2379a83c66febc98
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml
@@ -0,0 +1,55 @@
+<?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>org.xwiki.platform</groupId>
+ <artifactId>xwiki-platform-core</artifactId>
+ <version>3.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>xwiki-platform-wysiwyg</artifactId>
+ <name>XWiki Platform - WYSIWYG Editor - Parent POM</name>
+ <packaging>pom</packaging>
+ <description>Parent POM for the WYSIWYG editor modules</description>
+ <modules>
+ <module>xwiki-platform-wysiwyg-client</module>
+ <module>xwiki-platform-wysiwyg-plugin-api</module>
+ <module>xwiki-platform-wysiwyg-server</module>
+ <module>xwiki-platform-wysiwyg-war</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- Apply the Checkstyle configurations defined in the top level pom.xml file. -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <failsOnError>true</failsOnError>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-client/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-client/pom.xml
index fc874da6fa8b8c6bcd99c4e45821847f102688d0..bf0c95ff52de91e1deef422e5cfd226328b3ed9b 100644
--- a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-client/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-client/pom.xml
@@ -24,11 +24,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web</artifactId>
+ <artifactId>xwiki-platform-wysiwyg</artifactId>
<version>3.1-SNAPSHOT</version>
</parent>
- <artifactId>xwiki-web-gwt-wysiwyg-client</artifactId>
- <name>XWiki Platform - Web - GWT - WYSIWYG Editor - Client Side</name>
+ <artifactId>xwiki-platform-wysiwyg-client</artifactId>
+ <name>XWiki Platform - WYSIWYG Editor - Client Side</name>
<packaging>jar</packaging>
<description>The client side of XWiki's WYSIWYG editor. This is a reusable rich text editor all written in GWT.</description>
<dependencies>
@@ -36,25 +36,23 @@
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
- <version>${gwt.version}</version>
<scope>provided</scope>
</dependency>
<!-- GWT libraries -->
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web-gwt-user</artifactId>
+ <artifactId>xwiki-platform-gwt-user</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web-gwt-wysiwyg-plugin-api</artifactId>
+ <artifactId>xwiki-platform-wysiwyg-plugin-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<!-- SmartGWT is used only for its tree widget. -->
<groupId>com.smartgwt</groupId>
<artifactId>smartgwt</artifactId>
- <version>${smartgwt.version}</version>
</dependency>
<!-- XWiki dependencies -->
<dependency>
@@ -69,23 +67,18 @@
<!-- Test dependencies -->
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web-gwt-user</artifactId>
+ <artifactId>xwiki-platform-gwt-user</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web-gwt-wysiwyg-plugin-api</artifactId>
+ <artifactId>xwiki-platform-wysiwyg-plugin-api</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<resources>
@@ -104,30 +97,9 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
- <version>${gwt.maven.plugin.version}</version>
<configuration>
- <mode>htmlunit</mode>
- <testTimeOut>600</testTimeOut>
<includes>org/xwiki/gwt/wysiwyg/WysiwygTestSuite.java</includes>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!--
- We skip the tests because of http://jira.codehaus.org/browse/SUREFIRE-508 (Cannot run GWTTestCases with
- Surefire). GWT tests are currently run by gwt-maven-plugin.
- -->
- <skip>true</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -157,8 +129,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <failsOnError>true</failsOnError>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
<!-- New code should follow checkstyle rules. -->
<excludes>
org/xwiki/gwt/wysiwyg/client/diff/**/*,
@@ -170,42 +140,5 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <!--
- Exclude Client code since otherwise it would mean they would get instrumented by Clover and GWT would
- complain that it doesn't find the sources for Clover at runtime.
- -->
- <excludes>
- <exclude>**/client/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
- <profiles>
- <profile>
- <id>manual</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>gwt-maven-plugin</artifactId>
- <configuration>
- <mode>manual</mode>
- <productionMode>true</productionMode>
- <style>DETAILED</style>
- <!-- HACK: We inject the GWT arguments in the out parameter because we have no other option. -->
- <out>target/www-test -port 54321 -codeServerPort 12345 -userAgents gecko1_8</out>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-plugin-api/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-plugin-api/pom.xml
index d1dfa2e00a177cd78e0ba7e4058f549d82ab5870..a0e219f7eff1d9388643fffa14209bbbb640b96d 100644
--- a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-plugin-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-plugin-api/pom.xml
@@ -24,30 +24,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web</artifactId>
+ <artifactId>xwiki-platform-wysiwyg</artifactId>
<version>3.1-SNAPSHOT</version>
</parent>
- <artifactId>xwiki-web-gwt-wysiwyg-plugin-api</artifactId>
- <name>XWiki Platform - Web - GWT - WYSIWYG Editor - Plugin API</name>
+ <artifactId>xwiki-platform-wysiwyg-plugin-api</artifactId>
+ <name>XWiki Platform - WYSIWYG Editor - Plugin API</name>
<packaging>jar</packaging>
<description>The API that is used to write plugins for the WYSIWYG editor.</description>
<dependencies>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
- <version>${gwt.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web-gwt-user</artifactId>
+ <artifactId>xwiki-platform-gwt-user</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<resources>
@@ -79,30 +73,9 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
- <version>${gwt.maven.plugin.version}</version>
<configuration>
- <mode>htmlunit</mode>
- <testTimeOut>600</testTimeOut>
<includes>org/xwiki/gwt/wysiwyg/PluginTestSuite.java</includes>
</configuration>
- <executions>
- <execution>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!--
- We skip the tests because of http://jira.codehaus.org/browse/SUREFIRE-508 (Cannot run GWTTestCases with
- Surefire). GWT tests are currently run by gwt-maven-plugin.
- -->
- <skip>true</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -115,53 +88,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <!-- Apply the Checkstyle configurations defined in the top level pom.xml file. -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <failsOnError>true</failsOnError>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <!-- New code should follow checkstyle rules. -->
- </configuration>
- </plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <!--
- Exclude Client code since otherwise it would mean they would get instrumented by Clover and GWT would
- complain that it doesn't find the sources for Clover at runtime.
- -->
- <excludes>
- <exclude>**/client/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
- <profiles>
- <profile>
- <id>manual</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>gwt-maven-plugin</artifactId>
- <configuration>
- <mode>manual</mode>
- <productionMode>true</productionMode>
- <style>DETAILED</style>
- <!-- HACK: We inject the GWT arguments in the out parameter because we have no other option. -->
- <out>target/www-test -port 54321 -codeServerPort 12345 -userAgents gecko1_8</out>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-server/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-server/pom.xml
index ee738bebfdd01bc2089b2b007efd1ccfe633bdd2..c22ab438ffb0837d51a2060ec412fdfe324940f3 100644
--- a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-server/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-server/pom.xml
@@ -24,11 +24,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web</artifactId>
+ <artifactId>xwiki-platform-wysiwyg</artifactId>
<version>3.1-SNAPSHOT</version>
</parent>
- <artifactId>xwiki-web-gwt-wysiwyg-server</artifactId>
- <name>XWiki Platform - Web - GWT - WYSIWYG Editor - Server Side</name>
+ <artifactId>xwiki-platform-wysiwyg-server</artifactId>
+ <name>XWiki Platform - WYSIWYG Editor - Server Side</name>
<packaging>jar</packaging>
<description>The server side of XWiki's WYSIWYG editor.</description>
<dependencies>
@@ -36,21 +36,20 @@
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
- <version>${gwt.version}</version>
<scope>provided</scope>
</dependency>
<!-- GWT libraries -->
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web-gwt-wysiwyg-client</artifactId>
+ <artifactId>xwiki-platform-wysiwyg-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<!-- XWiki dependencies -->
<dependency>
- <groupId>com.xpn.xwiki.platform</groupId>
- <artifactId>xwiki-core</artifactId>
- <version>${platform.core.version}</version>
+ <groupId>org.xwiki.platform</groupId>
+ <artifactId>xwiki-platform-oldcore</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -61,20 +60,20 @@
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-core-bridge</artifactId>
- <version>${platform.core.version}</version>
+ <artifactId>xwiki-platform-bridge</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-core-model</artifactId>
- <version>${platform.core.version}</version>
+ <artifactId>xwiki-platform-model</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-core-container-api</artifactId>
- <version>${platform.core.version}</version>
+ <artifactId>xwiki-platform-container-api</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -89,11 +88,6 @@
<version>${commons.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -102,8 +96,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <failsOnError>true</failsOnError>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
<!-- New code should follow checkstyle rules. -->
<excludes>
org/xwiki/wysiwyg/server/internal/plugin/sync/DefaultSyncEngine.java,
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-war/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-war/pom.xml
index 6db4c6146df5df272d51b8a2d0aa2d005e93d539..713d681da64cbb930cbe9f5614bed9f9178cfa39 100644
--- a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-war/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-war/pom.xml
@@ -24,11 +24,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web</artifactId>
+ <artifactId>xwiki-platform-wysiwyg</artifactId>
<version>3.1-SNAPSHOT</version>
</parent>
- <artifactId>xwiki-web-gwt-wysiwyg-war</artifactId>
- <name>XWiki Platform - Web - GWT - WYSIWYG Editor - WAR Distribution</name>
+ <artifactId>xwiki-platform-wysiwyg-war</artifactId>
+ <name>XWiki Platform - WYSIWYG Editor - WAR Distribution</name>
<packaging>war</packaging>
<description>WAR distribution of XWiki's WYSIWYG editor.</description>
<properties>
@@ -40,13 +40,13 @@
<dependencies>
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web-gwt-wysiwyg-client</artifactId>
+ <artifactId>xwiki-platform-wysiwyg-client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web-gwt-wysiwyg-server</artifactId>
+ <artifactId>xwiki-platform-wysiwyg-server</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -55,7 +55,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
- <version>${gwt.maven.plugin.version}</version>
<configuration>
<module>${xwe.module}</module>
<webappDirectory>${gwt.output.directory}</webappDirectory>
@@ -94,7 +93,7 @@
<artifactItems>
<artifactItem>
<groupId>org.xwiki.platform</groupId>
- <artifactId>xwiki-web-gwt-wysiwyg-client</artifactId>
+ <artifactId>xwiki-platform-wysiwyg-client</artifactId>
<version>${project.version}</version>
<classifier>shared</classifier>
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/lib</outputDirectory>