[richfaces-svn-commits] JBoss Rich Faces SVN: r14146 - in trunk/examples/photoalbum: assembly and 7 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Tue May 12 20:46:31 EDT 2009
Author: nbelaevski
Date: 2009-05-12 20:46:30 -0400 (Tue, 12 May 2009)
New Revision: 14146
Removed:
trunk/examples/photoalbum/source/ear/src/main/application/jboss-app.xml
Modified:
trunk/examples/photoalbum/assembly/
trunk/examples/photoalbum/assembly/photoalbum.xml
trunk/examples/photoalbum/assembly/pom.xml
trunk/examples/photoalbum/pom.xml
trunk/examples/photoalbum/source/ear/pom.xml
trunk/examples/photoalbum/source/ejb/pom.xml
trunk/examples/photoalbum/source/pom.xml
trunk/examples/photoalbum/source/web/pom.xml
trunk/examples/photoalbum/tests/pom.xml
trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java
Log:
https://jira.jboss.org/jira/browse/RF-7082
Property changes on: trunk/examples/photoalbum/assembly
___________________________________________________________________
Name: svn:ignore
+ target
Modified: trunk/examples/photoalbum/assembly/photoalbum.xml
===================================================================
--- trunk/examples/photoalbum/assembly/photoalbum.xml 2009-05-12 23:36:50 UTC (rev 14145)
+++ trunk/examples/photoalbum/assembly/photoalbum.xml 2009-05-13 00:46:30 UTC (rev 14146)
@@ -1,5 +1,4 @@
<assembly>
- <id>photoalbum</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
@@ -7,9 +6,6 @@
<files>
<file>
- <source>/../source/ear/target/photoalbum-ear-1.0-SNAPSHOT.ear</source>
- </file>
- <file>
<source>/../../JBossORG-EULA.txt</source>
</file>
<file>
@@ -19,60 +15,31 @@
<fileSets>
<fileSet>
- <directory>/../doc</directory>
- <outputDirectory>/docs</outputDirectory>
+ <directory>target/docs</directory>
+ <outputDirectory>photoalbum/docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>/../source</directory>
- <outputDirectory>/src</outputDirectory>
+ <directory>../source</directory>
+ <outputDirectory>photoalbum/source</outputDirectory>
<includes>
- <include>*build.xml</include>
- <include>*build.properties</include>
- <include>pom.xml</include>
+ <include>*/src/**</include>
+ <include>*/sql/**</include>
+ <include>*/environment/**</include>
+ <include>*/Upload/short/**</include>
+ <include>**/*build.xml</include>
+ <include>**/build.properties</include>
+ <include>**/pom.xml</include>
</includes>
</fileSet>
- <fileSet>
- <directory>/../source/ear</directory>
- <outputDirectory>/src/ear</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>*build.xml</include>
- <include>*build.properties</include>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>/../source/ejb</directory>
- <outputDirectory>/src/ejb</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>sql/**</include>
- <include>*build.xml</include>
- <include>*build.properties</include>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>/../source/web</directory>
- <outputDirectory>/src/web</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>environment/**</include>
- <include>Upload/short/**</include>
- <include>*build.xml</include>
- <include>*build.properties</include>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>/../tests</directory>
- <outputDirectory>/src/tests</outputDirectory>
- <includes>
- <include>src/**</include>
- <include>*build.xml</include>
- <include>*build.properties</include>
- <include>pom.xml</include>
- </includes>
- </fileSet>
</fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>photoalbum/dist</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.richfaces.examples:*</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
</assembly>
\ No newline at end of file
Modified: trunk/examples/photoalbum/assembly/pom.xml
===================================================================
--- trunk/examples/photoalbum/assembly/pom.xml 2009-05-12 23:36:50 UTC (rev 14145)
+++ trunk/examples/photoalbum/assembly/pom.xml 2009-05-13 00:46:30 UTC (rev 14146)
@@ -2,95 +2,88 @@
<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</groupId>
+ <groupId>org.richfaces.examples</groupId>
<artifactId>photoalbum</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>${projectName}-assembler</artifactId>
- <name>Assembler module</name>
+
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>assembly</artifactId>
+ <name>Examples assembly project</name>
<packaging>pom</packaging>
<build>
- <finalName>${projectName}-ear-1.0-SNAPSHOT</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <executions>
- <execution>
- <id>fetch-feature</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <finalName>richfaces-examples-${project.version}</finalName>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>photoalbum-ear</artifactId>
+ <version>${project.version}</version>
+ <type>ear</type>
+ </dependency>
+ </dependencies>
+
<profiles>
<profile>
- <id>livedemo</id>
- </profile>
-
- <profile>
<id>release</id>
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <outputDirectory>../dist</outputDirectory>
- <descriptors>
- <descriptor>photoalbum.xml</descriptor>
- <descriptor>ear.xml</descriptor>
- </descriptors>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>make-assembly</id>
- <phase>install</phase>
+ <id>unpack</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>single</goal>
+ <goal>unpack</goal>
</goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.richfaces.docs.realworld</groupId>
+ <artifactId>en</artifactId>
+ <version>3.3.1-SNAPSHOT</version>
+ <type>jar</type>
+ <!--classifier>pdf</classifier-->
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>
+ ${project.build.directory}/docs
+ </outputDirectory>
+ <overWriteReleases>
+ false
+ </overWriteReleases>
+ <overWriteSnapshots>
+ true
+ </overWriteSnapshots>
+ </configuration>
</execution>
</executions>
</plugin>
-
+
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.2</version>
+ <artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <connectionType>developerConnection</connectionType>
+ <outputDirectory>${project.build.directory}/dist</outputDirectory>
+ <descriptors>
+ <descriptor>photoalbum.xml</descriptor>
+ <descriptor>ear.xml</descriptor>
+ </descriptors>
</configuration>
<executions>
<execution>
- <id>fetch-feature</id>
- <phase>generate-sources</phase>
+ <id>make-assembly</id>
+ <phase>package</phase>
<goals>
- <goal>export</goal>
+ <goal>single</goal>
</goals>
-
- <configuration>
- <connectionType>developerConnection</connectionType>
- <developerConnectionUrl>scm:svn:https://svn.jboss.org/repos/richfaces/branches/examples-data/photoapp/images/</developerConnectionUrl>
- <skipExportIfExists>true</skipExportIfExists>
- <exportDirectory>source/web/Upload/full</exportDirectory>
- </configuration>
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <executions>
- <execution>
- <id>fetch-feature</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
Modified: trunk/examples/photoalbum/pom.xml
===================================================================
--- trunk/examples/photoalbum/pom.xml 2009-05-12 23:36:50 UTC (rev 14145)
+++ trunk/examples/photoalbum/pom.xml 2009-05-13 00:46:30 UTC (rev 14146)
@@ -1,47 +1,13 @@
<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>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.examples</groupId>
<artifactId>photoalbum</artifactId>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
- <name>sample application</name>
- <parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>root</artifactId>
- <version>2.1.1.GA</version>
- </parent>
- <properties>
- <projectName>photoalbum</projectName>
- <richfacesVersion>3.3.1-SNAPSHOT</richfacesVersion>
- <seamVersion>2.1.1.GA</seamVersion>
- <faceletsVersion>1.1.15.B1</faceletsVersion>
- <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome>
- <jbosscontext>default</jbosscontext>
- <jboss.installer.url>file:E:\install\Develop\java\JBoss\jboss-4.2.3.GA.zip</jboss.installer.url>
- <imageset>full</imageset>
- <environment.properties>environment/prod</environment.properties>
- </properties>
- <repositories>
- <repository>
- <id>repository.jboss.com</id>
- <name>Jboss Repository for Maven</name>
- <url>http://repository.jboss.com/maven2/</url>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <name>Jboss Repository for Maven</name>
- <url>http://repository.jboss.org/maven2/</url>
- </repository>
- </repositories>
-
<modules>
- <module>source/ear</module>
- <module>source/ejb</module>
- <module>source/web</module>
- <module>assembly</module>
- <!--module>tests</module-->
+ <module>source</module>
</modules>
<build>
@@ -85,63 +51,4 @@
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>livedemo</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
-
- <properties>
- <imageset>full</imageset>
- <imagespath>Upload/full/images</imagespath>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.2</version>
- <configuration>
- <connectionType>developerConnection</connectionType>
- </configuration>
- <executions>
- <execution>
- <id>fetch-feature</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>export</goal>
- </goals>
-
- <configuration>
- <connectionType>developerConnection</connectionType>
- <developerConnectionUrl>scm:svn:https://svn.jboss.org/repos/richfaces/branches/examples-data/photoapp/images/</developerConnectionUrl>
- <skipExportIfExists>true</skipExportIfExists>
- <exportDirectory>source/web/Upload/full</exportDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>hudson</id>
- <properties>
- <jboss.installer.url>http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.3.GA.zip</jboss.installer.url>
- </properties>
- </profile>
-
- <profile>
- <id>release</id>
-
- <properties>
- <imageset>full</imageset>
- <imagespath>Upload/full/images</imagespath>
- </properties>
- </profile>
- </profiles>
-
</project>
\ No newline at end of file
Modified: trunk/examples/photoalbum/source/ear/pom.xml
===================================================================
--- trunk/examples/photoalbum/source/ear/pom.xml 2009-05-12 23:36:50 UTC (rev 14145)
+++ trunk/examples/photoalbum/source/ear/pom.xml 2009-05-13 00:46:30 UTC (rev 14146)
@@ -2,18 +2,21 @@
<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</groupId>
- <artifactId>photoalbum</artifactId>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>photoalbum-source</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
+
+ <groupId>org.richfaces.examples</groupId>
<artifactId>${projectName}-ear</artifactId>
- <name>EAR module</name>
+ <name>${appName} EAR module</name>
<packaging>ear</packaging>
+
<dependencies>
<dependency>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.examples</groupId>
<artifactId>${projectName}-web</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
@@ -22,9 +25,9 @@
<version>${richfacesVersion}</version>
</dependency>
<dependency>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.examples</groupId>
<artifactId>${projectName}-ejb</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>ejb</type>
</dependency>
<dependency>
@@ -62,43 +65,20 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <executions>
- <execution>
- <id>fetch-feature</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>2.3.1</version>
<configuration>
<generateApplicationXml>true</generateApplicationXml>
<includeJar>false</includeJar>
<defaultLibBundleDir>lib</defaultLibBundleDir>
- <loader-repository>seam.jboss.org:loader=${project.build.finalName}</loader-repository>
<modules>
<webModule>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.examples</groupId>
<artifactId>${projectName}-web</artifactId>
<contextRoot>/${projectName}</contextRoot>
</webModule>
<ejbModule>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.examples</groupId>
<artifactId>${projectName}-ejb</artifactId>
</ejbModule>
<ejbModule>
@@ -106,6 +86,10 @@
<artifactId>jboss-seam</artifactId>
</ejbModule>
</modules>
+ <jboss>
+ <version>4.2</version>
+ <loader-repository>org.richfaces.examples:loader=${project.build.finalName}</loader-repository>
+ </jboss>
</configuration>
</plugin>
Deleted: trunk/examples/photoalbum/source/ear/src/main/application/jboss-app.xml
===================================================================
--- trunk/examples/photoalbum/source/ear/src/main/application/jboss-app.xml 2009-05-12 23:36:50 UTC (rev 14145)
+++ trunk/examples/photoalbum/source/ear/src/main/application/jboss-app.xml 2009-05-13 00:46:30 UTC (rev 14146)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
- <!DOCTYPE jboss-app
- PUBLIC "-//JBoss//DTD J2EE Application 4.2//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd">
-
-<jboss-app>
- <loader-repository>
- seam.jboss.org:loader=photoalbum-ear-1.0-SNAPSHOT.ear
- </loader-repository>
-</jboss-app>
\ No newline at end of file
Modified: trunk/examples/photoalbum/source/ejb/pom.xml
===================================================================
--- trunk/examples/photoalbum/source/ejb/pom.xml 2009-05-12 23:36:50 UTC (rev 14145)
+++ trunk/examples/photoalbum/source/ejb/pom.xml 2009-05-13 00:46:30 UTC (rev 14146)
@@ -4,13 +4,14 @@
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</groupId>
- <artifactId>photoalbum</artifactId>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>photoalbum-source</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
+
+ <groupId>org.richfaces.examples</groupId>
<artifactId>${projectName}-ejb</artifactId>
- <name>EJB module</name>
- <version>1.0-SNAPSHOT</version>
+ <name>${appName} EJB module</name>
<packaging>ejb</packaging>
<dependencies>
@@ -97,28 +98,6 @@
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <executions>
- <execution>
- <id>fetch-feature</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<artifactId>maven-ejb-plugin</artifactId>
<configuration>
<ejbVersion>3.0</ejbVersion>
Modified: trunk/examples/photoalbum/source/pom.xml
===================================================================
--- trunk/examples/photoalbum/source/pom.xml 2009-05-12 23:36:50 UTC (rev 14145)
+++ trunk/examples/photoalbum/source/pom.xml 2009-05-13 00:46:30 UTC (rev 14146)
@@ -1,19 +1,22 @@
<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>
- <groupId>org.richfaces</groupId>
- <artifactId>photoalbum</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>sample application</name>
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>root</artifactId>
- <version>2.1.1.GA</version>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>photoalbum</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>photoalbum-source</artifactId>
+ <packaging>pom</packaging>
+ <name>${appName}</name>
+
<properties>
+ <appName>Photoalbum Demo Application</appName>
<projectName>photoalbum</projectName>
<richfacesVersion>3.3.1-SNAPSHOT</richfacesVersion>
<seamVersion>2.1.1.GA</seamVersion>
@@ -26,21 +29,15 @@
</properties>
<repositories>
<repository>
- <id>repository.jboss.com</id>
- <name>Jboss Repository for Maven</name>
- <url>http://repository.jboss.com/maven2/</url>
- </repository>
- <repository>
<id>repository.jboss.org</id>
<name>Jboss Repository for Maven</name>
<url>http://repository.jboss.org/maven2/</url>
</repository>
</repositories>
<modules>
- <module>ear</module>
<module>ejb</module>
<module>web</module>
- <!--module>tests</module-->
+ <module>ear</module>
</modules>
<build>
<plugins>
@@ -86,16 +83,14 @@
</pluginManagement>
</build>
-
<profiles>
<profile>
- <id>hudson</id>
+ <id>livedemo</id>
<properties>
- <jboss.installer.url>
- http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.3.GA.zip
- </jboss.installer.url>
+ <imageset>full</imageset>
+ <imagespath>Upload/full/images</imagespath>
+ <environment.properties>environment/prod</environment.properties>
</properties>
</profile>
</profiles>
-
</project>
\ No newline at end of file
Modified: trunk/examples/photoalbum/source/web/pom.xml
===================================================================
--- trunk/examples/photoalbum/source/web/pom.xml 2009-05-12 23:36:50 UTC (rev 14145)
+++ trunk/examples/photoalbum/source/web/pom.xml 2009-05-13 00:46:30 UTC (rev 14146)
@@ -4,13 +4,14 @@
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</groupId>
- <artifactId>photoalbum</artifactId>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>photoalbum-source</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
+
+ <groupId>org.richfaces.examples</groupId>
<artifactId>${projectName}-web</artifactId>
- <name>WAR module</name>
- <version>1.0-SNAPSHOT</version>
+ <name>${appName} WAR module</name>
<packaging>war</packaging>
<dependencies>
@@ -204,7 +205,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.richfaces</groupId>
+ <groupId>org.richfaces.examples</groupId>
<artifactId>${projectName}-ejb</artifactId>
<version>1.0-SNAPSHOT</version>
<type>ejb</type>
@@ -226,7 +227,7 @@
<artifactId>maven-scm-plugin</artifactId>
<version>1.2</version>
<configuration>
- <connectionType>developerConnection</connectionType>
+ <connectionType>connection</connectionType>
</configuration>
<executions>
<execution>
@@ -237,8 +238,8 @@
</goals>
<configuration>
- <connectionType>developerConnection</connectionType>
- <developerConnectionUrl>scm:svn:https://svn.jboss.org/repos/richfaces/branches/examples-data/photoapp/images/</developerConnectionUrl>
+ <connectionType>connection</connectionType>
+ <developerConnectionUrl>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/examples-data/photoapp/images/</developerConnectionUrl>
<skipExportIfExists>true</skipExportIfExists>
<exportDirectory>Upload/full</exportDirectory>
</configuration>
Modified: trunk/examples/photoalbum/tests/pom.xml
===================================================================
--- trunk/examples/photoalbum/tests/pom.xml 2009-05-12 23:36:50 UTC (rev 14145)
+++ trunk/examples/photoalbum/tests/pom.xml 2009-05-13 00:46:30 UTC (rev 14146)
@@ -1,11 +1,22 @@
<?xml version="1.0"?><project>
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.richfaces</groupId>
+ <parent>
+ <groupId>org.richfaces.examples</groupId>
<artifactId>photoalbum</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>photoalbum-tests</artifactId>
+ <name>Photoalbum Selenium Tests Module</name>
+ <packaging>jar</packaging>
+
+ <properties>
+ <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome>
+ <jboss.installer.url>file:F:\Distribs\jboss-4.2.3.GA.zip</jboss.installer.url>
+ <jbosscontext>default</jbosscontext>
+ </properties>
+
<repositories>
<repository>
<id>nexus-openqa</id>
@@ -33,18 +44,10 @@
</repository>
</repositories>
- <artifactId>${projectName}-tests</artifactId>
- <name>Selenium Tests Module</name>
- <version>1.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <properties>
- <jbosshome>${project.basedir}/target/installs/jboss-4.2.3.GA/jboss-4.2.3.GA</jbosshome>
- <jboss.installer.url>file:E:\apps\jboss\jboss-4.2.3.GA.zip</jboss.installer.url>
- </properties>
<dependencies>
<dependency>
- <groupId>org.richfaces</groupId>
- <artifactId>${projectName}-ear</artifactId>
+ <groupId>org.richfaces.examples</groupId>
+ <artifactId>photoalbum-ear</artifactId>
<version>${project.version}</version>
<type>ear</type>
<scope>provided</scope>
@@ -64,27 +67,6 @@
<classifier>jdk15</classifier>
</dependency>
<dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-api</artifactId>
- <version>${richfacesVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- <version>${richfacesVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>richfaces-ui</artifactId>
- <version>${richfacesVersion}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_08</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.openqa.selenium.client-drivers</groupId>
<artifactId>selenium-java-client-driver</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -113,17 +95,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <executions>
- <execution>
- <id>fetch-feature</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4.3</version>
<configuration>
@@ -196,7 +167,7 @@
<type>installed</type>
<deployables>
<deployable>
- <artifactId>${projectName}-ear</artifactId>
+ <artifactId>photoalbum-ear</artifactId>
<type>ear</type>
</deployable>
</deployables>
Modified: trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java
===================================================================
--- trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java 2009-05-12 23:36:50 UTC (rev 14145)
+++ trunk/examples/photoalbum/tests/src/test/java/org/richfaces/photoalbum/SeleniumTestBase.java 2009-05-13 00:46:30 UTC (rev 14146)
@@ -7,8 +7,6 @@
import java.io.FileFilter;
import java.io.FileInputStream;
-import org.ajax4jsf.javascript.JSFunction;
-import org.ajax4jsf.javascript.ScriptUtils;
import org.openqa.selenium.server.RemoteControlConfiguration;
import org.openqa.selenium.server.SeleniumServer;
import org.testng.Assert;
@@ -651,31 +649,6 @@
}
/**
- * Invokes JS method on client.
- *
- * @param id -
- * DOM id of component
- * @param method -
- * string method name
- * @param parameters -
- * parameters
- * @return
- */
- public String invokeFromComponent(String id, String method, Object parameters) {
- String _return = null;
- StringBuffer buffer = new StringBuffer();
- buffer.append("$('");
- buffer.append(id);
- buffer.append("').component.");
- buffer.append(method);
- buffer.append("(");
- buffer.append(ScriptUtils.toScript(parameters));
- buffer.append(");");
- _return = runScript(buffer.toString());
- return _return;
- }
-
- /**
* Creates delay
*
* @param miliSeconds
@@ -889,18 +862,4 @@
+ x + "," + y + ","+ctrl+");");
}
- /**
- * Calls component JS API
- *
- * @param id - Client id of the component to call operation on
- * @param function - JS function representing operation that should be called
- * @return - Result of execution
- */
- public String callComponentOperation(String id, JSFunction function) {
- StringBuffer command = new StringBuffer();
- new JSFunction("document.getElementById", id).appendScript(command);
- command.append(".component.");
- function.appendScript(command);
- return runScript(command.toString());
- }
}
More information about the richfaces-svn-commits
mailing list