[exo-jcr-commits] exo-jcr SVN: r269 - in ws/trunk: commons and 6 other directories.

Author: aparfonov Date: 2009-10-12 12:06:15 -0400 (Mon, 12 Oct 2009) New Revision: 269 Modified: ws/trunk/commons/pom.xml ws/trunk/frameworks/json/pom.xml ws/trunk/frameworks/servlet/pom.xml ws/trunk/packaging/module/pom.xml ws/trunk/pom.xml ws/trunk/rest/core/pom.xml ws/trunk/rest/ext/pom.xml ws/trunk/testframework/pom.xml Log: resore poms after using maven release plugin Modified: ws/trunk/commons/pom.xml =================================================================== --- ws/trunk/commons/pom.xml 2009-10-12 15:50:57 UTC (rev 268) +++ ws/trunk/commons/pom.xml 2009-10-12 16:06:15 UTC (rev 269) @@ -1,49 +1,49 @@ -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - 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.exoplatform.ws</groupId> - <artifactId>ws-parent</artifactId> - <version>2.2.x-SNAPSHOT</version> - </parent> - - <artifactId>exo.ws.commons</artifactId> - - <name>eXo WS :: Commons Utils</name> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.stream</groupId> - <artifactId>sjsxp</artifactId> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </dependency> - </dependencies> -</project> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + 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.exoplatform.ws</groupId> + <artifactId>ws-parent</artifactId> + <version>2.1.0-Beta03-SNAPSHOT</version> + </parent> + + <artifactId>exo.ws.commons</artifactId> + + <name>eXo WS :: Commons Utils</name> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.stream</groupId> + <artifactId>sjsxp</artifactId> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> + </dependencies> +</project> Modified: ws/trunk/frameworks/json/pom.xml =================================================================== --- ws/trunk/frameworks/json/pom.xml 2009-10-12 15:50:57 UTC (rev 268) +++ ws/trunk/frameworks/json/pom.xml 2009-10-12 16:06:15 UTC (rev 269) @@ -1,54 +1,54 @@ -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - 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.exoplatform.ws</groupId> - <artifactId>ws-parent</artifactId> - <version>2.2.x-SNAPSHOT</version> - </parent> - - <artifactId>exo.ws.frameworks.json</artifactId> - - <name>eXo WS :: Framework :: JSON</name> - <description>eXo Java Bean to JSON Transformation</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.json</include> - <include>**/*.txt</include> - </includes> - </testResource> - </testResources> - </build> -</project> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + 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.exoplatform.ws</groupId> + <artifactId>ws-parent</artifactId> + <version>2.1.0-Beta03-SNAPSHOT</version> + </parent> + + <artifactId>exo.ws.frameworks.json</artifactId> + + <name>eXo WS :: Framework :: JSON</name> + <description>eXo Java Bean to JSON Transformation</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.json</include> + <include>**/*.txt</include> + </includes> + </testResource> + </testResources> + </build> +</project> Modified: ws/trunk/frameworks/servlet/pom.xml =================================================================== --- ws/trunk/frameworks/servlet/pom.xml 2009-10-12 15:50:57 UTC (rev 268) +++ ws/trunk/frameworks/servlet/pom.xml 2009-10-12 16:06:15 UTC (rev 269) @@ -1,41 +1,41 @@ -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - 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.exoplatform.ws</groupId> - <artifactId>ws-parent</artifactId> - <version>2.2.x-SNAPSHOT</version> - </parent> - - <artifactId>exo.ws.frameworks.servlet</artifactId> - - <name>eXo WS :: Framework :: Servlet</name> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - </dependencies> -</project> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + 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.exoplatform.ws</groupId> + <artifactId>ws-parent</artifactId> + <version>2.1.0-Beta03-SNAPSHOT</version> + </parent> + + <artifactId>exo.ws.frameworks.servlet</artifactId> + + <name>eXo WS :: Framework :: Servlet</name> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + </dependencies> +</project> Modified: ws/trunk/packaging/module/pom.xml =================================================================== --- ws/trunk/packaging/module/pom.xml 2009-10-12 15:50:57 UTC (rev 268) +++ ws/trunk/packaging/module/pom.xml 2009-10-12 16:06:15 UTC (rev 269) @@ -1,66 +1,66 @@ - <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"> - <parent> - <groupId>org.exoplatform.ws</groupId> - <artifactId>ws-parent</artifactId> - <version>2.2.x-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>ws.packaging.module</artifactId> - <packaging>pom</packaging> - <name>eXo WS Build module</name> - - <properties> - <exobuild.name>ws</exobuild.name> - <exobuild.type>module</exobuild.type> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>prepare</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>target</outputDirectory> - <resources> - <resource> - <directory>src/main/javascript</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>target/${exobuild.name}.packaging.${exobuild.type}.js</file> - <type>js</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> + <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"> + <parent> + <groupId>org.exoplatform.ws</groupId> + <artifactId>ws-parent</artifactId> + <version>2.1.0-Beta03-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>ws.packaging.module</artifactId> + <packaging>pom</packaging> + <name>eXo WS Build module</name> + + <properties> + <exobuild.name>ws</exobuild.name> + <exobuild.type>module</exobuild.type> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>prepare</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>target</outputDirectory> + <resources> + <resource> + <directory>src/main/javascript</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/${exobuild.name}.packaging.${exobuild.type}.js</file> + <type>js</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Modified: ws/trunk/pom.xml =================================================================== --- ws/trunk/pom.xml 2009-10-12 15:50:57 UTC (rev 268) +++ ws/trunk/pom.xml 2009-10-12 16:06:15 UTC (rev 269) @@ -1,205 +1,205 @@ -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - 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.exoplatform</groupId> - <artifactId>foundation-parent</artifactId> - <version>2</version> - </parent> - - <groupId>org.exoplatform.ws</groupId> - <artifactId>ws-parent</artifactId> - <version>2.2.x-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>eXo WS</name> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/ws/branches/... - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/ws/bra... - <url>http://fisheye.jboss.org/browse/exo-jcr/ws/branches/2.2.x</url> - </scm> - - <properties> - <exo.product.name>exo-ws</exo.product.name> - <exo.product.specification>2.1</exo.product.specification> - - <org.exoplatform.kernel.version>2.2.0-Beta02</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.0-Beta02</org.exoplatform.core.version> - - <exo.test.includes>*Test*</exo.test.includes> - </properties> - - <modules> - <module>commons</module> - <module>frameworks/json</module> - <module>frameworks/servlet</module> - <module>testframework</module> - <module>rest/core</module> - <module>rest/ext</module> - <module>packaging/module</module> - </modules> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.json</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.commons</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.testframework</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.xml-processing</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - - <dependency> - <groupId>com.sun.xml.stream</groupId> - <artifactId>sjsxp</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1.7</version> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <version>0.4</version> - </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <!-- <version>1.2.1</version>--> - <version>1.0</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.2</version> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.xml</include> - <include>**/*.xsl</include> - <include>**/*.xsd</include> - <include>**/*.properties</include> - <include>**/*.ion</include> - <include>**/*.conf</include> - <include>**/*.config</include> - <include>**/*.groovy</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*.xml</include> - <include>**/*.xsl</include> - <include>**/*.xsd</include> - <include>**/*.properties</include> - <include>**/login.conf</include> - <include>**/*.ion</include> - <include>**/*.conf</include> - <include>**/*.config</include> - <include>**/*.groovy</include> - </includes> - </resource> - </resources> - <testResources> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xsl</include> - <include>**/*.xsd</include> - <include>**/*.txt</include> - <include>**/*.conf</include> - <include>**/*.config</include> - <include>**/*.groovy</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xsl</include> - <include>**/*.xsd</include> - <include>**/*.txt</include> - <include>**/*.conf</include> - <include>**/*.config</include> - <include>**/*.groovy</include> - </includes> - </testResource> - </testResources> - </build> -</project> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + 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.exoplatform</groupId> + <artifactId>foundation-parent</artifactId> + <version>2</version> + </parent> + + <groupId>org.exoplatform.ws</groupId> + <artifactId>ws-parent</artifactId> + <version>2.1.0-Beta03-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>eXo WS</name> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/ws/trunk<... + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/ws/tru... + <url>http://fisheye.jboss.org/browse/exo-jcr/ws/trunk</url> + </scm> + + <properties> + <exo.product.name>exo-ws</exo.product.name> + <exo.product.specification>2.1</exo.product.specification> + + <org.exoplatform.kernel.version>2.2.0-Beta02</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.0-Beta02</org.exoplatform.core.version> + + <exo.test.includes>*Test*</exo.test.includes> + </properties> + + <modules> + <module>commons</module> + <module>frameworks/json</module> + <module>frameworks/servlet</module> + <module>testframework</module> + <module>rest/core</module> + <module>rest/ext</module> + <module>packaging/module</module> + </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.commons</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.testframework</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.xml-processing</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + + <dependency> + <groupId>com.sun.xml.stream</groupId> + <artifactId>sjsxp</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.1.7</version> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>org.jvnet.jaxb2.maven2</groupId> + <artifactId>maven-jaxb2-plugin</artifactId> + <version>0.4</version> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <!-- <version>1.2.1</version>--> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.2</version> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*.xml</include> + <include>**/*.xsl</include> + <include>**/*.xsd</include> + <include>**/*.properties</include> + <include>**/*.ion</include> + <include>**/*.conf</include> + <include>**/*.config</include> + <include>**/*.groovy</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*.xml</include> + <include>**/*.xsl</include> + <include>**/*.xsd</include> + <include>**/*.properties</include> + <include>**/login.conf</include> + <include>**/*.ion</include> + <include>**/*.conf</include> + <include>**/*.config</include> + <include>**/*.groovy</include> + </includes> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xsl</include> + <include>**/*.xsd</include> + <include>**/*.txt</include> + <include>**/*.conf</include> + <include>**/*.config</include> + <include>**/*.groovy</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xsl</include> + <include>**/*.xsd</include> + <include>**/*.txt</include> + <include>**/*.conf</include> + <include>**/*.config</include> + <include>**/*.groovy</include> + </includes> + </testResource> + </testResources> + </build> +</project> Modified: ws/trunk/rest/core/pom.xml =================================================================== --- ws/trunk/rest/core/pom.xml 2009-10-12 15:50:57 UTC (rev 268) +++ ws/trunk/rest/core/pom.xml 2009-10-12 16:06:15 UTC (rev 269) @@ -1,151 +1,151 @@ -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - 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.exoplatform.ws</groupId> - <artifactId>ws-parent</artifactId> - <version>2.2.x-SNAPSHOT</version> - </parent> - - <artifactId>exo.ws.rest.core</artifactId> - - <name>eXo WS :: REST :: Core</name> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.xml-processing</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.json</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.testframework</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <executions> - <execution> - <id>generate wadl classes</id> - <goals> - <goal>generate</goal> - </goals> - <phase>generate-sources</phase> - <configuration> - <schemaDirectory>src/main/resources</schemaDirectory> - <catalog>src/main/resources/catalog.xml</catalog> - <generateDirectory>target/generated-sources</generateDirectory> - <generatePackage>org.exoplatform.services.rest.wadl.research</generatePackage> - <args> - <arg>-extension</arg> - </args> - <schemaIncludes> - <include>wadl.xsd</include> - </schemaIncludes> - </configuration> - </execution> - <execution> - <id>generate classes for test</id> - <goals> - <goal>generate</goal> - </goals> - <phase>generate-test-sources</phase> - <configuration> - <schemaDirectory>src/test/resources</schemaDirectory> - <catalog>src/main/resources/catalog.xml</catalog> - <generateDirectory>target/generated-test-sources</generateDirectory> - <generatePackage>org.exoplatform.services.rest.generated</generatePackage> - <args> - <arg>-extension</arg> - </args> - <schemaIncludes> - <include>book.xsd</include> - </schemaIncludes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>0</id> - <goals> - <goal>run</goal> - </goals> - <phase>generate-test-sources</phase> - <configuration> - <tasks> - <echo>copy files gnerated by JAXB to test source directory</echo> - <copy todir="src/test/java"> - <fileset dir="target/generated-test-sources"> - <include name="org/**" /> - </fileset> - </copy> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + 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.exoplatform.ws</groupId> + <artifactId>ws-parent</artifactId> + <version>2.1.0-Beta03-SNAPSHOT</version> + </parent> + + <artifactId>exo.ws.rest.core</artifactId> + + <name>eXo WS :: REST :: Core</name> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.xml-processing</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.testframework</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </dependency> + <dependency> + <groupId>org.jvnet.jaxb2.maven2</groupId> + <artifactId>maven-jaxb2-plugin</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.jvnet.jaxb2.maven2</groupId> + <artifactId>maven-jaxb2-plugin</artifactId> + <executions> + <execution> + <id>generate wadl classes</id> + <goals> + <goal>generate</goal> + </goals> + <phase>generate-sources</phase> + <configuration> + <schemaDirectory>src/main/resources</schemaDirectory> + <catalog>src/main/resources/catalog.xml</catalog> + <generateDirectory>target/generated-sources</generateDirectory> + <generatePackage>org.exoplatform.services.rest.wadl.research</generatePackage> + <args> + <arg>-extension</arg> + </args> + <schemaIncludes> + <include>wadl.xsd</include> + </schemaIncludes> + </configuration> + </execution> + <execution> + <id>generate classes for test</id> + <goals> + <goal>generate</goal> + </goals> + <phase>generate-test-sources</phase> + <configuration> + <schemaDirectory>src/test/resources</schemaDirectory> + <catalog>src/main/resources/catalog.xml</catalog> + <generateDirectory>target/generated-test-sources</generateDirectory> + <generatePackage>org.exoplatform.services.rest.generated</generatePackage> + <args> + <arg>-extension</arg> + </args> + <schemaIncludes> + <include>book.xsd</include> + </schemaIncludes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>0</id> + <goals> + <goal>run</goal> + </goals> + <phase>generate-test-sources</phase> + <configuration> + <tasks> + <echo>copy files gnerated by JAXB to test source directory</echo> + <copy todir="src/test/java"> + <fileset dir="target/generated-test-sources"> + <include name="org/**" /> + </fileset> + </copy> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Modified: ws/trunk/rest/ext/pom.xml =================================================================== --- ws/trunk/rest/ext/pom.xml 2009-10-12 15:50:57 UTC (rev 268) +++ ws/trunk/rest/ext/pom.xml 2009-10-12 16:06:15 UTC (rev 269) @@ -1,49 +1,49 @@ -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - 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.exoplatform.ws</groupId> - <artifactId>ws-parent</artifactId> - <version>2.2.x-SNAPSHOT</version> - </parent> - - <artifactId>exo.ws.rest.ext</artifactId> - - <name>eXo WS :: REST :: Extentions</name> - - <dependencies> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.commons</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - </dependency> - </dependencies> -</project> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + 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.exoplatform.ws</groupId> + <artifactId>ws-parent</artifactId> + <version>2.1.0-Beta03-SNAPSHOT</version> + </parent> + + <artifactId>exo.ws.rest.ext</artifactId> + + <name>eXo WS :: REST :: Extentions</name> + + <dependencies> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </dependency> + </dependencies> +</project> Modified: ws/trunk/testframework/pom.xml =================================================================== --- ws/trunk/testframework/pom.xml 2009-10-12 15:50:57 UTC (rev 268) +++ ws/trunk/testframework/pom.xml 2009-10-12 16:06:15 UTC (rev 269) @@ -1,43 +1,43 @@ -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - 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.exoplatform.ws</groupId> - <artifactId>ws-parent</artifactId> - <version>2.2.x-SNAPSHOT</version> - </parent> - - <artifactId>exo.ws.testframework</artifactId> - - <name>eXo WS :: HTTP :: testframework</name> - - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.3</version> - <scope>compile</scope> - </dependency> - </dependencies> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + 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.exoplatform.ws</groupId> + <artifactId>ws-parent</artifactId> + <version>2.1.0-Beta03-SNAPSHOT</version> + </parent> + + <artifactId>exo.ws.testframework</artifactId> + + <name>eXo WS :: HTTP :: testframework</name> + + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.3</version> + <scope>compile</scope> + </dependency> + </dependencies> </project> \ No newline at end of file