make jappstart more up to date

* use GAE 1.6.0
* use Spring 3.1
* use jquery 1.7.1
* no longer need user/pass bean post processer
* various dependency updates to use latest versions

README.md

@@ -1,6 +1,40 @@
 # Getting Started Guide
 jappstart is a Java framework for Google App Engine built on Spring, Spring Security, and Sitemesh. The project aims to be the starting point for Google App Engine Java applications. It's not a framework in the traditional sense -- rather it is designed to provide a solid foundation for GAE/Java applications that can be easily extended by developers.
 
+# Features
+* Appstats Support
+* Google AJAX Library API (jQuery)
+* Gravatar Integration
+* JRebel Support
+* Local Development Console Support (http://localhost:8080/_ah/admin)
+* Maven Support
+  * CSS/JS minification via the yuicompressor-maven-plugin
+  * Uses the maven-gae-plugin
+* Remote API/Bulk Loader Support
+* Sitemesh Integration
+* Spring 3
+  * JPA support
+  * JSON/AJAX integration (Jackson)
+  * JSR-303 validation
+  * Localization support
+* Spring Security 3
+  * Authentication
+  * Expression based access control
+  * Fully integrated with the App Engine Datastore and Memcache
+  * Login/create account functionality with e-mail confirmation
+  * Remember Me
+  * Support for hierarchical roles
+* Static Error Handler Support
+* Task Queue Support
+* URL Rewrite Integration
+
+# Versions
+* Goole App Engine SDK for Java 1.6.0
+* jQuery 1.7.1
+* Maven GAE Plugin 0.9.2
+* Spring 3.1.0
+* Spring Security 3.1.0
+
 ## Configure Property Files
 Configure the following properties in `filter-local.properties`, `filter-dev.properties`, and `filter-prod.properties`.
 

filter-dev.properties

@@ -7,6 +7,6 @@ google.jsapi.https.key=enterKey
 application.secureChannel=https
 application.hostname=enterId.appspot.com
 
-jquery.ver=1.6.3
+jquery.ver=1.7.1
 
 mail.fromAddress=do-not-reply@enterDomain.com

filter-local.properties

@@ -7,6 +7,6 @@ google.jsapi.https.key=enterKey
 application.secureChannel=http
 application.hostname=localhost:8080
 
-jquery.ver=1.6.3
+jquery.ver=1.7.1
 
 mail.fromAddress=do-not-reply@localhost.com

filter-prod.properties

@@ -7,6 +7,6 @@ google.jsapi.https.key=enterKey
 application.secureChannel=https
 application.hostname=enterDomain.com
 
-jquery.ver=1.6.3
+jquery.ver=1.7.1
 
 mail.fromAddress=do-not-reply@enterDomain.com

pom.xml

@@ -73,15 +73,15 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <gae.version>1.5.5</gae.version>
-        <gae.runtime>1.5.5</gae.runtime>
+        <gae.version>1.6.0</gae.version>
+        <gae.runtime>1.6.0</gae.runtime>
         <gae.home>${settings.localRepository}/com/google/appengine/appengine-java-sdk/${gae.version}/appengine-java-sdk-${gae.version}</gae.home>
         <rebel.home>${env.REBEL_HOME}</rebel.home>
         <maven.gae.plugin.version>0.9.2</maven.gae.plugin.version>
         <datanucleus.version>1.1.5</datanucleus.version>
-        <springframework.version>3.0.6.RELEASE</springframework.version>
-        <springframework.security.version>3.0.7.RELEASE</springframework.security.version>
-        <slf4j.version>1.6.1</slf4j.version>
+        <springframework.version>3.1.0.RELEASE</springframework.version>
+        <springframework.security.version>3.1.0.RELEASE</springframework.security.version>
+        <slf4j.version>1.6.4</slf4j.version>
     </properties>
 
     <repositories>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.7</version>
+            <version>4.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -162,13 +162,13 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>4.1.0.Final</version>
+            <version>4.2.0.Final</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib</artifactId>
-            <version>2.2</version>
+            <version>2.2.2</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -200,7 +200,7 @@
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
-            <version>1.4.1</version>
+            <version>1.4.4</version>
             <scope>provided</scope>
         </dependency>
 
@@ -279,7 +279,7 @@
         <dependency>
             <groupId>org.tuckey</groupId>
             <artifactId>urlrewritefilter</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.0</version>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
@@ -289,7 +289,7 @@
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.5.1</version>
+            <version>1.9.3</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -299,13 +299,18 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.4</version>
+            <version>1.6</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.5</version>
-        </dependency> 
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.5.4</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -409,7 +414,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.0.2</version>
+                <version>2.1.1</version>
                 <configuration>
                     <webResources>
                         <resource>
@@ -426,7 +431,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.3.2</version>
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>
@@ -435,12 +440,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.7</version>
+                <version>2.8</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.5</version>
+                <version>2.7</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -450,7 +455,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.0</version>
+                <version>2.2.2</version>
             </plugin>
         </plugins>
         <extensions>
@@ -514,7 +519,7 @@
                     <plugin>
                         <groupId>org.zeroturnaround</groupId>
                         <artifactId>jrebel-maven-plugin</artifactId>
-                        <version>1.0.7</version>
+                        <version>1.1.0</version>
                         <executions>
                             <execution>
                                 <id>generate-rebel-xml</id>

src/main/java/com/jappstart/model/auth/UserAccount.java

@@ -30,7 +30,7 @@
 import javax.persistence.Id;
 import javax.persistence.OneToOne;
 
-import org.springframework.security.core.codec.Hex;
+import org.springframework.security.crypto.codec.Hex;
 import org.springframework.stereotype.Repository;
 
 import com.google.appengine.api.datastore.Key;

src/main/webapp/WEB-INF/applicationContext-data.xml

@@ -21,9 +21,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:tx="http://www.springframework.org/schema/tx"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
         http://www.springframework.org/schema/tx 
-        http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+        http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
 
     <tx:annotation-driven />
 

src/main/webapp/WEB-INF/applicationContext-security.xml

@@ -21,9 +21,9 @@
     xmlns:beans="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
         http://www.springframework.org/schema/security
-        http://www.springframework.org/schema/security/spring-security-3.0.xsd">
+        http://www.springframework.org/schema/security/spring-security-3.1.xsd">
 
     <http auto-config="false" access-decision-manager-ref="accessDecisionManager" use-expressions="true">
         <intercept-url pattern="/_ah/**" access="hasRole('ROLE_ANONYMOUS')" requires-channel="http" />
@@ -36,16 +36,11 @@
         <intercept-url pattern="/register/**" access="hasRole('ROLE_ANONYMOUS')" requires-channel="${application.secureChannel}" />
         <intercept-url pattern="/" access="hasRole('ROLE_ANONYMOUS')" requires-channel="http" />
         <intercept-url pattern="/**" access="hasRole('ROLE_USER')" requires-channel="http" />
-        <form-login login-page="/login" login-processing-url="/login/submit" authentication-failure-url="/login/error" />
+        <form-login login-page="/login" login-processing-url="/login/submit" authentication-failure-url="/login/error" username-parameter="username" password-parameter="password" />
         <logout logout-url="/logout" />
         <remember-me services-ref="rememberMeServices" key="${google.app.id}" />
     </http>
 
-    <beans:bean id="userPassAuthFilterBeanPostProcessor" class="com.jappstart.service.auth.UserPassAuthFilterBeanPostProcessor">
-        <beans:property name="usernameParameter" value="username" />
-        <beans:property name="passwordParameter" value="password" />
-    </beans:bean>
-
     <beans:bean id="userDetailsService" class="com.jappstart.service.auth.UserDetailsServiceImpl">
         <beans:property name="datastoreService" ref="datastoreService" />
         <beans:property name="mailTaskName" value="mail" />

src/main/webapp/WEB-INF/applicationContext-service.xml

@@ -20,7 +20,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+        http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
     <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource">
         <property name="defaultEncoding" value="utf-8"/>

src/main/webapp/WEB-INF/applicationContext.xml

@@ -21,9 +21,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
         http://www.springframework.org/schema/context 
-        http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+        http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
     <context:annotation-config />
     <context:component-scan base-package="com.jappstart">

src/main/webapp/WEB-INF/dispatcher-servlet.xml

@@ -22,11 +22,11 @@
     xmlns:mvc="http://www.springframework.org/schema/mvc"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
+        http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
         http://www.springframework.org/schema/context 
-        http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+        http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
     <context:annotation-config />
     <context:component-scan base-package="com.jappstart.controller" />