December 2009 - weld-commits - Jboss List Archives

by weld-commits＠lists.jboss.org

Author: kpiwko(a)redhat.com Date: 2009-12-17 09:57:52 -0500 (Thu, 17 Dec 2009) New Revision: 5323 Modified: examples/trunk/pom.xml Log: WELD-24,WELD-25 Modified: examples/trunk/pom.xml =================================================================== --- examples/trunk/pom.xml 2009-12-17 14:35:36 UTC (rev 5322) +++ examples/trunk/pom.xml 2009-12-17 14:57:52 UTC (rev 5323) @@ -1,5 +1,6 @@ <?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/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.jboss.weld</groupId> @@ -94,6 +95,18 @@ <uel.glassfish.version>2.1.2-b04</uel.glassfish.version>  <testng.version>5.10</testng.version> + <selenium.java.client.version>1.0.1</selenium.java.client.version> + <selenium.maven.plugin.version>1.0</selenium.maven.plugin.version> + <cargo.maven2.plugin.version>1.0</cargo.maven2.plugin.version> + <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version> + <ant.junit.version>1.6.2</ant.junit.version> + <ftest.version.discriminator></ftest.version.discriminator> + <selenium.browser>*firefoxproxy</selenium.browser> + <selenium.browser.url>http://localhost:8080</selenium.browser.url> + <selenium.server.port>14444</selenium.server.port> + <selenium.server.host>localhost</selenium.server.host> + <selenium.speed>0</selenium.speed> + <selenium.timeout>30000</selenium.timeout> </properties>  @@ -173,14 +186,14 @@ <type>pom</type> <scope>import</scope> </dependency> - + <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> <version>${testng.version}</version> <classifier>jdk15</classifier> </dependency> - + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> @@ -236,8 +249,386 @@ <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/examples/trunk</connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/examples/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/Weld/build/tags/weld-parent-2/weld-exampl...</url> - </scm> + <url>http://fisheye.jboss.org/browse/Weld/build/tags/weld-parent-2/weld-exampl...</url> + </scm> + <profiles> + <profile> + <id>ftest-jboss-remote-51</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + + <pluginRepositories> + <pluginRepository> + <id>repository.codehaus.repository</id> + <url>http://repository.codehaus.org/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> + </pluginRepositories> + + <properties> + <ftest.testsuite>jboss5x.xml</ftest.testsuite> + </properties> + + <dependencies> + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + <version>${selenium.java.client.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> +  + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>${cargo.maven2.plugin.version}</version> + + <configuration> + <container> + <containerId>jboss5x</containerId> + <type>remote</type> + </container> + <configuration> + <type>runtime</type> + </configuration> + </configuration> + + <executions> + <execution> + <id>deploy</id> + <phase>pre-integration-test</phase> + <goals> + <goal>deploy</goal> + </goals> + </execution> + + <execution> + <id>undeploy</id> + <phase>post-integration-test</phase> + <goals> + <goal>undeploy</goal> + </goals> + </execution> + </executions> + </plugin> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + <version>${selenium.maven.plugin.version}</version> + <executions> + <execution> + <id>start-selenium</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start-server</goal> + </goals> + <configuration> + <background>true</background> + <port>${selenium.server.port}</port> + </configuration> + </execution> +  +  + </executions> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${maven.antrun.plugin.version}</version> + +  + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-junit</artifactId> + <version>${ant.junit.version}</version> + </dependency> + </dependencies> + + <executions> +  + <execution> + <id>testng</id> + <phase>integration-test</phase> + <configuration> + <tasks> + <taskdef resource="testngtasks" + classpath="testng.jar" classpathref="maven.test.classpath" /> + <testng classpathref="maven.test.classpath" + outputdir="${project.build.directory}/test-reports" + haltonfailure="false"> + <xmlfileset dir="src/test/selenium" + includes="${ftest.testsuite}" /> + <sysproperty key="selenium.server.port" + value="${selenium.server.port}" /> + <sysproperty key="selenium.server.host" + value="${selenium.server.host}" /> + <sysproperty key="selenium.browser" + value="${selenium.browser}" /> + <sysproperty key="selenium.browser.url" + value="${selenium.browser.url}" /> + <sysproperty key="selenium.speed" + value="${selenium.speed}" /> + <sysproperty key="selenium.timeout" + value="${selenium.timeout}" /> + <sysproperty key="basedir" + value="${basedir}" /> + </testng> + + <junitreport + todir="${project.build.directory}/test-reports"> + <fileset + dir="${project.build.directory}/test-reports"> + <include name="**/*.xml" /> + <exclude name="**/*testng*.xml" /> + <exclude + name="**/TESTS-TestSuites.xml" /> + </fileset> + <report format="noframes" + todir="${project.build.directory}/test-reports" /> + </junitreport> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>stop-selenium</id> + <phase>post-integration-test</phase> + <configuration> + <tasks> + <get taskname="selenium-shutdown" + src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" + ignoreerrors="true" + dest="${project.build.directory}/selenium.stop.msg" /> + <echo taskname="selenium-shutdown" + message="DGF Errors during shutdown are expected" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + <profile> + <id>ftest-jboss-remote-60</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + + <pluginRepositories> + <pluginRepository> + <id>repository.codehaus.repository</id> + <url>http://repository.codehaus.org/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </pluginRepository> + </pluginRepositories> + + <properties> + <ftest.testsuite>jboss5x.xml</ftest.testsuite> + </properties> + + <dependencies> + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + <version>${selenium.java.client.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> +  + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <version>${cargo.maven2.plugin.version}</version> + + <configuration> + <container> + <containerId>jboss5x</containerId> + <type>remote</type> + </container> + <configuration> + <type>runtime</type> + </configuration> + </configuration> + + <executions> + <execution> + <id>deploy</id> + <phase>pre-integration-test</phase> + <goals> + <goal>deploy</goal> + </goals> + </execution> + + <execution> + <id>undeploy</id> + <phase>post-integration-test</phase> + <goals> + <goal>undeploy</goal> + </goals> + </execution> + </executions> + </plugin> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>selenium-maven-plugin</artifactId> + <version>${selenium.maven.plugin.version}</version> + <executions> + <execution> + <id>start-selenium</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start-server</goal> + </goals> + <configuration> + <background>true</background> + <port>${selenium.server.port}</port> + </configuration> + </execution> +  +  + </executions> + </plugin> + +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>${maven.antrun.plugin.version}</version> + +  + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-junit</artifactId> + <version>${ant.junit.version}</version> + </dependency> + </dependencies> + + <executions> +  + <execution> + <id>testng</id> + <phase>integration-test</phase> + <configuration> + <tasks> + <taskdef resource="testngtasks" + classpath="testng.jar" classpathref="maven.test.classpath" /> + <testng classpathref="maven.test.classpath" + outputdir="${project.build.directory}/test-reports" + haltonfailure="false"> + <xmlfileset dir="src/test/selenium" + includes="${ftest.testsuite}" /> + <sysproperty key="selenium.server.port" + value="${selenium.server.port}" /> + <sysproperty key="selenium.server.host" + value="${selenium.server.host}" /> + <sysproperty key="selenium.browser" + value="${selenium.browser}" /> + <sysproperty key="selenium.browser.url" + value="${selenium.browser.url}" /> + <sysproperty key="selenium.speed" + value="${selenium.speed}" /> + <sysproperty key="selenium.timeout" + value="${selenium.timeout}" /> + <sysproperty key="basedir" + value="${basedir}" /> + </testng> + + <junitreport + todir="${project.build.directory}/test-reports"> + <fileset + dir="${project.build.directory}/test-reports"> + <include name="**/*.xml" /> + <exclude name="**/*testng*.xml" /> + <exclude + name="**/TESTS-TestSuites.xml" /> + </fileset> + <report format="noframes" + todir="${project.build.directory}/test-reports" /> + </junitreport> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>stop-selenium</id> + <phase>post-integration-test</phase> + <configuration> + <tasks> + <get taskname="selenium-shutdown" + src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" + ignoreerrors="true" + dest="${project.build.directory}/selenium.stop.msg" /> + <echo taskname="selenium-shutdown" + message="DGF Errors during shutdown are expected" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> </project>

14 years, 4 months

1
0
0 / 0

Weld SVN: r5322 - examples/trunk/jsf/login/src/main/webapp.

by weld-commits＠lists.jboss.org

Author: kpiwko(a)redhat.com Date: 2009-12-17 09:35:36 -0500 (Thu, 17 Dec 2009) New Revision: 5322 Modified: examples/trunk/jsf/login/src/main/webapp/home.xhtml Log: WELD-346 Modified: examples/trunk/jsf/login/src/main/webapp/home.xhtml =================================================================== --- examples/trunk/jsf/login/src/main/webapp/home.xhtml 2009-12-17 14:21:11 UTC (rev 5321) +++ examples/trunk/jsf/login/src/main/webapp/home.xhtml 2009-12-17 14:35:36 UTC (rev 5322) @@ -7,15 +7,15 @@ <ui:composition template="template.xhtml"> <ui:define name="content"> <h:messages/> - <h:form> + <h:form id="loginForm"> <h:panelGrid columns="2" rendered="#{!login.loggedIn}"> <h:outputLabel for="username">Username:</h:outputLabel> <h:inputText id="username" value="#{credentials.username}"/> <h:outputLabel for="password">Password:</h:outputLabel> <h:inputText id="password" value="#{credentials.password}"/> </h:panelGrid> - <h:commandButton value="Login" action="#{login.login}" rendered="#{!login.loggedIn}"/> - <h:commandButton value="Logout" action="#{login.logout}" rendered="#{login.loggedIn}"/> + <h:commandButton id="login" value="Login" action="#{login.login}" rendered="#{!login.loggedIn}"/> + <h:commandButton id="logout" value="Logout" action="#{login.logout}" rendered="#{login.loggedIn}"/> </h:form> </ui:define> </ui:composition>

14 years, 4 months

1
0
0 / 0

Weld SVN: r5321 - ftest and 50 other directories.

by weld-commits＠lists.jboss.org

Author: kpiwko(a)redhat.com Date: 2009-12-17 09:21:11 -0500 (Thu, 17 Dec 2009) New Revision: 5321 Added: ftest/ ftest/branches/ ftest/common/ ftest/common/branches/ ftest/common/tags/ ftest/common/trunk/ ftest/common/trunk/pom.xml ftest/common/trunk/src/ ftest/common/trunk/src/main/ ftest/common/trunk/src/main/java/ ftest/common/trunk/src/main/java/org/ ftest/common/trunk/src/main/java/org/jboss/ ftest/common/trunk/src/main/java/org/jboss/weld/ ftest/common/trunk/src/main/java/org/jboss/weld/example/ ftest/common/trunk/src/main/java/org/jboss/weld/example/common/ ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/ ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/ ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/SeleniumDateSelector.java ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldFunctionalTestListener.java ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldSelenium.java ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldSeleniumTest.java ftest/login/ ftest/login/branches/ ftest/login/tags/ ftest/login/trunk/ ftest/login/trunk/pom.xml ftest/login/trunk/src/ ftest/login/trunk/src/main/ ftest/login/trunk/src/main/java/ ftest/login/trunk/src/main/java/org/ ftest/login/trunk/src/main/java/org/jboss/ ftest/login/trunk/src/main/java/org/jboss/weld/ ftest/login/trunk/src/main/java/org/jboss/weld/example/ ftest/login/trunk/src/main/java/org/jboss/weld/example/login/ ftest/login/trunk/src/main/java/org/jboss/weld/example/login/test/ ftest/login/trunk/src/main/java/org/jboss/weld/example/login/test/selenium/ ftest/login/trunk/src/main/java/org/jboss/weld/example/login/test/selenium/CommonLoginTest.java ftest/numberguess/ ftest/numberguess/branches/ ftest/numberguess/tags/ ftest/numberguess/trunk/ ftest/numberguess/trunk/pom.xml ftest/numberguess/trunk/src/ ftest/numberguess/trunk/src/main/ ftest/numberguess/trunk/src/main/java/ ftest/numberguess/trunk/src/main/java/org/ ftest/numberguess/trunk/src/main/java/org/jboss/ ftest/numberguess/trunk/src/main/java/org/jboss/weld/ ftest/numberguess/trunk/src/main/java/org/jboss/weld/example/ ftest/numberguess/trunk/src/main/java/org/jboss/weld/example/numberguess/ ftest/numberguess/trunk/src/main/java/org/jboss/weld/example/numberguess/test/ ftest/numberguess/trunk/src/main/java/org/jboss/weld/example/numberguess/test/selenium/ ftest/numberguess/trunk/src/main/java/org/jboss/weld/example/numberguess/test/selenium/CommonNumberGuessTest.java ftest/tags/ ftest/translator/ ftest/translator/branches/ ftest/translator/tags/ ftest/translator/trunk/ ftest/translator/trunk/pom.xml ftest/translator/trunk/src/ ftest/translator/trunk/src/main/ ftest/translator/trunk/src/main/java/ ftest/translator/trunk/src/main/java/org/ ftest/translator/trunk/src/main/java/org/jboss/ ftest/translator/trunk/src/main/java/org/jboss/weld/ ftest/translator/trunk/src/main/java/org/jboss/weld/example/ ftest/translator/trunk/src/main/java/org/jboss/weld/example/translator/ ftest/translator/trunk/src/main/java/org/jboss/weld/example/translator/clustertest/ ftest/translator/trunk/src/main/java/org/jboss/weld/example/translator/clustertest/selenium/ ftest/translator/trunk/src/main/java/org/jboss/weld/example/translator/test/ ftest/translator/trunk/src/main/java/org/jboss/weld/example/translator/test/selenium/ ftest/translator/trunk/src/main/java/org/jboss/weld/example/translator/test/selenium/TranslatorTest.java ftest/trunk/ ftest/trunk/pom.xml Log: WELD-24,WELD-25 Added: ftest/common/trunk/pom.xml =================================================================== --- ftest/common/trunk/pom.xml (rev 0) +++ ftest/common/trunk/pom.xml 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-parent</artifactId> + <version>0.1</version> + </parent> + + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-common</artifactId> + <version>0.1</version> + <packaging>jar</packaging> + <name>Weld Examples Ftest: Common Functionality</name> +</project> + Added: ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/SeleniumDateSelector.java =================================================================== --- ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/SeleniumDateSelector.java (rev 0) +++ ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/SeleniumDateSelector.java 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,245 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.weld.example.common.test.selenium; + +import java.text.DateFormatSymbols; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.StringTokenizer; + +/** + * Selects date using Selenium in calendar provided by framework. Each framework + * is responsible for managing movement in calendar grid + * + * @author kpiwko + * + */ +public enum SeleniumDateSelector +{ + RICHFACES + { + @Override + public void setDay(WeldSelenium browser, int day) + { + String locator = "xpath=//td[contains(@class, 'rich-calendar-cell') and not(contains(@class,'rich-calendar-boundary-dates')) and text() ='" + Integer.toString(day) + "']"; + browser.waitForElement(locator); + browser.click(locator); + } + + @Override + public void setMonth(WeldSelenium browser, int month) + { + String monthLocator = "xpath=//div[@class='rich-calendar-tool-btn' and contains(.,',')]"; + StringTokenizer stk = new StringTokenizer(browser.getText(monthLocator), ","); + String calMonth = stk.nextToken().trim(); + int steps = monthStepsCount(calMonth, month); + + movement(browser, "xpath=//div[@class='rich-calendar-tool-btn' and text()='<']", "xpath=//div[@class='rich-calendar-tool-btn' and text()='>']", steps); + } + + @Override + public void setYear(WeldSelenium browser, int year) + { + String yearLocator = "xpath=//div[@class='rich-calendar-tool-btn' and contains(.,',')]"; + StringTokenizer stk = new StringTokenizer(browser.getText(yearLocator), ","); + // omit first token + stk.nextToken(); + String calYear = stk.nextToken().trim(); + int steps = yearStepsCount(calYear, year); + + movement(browser, "xpath=//div[@class='rich-calendar-tool-btn' and text()='<<']", "xpath=//div[@class='rich-calendar-tool-btn' and text()='>>'", steps); + } + + }, + ICEFACES + { + @Override + public void setDay(WeldSelenium browser, int day) + { + String locator = "xpath=//td[@class='iceSelInpDateDay']/a[./span/text()='" + Integer.toString(day) + "']"; + browser.waitForElement(locator); + browser.click(locator); + } + + @Override + public void setMonth(WeldSelenium browser, int month) + { + String monthLocator = "xpath=//td[@class='iceSelInpDateMonthYear'][2]"; + String calMonth = browser.getText(monthLocator).trim(); + int steps = monthStepsCount(calMonth, month); + + movement(browser, "xpath=//td[@class='iceSelInpDateMonthYear'][1]/a", "xpath=//td[@class='iceSelInpDateMonthYear'][3]/a", steps); + } + + @Override + public void setYear(WeldSelenium browser, int year) + { + String yearLocator = "xpath=//td[@class='iceSelInpDateMonthYear'][6]"; + String calYear = browser.getText(yearLocator).trim(); + int steps = yearStepsCount(calYear, year); + + movement(browser, "xpath=//td[@class='iceSelInpDateMonthYear'][5]/a", "xpath=//td[@class='iceSelInpDateMonthYear'][7]/a", steps); + } + + /** + * IceFaces forces partial submit, so we must wait for page reload + */ + @Override + protected void click(WeldSelenium browser, String locator) + { + browser.clickAndWait(locator); + } + + }; + + /** + * Selects date using Selenium browser + * + * @param browser Selenium browser instance + * @param date Date to be selected + */ + public void setDate(WeldSelenium browser, Date date) + { + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + + setYear(browser, cal.get(Calendar.YEAR)); + setMonth(browser, cal.get(Calendar.MONTH)); + setDay(browser, cal.get(Calendar.DAY_OF_MONTH)); + } + + /** + * Selects day in calendar + * + * @param browser Selenium browser instance + * @param day Integer containing the day to be selected, indexing from 1 + */ + protected abstract void setDay(WeldSelenium browser, int day); + + /** + * Selects month in calendar + * + * @param browser Selenium browser instance + * @param month Integer containing the month to be selected, indexing from 1 + */ + protected abstract void setMonth(WeldSelenium browser, int month); + + /** + * Selects year in calendar + * + * @param browser Selenium browser instance + * @param year Integer containing the year to be selected + */ + protected abstract void setYear(WeldSelenium browser, int year); + + /** + * Determines direction of month in calendar interface + * + * @param calMonth Which month is currently shown on calendar + * @param month Which month is desired to be set, indexing from 1 + * @return Number of steps which must be done in either of direction, where + * sign has meaning: + * <ul> + * <li>- goes to past</li> + * <li>+ goes to future</li> + * </ul> + */ + protected int monthStepsCount(String calMonth, int month) + { + final List<String> months = Arrays.asList((new DateFormatSymbols()).getMonths()); + int mindex = months.indexOf(calMonth); + if (mindex == -1) + throw new IllegalArgumentException("Unknown month: " + calMonth + " for locale: " + Locale.getDefault()); + + return month - (mindex + 1); + } + + /** + * Determines direction of year in calendar interface + * + * @param calYear Which year is currently shown on calendar + * @param year Which month is desired to be set, indexing from 1 + * @return Number of steps which must be done in either of direction, where + * sign has meaning: + * <ul> + * <li>- goes to past</li> + * <li>+ goes to future</li> + * </ul> + */ + protected final int yearStepsCount(String calYear, int year) + { + int yindex; + try + { + yindex = Integer.valueOf(calYear); + } + catch (NumberFormatException nfe) + { + throw new IllegalArgumentException("Invalid year: " + calYear, nfe); + } + + return year - yindex; + } + + /** + * Moves in either backward or forward direction according to step count. + * Uses locator of element for both directions. + * + * @param browser Selenium browser instance + * @param backLocator Element which moves calendar to past + * @param forwardLocator Element which moves calendar to future + * @param steps Number of steps to be done, determined by monthStepsCount() + * or yearStepsCount() function + * @see SeleniumDateSelector#monthStepsCount(String, int) + * @see SeleniumDateSelector#yearStepsCount(String, int) + */ + protected void movement(WeldSelenium browser, String backLocator, String forwardLocator, int steps) + { + // going to past + if (steps < 0) + { + for (int i = 0; i > steps; i--) + click(browser, backLocator); + } + // going to future + else + { + for (int i = 0; i < steps; i++) + click(browser, forwardLocator); + } + } + + /** + * Clicks on element. Allow differentiate action according to framework, such + * as wait for page to load for IceFaces + * + * @param browser Selenium browser + * @param locator Locator of element to be clicked on + */ + protected void click(WeldSelenium browser, String locator) + { + browser.click(locator); + } +} Added: ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldFunctionalTestListener.java =================================================================== --- ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldFunctionalTestListener.java (rev 0) +++ ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldFunctionalTestListener.java 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.weld.example.common.test.selenium; + +import org.testng.ITestContext; +import org.testng.ITestListener; +import org.testng.ITestResult; + +/** + * This listener class is used for capturing snapshot of running web application + * and storing HTML source of the browser content. It expects WeldSeleniumTest + * or its descendant to retrieve WeldSelenium object. + * + * @author Martin Gencur + * @author kpiwko + * + */ +public class WeldFunctionalTestListener implements ITestListener +{ + + public void onFinish(ITestContext context) + { + } + + public void onStart(ITestContext context) + { + } + + public void onTestFailedButWithinSuccessPercentage(ITestResult result) + { + } + + public void onTestFailure(ITestResult result) + { + WeldSeleniumTest testcase = getTest(result); + String logPath = testcase.getOutputDirectory() + "/" + result.getName(); + + try + { + testcase.getBrowser().captureScreenshot(logPath + ".png"); + } + catch (Exception e) + { + } + finally + { + testcase.getBrowser().logHTMLContext(logPath + ".html"); + testcase.stopBrowser(); + } + + } + + public void onTestSkipped(ITestResult result) + { + getTest(result).stopBrowser(); + } + + public void onTestStart(ITestResult result) + { + } + + public void onTestSuccess(ITestResult result) + { + getTest(result).stopBrowser(); + } + + private WeldSeleniumTest getTest(ITestResult result) throws RuntimeException + { + try + { + WeldSeleniumTest testcase = (WeldSeleniumTest) result.getInstance(); + return testcase; + } + catch (ClassCastException e) + { + System.err.println("Running WeldFunctionalTestListener on test not inherited from WeldSeleniumTest"); + throw new RuntimeException("Running WeldFunctionalTestListener on test not inherited from WeldSeleniumTest", e); + } + } +} Added: ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldSelenium.java =================================================================== --- ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldSelenium.java (rev 0) +++ ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldSelenium.java 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,341 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.weld.example.common.test.selenium; + +import java.io.BufferedWriter; +import java.io.FileOutputStream; +import java.io.OutputStreamWriter; + +import com.thoughtworks.selenium.DefaultSelenium; +import com.thoughtworks.selenium.Wait; + +/** + * This class slightly enhances a Selenium API for controlling a browser. + * + * @author Jozef Hartinger + * @author kpiwko + */ +public class WeldSelenium extends DefaultSelenium +{ + + private String timeout = "30000"; + private boolean icefacesDetection = false; + private long icefacesWaitTime = 1000; + private long windowMaximizeWaitTime = 5000L; + + private final String ICEFACES_CONNECTION_STATUS = "xpath=//div[@class='iceOutConStat connectionStatus']"; + private final String ICEFACES_IDLE_VISIBLE = "xpath=//div[@class='iceOutConStatInactv connectionStatusInactv'][@style='visibility: visible;']"; + + public WeldSelenium(String serverHost, int serverPort, String browserStartCommand, String browserURL) + { + super(serverHost, serverPort, browserStartCommand, browserURL); + } + + /** + * Same as click method but waits for page to load after clicking. Default + * timeout can be changed by setTimeout() method. + * + * @param locator + */ + public void clickAndWait(String locator) + { + click(locator); + waitForPageToLoad(); + } + + /** + * Simulates a user pressing "back" button and waits for page to load. + * Default timeout can be changed by setTimeout() method. + */ + public void goBackAndWait() + { + super.goBack(); + super.waitForPageToLoad(timeout); + } + + /** + * Simulates a user pressing "refresh" button and waits for page to load. + * Default timeout can be changed by setTimeout() method. + */ + public void refreshAndWait() + { + super.refresh(); + super.waitForPageToLoad(timeout); + } + + @Override + public void setTimeout(String timeout) + { + super.setTimeout(timeout); + this.timeout = timeout; + } + + public String getTimeout() + { + return timeout; + } + + public void waitForPageToLoad() + { + + waitForPageToLoad(timeout); + } + + @Override + public void waitForPageToLoad(String timeout) + { + if (icefacesDetection && isElementPresent(ICEFACES_CONNECTION_STATUS)) + { + waitForIcefaces(icefacesWaitTime, Long.valueOf(timeout)); + } + else + { + super.waitForPageToLoad(timeout); + } + } + + /** + * Waits until element is asynchronously loaded on page. Uses global Selenium + * timeout + * + * @param locator + * Locator of element + */ + public void waitForElement(final String locator) + { + waitForElement(locator, Long.valueOf(timeout)); + } + + /** + * Waits until element is asynchronously loaded on page. + * + * @param timeout + * Timeout in milliseconds + * @param locator + * Locator of element + */ + public void waitForElement(final String locator, long timeout) + { + new Wait() + { + @Override + public boolean until() + { + return isElementPresent(locator); + } + }.wait("Timeout while waiting for asynchronous update of " + locator, timeout); + } + + /** + * Waits until element is asynchronously unloaded from page. Uses global + * Selenium timeout + * + * @param locator + * Locator of element + */ + public void waitForElementNotPresent(final String locator) + { + waitForElementNotPresent(locator, Long.valueOf(timeout)); + } + + /** + * Waits until element is asynchronously unloaded from page. + * + * @param timeout + * Timeout in milliseconds + * @param locator + * Locator of element + */ + public void waitForElementNotPresent(final String locator, long timeout) + { + new Wait() + { + @Override + public boolean until() + { + return !isElementPresent(locator); + } + }.wait("Timeout while waiting for asynchronous update of " + locator, timeout); + } + + /** + * Waits until element's content is asynchronously loaded on page. Uses + * global Selenium timeout + * + * @param locator + * Locator of element + */ + public void waitForElementContent(final String locator) + { + waitForElementContent(locator, Long.valueOf(timeout)); + } + + /** + * Waits until element's content is asynchronously loaded on page + * + * @param timeout + * Timeout in milliseconds + * @param locator + * Locator of element + */ + public void waitForElementContent(final String locator, long timeout) + { + new Wait() + { + @Override + public boolean until() + { + return (getValue(locator).length() != 0); + } + }.wait("Timeout while waiting for asynchronous update of element content. Element: " + locator + ", " + "Content length: " + + getValue(locator).length(), timeout); + } + + /** + * Selects windows by its id. Waits until windows is refreshed. + * + * @param windowID + * Identification of window which is selected + */ + @Override + public void selectWindow(String windowID) + { + super.selectWindow(windowID); + refresh(); + waitForPageToLoad(); + } + + /** + * Returns true if icefaces detection is turned on + */ + public boolean isIcefacesDetection() + { + return icefacesDetection; + } + + /** + * Switch icefaces detection on/off + * + * @param icefacesDetection + */ + public void setIcefacesDetection(boolean icefacesDetection) + { + this.icefacesDetection = icefacesDetection; + } + + /** + * This wait time will be used when waiting for response after invoking + * icefaces action + */ + public long getIcefacesWaitTime() + { + return icefacesWaitTime; + } + + /** + * This wait time will be used when waiting for response after invoking + * icefaces action + * + * @param icefacesWaitTime + */ + public void setIcefacesWaitTime(long icefacesWaitTime) + { + this.icefacesWaitTime = icefacesWaitTime; + } + + /** + * Captures a screenshot and stores it into a file. Active windows is + * maximized before capturing a screenshot. + */ + @Override + public void captureScreenshot(String path) + { + windowMaximize(); + try + { + Thread.sleep(windowMaximizeWaitTime); + } + catch (InterruptedException e) + { + } + super.captureScreenshot(path); + } + + /** + * Logs HTML body into a file. + * + * @param path + */ + public void logHTMLContext(String path) + { + String source = getHtmlSource(); + BufferedWriter writer = null; + try + { + writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(path))); + writer.write(source); + writer.flush(); + } + catch (Exception e) + { + throw new RuntimeException("Unable to save HTML body", e); + } + finally + { + try + { + writer.close(); + } + catch (Exception e) + { + } + } + } + + private void waitForIcefaces(Long waitTime, Long timeout) + { + new Wait() + { + @Override + public boolean until() + { + return isElementPresent(ICEFACES_IDLE_VISIBLE); + } + }.wait("Timeout while waiting for icefaces idle state.", timeout); + try + { + Thread.sleep(icefacesWaitTime); + } + catch (InterruptedException e) + { + e.printStackTrace(); + } + new Wait() + { + @Override + public boolean until() + { + return isElementPresent("xpath=//body"); + } + }.wait("Timeout while waiting for document body after icefaces click.", timeout); + } +} Added: ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldSeleniumTest.java =================================================================== --- ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldSeleniumTest.java (rev 0) +++ ftest/common/trunk/src/main/java/org/jboss/weld/example/common/test/selenium/WeldSeleniumTest.java 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.weld.example.common.test.selenium; + +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Optional; +import org.testng.annotations.Parameters; + +/** + * Base class for all Weld based Selenium tests. + * + * @author jbalunas + * @author jharting + * @author kpiwko + * + */ +public abstract class WeldSeleniumTest +{ + protected WeldSelenium browser; + protected String contextPath; + protected String basedir; + + @BeforeMethod(groups={"seleniumSetUp"}) + @Parameters( { "selenium.server.host", "selenium.server.port", "selenium.browser", "selenium.browser.url", "selenium.speed", "selenium.timeout", "example.context.path", "basedir" }) + public void setUp(String host, String port, String browserType, String browserUrl, String speed, String timeout, @Optional("") String contextPath, String basedir) + { + browser = startBrowser(host, Integer.parseInt(port), browserType, browserUrl); + browser.allowNativeXpath("false"); + browser.setSpeed(speed); + browser.setTimeout(timeout); + + this.contextPath = contextPath; + this.basedir = basedir; + } + + // This is stopped automatically by listener + // It must be stopped in listener because in case of error + // Selenium session is required to exist to retrieve screenshot and HTML code of page + //@AfterMethod + public void tearDownDeprecated() + { + stopBrowser(); + } + + public WeldSelenium startBrowser(String host, int port, String browser, String browserUrl) + { + WeldSelenium newBrowser = new WeldSelenium(host, port, browser, browserUrl); + newBrowser.start(); + return newBrowser; + } + + public void stopBrowser() + { + if (browser != null) + { + browser.stop(); + } + } + + /** + * Returns WeldSelenium instance of this test case + * + * @return WeldSelenium instance + */ + public WeldSelenium getBrowser() + { + return browser; + } + + public String getOutputDirectory() { + return basedir + "/target/test-output/functional-framework" + contextPath; + } + +} Added: ftest/login/trunk/pom.xml =================================================================== --- ftest/login/trunk/pom.xml (rev 0) +++ ftest/login/trunk/pom.xml 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-parent</artifactId> + <version>0.1</version> + </parent> + + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-login</artifactId> + <version>0.1</version> + <packaging>jar</packaging> + <name>Weld Examples Ftest: Login</name> + + <dependencies> + <dependency> + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-common</artifactId> + <version>0.1</version> + </dependency> + </dependencies> + +</project> + Added: ftest/login/trunk/src/main/java/org/jboss/weld/example/login/test/selenium/CommonLoginTest.java =================================================================== --- ftest/login/trunk/src/main/java/org/jboss/weld/example/login/test/selenium/CommonLoginTest.java (rev 0) +++ ftest/login/trunk/src/main/java/org/jboss/weld/example/login/test/selenium/CommonLoginTest.java 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.weld.example.login.test.selenium; + +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + +import org.jboss.weld.example.common.test.selenium.WeldSeleniumTest; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Tests login examples in Weld + * + * @author kpiwko + */ +public class CommonLoginTest extends WeldSeleniumTest +{ + + protected String MAIN_PAGE = "/home.jsf"; + protected String LOGGED_IN = "xpath=//li[contains(text(),'Welcome')]"; + protected String LOGGED_OUT = "xpath=//li[contains(text(),'Goodbye')]"; + + protected String USERNAME_FIELD = "id=loginForm:username"; + protected String PASSWORD_FIELD = "id=loginForm:password"; + + protected String LOGIN_BUTTON = "id=loginForm:login"; + protected String LOGOUT_BUTTON = "id=loginForm:logout"; + + @BeforeMethod(dependsOnGroups = "seleniumSetUp") + public void open() + { + browser.open(contextPath + MAIN_PAGE); + browser.waitForPageToLoad(); + } + + @Test + public void loginTest() + { + assertFalse(browser.isElementPresent(LOGGED_IN), "User should not be logged in!"); + browser.type(USERNAME_FIELD, "User"); + browser.type(PASSWORD_FIELD, "password"); + browser.clickAndWait(LOGIN_BUTTON); + assertTrue(browser.isElementPresent(LOGGED_IN), "User should be logged in!"); + } + + @Test + public void logoutTest() + { + assertFalse(browser.isElementPresent(LOGGED_IN), "User should not be logged in!"); + browser.type(USERNAME_FIELD, "User"); + browser.type(PASSWORD_FIELD, "password"); + browser.clickAndWait(LOGIN_BUTTON); + assertTrue(browser.isElementPresent(LOGGED_IN), "User should be logged in!"); + browser.clickAndWait(LOGOUT_BUTTON); + assertTrue(browser.isElementPresent(LOGGED_OUT), "User should not be logged in!"); + } + +} Added: ftest/numberguess/trunk/pom.xml =================================================================== --- ftest/numberguess/trunk/pom.xml (rev 0) +++ ftest/numberguess/trunk/pom.xml 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-parent</artifactId> + <version>0.1</version> + </parent> + + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-numberguess</artifactId> + <version>0.1</version> + <packaging>jar</packaging> + <name>Weld Examples Ftest: Numberguess</name> + + <dependencies> + <dependency> + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-common</artifactId> + <version>0.1</version> + </dependency> + </dependencies> + +</project> + Added: ftest/numberguess/trunk/src/main/java/org/jboss/weld/example/numberguess/test/selenium/CommonNumberGuessTest.java =================================================================== --- ftest/numberguess/trunk/src/main/java/org/jboss/weld/example/numberguess/test/selenium/CommonNumberGuessTest.java (rev 0) +++ ftest/numberguess/trunk/src/main/java/org/jboss/weld/example/numberguess/test/selenium/CommonNumberGuessTest.java 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,131 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.weld.example.numberguess.test.selenium; + +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + +import org.jboss.weld.example.common.test.selenium.WeldSeleniumTest; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Tests numberguess examples in Weld + * + * @author Jozef Hartinger + * @author kpiwko + */ +public class CommonNumberGuessTest extends WeldSeleniumTest +{ + + protected String MAIN_PAGE = "/home.jsf"; + protected String GUESS_MESSAGES = "id=numberGuess:messages"; + + protected String GUESS_FIELD = "id=numberGuess:inputGuess"; + protected String GUESS_SUBMIT = "id=numberGuess:guessButton"; + protected String GUESS_RESET = "id=numberGuess:resetButton"; + protected String GUESS_SMALLEST = "id=numberGuess:smallest"; + protected String GUESS_BIGGEST = "id=numberGuess:biggest"; + + protected String WIN_MSG = "Correct!"; + protected String LOSE_MSG = "No guesses left!"; + + @BeforeMethod(dependsOnGroups = "seleniumSetUp") + public void open() + { + browser.open(contextPath + MAIN_PAGE); + browser.waitForPageToLoad(); + } + + @Test + public void smartTest() + { + + int min; + int max; + int guess; + int i = 0; + + while (isOnGuessPage()) + { + if (i > 9) + { + fail("Game should not be longer than 10 guesses"); + } + + assertTrue(browser.isElementPresent(GUESS_SMALLEST), "Expected smallest number on page"); + assertTrue(browser.isElementPresent(GUESS_BIGGEST), "Expected biggest number on page"); + + min = Integer.parseInt(browser.getText(GUESS_SMALLEST)); + max = Integer.parseInt(browser.getText(GUESS_BIGGEST)); + guess = min + ((max - min) / 2); + enterGuess(guess); + i++; + } + assertTrue(isOnWinPage(), "Win page expected after playing smart."); + } + + @Test + public void linearTest() + { + int guess = 0; + + while (isOnGuessPage()) + { + enterGuess(++guess); + assertTrue(guess <= 10, "Guess count exceeded."); + } + if (guess < 10) + { + assertTrue(isOnWinPage(), "Player should not lose before 10th guess."); + } + else + { + assertTrue(isOnLosePage() || isOnWinPage(), "After 10th guess player should lose or win."); + } + + } + + protected void enterGuess(int guess) + { + browser.type(GUESS_FIELD, String.valueOf(guess)); + browser.clickAndWait(GUESS_SUBMIT); + } + + protected boolean isOnGuessPage() + { + return !(isOnWinPage() || isOnLosePage()); + } + + protected boolean isOnWinPage() + { + String text = browser.getText(GUESS_MESSAGES); + return WIN_MSG.equals(text); + } + + protected boolean isOnLosePage() + { + String text = browser.getText(GUESS_MESSAGES); + return LOSE_MSG.equals(text); + } + +} Added: ftest/translator/trunk/pom.xml =================================================================== --- ftest/translator/trunk/pom.xml (rev 0) +++ ftest/translator/trunk/pom.xml 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-parent</artifactId> + <version>0.1</version> + </parent> + + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-translator</artifactId> + <packaging>jar</packaging> + <name>Weld Examples Ftest: Translator</name> + + <dependencies> + <dependency> + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-common</artifactId> + <version>0.1</version> + </dependency> + </dependencies> + +</project> + Added: ftest/translator/trunk/src/main/java/org/jboss/weld/example/translator/test/selenium/TranslatorTest.java =================================================================== --- ftest/translator/trunk/src/main/java/org/jboss/weld/example/translator/test/selenium/TranslatorTest.java (rev 0) +++ ftest/translator/trunk/src/main/java/org/jboss/weld/example/translator/test/selenium/TranslatorTest.java 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.weld.example.translator.test.selenium; + +import static org.testng.Assert.assertTrue; + +import org.jboss.weld.example.common.test.selenium.WeldSeleniumTest; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +/** + * Tests translator example in Weld + * + * @author mgencur + */ +public class TranslatorTest extends WeldSeleniumTest +{ + protected String MAIN_PAGE = "/home.jsf"; + protected String INPUT_AREA = "id=TranslatorMain:text"; + protected String TRANSLATE_BUTTON = "id=TranslatorMain:button"; + protected String ONE_SENTENCE = "This is only one sentence."; + protected String MORE_SENTENCES = "First sentence. Second and last sentence."; + protected String ONE_SENTENCE_TRANSLATED = "Lorem ipsum dolor sit amet."; + protected String MORE_SENTENCES_TRANSLATED = "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet."; + + @BeforeMethod(dependsOnGroups = "seleniumSetUp") + public void open() + { + browser.open(contextPath + MAIN_PAGE); + browser.waitForPageToLoad(); + } + + @Test + public void translateTest() + { + browser.type(INPUT_AREA, ONE_SENTENCE); + browser.clickAndWait(TRANSLATE_BUTTON); + assertTrue(browser.isTextPresent(ONE_SENTENCE_TRANSLATED), "One sentence translated into latin expected."); + browser.type(INPUT_AREA, MORE_SENTENCES); + browser.clickAndWait(TRANSLATE_BUTTON); + assertTrue(browser.isTextPresent(MORE_SENTENCES_TRANSLATED), "More sentences translated into latin expected."); + } +} Added: ftest/trunk/pom.xml =================================================================== --- ftest/trunk/pom.xml (rev 0) +++ ftest/trunk/pom.xml 2009-12-17 14:21:11 UTC (rev 5321) @@ -0,0 +1,63 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>8</version> + </parent> + + <groupId>org.jboss.weld.examples.ftest</groupId> + <artifactId>ftest-parent</artifactId> + <version>0.1</version> + <packaging>pom</packaging> + <name>Weld Examples Functional Tests Parent</name> + + <modules> + <module>common</module> + <module>numberguess</module> + <module>login</module> + <module>translator</module> + </modules> + + <properties> + <testng.version>5.10</testng.version> + <selenium.core.version>1.0.1</selenium.core.version> + <selenium.java.client.version>1.0.1</selenium.java.client.version> + </properties> + +  + <dependencies> + <dependency> + <groupId>org.seleniumhq.selenium.core</groupId> + <artifactId>selenium-core</artifactId> + <version>${selenium.core.version}</version> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + <version>${selenium.java.client.version}</version> + </dependency> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${testng.version}</version> + <classifier>jdk15</classifier> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + +</project>

14 years, 4 months

1
0
0 / 0

Weld SVN: r5320 - in archetypes/trunk: jsf/jee and 2 other directories.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-12-16 23:48:23 -0500 (Wed, 16 Dec 2009) New Revision: 5320 Modified: archetypes/trunk/jsf/jee-minimal/pom.xml archetypes/trunk/jsf/jee/pom.xml archetypes/trunk/jsf/servlet-minimal/pom.xml archetypes/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: archetypes/trunk/jsf/jee/pom.xml =================================================================== --- archetypes/trunk/jsf/jee/pom.xml 2009-12-17 04:48:15 UTC (rev 5319) +++ archetypes/trunk/jsf/jee/pom.xml 2009-12-17 04:48:23 UTC (rev 5320) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.0-BETA1</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/jsf/jee-minimal/pom.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/pom.xml 2009-12-17 04:48:15 UTC (rev 5319) +++ archetypes/trunk/jsf/jee-minimal/pom.xml 2009-12-17 04:48:23 UTC (rev 5320) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.0-BETA1</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/jsf/servlet-minimal/pom.xml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-12-17 04:48:15 UTC (rev 5319) +++ archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-12-17 04:48:23 UTC (rev 5320) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.0-BETA1</version> + <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/pom.xml =================================================================== --- archetypes/trunk/pom.xml 2009-12-17 04:48:15 UTC (rev 5319) +++ archetypes/trunk/pom.xml 2009-12-17 04:48:23 UTC (rev 5320) @@ -27,7 +27,7 @@ </repositories> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.0-BETA1</version> + <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Weld Archetypes</name> @@ -70,8 +70,8 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/tags/1.0.0-BETA1</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/tags/1.0.0-BETA1</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/archetypes/tags/1.0.0-BETA1</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/archetypes/trunk</url> </scm> </project>

14 years, 4 months

1
0
0 / 0

Weld SVN: r5319 - archetypes/tags.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-12-16 23:48:15 -0500 (Wed, 16 Dec 2009) New Revision: 5319 Added: archetypes/tags/1.0.0-BETA1/ Log: [maven-scm] copy for tag 1.0.0-BETA1 Copied: archetypes/tags/1.0.0-BETA1 (from rev 5318, archetypes/trunk)

14 years, 4 months

1
0
0 / 0

Weld SVN: r5318 - in archetypes/trunk: jsf/jee and 2 other directories.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-12-16 23:48:01 -0500 (Wed, 16 Dec 2009) New Revision: 5318 Modified: archetypes/trunk/jsf/jee-minimal/pom.xml archetypes/trunk/jsf/jee/pom.xml archetypes/trunk/jsf/servlet-minimal/pom.xml archetypes/trunk/pom.xml Log: [maven-release-plugin] prepare release 1.0.0-BETA1 Modified: archetypes/trunk/jsf/jee/pom.xml =================================================================== --- archetypes/trunk/jsf/jee/pom.xml 2009-12-17 04:44:17 UTC (rev 5317) +++ archetypes/trunk/jsf/jee/pom.xml 2009-12-17 04:48:01 UTC (rev 5318) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.0-BETA1-SNAPSHOT</version> + <version>1.0.0-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/jsf/jee-minimal/pom.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/pom.xml 2009-12-17 04:44:17 UTC (rev 5317) +++ archetypes/trunk/jsf/jee-minimal/pom.xml 2009-12-17 04:48:01 UTC (rev 5318) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.0-BETA1-SNAPSHOT</version> + <version>1.0.0-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/jsf/servlet-minimal/pom.xml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-12-17 04:44:17 UTC (rev 5317) +++ archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-12-17 04:48:01 UTC (rev 5318) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.0-BETA1-SNAPSHOT</version> + <version>1.0.0-BETA1</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/pom.xml =================================================================== --- archetypes/trunk/pom.xml 2009-12-17 04:44:17 UTC (rev 5317) +++ archetypes/trunk/pom.xml 2009-12-17 04:48:01 UTC (rev 5318) @@ -27,7 +27,7 @@ </repositories> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.0-BETA1-SNAPSHOT</version> + <version>1.0.0-BETA1</version> <packaging>pom</packaging> <name>Weld Archetypes</name> @@ -70,8 +70,8 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/weld/archetypes/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/archetypes/tags/1.0.0-BETA1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/archetypes/tags/1.0.0-BETA1</developerConnection> + <url>http://fisheye.jboss.org/browse/weld/archetypes/tags/1.0.0-BETA1</url> </scm> </project>

14 years, 4 months

1
0
0 / 0

Weld SVN: r5317 - in archetypes/trunk: jsf/jee and 2 other directories.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-12-16 23:44:17 -0500 (Wed, 16 Dec 2009) New Revision: 5317 Modified: archetypes/trunk/jsf/jee-minimal/pom.xml archetypes/trunk/jsf/jee/pom.xml archetypes/trunk/jsf/servlet-minimal/pom.xml archetypes/trunk/pom.xml Log: update version to 1.0.0-BETA1-SNAPSHOT Modified: archetypes/trunk/jsf/jee/pom.xml =================================================================== --- archetypes/trunk/jsf/jee/pom.xml 2009-12-17 04:43:58 UTC (rev 5316) +++ archetypes/trunk/jsf/jee/pom.xml 2009-12-17 04:44:17 UTC (rev 5317) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.1-BETA-SNAPSHOT</version> + <version>1.0.0-BETA1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/jsf/jee-minimal/pom.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/pom.xml 2009-12-17 04:43:58 UTC (rev 5316) +++ archetypes/trunk/jsf/jee-minimal/pom.xml 2009-12-17 04:44:17 UTC (rev 5317) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.1-BETA-SNAPSHOT</version> + <version>1.0.0-BETA1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/jsf/servlet-minimal/pom.xml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-12-17 04:43:58 UTC (rev 5316) +++ archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-12-17 04:44:17 UTC (rev 5317) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.1-BETA-SNAPSHOT</version> + <version>1.0.0-BETA1-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/pom.xml =================================================================== --- archetypes/trunk/pom.xml 2009-12-17 04:43:58 UTC (rev 5316) +++ archetypes/trunk/pom.xml 2009-12-17 04:44:17 UTC (rev 5317) @@ -27,7 +27,7 @@ </repositories> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>1.0.1-BETA-SNAPSHOT</version> + <version>1.0.0-BETA1-SNAPSHOT</version> <packaging>pom</packaging> <name>Weld Archetypes</name>

14 years, 4 months

1
0
0 / 0

Weld SVN: r5316 - archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-12-16 23:43:58 -0500 (Wed, 16 Dec 2009) New Revision: 5316 Added: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/index.jsp Log: add missing index.jsp Added: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/index.jsp =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/index.jsp (rev 0) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2009-12-17 04:43:58 UTC (rev 5316) @@ -0,0 +1 @@ +<% response.sendRedirect("index.jsf"); %>

14 years, 4 months

1
0
0 / 0

Weld SVN: r5315 - in archetypes/trunk/jsf: jee/src/main/resources/META-INF/maven and 18 other directories.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-12-16 23:42:20 -0500 (Wed, 16 Dec 2009) New Revision: 5315 Added: archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/maven/ archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp archetypes/trunk/jsf/jee/src/main/resources/META-INF/maven/ archetypes/trunk/jsf/jee/src/main/resources/META-INF/maven/archetype-metadata.xml archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/maven/ archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png Removed: archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl/ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/archetype.xml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp Log: switch to using modern archetype descriptor set default version for projects to 1.0.0-SNAPSHOT setting welcome-file to index.jsf does not work consistently, so revert propagate template to servlet-minimal from jee-minimal update template to include links to JSF community site and description of Weld add embedded glassfish plugin to jee-minimal Deleted: archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee/src/main/resources/META-INF/archetype.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archetype> - <id>weld-archetype-jee-quickstart</id> - <resources> - <resource>src/main/resources/import.sql</resource> - <resource>src/main/resources/META-INF/beans.xml</resource> - <resource>src/main/resources/META-INF/persistence.xml</resource> - <resource>src/main/webapp/index.xhtml</resource> - <resource>src/main/webapp/index.jsp</resource> - <resource>src/main/webapp/WEB-INF/web.xml</resource> - <resource>src/main/webapp/WEB-INF/faces-config.xml</resource> - <resource>src/main/webapp/META-INF/context.xml</resource> - </resources> - <sources> - <source>src/main/java/HelloWorld.java</source> - <source>src/main/java/Widget.java</source> - <source>src/main/java/WidgetListProducer.java</source> - <source>src/main/java/WidgetRepository.java</source> - <source>src/main/java/WidgetRepositoryProducer.java</source> - </sources> - <testSources /> - <testResources /> -</archetype> Added: archetypes/trunk/jsf/jee/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0) +++ archetypes/trunk/jsf/jee/src/main/resources/META-INF/maven/archetype-metadata.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archetype-descriptor name="weld-jsf-jee"> + <requiredProperties> + <requiredProperty key="version"> + <defaultValue>1.0.0-SNAPSHOT</defaultValue> + </requiredProperty> + </requiredProperties> + <fileSets> + <fileSet filtered="true" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>index.jsp</include> + <include>**/*.css</include> + <include>**/*.xhtml</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="false" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>**/*.png</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/main/resources</directory> + <includes> + <include>**/*.sql</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/test/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/test/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> +</archetype-descriptor> Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -27,6 +27,17 @@  <weld.extensions.version>1.0.0-CR2</weld.extensions.version> </properties> + + <repositories> +  +  + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> + <dependencyManagement> <dependencies>  Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -37,8 +37,4 @@ <persistence-unit-name>widgets</persistence-unit-name> </persistence-unit-ref> -  - <welcome-file-list> - <welcome-file>index.jsf</welcome-file> - </welcome-file-list> </web-app> Added: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java =================================================================== --- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java (rev 0) +++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/test/java/HelloWorldTest.java 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,12 @@ +package ${package}; + +import org.testng.annotations.Test; + +public class HelloWorldTest +{ + @Test + public void testGetText() { + HelloWorld fixture = new HelloWorld(); + assert "Hello World!".equals(fixture.getText()); + } +} Deleted: archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/archetype.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archetype> - <id>weld-archetype-jee-minimal-quickstart</id> - <resources> - <resource>src/main/resources/META-INF/beans.xml</resource> - <resource>src/main/webapp/index.xhtml</resource> - <resource>src/main/webapp/resources/css/screen.css</resource> - <resource filtered="false">src/main/webapp/resources/gfx/banner.png</resource> - <resource filtered="false">src/main/webapp/resources/gfx/weld.png</resource> - <resource>src/main/webapp/WEB-INF/web.xml</resource> - <resource>src/main/webapp/WEB-INF/faces-config.xml</resource> - <resource>src/main/webapp/WEB-INF/tmpl/default.xhtml</resource> - <resource>src/main/webapp/META-INF/context.xml</resource> - </resources> - <sources> - <source>src/main/java/HelloWorld.java</source> - </sources> - <testSources> - <source>src/test/java/HelloWorldTest.java</source> - </testSources> - <testResources/> -</archetype> Added: archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archetype-descriptor name="weld-jsf-jee-minimal"> + <requiredProperties> + <requiredProperty key="version"> + <defaultValue>1.0.0-SNAPSHOT</defaultValue> + </requiredProperty> + </requiredProperties> + <fileSets> + <fileSet filtered="true" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>index.jsp</include> + <include>**/*.css</include> + <include>**/*.xhtml</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="false" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>**/*.png</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/main/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/test/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/test/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> +</archetype-descriptor> Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -25,6 +25,26 @@ <weld.extensions.version>1.0.0-CR2</weld.extensions.version> </properties> + + <repositories> +  +  + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> + + <pluginRepositories> +  + <pluginRepository> + <id>glassfish</id> + <name>GlassFish Maven 2 Repository</name> + <url>http://download.java.net/maven/glassfish</url> + </pluginRepository> + </pluginRepositories> + <dependencyManagement> <dependencies>  @@ -37,6 +57,7 @@ </dependency> </dependencies> </dependencyManagement> + <dependencies>  <dependency> @@ -132,6 +153,17 @@ <serverName>${expr_start}jboss.domain${expr_end}</serverName> </configuration> </plugin> +  + <plugin> + <groupId>org.glassfish</groupId> + <artifactId>maven-embedded-glassfish-plugin</artifactId> + <version>3.0</version> + <configuration> + <app>target/${expr_start}build.finalName${expr_end}.war</app> + <port>7070</port> + <containerType>web</containerType> + </configuration> + </plugin> </plugins> </build> </project> Copied: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates (from rev 5312, archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl) Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tmpl/default.xhtml 2009-12-17 01:17:12 UTC (rev 5312) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -12,13 +12,19 @@ <div id="container"> <div id="content"> <div id="sidebar"> - <h3>Learn more</h3> + <h3>Find out more</h3> <p> + Explore JavaServer Faces. + </p> + <ul> + <li><a href="http://www.javaserverfaces.org">JSF community site</a></li> + </ul> + <p> Learn more about Java EE 6 and the extensions provided by Weld and Seam. </p> <ul> <li><a href="http://seamframework.org/Weld/JSR299AndWeldOverview">Overview</a></li> - <li><a href="http://seamframework.org">Project website</a></li> + <li><a href="http://seamframework.org">Project site</a></li> <li><a href="http://seamframework.org/Documentation/SeamDocumentation#H-WeldReferenceD...">Documentation</a></li> <li><a href="http://seamframework.org/Community/Forums">User forums</a></li> <li><a href="http://seamframework.org/Community/MailingLists">Mailing lists</a></li> @@ -36,7 +42,10 @@ </div> <div id="footer"> <h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/> - <p>Weld is an open source (Apache License, Version 2.0) implementation of CDI.</p> + <p> + This project was generated from a Maven archetype maintained by the Weld team.<br/> + Weld is the reference implementation of CDI, released under the Apache License, Version 2.0.<br/> + </p> </div> </div> </h:body> Modified: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,19 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">  +  <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> @@ -33,8 +31,4 @@ <param-value>true</param-value> </context-param> -  - <welcome-file-list> - <welcome-file>index.jsf</welcome-file> - </welcome-file-list> </web-app> Copied: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml (from rev 5312, archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml) =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml (rev 0) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + template="/WEB-INF/templates/default.xhtml"> + <ui:define name="content"> + <h1>Hello World!</h1> + <p>Your CDI bean <code>HelloWorld</code> says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p> + + <h:form id="bv"> + <h2>Bean Validation examples</h2> + <p>Enforces annotation-based constraints defined on the model class.</p> + <table> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="letters" value="Letters:"/> + </th> + <td> + <h:inputText id="letters" value="#{helloWorld.letters}"/> + <h:message for="letters" errorClass="invalid"/> + </td> + </tr> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="numbers" value="Numbers:"/> + </th> + <td> + <h:inputText id="numbers" value="#{helloWorld.numbers}"/> + <h:message for="numbers" errorClass="invalid"/> + </td> + </tr> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="email" value="Email:"/> + </th> + <td> + <h:inputText id="email" value="#{helloWorld.email}"/> + <h:message for="email" errorClass="invalid"/> + </td> + </tr> + </table> + <p> + <h:commandButton id="check" action="check" value="Check values"/> + <h:outputText value=" All clear!" rendered="#{facesContext.postback and empty facesContext.messageList}" style="color: green;"/> + </p> + </h:form> + </ui:define> +</ui:composition> Added: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp (rev 0) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1 @@ +<% response.sendRedirect("home.jsf"); %> Deleted: archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml =================================================================== --- archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/jee-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - template="/WEB-INF/tmpl/default.xhtml"> - <ui:define name="content"> - <h1>Hello World!</h1> - <p>Your CDI bean <code>HelloWorld</code> says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p> - - <h:form id="bv"> - <h2>Bean Validation examples</h2> - <p>Enforces annotation-based constraints defined on the model class.</p> - <table> - <tr> - <th style="text-align: right;"> - <h:outputLabel for="letters" value="Letters:"/> - </th> - <td> - <h:inputText id="letters" value="#{helloWorld.letters}"/> - <h:message for="letters" errorClass="invalid"/> - </td> - </tr> - <tr> - <th style="text-align: right;"> - <h:outputLabel for="numbers" value="Numbers:"/> - </th> - <td> - <h:inputText id="numbers" value="#{helloWorld.numbers}"/> - <h:message for="numbers" errorClass="invalid"/> - </td> - </tr> - <tr> - <th style="text-align: right;"> - <h:outputLabel for="email" value="Email:"/> - </th> - <td> - <h:inputText id="email" value="#{helloWorld.email}"/> - <h:message for="email" errorClass="invalid"/> - </td> - </tr> - </table> - <p> - <h:commandButton id="check" action="check" value="Check values"/> - <h:outputText value=" All clear!" rendered="#{facesContext.postback and empty facesContext.messageList}" style="color: green;"/> - </p> - </h:form> - </ui:define> -</ui:composition> Deleted: archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/archetype.xml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/archetype.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/archetype.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archetype> - <id>weld-archetype-servlet-quickstart</id> - <resources> - <resource>src/main/webapp/index.xhtml</resource> - <resource>src/main/webapp/index.jsp</resource> - <resource>src/main/webapp/WEB-INF/web.xml</resource> - <resource>src/main/webapp/WEB-INF/faces-config.xml</resource> - <resource>src/main/resources/META-INF/beans.xml</resource> - <resource>src/main/webapp/META-INF/context.xml</resource> - </resources> - <sources> - <source>src/main/java/HelloWorld.java</source> - </sources> - <testSources> - <source>src/test/java/HelloWorldTest.java</source> - </testSources> - <testResources> - <resource>src/test/resources/jetty-env.xml</resource> - </testResources> -</archetype> Added: archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/META-INF/maven/archetype-metadata.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<archetype-descriptor name="weld-jsf-servlet-minimal"> + <requiredProperties> + <requiredProperty key="version"> + <defaultValue>1.0.0-SNAPSHOT</defaultValue> + </requiredProperty> + </requiredProperties> + <fileSets> + <fileSet filtered="true" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>index.jsp</include> + <include>**/*.css</include> + <include>**/*.xhtml</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="false" packaged="false"> + <directory>src/main/webapp</directory> + <includes> + <include>**/*.png</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/main/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="true"> + <directory>src/test/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/test/resources</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + </fileSets> +</archetype-descriptor> Modified: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:42:20 UTC (rev 5315) @@ -22,6 +22,16 @@ <weld.extensions.version>1.0.0-CR2</weld.extensions.version> </properties> + <repositories> +  +  + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/maven2</url> + </repository> + </repositories> + <dependencyManagement> <dependencies>  Added: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml (rev 0) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/default.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,52 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> + <h:head> + <title>Java EE 6 Starter Application</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <h:outputStylesheet name="css/screen.css"/> + </h:head> + <h:body> + <div id="container"> + <div id="content"> + <div id="sidebar"> + <h3>Find out more</h3> + <p> + Explore JavaServer Faces. + </p> + <ul> + <li><a href="http://www.javaserverfaces.org">JSF community site</a></li> + </ul> + <p> + Learn more about Java EE 6 and the extensions provided by Weld and Seam. + </p> + <ul> + <li><a href="http://seamframework.org/Weld/JSR299AndWeldOverview">Overview</a></li> + <li><a href="http://seamframework.org">Project site</a></li> + <li><a href="http://seamframework.org/Documentation/SeamDocumentation#H-WeldReferenceD...">Documentation</a></li> + <li><a href="http://seamframework.org/Community/Forums">User forums</a></li> + <li><a href="http://seamframework.org/Community/MailingLists">Mailing lists</a></li> + <li><a href="https://jira.jboss.org/jira/browse/WELD">Issue tracker</a></li> + </ul> + <p> + If you have an add-on, please <a href="http://seamframework.org/Community/Forums">let us know</a> and + consider <a href="http://seamframework.org/Community/Contribute">contributing</a> it back to the + community! + </p> + </div> + <ui:insert name="content"> + [Template content will be inserted here] + </ui:insert> + </div> + <div id="footer"> + <h:graphicImage value="/resources/gfx/weld.png" alt="Weld logo"/> + <p> + This project was generated from a Maven archetype maintained by the Weld team.<br/> + Weld is the reference implementation of CDI, released under the Apache License, Version 2.0.<br/> + </p> + </div> + </div> + </h:body> +</html> Copied: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml (from rev 5312, archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml) =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml (rev 0) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/home.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + template="/WEB-INF/templates/default.xhtml"> + <ui:define name="content"> + <h1>Hello World!</h1> + <p>Your CDI bean <code>HelloWorld</code> says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p> + + <h:form id="bv"> + <h2>Bean Validation examples</h2> + <p>Enforces annotation-based constraints defined on the model class.</p> + <table> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="letters" value="Letters:"/> + </th> + <td> + <h:inputText id="letters" value="#{helloWorld.letters}"/> + <h:message for="letters" errorClass="invalid"/> + </td> + </tr> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="numbers" value="Numbers:"/> + </th> + <td> + <h:inputText id="numbers" value="#{helloWorld.numbers}"/> + <h:message for="numbers" errorClass="invalid"/> + </td> + </tr> + <tr> + <th style="text-align: right;"> + <h:outputLabel for="email" value="Email:"/> + </th> + <td> + <h:inputText id="email" value="#{helloWorld.email}"/> + <h:message for="email" errorClass="invalid"/> + </td> + </tr> + </table> + <p> + <h:commandButton id="check" action="check" value="Check values"/> + <h:outputText value=" All clear!" rendered="#{facesContext.postback and empty facesContext.messageList}" style="color: green;"/> + </p> + </h:form> + </ui:define> +</ui:composition> Modified: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,5 +1 @@ -<html> -<head> -<meta HTTP-EQUIV="REFRESH" content="0; url=index.jsf"> -</head> -</html> +<% response.sendRedirect("home.jsf"); %> Deleted: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-12-17 04:14:17 UTC (rev 5314) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2009-12-17 04:42:20 UTC (rev 5315) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html"> - <h:head> - <title>Weld JSF/Servlet Starter Application</title> - </h:head> - <h:body> - <h1>Hello World!</h1> - <p>My CDI bean says <span style="color: blue;">#{helloWorld.text}</span> using the Unified EL.</p> - - <h:form> - <h2>Bean Validation examples</h2> - <p>Enforces annotation-based constraints defined on the model class.</p> - <table> - <tr> - <th style="text-align: right;"> - <h:outputLabel for="letters" value="Letters:"/> - </th> - <td> - <h:inputText id="letters" value="#{helloWorld.letters}"/> - <h:message for="letters" style="color: red;"/> - </td> - </tr> - <tr> - <th style="text-align: right;"> - <h:outputLabel for="numbers" value="Numbers (max two digits):"/> - </th> - <td> - <h:inputText id="numbers" value="#{helloWorld.numbers}"/> - <h:message for="numbers" style="color: red;"/> - </td> - </tr> - <tr> - <th style="text-align: right;"> - <h:outputLabel for="email" value="Email:"/> - </th> - <td> - <h:inputText id="email" value="#{helloWorld.email}"/> - <h:message for="email" style="color: red;"/> - </td> - </tr> - </table> - <p> - <h:commandButton action="check" value="Check"/> - <h:outputText value=" All clear!" rendered="#{facesContext.postback and empty facesContext.messageList}" style="color: green;"/> - </p> - </h:form> - </h:body> -</html> Added: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css =================================================================== --- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css (rev 0) +++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/css/screen.css 2009-12-17 04:42:20 UTC (rev 5315) @@ -0,0 +1,39 @@ +body { + margin: 0; + padding: 0; + background-color: #EAECEE; + font-family: Verdana, sans-serif; + font-size: 0.9em; +} +#container { + margin: 0 auto; + padding: 0 20px 10px 20px; + border: 1px solid #666666; + width: 865px; /* subtract 40px from banner width for padding */ + background: #FFFFFF url(#{request.contextPath}/resources/gfx/banner.png) no-repeat; + padding-top: 110px; +} +#sidebar { + font-size: 0.9em; + width: 225px; + float: right; + border: 1px solid #666666; + background: #EAECEE; + padding: 0 15px 5px 15px; +} +#sidebar ul { + padding-left: 30px; +} +#footer { + clear: both; + text-align: center; + color: #666666; + font-size: 0.85em; +} +code { + font-size: 1.1em; +} +span.invalid { + padding-left: 3px; + color: red; +} \ No newline at end of file Added: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png =================================================================== (Binary files differ) Property changes on: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/banner.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png =================================================================== (Binary files differ) Property changes on: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/src/main/webapp/resources/gfx/weld.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

14 years, 4 months

1
0
0 / 0

Weld SVN: r5314 - in archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf: jee-minimal/src/main/resources/archetype-resources and 1 other directories.

by weld-commits＠lists.jboss.org

Author: sboscarine Date: 2009-12-16 23:14:17 -0500 (Wed, 16 Dec 2009) New Revision: 5314 Modified: archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/jee/src/main/resources/archetype-resources/pom.xml archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml Log: updated comments Modified: archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/jee/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-12-17 03:57:29 UTC (rev 5313) +++ archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:14:17 UTC (rev 5314) @@ -9,7 +9,7 @@ <version>${version}</version> <repositories>  -  +  <repository> <id>repository.jboss.org</id> <name>JBoss Repository</name> Modified: archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 03:57:29 UTC (rev 5313) +++ archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/jee-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:14:17 UTC (rev 5314) @@ -9,7 +9,7 @@ <version>${version}</version> <repositories>  -  +  <repository> <id>repository.jboss.org</id> <name>JBoss Repository</name> Modified: archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml =================================================================== --- archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 03:57:29 UTC (rev 5313) +++ archetypes/tags/weld-archetype-parent-1.0.0-BETA/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml 2009-12-17 04:14:17 UTC (rev 5314) @@ -9,7 +9,7 @@ <version>${version}</version> <repositories>  -  +  <repository> <id>repository.jboss.org</id> <name>JBoss Repository</name>

14 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits December 2009