July 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r17932 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-07-11 18:58:06 -0400 (Sun, 11 Jul 2010) New Revision: 17932 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java Log: CDK: fixed @JsfRenderer not processed correctly for defined (non-generated) classes Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java 2010-07-11 21:43:10 UTC (rev 17931) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/processors/RendererProcessor.java 2010-07-11 22:58:06 UTC (rev 17932) @@ -30,6 +30,8 @@ import javax.lang.model.element.Element; import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; import org.richfaces.cdk.FileManager; import org.richfaces.cdk.Source; @@ -109,11 +111,18 @@ if (componentElement.getModifiers().contains(Modifier.ABSTRACT) || !Strings.isEmpty(generatedClass)) { modelElement.setGenerate(true); modelElement.setRendererClass(ClassName.parseName(generatedClass)); + modelElement.setBaseClass(ClassName.parseName(componentElement.getQualifiedName().toString())); } else { modelElement.setGenerate(false); + modelElement.setRendererClass(ClassName.parseName(componentElement.getQualifiedName().toString())); + + TypeMirror superclass = componentElement.getSuperclass(); + if (superclass.getKind() == TypeKind.DECLARED) { + TypeElement typeElement = getSourceUtils().asTypeElement(superclass); + modelElement.setBaseClass(ClassName.parseName(typeElement.getQualifiedName().toString())); + } } - modelElement.setBaseClass(ClassName.parseName(componentElement.getQualifiedName().toString())); } private void setComponentType(RendererModel rendererModel) {

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17931 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-07-11 17:43:10 -0400 (Sun, 11 Jul 2010) New Revision: 17931 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaMethod.java Log: Fix for NPE in CDK Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaMethod.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaMethod.java 2010-07-11 15:48:21 UTC (rev 17930) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/builder/model/JavaMethod.java 2010-07-11 21:43:10 UTC (rev 17931) @@ -22,6 +22,7 @@ package org.richfaces.cdk.templatecompiler.builder.model; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.richfaces.cdk.templatecompiler.el.types.ELType; @@ -80,7 +81,15 @@ public Iterable<JavaImport> getRequiredImports() { Iterable<JavaImport> exceptionsImports = Iterables.concat(Iterables.transform(getExceptions(), RequireImports.IMPORTS_TRANSFORM)); Iterable<JavaImport> argumentsImports = Iterables.concat(Iterables.transform(getArguments(), RequireImports.IMPORTS_TRANSFORM)); - Iterable<JavaImport> imports = Iterables.concat(getReturnType().getRequiredImports(),getMethodBody().getRequiredImports(),exceptionsImports,argumentsImports); + + Iterable<JavaImport> methodBodyImports = Collections.emptySet(); + + JavaStatement methodBody = getMethodBody(); + if (methodBody != null) { + methodBodyImports = methodBody.getRequiredImports(); + } + + Iterable<JavaImport> imports = Iterables.concat(getReturnType().getRequiredImports(),methodBodyImports,exceptionsImports,argumentsImports); return imports; } }

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17930 - root/tests/metamer/trunk/ftest.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-11 11:48:21 -0400 (Sun, 11 Jul 2010) New Revision: 17930 Modified: root/tests/metamer/trunk/ftest/pom.xml Log: switching back to version.richfaces=4.0.0-SNAPSHOT Modified: root/tests/metamer/trunk/ftest/pom.xml =================================================================== --- root/tests/metamer/trunk/ftest/pom.xml 2010-07-11 15:41:06 UTC (rev 17929) +++ root/tests/metamer/trunk/ftest/pom.xml 2010-07-11 15:48:21 UTC (rev 17930) @@ -79,8 +79,8 @@ <properties> <context.path>/metamer/</context.path> - <deployable.version>4.0.0.Alpha2</deployable.version> - <ftest.source.version>4.0.0.Alpha2</ftest.source.version> + <deployable.version>4.0.0-SNAPSHOT</deployable.version> + <ftest.source.version>4.0.0-SNAPSHOT</ftest.source.version> <testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml> </properties>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17929 - root/tests/metamer/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-11 11:41:06 -0400 (Sun, 11 Jul 2010) New Revision: 17929 Modified: root/tests/metamer/trunk/pom.xml Log: switching back to version.richfaces=4.0.0-SNAPSHOT Modified: root/tests/metamer/trunk/pom.xml =================================================================== --- root/tests/metamer/trunk/pom.xml 2010-07-11 15:37:07 UTC (rev 17928) +++ root/tests/metamer/trunk/pom.xml 2010-07-11 15:41:06 UTC (rev 17929) @@ -95,7 +95,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <version.richfaces>4.0.0.Alpha2</version.richfaces> + <version.richfaces>4.0.0-SNAPSHOT</version.richfaces> </properties> <dependencyManagement>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17928 - in root/tests/metamer/trunk: application and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-11 11:37:07 -0400 (Sun, 11 Jul 2010) New Revision: 17928 Modified: root/tests/metamer/trunk/application/pom.xml root/tests/metamer/trunk/ftest-source/pom.xml root/tests/metamer/trunk/ftest/pom.xml root/tests/metamer/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: root/tests/metamer/trunk/application/pom.xml =================================================================== --- root/tests/metamer/trunk/application/pom.xml 2010-07-11 15:36:53 UTC (rev 17927) +++ root/tests/metamer/trunk/application/pom.xml 2010-07-11 15:37:07 UTC (rev 17928) @@ -26,7 +26,7 @@ <parent> <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.0.0.Alpha2</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.richfaces.tests</groupId> Modified: root/tests/metamer/trunk/ftest/pom.xml =================================================================== --- root/tests/metamer/trunk/ftest/pom.xml 2010-07-11 15:36:53 UTC (rev 17927) +++ root/tests/metamer/trunk/ftest/pom.xml 2010-07-11 15:37:07 UTC (rev 17928) @@ -30,14 +30,14 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-ftest</artifactId> - <version>4.0.0.Alpha2</version> + <version>4.0.0-SNAPSHOT</version> <name>Metamer: RichFaces Testing Application - Functional Test</name> <packaging>pom</packaging> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/trunk...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/tags/met...</developerConnection> - <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/trunk/tags/m...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/trunk...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/ftest</developerConnection> + <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/trunk/ftest</url> </scm> <licenses> Modified: root/tests/metamer/trunk/ftest-source/pom.xml =================================================================== --- root/tests/metamer/trunk/ftest-source/pom.xml 2010-07-11 15:36:53 UTC (rev 17927) +++ root/tests/metamer/trunk/ftest-source/pom.xml 2010-07-11 15:37:07 UTC (rev 17928) @@ -25,7 +25,7 @@ <parent> <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.0.0.Alpha2</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.richfaces.tests</groupId> Modified: root/tests/metamer/trunk/pom.xml =================================================================== --- root/tests/metamer/trunk/pom.xml 2010-07-11 15:36:53 UTC (rev 17927) +++ root/tests/metamer/trunk/pom.xml 2010-07-11 15:37:07 UTC (rev 17928) @@ -31,7 +31,7 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.0.0.Alpha2</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Metamer: RichFaces Testing Application - Project Root</name> @@ -50,9 +50,9 @@ </licenses> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/tags/...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/tags/met...</developerConnection> - <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/tags/metamer...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/trunk</url> </scm> <distributionManagement>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17927 - root/tests/metamer/tags.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-11 11:36:53 -0400 (Sun, 11 Jul 2010) New Revision: 17927 Added: root/tests/metamer/tags/metamer-4.0.0.Alpha2/ Log: [maven-scm] copy for tag metamer-4.0.0.Alpha2 Copied: root/tests/metamer/tags/metamer-4.0.0.Alpha2 (from rev 17926, root/tests/metamer/trunk)

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17926 - in root/tests/metamer/trunk: application and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-11 11:36:29 -0400 (Sun, 11 Jul 2010) New Revision: 17926 Modified: root/tests/metamer/trunk/application/pom.xml root/tests/metamer/trunk/ftest-source/pom.xml root/tests/metamer/trunk/ftest/pom.xml root/tests/metamer/trunk/pom.xml Log: [maven-release-plugin] prepare release metamer-4.0.0.Alpha2 Modified: root/tests/metamer/trunk/application/pom.xml =================================================================== --- root/tests/metamer/trunk/application/pom.xml 2010-07-11 15:33:16 UTC (rev 17925) +++ root/tests/metamer/trunk/application/pom.xml 2010-07-11 15:36:29 UTC (rev 17926) @@ -1,300 +1,299 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  - -<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/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.richfaces.tests</groupId> - <artifactId>metamer-root</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> - - <groupId>org.richfaces.tests</groupId> - <artifactId>metamer</artifactId> - <packaging>war</packaging> - <name>Metamer: RichFaces Testing Application</name> - - <repositories> - <repository> - <id>maven-repository2.dev.java.net</id> - <name>Java.net Repository for Maven 2</name> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - - <properties> - <jetty.port>8080</jetty.port> - </properties> - - <dependencies> -  - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - </dependency> - -  - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - </dependency> - -  - </dependencies> - - <build> - <finalName>metamer</finalName> - - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>${jetty.port}</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <id>jee6</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> - <classifier>jee6</classifier> - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes> - </configuration> - </execution> - </executions> - <configuration> - <classifier>tomcat6</classifier> - </configuration> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>group-sources</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <finalName>sources</finalName> - <descriptor>assembler.xml</descriptor> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>package</phase> - <configuration> - <classesDirectory>${basedir}/target/sources/sources</classesDirectory> - <classifier>sources</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jee6</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6 - </webappDirectory> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>glassfish3</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-glassfish3 - </webappDirectory> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> -</project> - - - +<?xml version="1.0" encoding="UTF-8"?> + +  + +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces.tests</groupId> + <artifactId>metamer-root</artifactId> + <version>4.0.0.Alpha2</version> + </parent> + + <groupId>org.richfaces.tests</groupId> + <artifactId>metamer</artifactId> + <packaging>war</packaging> + <name>Metamer: RichFaces Testing Application</name> + + <repositories> + <repository> + <id>maven-repository2.dev.java.net</id> + <name>Java.net Repository for Maven 2</name> + <url>http://download.java.net/maven/2</url> + </repository> + </repositories> + + <properties> + <jetty.port>8080</jetty.port> + </properties> + + <dependencies> +  + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + </dependency> + +  + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + </dependency> + +  + </dependencies> + + <build> + <finalName>metamer</finalName> + + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.18</version> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>${jetty.port}</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>jee6</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + <classifier>jee6</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes> + </configuration> + </execution> + </executions> + <configuration> + <classifier>tomcat6</classifier> + </configuration> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>group-sources</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <finalName>sources</finalName> + <descriptor>assembler.xml</descriptor> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + <phase>package</phase> + <configuration> + <classesDirectory>${basedir}/target/sources/sources</classesDirectory> + <classifier>sources</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jee6</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6 + </webappDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>glassfish3</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-glassfish3 + </webappDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> +</project> + + + Modified: root/tests/metamer/trunk/ftest/pom.xml =================================================================== --- root/tests/metamer/trunk/ftest/pom.xml 2010-07-11 15:33:16 UTC (rev 17925) +++ root/tests/metamer/trunk/ftest/pom.xml 2010-07-11 15:36:29 UTC (rev 17926) @@ -19,8 +19,7 @@ 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"> +<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> @@ -31,14 +30,14 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-ftest</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Alpha2</version> <name>Metamer: RichFaces Testing Application - Functional Test</name> <packaging>pom</packaging> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/trunk...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/ftest</developerConnection> - <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/trunk/ftest</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/trunk...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/tags/met...</developerConnection> + <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/trunk/tags/m...</url> </scm> <licenses> @@ -80,8 +79,8 @@ <properties> <context.path>/metamer/</context.path> - <deployable.version>4.0.0-SNAPSHOT</deployable.version> - <ftest.source.version>4.0.0-SNAPSHOT</ftest.source.version> + <deployable.version>4.0.0.Alpha2</deployable.version> + <ftest.source.version>4.0.0.Alpha2</ftest.source.version> <testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml> </properties> Modified: root/tests/metamer/trunk/ftest-source/pom.xml =================================================================== --- root/tests/metamer/trunk/ftest-source/pom.xml 2010-07-11 15:33:16 UTC (rev 17925) +++ root/tests/metamer/trunk/ftest-source/pom.xml 2010-07-11 15:36:29 UTC (rev 17926) @@ -19,14 +19,13 @@ 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"> +<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.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Alpha2</version> </parent> <groupId>org.richfaces.tests</groupId> Modified: root/tests/metamer/trunk/pom.xml =================================================================== --- root/tests/metamer/trunk/pom.xml 2010-07-11 15:33:16 UTC (rev 17925) +++ root/tests/metamer/trunk/pom.xml 2010-07-11 15:36:29 UTC (rev 17926) @@ -1,158 +1,157 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  - -<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/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> - </parent> - - <groupId>org.richfaces.tests</groupId> - <artifactId>metamer-root</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Metamer: RichFaces Testing Application - Project Root</name> - - <modules> - <module>application</module> - <module>ftest-source</module> - <module>ftest</module> - </modules> - - <licenses> - <license> - <name>GNU Lesser General Public License, Version 2.1</name> - <distribution>repo</distribution> - <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url> - </license> - </licenses> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/trunk</url> - </scm> - - <distributionManagement> - <snapshotRepository> - <id>jboss-qa-snapshots</id> - <name>JBoss QA snapshot repository</name> - <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/snapshots</url> - </snapshotRepository> - <repository> - <id>jboss-qa-releases</id> - <name>JBoss QA selease repository</name> - <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url> - </repository> - </distributionManagement> - - <issueManagement> - <system>jira</system> - <url>https://jira.jboss.org/jira/browse/RFPL</url> - </issueManagement> - - <developers> - <developer> - <name>Pavol Pitonak</name> - <email>ppitonak(a)redhat.com</email> - </developer> - <developer> - <name>Lukas Fryc</name> - <email>lfryc(a)redhat.com</email> - </developer> - </developers> - - <repositories> - <repository> - <id>jboss-qa-repository</id> - <url>http://nexus.qa.jboss.com:8081/nexus/content/groups/public-all</url> - </repository> - </repositories> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <version.richfaces>4.0.0-SNAPSHOT</version.richfaces> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-bom</artifactId> - <version>${version.richfaces}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${version.richfaces}</version> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.12.1</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <plugins> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <arguments>-Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> - <tagBase>https://svn.jboss.org/repos/richfaces/root/tests/metamer/tags</tagBase> - <branchBase>https://svn.jboss.org/repos/richfaces/root/tests/metamer/branches</branchBase> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-build-checkstyle</artifactId> - <version>${richfaces.checkstyle.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> - - - +<?xml version="1.0" encoding="UTF-8"?> + +  + +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>7</version> + </parent> + + <groupId>org.richfaces.tests</groupId> + <artifactId>metamer-root</artifactId> + <version>4.0.0.Alpha2</version> + <packaging>pom</packaging> + <name>Metamer: RichFaces Testing Application - Project Root</name> + + <modules> + <module>application</module> + <module>ftest-source</module> + <module>ftest</module> + </modules> + + <licenses> + <license> + <name>GNU Lesser General Public License, Version 2.1</name> + <distribution>repo</distribution> + <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url> + </license> + </licenses> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/tags/...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/tags/met...</developerConnection> + <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/tags/metamer...</url> + </scm> + + <distributionManagement> + <snapshotRepository> + <id>jboss-qa-snapshots</id> + <name>JBoss QA snapshot repository</name> + <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/snapshots</url> + </snapshotRepository> + <repository> + <id>jboss-qa-releases</id> + <name>JBoss QA selease repository</name> + <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url> + </repository> + </distributionManagement> + + <issueManagement> + <system>jira</system> + <url>https://jira.jboss.org/jira/browse/RFPL</url> + </issueManagement> + + <developers> + <developer> + <name>Pavol Pitonak</name> + <email>ppitonak(a)redhat.com</email> + </developer> + <developer> + <name>Lukas Fryc</name> + <email>lfryc(a)redhat.com</email> + </developer> + </developers> + + <repositories> + <repository> + <id>jboss-qa-repository</id> + <url>http://nexus.qa.jboss.com:8081/nexus/content/groups/public-all</url> + </repository> + </repositories> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <richfaces.checkstyle.version>1</richfaces.checkstyle.version> + <version.richfaces>4.0.0.Alpha2</version.richfaces> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-bom</artifactId> + <version>${version.richfaces}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>${version.richfaces}</version> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.12.1</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <plugins> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <arguments>-Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> + <tagBase>https://svn.jboss.org/repos/richfaces/root/tests/metamer/tags</tagBase> + <branchBase>https://svn.jboss.org/repos/richfaces/root/tests/metamer/branches</branchBase> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle</artifactId> + <version>${richfaces.checkstyle.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> + + +

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17925 - root/tests/metamer/trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-11 11:33:16 -0400 (Sun, 11 Jul 2010) New Revision: 17925 Modified: root/tests/metamer/trunk/pom.xml Log: fixed the release plugin settings (wrong tag and branch base) Modified: root/tests/metamer/trunk/pom.xml =================================================================== --- root/tests/metamer/trunk/pom.xml 2010-07-11 15:31:45 UTC (rev 17924) +++ root/tests/metamer/trunk/pom.xml 2010-07-11 15:33:16 UTC (rev 17925) @@ -132,8 +132,8 @@ <artifactId>maven-release-plugin</artifactId> <configuration> <arguments>-Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> - <tagBase>https://svn.jboss.org/repos/qa/richfaces-selenium/tags</tagBase> - <branchBase>https://svn.jboss.org/repos/qa/richfaces-selenium/branches</branchBase> + <tagBase>https://svn.jboss.org/repos/richfaces/root/tests/metamer/tags</tagBase> + <branchBase>https://svn.jboss.org/repos/richfaces/root/tests/metamer/branches</branchBase> </configuration> </plugin> </plugins>

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17924 - in root/tests/metamer/trunk: application and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-11 11:31:45 -0400 (Sun, 11 Jul 2010) New Revision: 17924 Modified: root/tests/metamer/trunk/application/pom.xml root/tests/metamer/trunk/ftest-source/pom.xml root/tests/metamer/trunk/ftest/pom.xml root/tests/metamer/trunk/pom.xml Log: reverting previous release Modified: root/tests/metamer/trunk/application/pom.xml =================================================================== --- root/tests/metamer/trunk/application/pom.xml 2010-07-11 15:22:55 UTC (rev 17923) +++ root/tests/metamer/trunk/application/pom.xml 2010-07-11 15:31:45 UTC (rev 17924) @@ -1,299 +1,300 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  - -<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/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.richfaces.tests</groupId> - <artifactId>metamer-root</artifactId> - <version>4.0.0.Alpha2</version> - </parent> - - <groupId>org.richfaces.tests</groupId> - <artifactId>metamer</artifactId> - <packaging>war</packaging> - <name>Metamer: RichFaces Testing Application</name> - - <repositories> - <repository> - <id>maven-repository2.dev.java.net</id> - <name>Java.net Repository for Maven 2</name> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - - <properties> - <jetty.port>8080</jetty.port> - </properties> - - <dependencies> -  - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - </dependency> - -  - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - </dependency> - -  - </dependencies> - - <build> - <finalName>metamer</finalName> - - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>${jetty.port}</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <id>jee6</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> - <classifier>jee6</classifier> - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes> - </configuration> - </execution> - </executions> - <configuration> - <classifier>tomcat6</classifier> - </configuration> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>group-sources</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <finalName>sources</finalName> - <descriptor>assembler.xml</descriptor> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>package</phase> - <configuration> - <classesDirectory>${basedir}/target/sources/sources</classesDirectory> - <classifier>sources</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jee6</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6 - </webappDirectory> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>glassfish3</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-glassfish3 - </webappDirectory> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> -</project> - - - +<?xml version="1.0" encoding="UTF-8"?> + +  + +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces.tests</groupId> + <artifactId>metamer-root</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <groupId>org.richfaces.tests</groupId> + <artifactId>metamer</artifactId> + <packaging>war</packaging> + <name>Metamer: RichFaces Testing Application</name> + + <repositories> + <repository> + <id>maven-repository2.dev.java.net</id> + <name>Java.net Repository for Maven 2</name> + <url>http://download.java.net/maven/2</url> + </repository> + </repositories> + + <properties> + <jetty.port>8080</jetty.port> + </properties> + + <dependencies> +  + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + </dependency> + +  + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + </dependency> + +  + </dependencies> + + <build> + <finalName>metamer</finalName> + + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.18</version> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>${jetty.port}</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>jee6</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + <classifier>jee6</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes> + </configuration> + </execution> + </executions> + <configuration> + <classifier>tomcat6</classifier> + </configuration> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>group-sources</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <finalName>sources</finalName> + <descriptor>assembler.xml</descriptor> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + <phase>package</phase> + <configuration> + <classesDirectory>${basedir}/target/sources/sources</classesDirectory> + <classifier>sources</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jee6</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6 + </webappDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>glassfish3</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-glassfish3 + </webappDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> +</project> + + + Modified: root/tests/metamer/trunk/ftest/pom.xml =================================================================== --- root/tests/metamer/trunk/ftest/pom.xml 2010-07-11 15:22:55 UTC (rev 17923) +++ root/tests/metamer/trunk/ftest/pom.xml 2010-07-11 15:31:45 UTC (rev 17924) @@ -19,7 +19,8 @@ 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"> +<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> @@ -30,14 +31,14 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-ftest</artifactId> - <version>4.0.0.Alpha2</version> + <version>4.0.0-SNAPSHOT</version> <name>Metamer: RichFaces Testing Application - Functional Test</name> <packaging>pom</packaging> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/qa/richfaces-selenium/tags/metamer-4....</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/qa/richfaces-selenium/tags/metamer-4....</developerConnection> - <url>scm:svn:https://svn.jboss.org/repos/qa/richfaces-selenium/tags/metamer-4....</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/trunk...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/ftest</developerConnection> + <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/trunk/ftest</url> </scm> <licenses> @@ -79,8 +80,8 @@ <properties> <context.path>/metamer/</context.path> - <deployable.version>4.0.0.Alpha2</deployable.version> - <ftest.source.version>4.0.0.Alpha2</ftest.source.version> + <deployable.version>4.0.0-SNAPSHOT</deployable.version> + <ftest.source.version>4.0.0-SNAPSHOT</ftest.source.version> <testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml> </properties> Modified: root/tests/metamer/trunk/ftest-source/pom.xml =================================================================== --- root/tests/metamer/trunk/ftest-source/pom.xml 2010-07-11 15:22:55 UTC (rev 17923) +++ root/tests/metamer/trunk/ftest-source/pom.xml 2010-07-11 15:31:45 UTC (rev 17924) @@ -19,13 +19,14 @@ 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"> +<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.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.0.0.Alpha2</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.richfaces.tests</groupId> Modified: root/tests/metamer/trunk/pom.xml =================================================================== --- root/tests/metamer/trunk/pom.xml 2010-07-11 15:22:55 UTC (rev 17923) +++ root/tests/metamer/trunk/pom.xml 2010-07-11 15:31:45 UTC (rev 17924) @@ -1,157 +1,158 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  - -<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/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> - </parent> - - <groupId>org.richfaces.tests</groupId> - <artifactId>metamer-root</artifactId> - <version>4.0.0.Alpha2</version> - <packaging>pom</packaging> - <name>Metamer: RichFaces Testing Application - Project Root</name> - - <modules> - <module>application</module> - <module>ftest-source</module> - <module>ftest</module> - </modules> - - <licenses> - <license> - <name>GNU Lesser General Public License, Version 2.1</name> - <distribution>repo</distribution> - <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url> - </license> - </licenses> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/qa/richfaces-selenium/tags/metamer...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/qa/richfaces-selenium/tags/metamer-4....</developerConnection> - <url>scm:svn:https://svn.jboss.org/repos/qa/richfaces-selenium/tags/metamer-4....</url> - </scm> - - <distributionManagement> - <snapshotRepository> - <id>jboss-qa-snapshots</id> - <name>JBoss QA snapshot repository</name> - <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/snapshots</url> - </snapshotRepository> - <repository> - <id>jboss-qa-releases</id> - <name>JBoss QA selease repository</name> - <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url> - </repository> - </distributionManagement> - - <issueManagement> - <system>jira</system> - <url>https://jira.jboss.org/jira/browse/RFPL</url> - </issueManagement> - - <developers> - <developer> - <name>Pavol Pitonak</name> - <email>ppitonak(a)redhat.com</email> - </developer> - <developer> - <name>Lukas Fryc</name> - <email>lfryc(a)redhat.com</email> - </developer> - </developers> - - <repositories> - <repository> - <id>jboss-qa-repository</id> - <url>http://nexus.qa.jboss.com:8081/nexus/content/groups/public-all</url> - </repository> - </repositories> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <version.richfaces>4.0.0.Alpha2</version.richfaces> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-bom</artifactId> - <version>${version.richfaces}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${version.richfaces}</version> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.12.1</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <plugins> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <arguments>-Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> - <tagBase>https://svn.jboss.org/repos/qa/richfaces-selenium/tags</tagBase> - <branchBase>https://svn.jboss.org/repos/qa/richfaces-selenium/branches</branchBase> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-build-checkstyle</artifactId> - <version>${richfaces.checkstyle.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> - - - +<?xml version="1.0" encoding="UTF-8"?> + +  + +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>7</version> + </parent> + + <groupId>org.richfaces.tests</groupId> + <artifactId>metamer-root</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Metamer: RichFaces Testing Application - Project Root</name> + + <modules> + <module>application</module> + <module>ftest-source</module> + <module>ftest</module> + </modules> + + <licenses> + <license> + <name>GNU Lesser General Public License, Version 2.1</name> + <distribution>repo</distribution> + <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url> + </license> + </licenses> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/trunk</url> + </scm> + + <distributionManagement> + <snapshotRepository> + <id>jboss-qa-snapshots</id> + <name>JBoss QA snapshot repository</name> + <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/snapshots</url> + </snapshotRepository> + <repository> + <id>jboss-qa-releases</id> + <name>JBoss QA selease repository</name> + <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url> + </repository> + </distributionManagement> + + <issueManagement> + <system>jira</system> + <url>https://jira.jboss.org/jira/browse/RFPL</url> + </issueManagement> + + <developers> + <developer> + <name>Pavol Pitonak</name> + <email>ppitonak(a)redhat.com</email> + </developer> + <developer> + <name>Lukas Fryc</name> + <email>lfryc(a)redhat.com</email> + </developer> + </developers> + + <repositories> + <repository> + <id>jboss-qa-repository</id> + <url>http://nexus.qa.jboss.com:8081/nexus/content/groups/public-all</url> + </repository> + </repositories> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <richfaces.checkstyle.version>1</richfaces.checkstyle.version> + <version.richfaces>4.0.0-SNAPSHOT</version.richfaces> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-bom</artifactId> + <version>${version.richfaces}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>${version.richfaces}</version> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.12.1</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <plugins> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <arguments>-Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> + <tagBase>https://svn.jboss.org/repos/qa/richfaces-selenium/tags</tagBase> + <branchBase>https://svn.jboss.org/repos/qa/richfaces-selenium/branches</branchBase> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle</artifactId> + <version>${richfaces.checkstyle.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> + + +

14 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r17923 - in root/tests/metamer/trunk: application and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-07-11 11:22:55 -0400 (Sun, 11 Jul 2010) New Revision: 17923 Modified: root/tests/metamer/trunk/application/pom.xml root/tests/metamer/trunk/ftest-source/pom.xml root/tests/metamer/trunk/ftest/pom.xml root/tests/metamer/trunk/pom.xml Log: [maven-release-plugin] prepare release metamer-4.0.0.Alpha2 Modified: root/tests/metamer/trunk/application/pom.xml =================================================================== --- root/tests/metamer/trunk/application/pom.xml 2010-07-11 15:18:40 UTC (rev 17922) +++ root/tests/metamer/trunk/application/pom.xml 2010-07-11 15:22:55 UTC (rev 17923) @@ -1,300 +1,299 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  - -<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/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.richfaces.tests</groupId> - <artifactId>metamer-root</artifactId> - <version>4.0.0-SNAPSHOT</version> - </parent> - - <groupId>org.richfaces.tests</groupId> - <artifactId>metamer</artifactId> - <packaging>war</packaging> - <name>Metamer: RichFaces Testing Application</name> - - <repositories> - <repository> - <id>maven-repository2.dev.java.net</id> - <name>Java.net Repository for Maven 2</name> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - - <properties> - <jetty.port>8080</jetty.port> - </properties> - - <dependencies> -  - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - </dependency> - -  - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - -  - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - </dependency> - -  - </dependencies> - - <build> - <finalName>metamer</finalName> - - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>${jetty.port}</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <id>jee6</id> - <phase>package</phase> - <goals> - <goal>war</goal> - </goals> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> - <classifier>jee6</classifier> - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes> - </configuration> - </execution> - </executions> - <configuration> - <classifier>tomcat6</classifier> - </configuration> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>group-sources</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <finalName>sources</finalName> - <descriptor>assembler.xml</descriptor> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>package</phase> - <configuration> - <classesDirectory>${basedir}/target/sources/sources</classesDirectory> - <classifier>sources</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jee6</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6 - </webappDirectory> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>glassfish3</id> - <build> - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webappDirectory>${project.build.directory}/${project.build.finalName}-glassfish3 - </webappDirectory> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>${jsf2.api.groupid}</groupId> - <artifactId>${jsf2.api.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>${jsf2.impl.groupid}</groupId> - <artifactId>${jsf2.impl.artifactid}</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <version>1.1</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - </profiles> -</project> - - - +<?xml version="1.0" encoding="UTF-8"?> + +  + +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces.tests</groupId> + <artifactId>metamer-root</artifactId> + <version>4.0.0.Alpha2</version> + </parent> + + <groupId>org.richfaces.tests</groupId> + <artifactId>metamer</artifactId> + <packaging>war</packaging> + <name>Metamer: RichFaces Testing Application</name> + + <repositories> + <repository> + <id>maven-repository2.dev.java.net</id> + <name>Java.net Repository for Maven 2</name> + <url>http://download.java.net/maven/2</url> + </repository> + </repositories> + + <properties> + <jetty.port>8080</jetty.port> + </properties> + + <dependencies> +  + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + </dependency> + +  + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + </dependency> + +  + </dependencies> + + <build> + <finalName>metamer</finalName> + + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.18</version> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>${jetty.port}</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>jee6</id> + <phase>package</phase> + <goals> + <goal>war</goal> + </goals> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> + <classifier>jee6</classifier> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/jta-*</warSourceExcludes> + </configuration> + </execution> + </executions> + <configuration> + <classifier>tomcat6</classifier> + </configuration> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>group-sources</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <finalName>sources</finalName> + <descriptor>assembler.xml</descriptor> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + <phase>package</phase> + <configuration> + <classesDirectory>${basedir}/target/sources/sources</classesDirectory> + <classifier>sources</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jee6</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6 + </webappDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.16</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>glassfish3</id> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webappDirectory>${project.build.directory}/${project.build.finalName}-glassfish3 + </webappDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>${jsf2.api.groupid}</groupId> + <artifactId>${jsf2.api.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${jsf2.impl.groupid}</groupId> + <artifactId>${jsf2.impl.artifactid}</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> +</project> + + + Modified: root/tests/metamer/trunk/ftest/pom.xml =================================================================== --- root/tests/metamer/trunk/ftest/pom.xml 2010-07-11 15:18:40 UTC (rev 17922) +++ root/tests/metamer/trunk/ftest/pom.xml 2010-07-11 15:22:55 UTC (rev 17923) @@ -19,8 +19,7 @@ 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"> +<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> @@ -31,14 +30,14 @@ <groupId>org.richfaces.tests</groupId> <artifactId>metamer-ftest</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Alpha2</version> <name>Metamer: RichFaces Testing Application - Functional Test</name> <packaging>pom</packaging> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/trunk...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/ftest</developerConnection> - <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/trunk/ftest</url> + <connection>scm:svn:https://svn.jboss.org/repos/qa/richfaces-selenium/tags/metamer-4....</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/qa/richfaces-selenium/tags/metamer-4....</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/qa/richfaces-selenium/tags/metamer-4....</url> </scm> <licenses> @@ -80,8 +79,8 @@ <properties> <context.path>/metamer/</context.path> - <deployable.version>4.0.0-SNAPSHOT</deployable.version> - <ftest.source.version>4.0.0-SNAPSHOT</ftest.source.version> + <deployable.version>4.0.0.Alpha2</deployable.version> + <ftest.source.version>4.0.0.Alpha2</ftest.source.version> <testng.suite.xml>src/test/resources/testng.xml</testng.suite.xml> </properties> Modified: root/tests/metamer/trunk/ftest-source/pom.xml =================================================================== --- root/tests/metamer/trunk/ftest-source/pom.xml 2010-07-11 15:18:40 UTC (rev 17922) +++ root/tests/metamer/trunk/ftest-source/pom.xml 2010-07-11 15:22:55 UTC (rev 17923) @@ -19,14 +19,13 @@ 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"> +<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.richfaces.tests</groupId> <artifactId>metamer-root</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Alpha2</version> </parent> <groupId>org.richfaces.tests</groupId> Modified: root/tests/metamer/trunk/pom.xml =================================================================== --- root/tests/metamer/trunk/pom.xml 2010-07-11 15:18:40 UTC (rev 17922) +++ root/tests/metamer/trunk/pom.xml 2010-07-11 15:22:55 UTC (rev 17923) @@ -1,158 +1,157 @@ -<?xml version="1.0" encoding="UTF-8"?> - -  - -<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/xsd/maven-4.0.0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> - </parent> - - <groupId>org.richfaces.tests</groupId> - <artifactId>metamer-root</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Metamer: RichFaces Testing Application - Project Root</name> - - <modules> - <module>application</module> - <module>ftest-source</module> - <module>ftest</module> - </modules> - - <licenses> - <license> - <name>GNU Lesser General Public License, Version 2.1</name> - <distribution>repo</distribution> - <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url> - </license> - </licenses> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/tests/metamer/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root/tests/metamer/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/RichFaces/root/tests/metamer/trunk</url> - </scm> - - <distributionManagement> - <snapshotRepository> - <id>jboss-qa-snapshots</id> - <name>JBoss QA snapshot repository</name> - <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/snapshots</url> - </snapshotRepository> - <repository> - <id>jboss-qa-releases</id> - <name>JBoss QA selease repository</name> - <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url> - </repository> - </distributionManagement> - - <issueManagement> - <system>jira</system> - <url>https://jira.jboss.org/jira/browse/RFPL</url> - </issueManagement> - - <developers> - <developer> - <name>Pavol Pitonak</name> - <email>ppitonak(a)redhat.com</email> - </developer> - <developer> - <name>Lukas Fryc</name> - <email>lfryc(a)redhat.com</email> - </developer> - </developers> - - <repositories> - <repository> - <id>jboss-qa-repository</id> - <url>http://nexus.qa.jboss.com:8081/nexus/content/groups/public-all</url> - </repository> - </repositories> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <richfaces.checkstyle.version>1</richfaces.checkstyle.version> - <version.richfaces>4.0.0-SNAPSHOT</version.richfaces> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-bom</artifactId> - <version>${version.richfaces}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>${version.richfaces}</version> - </dependency> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.12.1</version> - </dependency> - </dependencies> - </dependencyManagement> - - <build> - <plugins> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <arguments>-Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> - <tagBase>https://svn.jboss.org/repos/qa/richfaces-selenium/tags</tagBase> - <branchBase>https://svn.jboss.org/repos/qa/richfaces-selenium/branches</branchBase> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-build-checkstyle</artifactId> - <version>${richfaces.checkstyle.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> - - - +<?xml version="1.0" encoding="UTF-8"?> + +  + +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>7</version> + </parent> + + <groupId>org.richfaces.tests</groupId> + <artifactId>metamer-root</artifactId> + <version>4.0.0.Alpha2</version> + <packaging>pom</packaging> + <name>Metamer: RichFaces Testing Application - Project Root</name> + + <modules> + <module>application</module> + <module>ftest-source</module> + <module>ftest</module> + </modules> + + <licenses> + <license> + <name>GNU Lesser General Public License, Version 2.1</name> + <distribution>repo</distribution> + <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url> + </license> + </licenses> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/qa/richfaces-selenium/tags/metamer...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/qa/richfaces-selenium/tags/metamer-4....</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/qa/richfaces-selenium/tags/metamer-4....</url> + </scm> + + <distributionManagement> + <snapshotRepository> + <id>jboss-qa-snapshots</id> + <name>JBoss QA snapshot repository</name> + <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/snapshots</url> + </snapshotRepository> + <repository> + <id>jboss-qa-releases</id> + <name>JBoss QA selease repository</name> + <url>http://nexus.qa.jboss.com:8081/nexus/content/repositories/releases</url> + </repository> + </distributionManagement> + + <issueManagement> + <system>jira</system> + <url>https://jira.jboss.org/jira/browse/RFPL</url> + </issueManagement> + + <developers> + <developer> + <name>Pavol Pitonak</name> + <email>ppitonak(a)redhat.com</email> + </developer> + <developer> + <name>Lukas Fryc</name> + <email>lfryc(a)redhat.com</email> + </developer> + </developers> + + <repositories> + <repository> + <id>jboss-qa-repository</id> + <url>http://nexus.qa.jboss.com:8081/nexus/content/groups/public-all</url> + </repository> + </repositories> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <richfaces.checkstyle.version>1</richfaces.checkstyle.version> + <version.richfaces>4.0.0.Alpha2</version.richfaces> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-bom</artifactId> + <version>${version.richfaces}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + <dependency> + <groupId>org.richfaces.cdk</groupId> + <artifactId>annotations</artifactId> + <version>${version.richfaces}</version> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.12.1</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <plugins> + <plugin> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <arguments>-Dselenium.test.skip=true -Dselenium.server.skip=true</arguments> + <tagBase>https://svn.jboss.org/repos/qa/richfaces-selenium/tags</tagBase> + <branchBase>https://svn.jboss.org/repos/qa/richfaces-selenium/branches</branchBase> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-build-checkstyle</artifactId> + <version>${richfaces.checkstyle.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> + + +

14 years, 6 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits July 2010