Author: gmazza
Date: Wed Aug 7 19:34:05 2013
New Revision: 1511450
URL: http://svn.apache.org/r1511450
Log:
Added some ids to anchors in JSPs to make Selenium more i18n-independent, added
comment not to distribute w/Hibernate due to its being LGPL.
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Welcome.jsp
roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java
roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java
Modified: roller/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1511450&r1=1511449&r2=1511450&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Wed Aug 7 19:34:05 2013
@@ -41,14 +41,18 @@
<version>2.5.0</version>
</dependency>
- <!-- Alternative testing with Hibernate (used by default
- with JBoss
+ <!-- Alternative testing with Hibernate (used by default with JBoss)
Important: set
hibernate.transaction.factory_class=org.hibernate.transaction.JDBCTransactionFactory
in your roller-custom.properties if using Hibernate with Tomcat
org.javassist:javassist:3.15.0 cannot replace differently named
javassist:javassist:3.11.0
always provided by struts2-spring-plugin so filtering it out;
already provided by JBoss anyway
- <dependency>
+
+ Note: Apache cannot distribute Hibernate due to it being LGPL, so
these dependencies must be
+ commented out in trunk. We have this dependency declaration to
help with testing on JBoss
+ which uses Hibernate.
+ -->
+ <!--dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>4.2.3.Final</version>
@@ -59,14 +63,13 @@
</exclusion>
</exclusions>
</dependency>
- -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.6.1</version>
<scope>runtime</scope>
- </dependency>
+ </dependency-->
<!-- To test with OpenJPA instead of EclipseLink, will need to add
OpenJPA
dependencies and static bytecode enhancement of the generated JPA
classes
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java?rev=1511450&r1=1511449&r2=1511450&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
Wed Aug 7 19:34:05 2013
@@ -28,13 +28,11 @@ import org.apache.roller.weblogger.ui.st
public class Login extends UIAction {
private String error = null;
- private boolean openidEnabled =
WebloggerConfig.getBooleanProperty("authentication.openid.enabled");
-
+
public Login() {
this.pageTitle = "loginPage.title";
}
-
-
+
// override default security, we do not require an authenticated user
public boolean isUserRequired() {
return false;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1511450&r1=1511449&r2=1511450&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
Wed Aug 7 19:34:05 2013
@@ -59,13 +59,11 @@ public class Register extends UIAction i
private String activationCode = null;
private ProfileBean bean = new ProfileBean();
-
-
+
public Register() {
this.pageTitle = "newUser.addNewUser";
}
-
// override default security, we do not require an authenticated user
public boolean isUserRequired() {
return false;
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp?rev=1511450&r1=1511449&r2=1511450&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Setup.jsp Wed Aug 7
19:34:05 2013
@@ -36,7 +36,7 @@
<s:text name="index.createUserHelp" /><br /><br />
<s:if test="userCount == 0">
<s:text name="index.createUserBy" />
- <a href='<s:url action="register"/>'>
+ <a id="a_createUser" href='<s:url action="register"/>'>
<s:text name="index.createUserPage" /></a>.
<br /><br />
</s:if>
@@ -54,7 +54,7 @@
<s:text name="index.createWeblogHelp" /><br /><br />
<s:if test="userCount > 0 && blogCount == 0">
<s:text name="index.createWeblogBy" />
- <a href='<s:url action="createWeblog"/>'>
+ <a id="a_createBlog" href='<s:url action="createWeblog"/>'>
<s:text name="index.createWeblogPage" /></a>.
<br /><br />
</s:if>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Welcome.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Welcome.jsp?rev=1511450&r1=1511449&r2=1511450&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Welcome.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Welcome.jsp Wed Aug 7
19:34:05 2013
@@ -19,7 +19,7 @@
<s:if test="activationStatus == null">
<p><s:text name="welcome.accountCreated" /></p>
- <p><a href="<s:url action="login-redirect"/>" ><s:text
name="welcome.clickHere" /></a>
+ <p><a id="a_clickHere" href="<s:url action="login-redirect"/>" ><s:text
name="welcome.clickHere" /></a>
<s:text name="welcome.toLoginAndPost" /></p>
</s:if>
Modified:
roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java
URL:
http://svn.apache.org/viewvc/roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java?rev=1511450&r1=1511449&r2=1511450&view=diff
==============================================================================
---
roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java
(original)
+++
roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/SetupPage.java
Wed Aug 7 19:34:05 2013
@@ -36,7 +36,7 @@ public class SetupPage extends AbstractR
}
public RegisterPage createNewUser() {
- clickByLinkText("New User Registration Page");
+ clickById("a_createUser");
return new RegisterPage(driver);
}
Modified:
roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java
URL:
http://svn.apache.org/viewvc/roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java?rev=1511450&r1=1511449&r2=1511450&view=diff
==============================================================================
---
roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java
(original)
+++
roller/trunk/it-selenium/src/test/java/org/apache/roller/selenium/core/WelcomePage.java
Wed Aug 7 19:34:05 2013
@@ -37,7 +37,7 @@ public class WelcomePage extends Abstrac
}
public LoginPage doRollerLogin() {
- clickByLinkText("Click here");
+ clickById("a_clickHere");
return new LoginPage(driver);
}
