Author: hritcu Date: 2007-12-27 14:54:25 +0100 (Thu, 27 Dec 2007) New Revision: 6488
Added: xwiki-platform/web/tags/xwiki-web-1.2-rc-2/ xwiki-platform/web/tags/xwiki-web-1.2-rc-2/exo/pom.xml xwiki-platform/web/tags/xwiki-web-1.2-rc-2/gwt/pom.xml xwiki-platform/web/tags/xwiki-web-1.2-rc-2/pom.xml xwiki-platform/web/tags/xwiki-web-1.2-rc-2/standard/pom.xml Removed: xwiki-platform/web/tags/xwiki-web-1.2-rc-2/exo/pom.xml xwiki-platform/web/tags/xwiki-web-1.2-rc-2/gwt/pom.xml xwiki-platform/web/tags/xwiki-web-1.2-rc-2/pom.xml xwiki-platform/web/tags/xwiki-web-1.2-rc-2/standard/pom.xml Log: [maven-release-plugin] copy for tag xwiki-web-1.2-rc-2 Copied: xwiki-platform/web/tags/xwiki-web-1.2-rc-2 (from rev 6484, xwiki-platform/web/branches/xwiki-web-1.2) Deleted: xwiki-platform/web/tags/xwiki-web-1.2-rc-2/exo/pom.xml =================================================================== --- xwiki-platform/web/branches/xwiki-web-1.2/exo/pom.xml 2007-12-27 13:05:45 UTC (rev 6484) +++ xwiki-platform/web/tags/xwiki-web-1.2-rc-2/exo/pom.xml 2007-12-27 13:54:25 UTC (rev 6488) @@ -1,102 +0,0 @@ -<!-- - * - * 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.platform</groupId> - <artifactId>xwiki-web</artifactId> - <version>1.2-SNAPSHOT</version> - </parent> - <artifactId>xwiki-web-exo</artifactId> - <name>XWiki Platform - Web - Exo</name> - <packaging>war</packaging> - <description>The Exoplatform XWiki WAR</description> - <dependencies> - <dependency> - <groupId>com.xpn.xwiki.platform</groupId> - <artifactId>xwiki-web-standard</artifactId> - <version>${version}</version> - <type>war</type> - </dependency> - <!-- We shouldn't need this dependency but Surefire plugin v2.3 fails with a "Null" if it's - not defined. Seems to be fixed in the latest Surefire plugin in Maven's trunk so when - 2.3.1 or 2.4 is out, switch to it and remove this dependency. --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <!-- Inject XWiki's configuration --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <!-- The remote resources plugin adds its output directory as a resource directory - so that the Maven resources plugin copies these resources to target/classes. - However copying them to target/classes will make them appear in WEB-INF/classes - in the generated WAR since the WAR plugin copies resources in target/classes in - WEB-INF/classes. Thus to prevent this we're binding this execution to a phase - that comes after the execution of the resources plugin (which executes in the - process-resources phase). Thus this remote resources plugin will execute just - after the resources plugin and the resources won't be copied, which is why we're - adding a webResource configuration element below in the WAR plugin's - configuration. --> - <phase>process-resources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <resourceBundles> - <resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle> - </resourceBundles> - <properties> - <xwikiCfgExo>1</xwikiCfgExo> - </properties> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>${project.build.directory}/maven-shared-archive-resources</directory> - <targetPath>WEB-INF</targetPath> - <includes> - <include>xwiki.cfg</include> - </includes> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> -</project> - Copied: xwiki-platform/web/tags/xwiki-web-1.2-rc-2/exo/pom.xml (from rev 6485, xwiki-platform/web/branches/xwiki-web-1.2/exo/pom.xml) =================================================================== --- xwiki-platform/web/tags/xwiki-web-1.2-rc-2/exo/pom.xml (rev 0) +++ xwiki-platform/web/tags/xwiki-web-1.2-rc-2/exo/pom.xml 2007-12-27 13:54:25 UTC (rev 6488) @@ -0,0 +1,102 @@ +<!-- + * + * 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.platform</groupId> + <artifactId>xwiki-web</artifactId> + <version>1.2-rc-2</version> + </parent> + <artifactId>xwiki-web-exo</artifactId> + <name>XWiki Platform - Web - Exo</name> + <packaging>war</packaging> + <description>The Exoplatform XWiki WAR</description> + <dependencies> + <dependency> + <groupId>com.xpn.xwiki.platform</groupId> + <artifactId>xwiki-web-standard</artifactId> + <version>${version}</version> + <type>war</type> + </dependency> + <!-- We shouldn't need this dependency but Surefire plugin v2.3 fails with a "Null" if it's + not defined. Seems to be fixed in the latest Surefire plugin in Maven's trunk so when + 2.3.1 or 2.4 is out, switch to it and remove this dependency. --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <!-- Inject XWiki's configuration --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <!-- The remote resources plugin adds its output directory as a resource directory + so that the Maven resources plugin copies these resources to target/classes. + However copying them to target/classes will make them appear in WEB-INF/classes + in the generated WAR since the WAR plugin copies resources in target/classes in + WEB-INF/classes. Thus to prevent this we're binding this execution to a phase + that comes after the execution of the resources plugin (which executes in the + process-resources phase). Thus this remote resources plugin will execute just + after the resources plugin and the resources won't be copied, which is why we're + adding a webResource configuration element below in the WAR plugin's + configuration. --> + <phase>process-resources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <resourceBundles> + <resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle> + </resourceBundles> + <properties> + <xwikiCfgExo>1</xwikiCfgExo> + </properties> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>${project.build.directory}/maven-shared-archive-resources</directory> + <targetPath>WEB-INF</targetPath> + <includes> + <include>xwiki.cfg</include> + </includes> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> +</project> + Deleted: xwiki-platform/web/tags/xwiki-web-1.2-rc-2/gwt/pom.xml =================================================================== --- xwiki-platform/web/branches/xwiki-web-1.2/gwt/pom.xml 2007-12-27 13:05:45 UTC (rev 6484) +++ xwiki-platform/web/tags/xwiki-web-1.2-rc-2/gwt/pom.xml 2007-12-27 13:54:25 UTC (rev 6488) @@ -1,101 +0,0 @@ -<!-- - * - * 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.platform</groupId> - <artifactId>xwiki-web</artifactId> - <version>1.2-SNAPSHOT</version> - </parent> - <artifactId>xwiki-web-gwt</artifactId> - <name>XWiki Platform - Web - GWT API</name> - <packaging>jar</packaging> - <description>The Common GWT API XWiki JAR</description> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>1.3.3</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>1.3.3</version> - <!-- This JAR is used to generate JS files and shouldn't be included in the server side - WAR --> - <scope>provided</scope> - </dependency> - <!-- The GWT TK library is not in any Maven2 remote repository. For the time being we - have uploaded it in our custom Maven repository on http://maven.xwiki.org. --> - <dependency> - <groupId>gwttk</groupId> - <artifactId>gwttk</artifactId> - <version>0.2.2</version> - <!-- This JAR is used to generate JS files and shouldn't be included in the server side - WAR --> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.xpn.xwiki.platform</groupId> - <artifactId>xwiki-core</artifactId> - <version>${platform.core.version}</version> - <!-- We don't want all the Core libs to be put in WEB-INF/lib as this GWT WAR will be - overlayed with the Standard WAR which already contains all the required libs --> - <scope>provided</scope> - </dependency> - <!-- Not sure why we have to add again this dependency. It's already defined in xwiki-core - but it doesn't get imported as a transitive dependency. Maybe because we're importing - xwiki-ocre with a provided scope... --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <!-- Note: The 2.4 version is not technically correct as 2.4 corresponds to a specification - # and is not an implementation version. The central repo would need to be fixed... --> - <version>2.4</version> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <!-- We need to generate the source JAR as it'll be needed by the GWT module that depends - on this as the GWT compiler needs the sources to generate the JS files --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> - </repository> - </repositories> -</project> Copied: xwiki-platform/web/tags/xwiki-web-1.2-rc-2/gwt/pom.xml (from rev 6485, xwiki-platform/web/branches/xwiki-web-1.2/gwt/pom.xml) =================================================================== --- xwiki-platform/web/tags/xwiki-web-1.2-rc-2/gwt/pom.xml (rev 0) +++ xwiki-platform/web/tags/xwiki-web-1.2-rc-2/gwt/pom.xml 2007-12-27 13:54:25 UTC (rev 6488) @@ -0,0 +1,101 @@ +<!-- + * + * 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.platform</groupId> + <artifactId>xwiki-web</artifactId> + <version>1.2-rc-2</version> + </parent> + <artifactId>xwiki-web-gwt</artifactId> + <name>XWiki Platform - Web - GWT API</name> + <packaging>jar</packaging> + <description>The Common GWT API XWiki JAR</description> + <dependencies> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>1.3.3</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>1.3.3</version> + <!-- This JAR is used to generate JS files and shouldn't be included in the server side + WAR --> + <scope>provided</scope> + </dependency> + <!-- The GWT TK library is not in any Maven2 remote repository. For the time being we + have uploaded it in our custom Maven repository on http://maven.xwiki.org. --> + <dependency> + <groupId>gwttk</groupId> + <artifactId>gwttk</artifactId> + <version>0.2.2</version> + <!-- This JAR is used to generate JS files and shouldn't be included in the server side + WAR --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.xpn.xwiki.platform</groupId> + <artifactId>xwiki-core</artifactId> + <version>${platform.core.version}</version> + <!-- We don't want all the Core libs to be put in WEB-INF/lib as this GWT WAR will be + overlayed with the Standard WAR which already contains all the required libs --> + <scope>provided</scope> + </dependency> + <!-- Not sure why we have to add again this dependency. It's already defined in xwiki-core + but it doesn't get imported as a transitive dependency. Maybe because we're importing + xwiki-ocre with a provided scope... --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <!-- Note: The 2.4 version is not technically correct as 2.4 corresponds to a specification + # and is not an implementation version. The central repo would need to be fixed... --> + <version>2.4</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <!-- We need to generate the source JAR as it'll be needed by the GWT module that depends + on this as the GWT compiler needs the sources to generate the JS files --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <repositories> + <repository> + <id>gwt-maven</id> + <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url> + </repository> + </repositories> +</project> Deleted: xwiki-platform/web/tags/xwiki-web-1.2-rc-2/pom.xml =================================================================== --- xwiki-platform/web/branches/xwiki-web-1.2/pom.xml 2007-12-27 13:05:45 UTC (rev 6484) +++ xwiki-platform/web/tags/xwiki-web-1.2-rc-2/pom.xml 2007-12-27 13:54:25 UTC (rev 6488) @@ -1,75 +0,0 @@ -<!-- - * - * 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.platform</groupId> - <artifactId>xwiki</artifactId> - <version>8</version> - <relativePath>../xwiki-platform-pom</relativePath> - </parent> - <artifactId>xwiki-web</artifactId> - <version>1.2-SNAPSHOT</version> - <name>XWiki Platform - Web - Parent POM</name> - <packaging>pom</packaging> - <description>Common web resources for all XWiki WARs</description> - <scm> - <connection>scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/branches/xwiki-web-1.2</connection> - <developerConnection>scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/branches/xwiki-web-1.2</developerConnection> - <url>http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/branches/xwiki-web-1.2</url> - </scm> - <properties> - <!-- Versions of XWiki dependencies used in Platform/Web modules --> - <platform.tools.version>1.7</platform.tools.version> - <platform.core.version>1.2-rc-2</platform.core.version> - </properties> - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>gwt</module> - <module>standard</module> - <module>exo</module> - </modules> - </profile> - <profile> - <!-- XWiki Enterprise --> - <id>xe</id> - <modules> - <module>gwt</module> - <module>standard</module> - </modules> - </profile> - <profile> - <!-- XWiki Enterprise Manager --> - <id>xem</id> - <modules> - <module>gwt</module> - <module>standard</module> - </modules> - </profile> - </profiles> -</project> Copied: xwiki-platform/web/tags/xwiki-web-1.2-rc-2/pom.xml (from rev 6487, xwiki-platform/web/branches/xwiki-web-1.2/pom.xml) =================================================================== --- xwiki-platform/web/tags/xwiki-web-1.2-rc-2/pom.xml (rev 0) +++ xwiki-platform/web/tags/xwiki-web-1.2-rc-2/pom.xml 2007-12-27 13:54:25 UTC (rev 6488) @@ -0,0 +1,75 @@ +<!-- + * + * 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.platform</groupId> + <artifactId>xwiki</artifactId> + <version>8</version> + <relativePath>../xwiki-platform-pom</relativePath> + </parent> + <artifactId>xwiki-web</artifactId> + <version>1.2-rc-2</version> + <name>XWiki Platform - Web - Parent POM</name> + <packaging>pom</packaging> + <description>Common web resources for all XWiki WARs</description> + <scm> + <connection>scm:svn:http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-rc-2</connection> + <developerConnection>scm:svn:https://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-rc-2</developerConnection> + <url>http://svn.xwiki.org/svnroot/xwiki/xwiki-platform/web/tags/xwiki-web-1.2-rc-2</url> + </scm> + <properties> + <!-- Versions of XWiki dependencies used in Platform/Web modules --> + <platform.tools.version>1.7</platform.tools.version> + <platform.core.version>1.2-rc-2</platform.core.version> + </properties> + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>gwt</module> + <module>standard</module> + <module>exo</module> + </modules> + </profile> + <profile> + <!-- XWiki Enterprise --> + <id>xe</id> + <modules> + <module>gwt</module> + <module>standard</module> + </modules> + </profile> + <profile> + <!-- XWiki Enterprise Manager --> + <id>xem</id> + <modules> + <module>gwt</module> + <module>standard</module> + </modules> + </profile> + </profiles> +</project> Deleted: xwiki-platform/web/tags/xwiki-web-1.2-rc-2/standard/pom.xml =================================================================== --- xwiki-platform/web/branches/xwiki-web-1.2/standard/pom.xml 2007-12-27 13:05:45 UTC (rev 6484) +++ xwiki-platform/web/tags/xwiki-web-1.2-rc-2/standard/pom.xml 2007-12-27 13:54:25 UTC (rev 6488) @@ -1,177 +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.platform</groupId> - <artifactId>xwiki-web</artifactId> - <version>1.2-SNAPSHOT</version> - </parent> - <artifactId>xwiki-web-standard</artifactId> - <name>XWiki Platform - Web - Standard</name> - <packaging>war</packaging> - <description>The standard XWiki WAR</description> - <dependencies> - <dependency> - <groupId>com.xpn.xwiki.platform</groupId> - <artifactId>xwiki-core</artifactId> - <version>${platform.core.version}</version> - </dependency> - <!-- Add the GWT JAR so that XWiki Core is GWT-ready and so that the XWiki GWT Servlet can - be activated by default in web.xml --> - <dependency> - <groupId>com.xpn.xwiki.platform</groupId> - <artifactId>xwiki-web-gwt</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.xwiki.platform</groupId> - <artifactId>xwiki-core-plexus</artifactId> - <version>${platform.core.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <!-- Inject XWiki's configuration --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-remote-resources-plugin</artifactId> - <executions> - <execution> - <!-- The remote resources plugin adds its output directory as a resource directory - so that the Maven resources plugin copies these resources to target/classes. - However copying them to target/classes will make them appear in WEB-INF/classes - in the generated WAR since the WAR plugin copies resources in target/classes in - WEB-INF/classes. Thus to prevent this we're binding this execution to a phase - that comes after the execution of the resources plugin (which executes in the - process-resources phase). Thus this remote resources plugin will execute just - after the resources plugin and the resources won't be copied, which is why we're - adding a webResource configuration element below in the WAR plugin's - configuration. --> - <phase>process-resources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <resourceBundles> - <resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle> - </resourceBundles> - <properties> - <xwikiDbConnectionUrl>none</xwikiDbConnectionUrl> - </properties> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>${project.build.directory}/maven-shared-archive-resources</directory> - <targetPath>WEB-INF</targetPath> - <includes> - <include>hibernate.cfg.xml</include> - <include>xwiki.cfg</include> - </includes> - </resource> - <resource> - <directory>${basedir}/src/main/webInfResources</directory> - <targetPath>WEB-INF</targetPath> - <filtering>true</filtering> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - <profiles> - <profile> - <id>jettyrun</id> - <build> - <plugins> - <!-- Run 'mvn install -Pjettyrun' to execute xwiki in Jetty. Useful for testing. - Note: You'll need a database set up and running. If you use the HSQLDB profile - the database is looked for in database/ so it's very likely you'll get an - empty wiki. You'll need to import some pages in it using a XAR for example. --> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <configuration> - <contextPath>/xwiki</contextPath> - <classesDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF</classesDirectory> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8080</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - <!-- Add the database JAR since it's not included in the WAR. The Hibernate config - file is automtically added by the remote resources plugin --> - <dependencies> - <dependency> - <groupId>${xwiki.db.jdbc.groupId}</groupId> - <artifactId>${xwiki.db.jdbc.artifactId}</artifactId> - <version>${xwiki.db.jdbc.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-remote-resources-plugin</artifactId> - <configuration> - <properties> - <xwikiDbConnectionUrl>${xwiki.db.connection.url}</xwikiDbConnectionUrl> - </properties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>ci</id> - <activation> - <!-- This property is automatically defined by the Maven release plugin when executing - a release. Thus this profile will be automatically enabled when releasing --> - <property> - <name>performRelease</name> - </property> - </activation> - <build> - <plugins> - <!-- Use the build number plugin to add the SVN revision number to XWiki's - version.properties file so that it's included when displaying XWiki's version. - Note: This plugin works by making the buildNumber property available. We then filter - the version.properties file so that the property is replaced by its value. --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>maven-buildnumber-plugin</artifactId> - <version>0.9.5</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>create</goal> - </goals> - </execution> - </executions> - <configuration> - <doCheck>true</doCheck> - <doUpdate>true</doUpdate> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> Copied: xwiki-platform/web/tags/xwiki-web-1.2-rc-2/standard/pom.xml (from rev 6485, xwiki-platform/web/branches/xwiki-web-1.2/standard/pom.xml) =================================================================== --- xwiki-platform/web/tags/xwiki-web-1.2-rc-2/standard/pom.xml (rev 0) +++ xwiki-platform/web/tags/xwiki-web-1.2-rc-2/standard/pom.xml 2007-12-27 13:54:25 UTC (rev 6488) @@ -0,0 +1,177 @@ +<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.platform</groupId> + <artifactId>xwiki-web</artifactId> + <version>1.2-rc-2</version> + </parent> + <artifactId>xwiki-web-standard</artifactId> + <name>XWiki Platform - Web - Standard</name> + <packaging>war</packaging> + <description>The standard XWiki WAR</description> + <dependencies> + <dependency> + <groupId>com.xpn.xwiki.platform</groupId> + <artifactId>xwiki-core</artifactId> + <version>${platform.core.version}</version> + </dependency> + <!-- Add the GWT JAR so that XWiki Core is GWT-ready and so that the XWiki GWT Servlet can + be activated by default in web.xml --> + <dependency> + <groupId>com.xpn.xwiki.platform</groupId> + <artifactId>xwiki-web-gwt</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.xwiki.platform</groupId> + <artifactId>xwiki-core-plexus</artifactId> + <version>${platform.core.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <!-- Inject XWiki's configuration --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <executions> + <execution> + <!-- The remote resources plugin adds its output directory as a resource directory + so that the Maven resources plugin copies these resources to target/classes. + However copying them to target/classes will make them appear in WEB-INF/classes + in the generated WAR since the WAR plugin copies resources in target/classes in + WEB-INF/classes. Thus to prevent this we're binding this execution to a phase + that comes after the execution of the resources plugin (which executes in the + process-resources phase). Thus this remote resources plugin will execute just + after the resources plugin and the resources won't be copied, which is why we're + adding a webResource configuration element below in the WAR plugin's + configuration. --> + <phase>process-resources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> + <resourceBundles> + <resourceBundle>com.xpn.xwiki.platform:xwiki-configuration-resources:${platform.tools.version}</resourceBundle> + </resourceBundles> + <properties> + <xwikiDbConnectionUrl>none</xwikiDbConnectionUrl> + </properties> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>${project.build.directory}/maven-shared-archive-resources</directory> + <targetPath>WEB-INF</targetPath> + <includes> + <include>hibernate.cfg.xml</include> + <include>xwiki.cfg</include> + </includes> + </resource> + <resource> + <directory>${basedir}/src/main/webInfResources</directory> + <targetPath>WEB-INF</targetPath> + <filtering>true</filtering> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + <profiles> + <profile> + <id>jettyrun</id> + <build> + <plugins> + <!-- Run 'mvn install -Pjettyrun' to execute xwiki in Jetty. Useful for testing. + Note: You'll need a database set up and running. If you use the HSQLDB profile + the database is looked for in database/ so it's very likely you'll get an + empty wiki. You'll need to import some pages in it using a XAR for example. --> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <configuration> + <contextPath>/xwiki</contextPath> + <classesDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF</classesDirectory> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>8080</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + <!-- Add the database JAR since it's not included in the WAR. The Hibernate config + file is automtically added by the remote resources plugin --> + <dependencies> + <dependency> + <groupId>${xwiki.db.jdbc.groupId}</groupId> + <artifactId>${xwiki.db.jdbc.artifactId}</artifactId> + <version>${xwiki.db.jdbc.version}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <configuration> + <properties> + <xwikiDbConnectionUrl>${xwiki.db.connection.url}</xwikiDbConnectionUrl> + </properties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>ci</id> + <activation> + <!-- This property is automatically defined by the Maven release plugin when executing + a release. Thus this profile will be automatically enabled when releasing --> + <property> + <name>performRelease</name> + </property> + </activation> + <build> + <plugins> + <!-- Use the build number plugin to add the SVN revision number to XWiki's + version.properties file so that it's included when displaying XWiki's version. + Note: This plugin works by making the buildNumber property available. We then filter + the version.properties file so that the property is replaced by its value. --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>maven-buildnumber-plugin</artifactId> + <version>0.9.5</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <doCheck>true</doCheck> + <doUpdate>true</doUpdate> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications
