From 3af9f89c72771da77f0884de41c2edc9d028fe1f Mon Sep 17 00:00:00 2001 From: Jeremy Grelle Date: Thu, 24 Apr 2008 18:32:30 +0000 Subject: [PATCH] Final cleanup of package structure. --- .../faces/{mvc => }/richfaces/RichFacesAjaxHandler.java | 4 ++-- .../faces/{mvc => }/richfaces/package.html | 0 .../org/springframework/faces/webflow/JsfViewFactory.java | 4 ++-- .../js/{mvc/servlet => ajax}/AjaxHandler.java | 2 +- .../servlet => ajax}/SpringJavascriptAjaxHandler.java | 2 +- .../TilesAjaxView.java => tiles2/AjaxTilesView.java} | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) rename spring-faces/src/main/java/org/springframework/faces/{mvc => }/richfaces/RichFacesAjaxHandler.java (96%) rename spring-faces/src/main/java/org/springframework/faces/{mvc => }/richfaces/package.html (100%) rename spring-js/src/main/java/org/springframework/js/{mvc/servlet => ajax}/AjaxHandler.java (97%) rename spring-js/src/main/java/org/springframework/js/{mvc/servlet => ajax}/SpringJavascriptAjaxHandler.java (98%) rename spring-js/src/main/java/org/springframework/js/ajax/{view/TilesAjaxView.java => tiles2/AjaxTilesView.java} (93%) diff --git a/spring-faces/src/main/java/org/springframework/faces/mvc/richfaces/RichFacesAjaxHandler.java b/spring-faces/src/main/java/org/springframework/faces/richfaces/RichFacesAjaxHandler.java similarity index 96% rename from spring-faces/src/main/java/org/springframework/faces/mvc/richfaces/RichFacesAjaxHandler.java rename to spring-faces/src/main/java/org/springframework/faces/richfaces/RichFacesAjaxHandler.java index 94f00fb1..80f650c6 100644 --- a/spring-faces/src/main/java/org/springframework/faces/mvc/richfaces/RichFacesAjaxHandler.java +++ b/spring-faces/src/main/java/org/springframework/faces/richfaces/RichFacesAjaxHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.faces.mvc.richfaces; +package org.springframework.faces.richfaces; import java.io.IOException; @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse; import org.ajax4jsf.context.AjaxContext; import org.springframework.faces.webflow.FlowLifecycle; -import org.springframework.js.mvc.servlet.SpringJavascriptAjaxHandler; +import org.springframework.js.ajax.SpringJavascriptAjaxHandler; /** * Ajax handler that works with Rich Faces, allowing support for Web Flow ajax features with the Rich Faces toolkit. diff --git a/spring-faces/src/main/java/org/springframework/faces/mvc/richfaces/package.html b/spring-faces/src/main/java/org/springframework/faces/richfaces/package.html similarity index 100% rename from spring-faces/src/main/java/org/springframework/faces/mvc/richfaces/package.html rename to spring-faces/src/main/java/org/springframework/faces/richfaces/package.html diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java index 76aef4b9..7694f821 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java @@ -35,8 +35,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.core.io.ContextResource; import org.springframework.core.io.Resource; import org.springframework.faces.ui.AjaxViewRoot; -import org.springframework.js.mvc.servlet.AjaxHandler; -import org.springframework.js.mvc.servlet.SpringJavascriptAjaxHandler; +import org.springframework.js.ajax.AjaxHandler; +import org.springframework.js.ajax.SpringJavascriptAjaxHandler; import org.springframework.webflow.context.ExternalContext; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.View; diff --git a/spring-js/src/main/java/org/springframework/js/mvc/servlet/AjaxHandler.java b/spring-js/src/main/java/org/springframework/js/ajax/AjaxHandler.java similarity index 97% rename from spring-js/src/main/java/org/springframework/js/mvc/servlet/AjaxHandler.java rename to spring-js/src/main/java/org/springframework/js/ajax/AjaxHandler.java index 3c752571..f6b46f68 100644 --- a/spring-js/src/main/java/org/springframework/js/mvc/servlet/AjaxHandler.java +++ b/spring-js/src/main/java/org/springframework/js/ajax/AjaxHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.js.mvc.servlet; +package org.springframework.js.ajax; import java.io.IOException; diff --git a/spring-js/src/main/java/org/springframework/js/mvc/servlet/SpringJavascriptAjaxHandler.java b/spring-js/src/main/java/org/springframework/js/ajax/SpringJavascriptAjaxHandler.java similarity index 98% rename from spring-js/src/main/java/org/springframework/js/mvc/servlet/SpringJavascriptAjaxHandler.java rename to spring-js/src/main/java/org/springframework/js/ajax/SpringJavascriptAjaxHandler.java index fe79f05f..51df97a1 100644 --- a/spring-js/src/main/java/org/springframework/js/mvc/servlet/SpringJavascriptAjaxHandler.java +++ b/spring-js/src/main/java/org/springframework/js/ajax/SpringJavascriptAjaxHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.js.mvc.servlet; +package org.springframework.js.ajax; import java.io.IOException; diff --git a/spring-js/src/main/java/org/springframework/js/ajax/view/TilesAjaxView.java b/spring-js/src/main/java/org/springframework/js/ajax/tiles2/AjaxTilesView.java similarity index 93% rename from spring-js/src/main/java/org/springframework/js/ajax/view/TilesAjaxView.java rename to spring-js/src/main/java/org/springframework/js/ajax/tiles2/AjaxTilesView.java index 3a4d489c..9fdd9377 100644 --- a/spring-js/src/main/java/org/springframework/js/ajax/view/TilesAjaxView.java +++ b/spring-js/src/main/java/org/springframework/js/ajax/tiles2/AjaxTilesView.java @@ -1,4 +1,4 @@ -package org.springframework.js.ajax.view; +package org.springframework.js.ajax.tiles2; import java.util.HashMap; import java.util.Iterator; @@ -15,13 +15,13 @@ import org.apache.tiles.Attribute.AttributeType; import org.apache.tiles.access.TilesAccess; import org.apache.tiles.context.TilesRequestContext; import org.apache.tiles.impl.BasicTilesContainer; -import org.springframework.js.mvc.servlet.AjaxHandler; -import org.springframework.js.mvc.servlet.SpringJavascriptAjaxHandler; +import org.springframework.js.ajax.AjaxHandler; +import org.springframework.js.ajax.SpringJavascriptAjaxHandler; import org.springframework.web.servlet.support.JstlUtils; import org.springframework.web.servlet.support.RequestContext; import org.springframework.web.servlet.view.tiles2.TilesView; -public class TilesAjaxView extends TilesView { +public class AjaxTilesView extends TilesView { public static final String FRAGMENTS_PARAM = "fragments";