Author: gmazza
Date: Tue Jul 30 11:16:16 2013
New Revision: 1508391

URL: http://svn.apache.org/r1508391
Log:
Switching to Hibernate JPA, at least until the EclipseLink problem w/MediaFiles 
is fixed.

Modified:
    roller/trunk/app/pom.xml
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp

Modified: roller/trunk/app/pom.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1508391&r1=1508390&r2=1508391&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Tue Jul 30 11:16:16 2013
@@ -66,11 +66,11 @@
              placed in the src/test/resources/roller-custom.properties
              file.
          -->
-        <dependency>
+        <!--dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
             <version>2.5.0</version>
-        </dependency>
+        </dependency-->
 
         <!-- Alternative testing with Hibernate (used by default
              with JBoss
@@ -81,7 +81,7 @@
              always provided by struts2-spring-plugin so filtering it out; 
already provided by JBoss anyway
         -->
 
-        <!--dependency>
+        <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
             <version>4.2.1.Final</version>
@@ -98,7 +98,7 @@
             <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/webapp/WEB-INF/jsps/core/Register.jsp
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp?rev=1508391&r1=1508390&r2=1508391&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/Register.jsp Tue Jul 30 
11:16:16 2013
@@ -172,7 +172,7 @@ function onChange() {
         if (emailAddress) disabled = false;
 
     } else if (openIdConfig == 'disabled') {
-        if (emailAddress && userName && passwordText && passwordConfirm && 
emailAddress) disabled = false;
+        if (emailAddress && userName && passwordText && passwordConfirm) 
disabled = false;
         
     } else if (openIdConfig == 'only') {
         if (emailAddress && openIdUrl) disabled = false;


Reply via email to