diff --git a/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces-Dojo.js b/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces-Dojo.js
new file mode 100644
index 00000000..f27d73a9
--- /dev/null
+++ b/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces-Dojo.js
@@ -0,0 +1,21 @@
+SpringFaces.DojoGenericFieldAdvisor = function(config){
+			
+	dojo.mixin(this, config);
+};
+		
+SpringFaces.DojoGenericFieldAdvisor.prototype = {
+			
+	targetElId : "",
+	decoratorType : "",
+	decorator : null,
+	decoratorAttrs : "",
+			
+	apply : function(){
+	        	
+       	this.decorator = eval("new "+ this.decoratorType + "(" + this.decoratorAttrs +", dojo.byId('"+this.targetElId+"'));" );
+
+       	this.decorator.startup();
+	}			
+};
+
+dojo.addOnLoad(SpringFaces.applyAdvisors);
\ No newline at end of file
diff --git a/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces-Ext.js b/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces-Ext.js
new file mode 100644
index 00000000..dcee20e0
--- /dev/null
+++ b/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces-Ext.js
@@ -0,0 +1,26 @@
+SpringFaces.ExtGenericFieldAdvisor = function(config){
+			
+	Ext.apply(this, config);
+};
+		
+SpringFaces.ExtGenericFieldAdvisor.prototype = {
+			
+	targetElId : "",
+	msgElId : "",
+	decoratorType : "",
+	decorator : null,
+	decoratorAttrs : "",
+			
+	apply : function(){
+			
+		var target = document.getElementById(this.targetElId);
+       	var msgEl = document.getElementById(this.msgElId);
+	        	
+       	this.decorator = eval("new "+ this.decoratorType + "(" + this.decoratorAttrs +");" );
+       	
+       	this.decorator.msgTarget=msgEl;
+       	this.decorator.applyTo(target);
+	}			
+};
+
+Ext.onReady(SpringFaces.applyAdvisors);
\ No newline at end of file
diff --git a/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces.js b/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces.js
index a1f03fb3..3a665608 100644
--- a/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces.js
+++ b/spring-faces/src/main/java/META-INF/spring-faces/SpringFaces.js
@@ -2,31 +2,6 @@ SpringFaces = {};
 		
 SpringFaces.advisors = [];
 		
-SpringFaces.ExtGenericFieldAdvisor = function(config){
-			
-	Ext.apply(this, config);
-};
-		
-SpringFaces.ExtGenericFieldAdvisor.prototype = {
-			
-	targetElId : "",
-	msgElId : "",
-	decoratorType : "",
-	decorator : null,
-	decoratorAttrs : "",
-			
-	apply : function(){
-			
-		var target = document.getElementById(this.targetElId);
-       	var msgEl = document.getElementById(this.msgElId);
-	        	
-       	this.decorator = eval("new "+ this.decoratorType + "(" + this.decoratorAttrs +");" );
-       	
-       	this.decorator.msgTarget=msgEl;
-       	this.decorator.applyTo(target);
-	}			
-};
-		
 SpringFaces.applyAdvisors = function(){
 			
 	for (var x=0; x<SpringFaces.advisors.length; x++) {
@@ -43,6 +18,4 @@ SpringFaces.validateAll = function(){
 		}
 	}
 	return valid;
-};
-		
-Ext.onReady(SpringFaces.applyAdvisors);
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisor.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisor.java
new file mode 100644
index 00000000..a0e18518
--- /dev/null
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisor.java
@@ -0,0 +1,12 @@
+package org.springframework.faces.ui;
+
+import javax.faces.component.UIComponentBase;
+
+public class DojoAdvisor extends UIComponentBase {
+
+	public String getFamily() {
+
+		return "spring.faces.DojoAdvisor";
+	}
+
+}
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java
new file mode 100644
index 00000000..734ce060
--- /dev/null
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java
@@ -0,0 +1,39 @@
+package org.springframework.faces.ui;
+
+import java.io.IOException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.render.Renderer;
+
+import org.springframework.faces.ui.resource.FlowResourceHelper;
+
+public class DojoRenderer extends Renderer {
+
+	private String dojoJsResourceUri = "/dojo/dojo.js";
+
+	private String dojoStyleResourceUri = "/dojo/dojo.css";
+
+	private String dijitThemePath = "/dijit/themes/";
+
+	private String dijitTheme = "tundra";
+
+	private String springFacesJsResourceUri = "/spring-faces/SpringFaces.js";
+
+	private String springFacesDojoJsResourceUri = "/spring-faces/SpringFaces-Dojo.js";
+
+	private FlowResourceHelper resourceHelper = new FlowResourceHelper();
+
+	public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
+
+		resourceHelper.renderStyleLink(context, dijitThemePath + "/" + dijitTheme + "/" + dijitTheme + ".css");
+
+		resourceHelper.renderStyleLink(context, dojoStyleResourceUri);
+
+		resourceHelper.renderScriptLink(context, dojoJsResourceUri);
+
+		resourceHelper.renderScriptLink(context, springFacesJsResourceUri);
+
+		resourceHelper.renderScriptLink(context, springFacesDojoJsResourceUri);
+	}
+}
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java
index 9906753f..8e4244a2 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/ExtJsRenderer.java
@@ -16,6 +16,8 @@ public class ExtJsRenderer extends Renderer {
 
 	private static final String SPRING_FACES_SCRIPT = "/spring-faces/SpringFaces.js";
 
+	private static final String SPRING_FACES_EXT_SCRIPT = "/spring-faces/SpringFaces-Ext.js";
+
 	private FlowResourceHelper resourceHelper = new FlowResourceHelper();
 
 	public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
@@ -31,5 +33,7 @@ public class ExtJsRenderer extends Renderer {
 		}
 
 		resourceHelper.renderScriptLink(context, SPRING_FACES_SCRIPT);
+
+		resourceHelper.renderScriptLink(context, SPRING_FACES_EXT_SCRIPT);
 	}
 }
diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResolveAndRenderResourceAction.java b/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResolveAndRenderResourceAction.java
index 9c36573e..627e2c62 100644
--- a/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResolveAndRenderResourceAction.java
+++ b/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResolveAndRenderResourceAction.java
@@ -2,6 +2,7 @@ package org.springframework.faces.ui.resource;
 
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URL;
 import java.net.URLConnection;
 import java.util.HashMap;
 import java.util.Map;
@@ -41,14 +42,22 @@ public class ResolveAndRenderResourceAction implements Action {
 
 	public Event execute(RequestContext context) throws Exception {
 
-		String resourcePath = "META-INF" + context.getExternalContext().getRequestPath().toString();
-		URLConnection resourceConn = ClassUtils.getDefaultClassLoader().getResource(resourcePath).openConnection();
-		long lastModified = resourceConn.getLastModified();
-
 		HttpServletRequest request = (HttpServletRequest) context.getExternalContext().getRequest();
 		HttpServletResponse response = (HttpServletResponse) context.getExternalContext().getResponse();
 		ServletContext servletContext = (ServletContext) context.getExternalContext().getContext();
 
+		String resourcePath = "META-INF" + context.getExternalContext().getRequestPath().toString();
+
+		URL resource = ClassUtils.getDefaultClassLoader().getResource(resourcePath);
+
+		if (resource == null) {
+			response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+			return new Event(this, "success");
+		}
+
+		URLConnection resourceConn = resource.openConnection();
+		long lastModified = resourceConn.getLastModified();
+
 		long ifModifiedSince = request.getDateHeader(IF_MODIFIED_SINCE_HEADER);
 		if (ifModifiedSince > 0 && lastModified / 1000 <= ifModifiedSince / 1000) {
 			response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
diff --git a/spring-faces/src/test/java/org/springframework/faces/ui/resource/ResolveAndRenderResourceActionTests.java b/spring-faces/src/test/java/org/springframework/faces/ui/resource/ResolveAndRenderResourceActionTests.java
index ddb0814c..7fc83ab4 100644
--- a/spring-faces/src/test/java/org/springframework/faces/ui/resource/ResolveAndRenderResourceActionTests.java
+++ b/spring-faces/src/test/java/org/springframework/faces/ui/resource/ResolveAndRenderResourceActionTests.java
@@ -22,7 +22,7 @@ public class ResolveAndRenderResourceActionTests extends TestCase {
 
 	ExternalContext externalContext = createMock(ExternalContext.class);
 	RequestContext requestContext = createMock(RequestContext.class);
-	ServletContext servletContext = new MimeAwareMockServletContext();
+	ServletContext servletContext = new ResourceTestMockServletContext();
 	MockHttpServletResponse response = new MockHttpServletResponse();
 	MockHttpServletRequest request = new MockHttpServletRequest();
 
@@ -52,10 +52,24 @@ public class ResolveAndRenderResourceActionTests extends TestCase {
 		action.execute(requestContext);
 	}
 
-	private class MimeAwareMockServletContext extends MockServletContext {
+	public final void testExecute_ResourceNotFound() throws Exception {
+
+		requestPath = new RequestPath("/xxx/xxx.js");
+
+		expect(externalContext.getRequestPath()).andStubReturn(requestPath);
+
+		replay(new Object[] { requestContext, externalContext });
+
+		action.execute(requestContext);
+
+		assertEquals(404, response.getStatus());
+	}
+
+	private class ResourceTestMockServletContext extends MockServletContext {
 
 		public String getMimeType(String filePath) {
 			return null;
 		}
+
 	}
 }