Stephen McKamey avatar Stephen McKamey committed c34c8d8

updating libs

Comments (0)

Files changed (10)

 duel-mvc-archetype/target
 mvcapp/target
 bootstrap
+duel-mvc/src/main/java/org/duelengine/duel/mvc/CrossOriginResourceSharingFilter.java

duel-mvc-archetype/pom.xml

 
 	<groupId>org.duelengine</groupId>
 	<artifactId>duel-mvc-archetype</artifactId>
-	<version>0.8.3</version>
+	<version>0.9.0</version>
 	<packaging>maven-archetype</packaging>
 
 	<name>DUEL MVC Archetype</name>
-	<description>MVC project archetype using Jersey 1.9.1, Guice 3.0, DUEL views 0.8.3, DUEL merge 0.5.4</description>
+	<description>MVC project archetype using Jersey, Guice, DUEL views, DUEL merge</description>
 	<url>http://duelengine.org</url>
 	<licenses>
 		<license>

duel-mvc-archetype/src/main/resources/archetype-resources/pom.xml

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<resourcesDir>${project.basedir}/src/main/resources</resourcesDir>
 
-		<mvc.version>0.8.3</mvc.version>
-		<duel.version>0.8.3</duel.version>
-		<merge.version>0.5.4</merge.version>
-		<jackson.version>1.9.6</jackson.version>
+		<mvc.version>0.9.0</mvc.version>
+		<duel.version>0.8.4</duel.version>
+		<merge.version>0.5.5</merge.version>
+		<jackson.version>2.0.4</jackson.version>
+		<jacksonXML.version>2.0.3</jacksonXML.version>
 		<guice.version>3.0</guice.version>
 		<jersey.version>1.9.1</jersey.version>
-		<slf4j.version>1.6.4</slf4j.version>
-		<servlet.version>2.5</servlet.version>
+		<slf4j.version>1.6.6</slf4j.version>
+		<servlet.version>3.0.1</servlet.version>
 		<junit.version>4.9</junit.version>
 		<m2e.version>1.0.0</m2e.version>
 		<jrebel.version>1.1.0</jrebel.version>
 
 		<merge.cdnMapFile>/cdn.properties</merge.cdnMapFile>
 		<merge.cdnRoot>/cdn/</merge.cdnRoot>
-		<merge.cdnFiles>.ico .png .jpg .gif .eot .woff .ttf .svg</merge.cdnFiles>
+		<merge.cdnFiles>.ico .png .jpg .gif .eot .woff .ttf .svg .svgz</merge.cdnFiles>
 	</properties>
 
 	<dependencies>
-		<!-- DUEL runtime -->
-		<dependency>
-			<groupId>org.duelengine</groupId>
-			<artifactId>duel-runtime</artifactId>
-			<version>${duel.version}</version>
-		</dependency>
 		<!-- DUEL-MVC runtime -->
 		<dependency>
 			<groupId>org.duelengine</groupId>
 			<version>${mvc.version}</version>
 		</dependency>
 
-		<!-- Jackson JSON runtime -->
+		<!-- Jackson JAX-RS provider -->
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-
-		<!-- Jackson JAX-RS provider -->
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-jaxrs</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-xc</artifactId>
-			<version>${jackson.version}</version>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-xml-provider</artifactId>
+			<version>${jacksonXML.version}</version>
 		</dependency>
 
 		<!-- Guice runtime -->
 			<version>${slf4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
+			<groupId>com.pseudocode</groupId>
+			<artifactId>slf4j-compact</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
 
 		<!-- Servlet interfaces -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>

duel-mvc-archetype/src/main/resources/archetype-resources/src/main/java/AppRoot.java

 
 import javax.servlet.http.HttpServlet;
 
-import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
 import org.duelengine.duel.CDNLinkInterceptor;
 import org.duelengine.duel.LinkInterceptor;
 import org.duelengine.duel.mvc.DuelMvcContext;
 
 import ${package}.aspects.ErrorHandler;
 import ${package}.controllers.BaseController;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.fasterxml.jackson.jaxrs.xml.JacksonXMLProvider;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Provides;
 				// setup Guice-style configuration values
 				bindConstants();
 
-				// bind JAXB/JSON serialization
-				bind(JacksonJaxbJsonProvider.class).in(Singleton.class);
+				// bind JSON serialization
+				bind(JacksonJsonProvider.class).in(Singleton.class);
+
+				// bind XML serialization
+				bind(JacksonXMLProvider.class).in(Singleton.class);
 
 				// context for each request
 				bind(DuelMvcContext.class).to(AppContext.class);
 
 	<groupId>org.duelengine</groupId>
 	<artifactId>duel-mvc</artifactId>
-	<version>0.8.3</version>
+	<version>0.9.0</version>
 	<packaging>jar</packaging>
 
 	<name>DUEL-MVC</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<duel.version>0.8.3</duel.version>
+		<duel.version>0.8.4</duel.version>
 		<guice.version>3.0</guice.version>
 		<jersey.version>1.9.1</jersey.version>
 		<ehcache.version>2.0.4</ehcache.version>
-		<servlet.version>2.5</servlet.version>
-		<junit.version>4.9</junit.version>
+		<servlet.version>3.0.1</servlet.version>
+		<junit.version>4.10</junit.version>
 		<jvm.version>1.6</jvm.version>
 	</properties>
 
 		<!-- Servlet interfaces -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>
-#!/bin/sh
+#!/bin/bash
 
-# NOTE: you'll want to change these values for your project
+# NOTE: you'll want to change these values per your project
 GROUP_ID="com.example"
 ROOT_DIR="myapp"
 MVC_APP="foo"
 BOOTSTRAP="bootstrap"
 
 # NOTE: make sure these are the latest versions
-ARCHETYPE_VER="0.8.1"
-BOOTSTRAP_VER="0.2.2"
+ARCHETYPE_VER="0.9.0"
+BOOTSTRAP_VER="0.4.0"
 
 # generate a root project folder
 mvn archetype:generate \
 mvn package
 
 # run the resulting WAR on the test bootstrap
-java -jar $BOOTSTRAP/target/$BOOTSTRAP.jar -war $MVC_APP/target/$MVC_APP.war
+java -jar $BOOTSTRAP/target/$BOOTSTRAP.jar -war /=$MVC_APP/target/$MVC_APP.war
-#!/bin/sh
+#!/bin/bash
 
 clear;
 
 # ensure mvcapp is built, then launch with bootstrap
 mvn clean package && \
 java $JREBEL_OPTS \
+	-Djava.awt.headless=true \
 	-Drebel.jersey_plugin=true \
 	-jar bootstrap/target/bootstrap.jar \
 	-war mvcapp/target/mvcapp/ \
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<resourcesDir>${project.basedir}/src/main/resources</resourcesDir>
 
-		<mvc.version>0.8.3</mvc.version>
-		<duel.version>0.8.3</duel.version>
-		<merge.version>0.5.4</merge.version>
-		<jackson.version>1.9.6</jackson.version>
+		<mvc.version>0.9.0</mvc.version>
+		<duel.version>0.8.4</duel.version>
+		<merge.version>0.5.5</merge.version>
+		<jackson.version>2.0.4</jackson.version>
+		<jacksonXML.version>2.0.3</jacksonXML.version>
 		<guice.version>3.0</guice.version>
 		<jersey.version>1.9.1</jersey.version>
-		<slf4j.version>1.6.4</slf4j.version>
-		<servlet.version>2.5</servlet.version>
+		<slf4j.version>1.6.6</slf4j.version>
+		<servlet.version>3.0.1</servlet.version>
 		<junit.version>4.9</junit.version>
 		<m2e.version>1.0.0</m2e.version>
 		<jrebel.version>1.1.0</jrebel.version>
 
 		<merge.cdnMapFile>/cdn.properties</merge.cdnMapFile>
 		<merge.cdnRoot>/cdn/</merge.cdnRoot>
-		<merge.cdnFiles>.ico .png .jpg .gif .eot .woff .ttf .svg</merge.cdnFiles>
+		<merge.cdnFiles>.ico .png .jpg .gif .eot .woff .ttf .svg .svgz</merge.cdnFiles>
 	</properties>
 
 	<dependencies>
-		<!-- DUEL runtime -->
-		<dependency>
-			<groupId>org.duelengine</groupId>
-			<artifactId>duel-runtime</artifactId>
-			<version>${duel.version}</version>
-		</dependency>
 		<!-- DUEL-MVC runtime -->
 		<dependency>
 			<groupId>org.duelengine</groupId>
 			<version>${mvc.version}</version>
 		</dependency>
 
-		<!-- Jackson JSON runtime -->
+		<!-- Jackson JAX-RS provider -->
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-mapper-asl</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-
-		<!-- Jackson JAX-RS provider -->
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-jaxrs</artifactId>
-			<version>${jackson.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-xc</artifactId>
-			<version>${jackson.version}</version>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
+			<artifactId>jackson-jaxrs-xml-provider</artifactId>
+			<version>${jacksonXML.version}</version>
 		</dependency>
 
 		<!-- Guice runtime -->
 			<version>${slf4j.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-jdk14</artifactId>
+			<groupId>com.pseudocode</groupId>
+			<artifactId>slf4j-compact</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
 
 		<!-- Servlet interfaces -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>

mvcapp/src/main/java/com/example/mvcapp/AppRoot.java

 
 import javax.servlet.http.HttpServlet;
 
-import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
 import org.duelengine.duel.CDNLinkInterceptor;
 import org.duelengine.duel.LinkInterceptor;
 import org.duelengine.duel.mvc.DuelMvcContext;
 
 import com.example.mvcapp.aspects.ErrorHandler;
 import com.example.mvcapp.controllers.BaseController;
+
+import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.fasterxml.jackson.jaxrs.xml.JacksonXMLProvider;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Provides;
 				// setup Guice-style configuration values
 				bindConstants();
 
-				// bind JAXB/JSON serialization
-				bind(JacksonJaxbJsonProvider.class).in(Singleton.class);
+				// bind JSON serialization
+				bind(JacksonJsonProvider.class).in(Singleton.class);
+
+				// bind XML serialization
+				bind(JacksonXMLProvider.class).in(Singleton.class);
 
 				// context for each request
 				bind(DuelMvcContext.class).to(AppContext.class);
 
 ###Minimum:
 
-- Java SE JDK 1.6
+- Java SE JDK 1.6 (1.7 should work but still needs more testing)
 	http://www.oracle.com/technetwork/java/javase/downloads/
-- Maven 3.0.3
+- Maven 3.0.x
 	http://maven.apache.org/download.html
 
 ###Recommended:
 
-- Eclipse IDE 2.7
+- Eclipse IDE 3.7.x (4.2 should work but still needs more testing)
 	http://www.eclipse.org/downloads/
-- m2e 1.0.0
+- m2e 1.0.x
 	http://www.eclipse.org/m2e/download/
-- JRebel 4.5.2
-	http://www.zeroturnaround.com/jrebel/current/
+- JRebel 5.0.x
+	http://zeroturnaround.com/software/jrebel/download/
 
 Usage
 -----
-	# NOTE: you'll want to change these values for your project
+	# NOTE: you'll want to change these values per your project
 	GROUP_ID="com.example"
 	ROOT_DIR="myapp"
 	MVC_APP="foo"
 	BOOTSTRAP="bootstrap"
 	
 	# NOTE: make sure these are the latest versions
-	ARCHETYPE_VER="0.8.2"
-	BOOTSTRAP_VER="0.2.2"
+	ARCHETYPE_VER="0.9.0"
+	BOOTSTRAP_VER="0.4.0"
 	
 	# generate a root project folder
 	mvn archetype:generate \
 	mvn package
 	
 	# run the resulting WAR on the test bootstrap
-	java -jar $BOOTSTRAP/target/$BOOTSTRAP.jar -war $MVC_APP/target/$MVC_APP.war
+	java -jar $BOOTSTRAP/target/$BOOTSTRAP.jar -war /=$MVC_APP/target/$MVC_APP.war
 
 JRebel Setup
 ------------
 		java $JREBEL_OPTS \
 			-Drebel.jersey_plugin=true \
 			-jar bootstrap/target/bootstrap.jar \
-			-war mvcapp/target/mvcapp/
+			-war /=mvcapp/target/mvcapp/
 
 2. View at `http://127.0.0.1:8080/`
 3. Edit with Eclipse... refresh browser
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.