Author: tremes Date: 2013-06-04 03:13:54 -0400 (Tue, 04 Jun 2013) New Revision: 15540 Removed: branches/enterprise/WFK-2_1/examples/openid/openid-tests/pom.xml branches/enterprise/WFK-2_1/examples/openid/openid-tests/src/test/java/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java branches/enterprise/WFK-2_1/examples/openid/openid-tests/src/test/resources-ftest/testng.xml Modified: branches/enterprise/WFK-2_1/examples/openid/openid-ear/pom.xml branches/enterprise/WFK-2_1/examples/openid/openid-web/pom.xml branches/enterprise/WFK-2_1/examples/openid/pom.xml Log: openid example migrated Modified: branches/enterprise/WFK-2_1/examples/openid/openid-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/openid/openid-ear/pom.xml 2013-06-04 07:01:40 UTC (rev 15539) +++ branches/enterprise/WFK-2_1/examples/openid/openid-ear/pom.xml 2013-06-04 07:13:54 UTC (rev 15540) @@ -66,6 +66,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> + <version>${version.ear.plugin}</version> <configuration> <version>6</version> <defaultLibBundleDir>lib</defaultLibBundleDir> Deleted: branches/enterprise/WFK-2_1/examples/openid/openid-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/openid/openid-tests/pom.xml 2013-06-04 07:01:40 UTC (rev 15539) +++ branches/enterprise/WFK-2_1/examples/openid/openid-tests/pom.xml 2013-06-04 07:13:54 UTC (rev 15540) @@ -1,94 +0,0 @@ -<?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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>openid</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples.openid</groupId> - <artifactId>openid-tests</artifactId> - <name>Openid Integration Tests Module (EE6)</name> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.openid</groupId> - <artifactId>openid-ejb</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-server</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-java</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>functional-tests</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>ftest</id> - <properties> - <example.context.path>seam-openid</example.context.path> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>selenium-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>failsafe-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Deleted: branches/enterprise/WFK-2_1/examples/openid/openid-tests/src/test/java/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/openid/openid-tests/src/test/java/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java 2013-06-04 07:01:40 UTC (rev 15539) +++ branches/enterprise/WFK-2_1/examples/openid/openid-tests/src/test/java/org/jboss/seam/example/openid/test/selenium/SeleniumOpenIdTest.java 2013-06-04 07:13:54 UTC (rev 15540) @@ -1,132 +0,0 @@ -/* - * 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.seam.example.openid.test.selenium; - -import static org.testng.AssertJUnit.assertTrue; -import static org.testng.AssertJUnit.assertEquals; -import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -/** - * This class tests basic functionality of Seam OpenId example. - * - * For executing this test a selenium.browser property is automaticly changed: - * - * selenium.browser=*chrome (to test Mozilla Firefox) - * selenium.browser=*iehta (to test Internet Explorer) - * - * This parameter tells browser to increase its privileges to be able to - * work across multiple domains. - * - * - * @author Martin Gencur - * - */ -public class SeleniumOpenIdTest extends SeamSeleniumTest -{ - public static final String HOME_PAGE_TITLE = "OpenID Wall"; - public static final String LOGIN_LINK = "xpath=//input[@value='OpenID Login']"; - public static final String LOGIN_INPUT = "xpath=//input[@class='openid_input']"; - public static final String PASSWORD_INPUT = "id=password"; - public static final String SIGNIN_BUTTON = "id=signin_button"; - public static final String CONTINUE_BUTTON = "xpath=//button[contains(text(),'Continue')]"; - public static final String LOGOUT_BUTTON = "xpath=//input[@value='Logout']"; - - public static String OPENID_ACCOUNT; - public static String OPENID_PASSWORD; - - public static String ORIGINAL_BROWSER; - - @BeforeClass - @Parameters( { "openid.account", "openid.password" }) - public void setCredentials(String account, String password) { - OPENID_ACCOUNT = account; - OPENID_PASSWORD = password; - } - - @AfterClass - public void returnBrowser(){ - super.setBrowser(ORIGINAL_BROWSER); - } - - @BeforeMethod - @Override - public void setUp() - { - /*setting browser with enhanced security privileges for selenium*/ - setProperBrowser(SeamSeleniumTest.getBrowser()); - super.setUp(); - browser.open(CONTEXT_PATH); - } - - /** - * Place holder - just verifies that example deploys - */ - @Test - public void homePageLoadTest() - { - assertEquals("Unexpected page title.", HOME_PAGE_TITLE, browser.getTitle()); - } - - /** - * Method verifies login and logout operations. - */ - @Test(dependsOnMethods={"homePageLoadTest"}) - public void openIdLoginLogoutTest(){ - deleteCookies(); - browser.type(LOGIN_INPUT, OPENID_ACCOUNT); - browser.clickAndWait(LOGIN_LINK); - browser.type(PASSWORD_INPUT, OPENID_PASSWORD); - browser.clickAndWait(SIGNIN_BUTTON); - if (browser.isElementPresent(CONTINUE_BUTTON)) { - browser.clickAndWait(CONTINUE_BUTTON); - } - assertTrue("Page should contain information about successfull login", browser.isTextPresent("OpenID login successful...")); - browser.clickAndWait(LOGOUT_BUTTON); - assertTrue("Page should contain input field which means that user is not logged in anymore", browser.isElementPresent(LOGIN_INPUT)); - } - - private void deleteCookies(){ - browser.deleteCookie("session_id",""); - browser.deleteCookie("secure_session_id",""); - } - - /** - * Method for setting proper browser for selenium so that it can work - * across multiple domains. - * - * @param origBrowser Originally intended browser - */ - private void setProperBrowser(String origBrowser){ - ORIGINAL_BROWSER = origBrowser; - if (origBrowser.equals("*firefox") || origBrowser.equals("*firefoxproxy")) { - super.setBrowser("*chrome"); - } - if (origBrowser.equals("*iexplore") || origBrowser.equals("*iexploreproxy")) { - super.setBrowser("*iehta"); - } - } -} Deleted: branches/enterprise/WFK-2_1/examples/openid/openid-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/openid/openid-tests/src/test/resources-ftest/testng.xml 2013-06-04 07:01:40 UTC (rev 15539) +++ branches/enterprise/WFK-2_1/examples/openid/openid-tests/src/test/resources-ftest/testng.xml 2013-06-04 07:13:54 UTC (rev 15540) @@ -1,26 +0,0 @@ - - <!-- - 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. - --> -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="OpenId example" verbose="2" parallel="false"> - <test name="openid_tests"> - <parameter name="PROPERTY_FILE" value="" /> - <classes> - <class name="org.jboss.seam.example.openid.test.selenium.SeleniumOpenIdTest" /> - </classes> - </test> -</suite> Modified: branches/enterprise/WFK-2_1/examples/openid/openid-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/openid/openid-web/pom.xml 2013-06-04 07:01:40 UTC (rev 15539) +++ branches/enterprise/WFK-2_1/examples/openid/openid-web/pom.xml 2013-06-04 07:13:54 UTC (rev 15540) @@ -78,6 +78,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> + <version>${version.war.plugin}</version> <configuration> <webResources> <resource> Modified: branches/enterprise/WFK-2_1/examples/openid/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/openid/pom.xml 2013-06-04 07:01:40 UTC (rev 15539) +++ branches/enterprise/WFK-2_1/examples/openid/pom.xml 2013-06-04 07:13:54 UTC (rev 15540) @@ -1,14 +1,9 @@ <?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"> - <parent> - <artifactId>examples</artifactId> - <groupId>org.jboss.seam</groupId> - <version>2.3.1.Final-redhat-2</version> - </parent> - <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.examples</groupId> <artifactId>openid</artifactId> + <version>2.3.1.Final-redhat-2</version> <packaging>pom</packaging> <name>OpenID Example (EE6)</name> @@ -16,9 +11,36 @@ <module>openid-ejb</module> <module>openid-web</module> <module>openid-ear</module> - <module>openid-tests</module> </modules> + <properties> + <example.name>openid</example.name> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.source>1.6</maven.compiler.source> + + <!-- To use jacoco, set jacoco.agent system property to something like + -javaagent:/path/to/jacocoagent.jar=append=true,destfile=/path/to/output/jacoco.exec --> + <jacoco.agent /> + + <!-- To use custom Maven settings and profiles, uncomment and customize + the following properties. This is necessary for the ShrinkWrap resolver to + function properly. --> + <!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings> --> + <!--<maven.profiles>custom,profile</maven.profiles> --> + + <version.commons.logging>1.1.1</version.commons.logging> + <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver> + + <!-- Plugin versions --> + <version.dependency.plugin>2.5.1</version.dependency.plugin> + <version.surefire.plugin>2.10</version.surefire.plugin> + <version.compiler.plugin>2.3.1</version.compiler.plugin> + <version.ear.plugin>2.6</version.ear.plugin> + <version.war.plugin>2.1.1</version.war.plugin> + <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin> + </properties> + <dependencyManagement> <dependencies> <dependency> @@ -27,18 +49,86 @@ <version>${project.version}</version> <type>ejb</type> </dependency> + <dependency> <groupId>org.jboss.seam.examples.openid</groupId> <artifactId>openid-web</artifactId> <version>${project.version}</version> <type>war</type> </dependency> + <dependency> <groupId>org.jboss.seam.examples.openid</groupId> <artifactId>openid-ear</artifactId> <version>${project.version}</version> </dependency> + + <!-- BOMs --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-bom</artifactId> + <version>${version.shrinkwrap.resolver}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>bom</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons.logging}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <!-- Manage plugin versions for build stability --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.surefire.plugin}</version> + <configuration> + <systemPropertyVariables> + <org.apache.maven.user-settings>${maven.user.settings}</org.apache.maven.user-settings> + <maven.profiles>${maven.profiles}</maven.profiles> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${version.dependency.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>${version.compiler.plugin}</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project>