ROO-516: JSF 2.0 Addon - refactored with new packages

gavinlau · Oct 14, 2011 · efa3044 · efa3044
1 parent 478e6c1
commit efa3044
Show file tree

Hide file tree

Showing 22 changed files with 84 additions and 73 deletions.
diff --git a/addon-jsf/src/main/java/org/springframework/roo/addon/jsf/JsfCommands.java b/addon-jsf/src/main/java/org/springframework/roo/addon/jsf/JsfCommands.java
@@ -3,6 +3,8 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
+import org.springframework.roo.addon.jsf.model.Theme;
+import org.springframework.roo.addon.jsf.model.UploadedFileContentType;
 import org.springframework.roo.model.JavaPackage;
 import org.springframework.roo.model.JavaSymbolName;
 import org.springframework.roo.model.JavaType;

diff --git a/addon-jsf/src/main/java/org/springframework/roo/addon/jsf/JsfOperations.java b/addon-jsf/src/main/java/org/springframework/roo/addon/jsf/JsfOperations.java
@@ -1,5 +1,7 @@
 package org.springframework.roo.addon.jsf;
 
+import org.springframework.roo.addon.jsf.model.Theme;
+import org.springframework.roo.addon.jsf.model.UploadedFileContentType;
 import org.springframework.roo.model.JavaPackage;
 import org.springframework.roo.model.JavaSymbolName;
 import org.springframework.roo.model.JavaType;

diff --git a/addon-jsf/src/main/java/org/springframework/roo/addon/jsf/JsfOperationsImpl.java b/addon-jsf/src/main/java/org/springframework/roo/addon/jsf/JsfOperationsImpl.java
@@ -18,6 +18,9 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
+import org.springframework.roo.addon.jsf.managedbean.JsfManagedBeanMetadata;
+import org.springframework.roo.addon.jsf.model.Theme;
+import org.springframework.roo.addon.jsf.model.UploadedFileContentType;
 import org.springframework.roo.addon.plural.PluralMetadata;
 import org.springframework.roo.classpath.PhysicalTypeCategory;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;
@@ -234,7 +237,7 @@ private void copyEntityTypePage(final JavaType entity, final String beanName, fi
 
 	private void createConverter(final JavaPackage javaPackage, final JavaType entity) {
 		// Create type annotation for new converter class
-		JavaType converterType = new JavaType(javaPackage.getFullyQualifiedPackageName() + "." + entity.getSimpleTypeName() + "Converter");
+		JavaType converterType = new JavaType(javaPackage.getFullyQualifiedPackageName() + ".converter." + entity.getSimpleTypeName() + "Converter");
 		AnnotationMetadataBuilder annotationBuilder = new AnnotationMetadataBuilder(ROO_JSF_CONVERTER);
 		annotationBuilder.addClassAttribute("entity", entity);
 		String declaredByMetadataId = PhysicalTypeIdentifier.createIdentifier(converterType, Path.SRC_MAIN_JAVA);

diff --git a/...addon/jsf/JsfApplicationBeanMetadata.java → ...plication/JsfApplicationBeanMetadata.java b/...addon/jsf/JsfApplicationBeanMetadata.java → ...plication/JsfApplicationBeanMetadata.java
@@ -1,18 +1,18 @@
-package org.springframework.roo.addon.jsf;
-
-import static org.springframework.roo.addon.jsf.JsfJavaType.DISPLAY_CREATE_DIALOG;
-import static org.springframework.roo.addon.jsf.JsfJavaType.DISPLAY_LIST;
-import static org.springframework.roo.addon.jsf.JsfJavaType.EL_CONTEXT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.EXPRESSION_FACTORY;
-import static org.springframework.roo.addon.jsf.JsfJavaType.FACES_CONTEXT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.MANAGED_BEAN;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_DEFAULT_MENU_MODEL;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_MENU_ITEM;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_MENU_MODEL;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_SUB_MENU;
-import static org.springframework.roo.addon.jsf.JsfJavaType.REQUEST_SCOPED;
-import static org.springframework.roo.addon.jsf.JsfJavaType.SESSION_SCOPED;
-import static org.springframework.roo.addon.jsf.JsfJavaType.VIEW_SCOPED;
+package org.springframework.roo.addon.jsf.application;
+
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.DISPLAY_CREATE_DIALOG;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.DISPLAY_LIST;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.EL_CONTEXT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.EXPRESSION_FACTORY;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.FACES_CONTEXT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.MANAGED_BEAN;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_DEFAULT_MENU_MODEL;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_MENU_ITEM;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_MENU_MODEL;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_SUB_MENU;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.REQUEST_SCOPED;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.SESSION_SCOPED;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.VIEW_SCOPED;
 import static org.springframework.roo.model.JdkJavaType.POST_CONSTRUCT;
 import static org.springframework.roo.model.RooJavaType.ROO_JSF_MANAGED_BEAN;
 

diff --git a/...f/JsfApplicationBeanMetadataProvider.java → ...n/JsfApplicationBeanMetadataProvider.java b/...f/JsfApplicationBeanMetadataProvider.java → ...n/JsfApplicationBeanMetadataProvider.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.application;
 
 import org.springframework.roo.classpath.itd.ItdTriggerBasedMetadataProvider;
 

diff --git a/...fApplicationBeanMetadataProviderImpl.java → ...fApplicationBeanMetadataProviderImpl.java b/...fApplicationBeanMetadataProviderImpl.java → ...fApplicationBeanMetadataProviderImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.application;
 
 import static org.springframework.roo.model.RooJavaType.ROO_JSF_APPLICATION_BEAN;
 import static org.springframework.roo.model.RooJavaType.ROO_JSF_MANAGED_BEAN;
@@ -10,6 +10,7 @@
 import org.apache.felix.scr.annotations.Service;
 import org.osgi.service.component.ComponentContext;
 import org.springframework.roo.addon.configurable.ConfigurableMetadataProvider;
+import org.springframework.roo.addon.jsf.managedbean.JsfManagedBeanMetadata;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.TypeLocationService;

diff --git a/.../roo/addon/jsf/RooJsfApplicationBean.java → ...sf/application/RooJsfApplicationBean.java b/.../roo/addon/jsf/RooJsfApplicationBean.java → ...sf/application/RooJsfApplicationBean.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.application;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...don/jsf/JsfConverterAnnotationValues.java → ...nverter/JsfConverterAnnotationValues.java b/...don/jsf/JsfConverterAnnotationValues.java → ...nverter/JsfConverterAnnotationValues.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.converter;
 
 import static org.springframework.roo.model.RooJavaType.ROO_JSF_CONVERTER;
 

diff --git a/...k/roo/addon/jsf/JsfConverterMetadata.java → ...n/jsf/converter/JsfConverterMetadata.java b/...k/roo/addon/jsf/JsfConverterMetadata.java → ...n/jsf/converter/JsfConverterMetadata.java
@@ -1,10 +1,10 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.converter;
 
 import static java.lang.reflect.Modifier.PUBLIC;
-import static org.springframework.roo.addon.jsf.JsfJavaType.CONVERTER;
-import static org.springframework.roo.addon.jsf.JsfJavaType.FACES_CONTEXT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.FACES_CONVERTER;
-import static org.springframework.roo.addon.jsf.JsfJavaType.UI_COMPONENT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.CONVERTER;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.FACES_CONTEXT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.FACES_CONVERTER;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.UI_COMPONENT;
 import static org.springframework.roo.model.JavaType.OBJECT;
 
 import java.util.Arrays;

diff --git a/...don/jsf/JsfConverterMetadataProvider.java → ...nverter/JsfConverterMetadataProvider.java b/...don/jsf/JsfConverterMetadataProvider.java → ...nverter/JsfConverterMetadataProvider.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.converter;
 
 import org.springframework.roo.classpath.itd.ItdTriggerBasedMetadataProvider;
 

diff --git a/...jsf/JsfConverterMetadataProviderImpl.java → ...ter/JsfConverterMetadataProviderImpl.java b/...jsf/JsfConverterMetadataProviderImpl.java → ...ter/JsfConverterMetadataProviderImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.converter;
 
 import static org.springframework.roo.classpath.customdata.CustomDataKeys.FIND_ALL_METHOD;
 import static org.springframework.roo.classpath.customdata.CustomDataKeys.PERSISTENT_TYPE;

diff --git a/...mework/roo/addon/jsf/RooJsfConverter.java → .../addon/jsf/converter/RooJsfConverter.java b/...mework/roo/addon/jsf/RooJsfConverter.java → .../addon/jsf/converter/RooJsfConverter.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.converter;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...n/jsf/JsfManagedBeanAnnotationValues.java → ...dbean/JsfManagedBeanAnnotationValues.java b/...n/jsf/JsfManagedBeanAnnotationValues.java → ...dbean/JsfManagedBeanAnnotationValues.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.managedbean;
 
 import static org.springframework.roo.model.RooJavaType.ROO_JSF_MANAGED_BEAN;
 

diff --git a/...roo/addon/jsf/JsfManagedBeanMetadata.java → ...f/managedbean/JsfManagedBeanMetadata.java b/...roo/addon/jsf/JsfManagedBeanMetadata.java → ...f/managedbean/JsfManagedBeanMetadata.java
@@ -1,42 +1,42 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.managedbean;
 
 import static java.lang.reflect.Modifier.PRIVATE;
 import static java.lang.reflect.Modifier.PUBLIC;
-import static org.springframework.roo.addon.jsf.JsfJavaType.DATE_TIME_CONVERTER;
-import static org.springframework.roo.addon.jsf.JsfJavaType.DISPLAY_CREATE_DIALOG;
-import static org.springframework.roo.addon.jsf.JsfJavaType.DISPLAY_LIST;
-import static org.springframework.roo.addon.jsf.JsfJavaType.DOUBLE_RANGE_VALIDATOR;
-import static org.springframework.roo.addon.jsf.JsfJavaType.EL_CONTEXT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.ENUM_CONVERTER;
-import static org.springframework.roo.addon.jsf.JsfJavaType.EXPRESSION_FACTORY;
-import static org.springframework.roo.addon.jsf.JsfJavaType.FACES_CONTEXT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.FACES_MESSAGE;
-import static org.springframework.roo.addon.jsf.JsfJavaType.HTML_OUTPUT_TEXT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.HTML_PANEL_GRID;
-import static org.springframework.roo.addon.jsf.JsfJavaType.LENGTH_VALIDATOR;
-import static org.springframework.roo.addon.jsf.JsfJavaType.LONG_RANGE_VALIDATOR;
-import static org.springframework.roo.addon.jsf.JsfJavaType.MANAGED_BEAN;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_AUTO_COMPLETE;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_CALENDAR;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_CLOSE_EVENT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_COMMAND_BUTTON;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_DEFAULT_STREAMED_CONTENT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_FILE_DOWNLOAD_ACTION_LISTENER;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_FILE_UPLOAD;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_FILE_UPLOAD_EVENT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_INPUT_TEXT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_INPUT_TEXTAREA;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_MESSAGE;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_REQUEST_CONTEXT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_SELECT_BOOLEAN_CHECKBOX;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_SELECT_MANY_MENU;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_SPINNER;
-import static org.springframework.roo.addon.jsf.JsfJavaType.PRIMEFACES_STREAMED_CONTENT;
-import static org.springframework.roo.addon.jsf.JsfJavaType.REQUEST_SCOPED;
-import static org.springframework.roo.addon.jsf.JsfJavaType.SESSION_SCOPED;
-import static org.springframework.roo.addon.jsf.JsfJavaType.UI_SELECT_ITEM;
-import static org.springframework.roo.addon.jsf.JsfJavaType.UI_SELECT_ITEMS;
-import static org.springframework.roo.addon.jsf.JsfJavaType.VIEW_SCOPED;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.DATE_TIME_CONVERTER;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.DISPLAY_CREATE_DIALOG;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.DISPLAY_LIST;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.DOUBLE_RANGE_VALIDATOR;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.EL_CONTEXT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.ENUM_CONVERTER;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.EXPRESSION_FACTORY;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.FACES_CONTEXT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.FACES_MESSAGE;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.HTML_OUTPUT_TEXT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.HTML_PANEL_GRID;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.LENGTH_VALIDATOR;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.LONG_RANGE_VALIDATOR;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.MANAGED_BEAN;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_AUTO_COMPLETE;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_CALENDAR;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_CLOSE_EVENT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_COMMAND_BUTTON;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_DEFAULT_STREAMED_CONTENT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_FILE_DOWNLOAD_ACTION_LISTENER;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_FILE_UPLOAD;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_FILE_UPLOAD_EVENT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_INPUT_TEXT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_INPUT_TEXTAREA;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_MESSAGE;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_REQUEST_CONTEXT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_SELECT_BOOLEAN_CHECKBOX;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_SELECT_MANY_MENU;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_SPINNER;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.PRIMEFACES_STREAMED_CONTENT;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.REQUEST_SCOPED;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.SESSION_SCOPED;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.UI_SELECT_ITEM;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.UI_SELECT_ITEMS;
+import static org.springframework.roo.addon.jsf.model.JsfJavaType.VIEW_SCOPED;
 import static org.springframework.roo.classpath.customdata.CustomDataKeys.FIND_ALL_METHOD;
 import static org.springframework.roo.classpath.customdata.CustomDataKeys.MERGE_METHOD;
 import static org.springframework.roo.classpath.customdata.CustomDataKeys.PERSIST_METHOD;
@@ -64,6 +64,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.springframework.roo.addon.jsf.model.JsfFieldHolder;
+import org.springframework.roo.addon.jsf.model.UploadedFileContentType;
 import org.springframework.roo.classpath.PhysicalTypeIdentifierNamingUtils;
 import org.springframework.roo.classpath.PhysicalTypeMetadata;
 import org.springframework.roo.classpath.customdata.CustomDataKeys;

diff --git a/...n/jsf/JsfManagedBeanMetadataProvider.java → ...dbean/JsfManagedBeanMetadataProvider.java b/...n/jsf/JsfManagedBeanMetadataProvider.java → ...dbean/JsfManagedBeanMetadataProvider.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.managedbean;
 
 import org.springframework.roo.classpath.itd.ItdTriggerBasedMetadataProvider;
 

diff --git a/...f/JsfManagedBeanMetadataProviderImpl.java → ...n/JsfManagedBeanMetadataProviderImpl.java b/...f/JsfManagedBeanMetadataProviderImpl.java → ...n/JsfManagedBeanMetadataProviderImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.managedbean;
 
 import static org.springframework.roo.classpath.customdata.CustomDataKeys.COUNT_ALL_METHOD;
 import static org.springframework.roo.classpath.customdata.CustomDataKeys.EMBEDDED_FIELD;
@@ -28,6 +28,7 @@
 import org.apache.felix.scr.annotations.Service;
 import org.osgi.service.component.ComponentContext;
 import org.springframework.roo.addon.configurable.ConfigurableMetadataProvider;
+import org.springframework.roo.addon.jsf.model.JsfFieldHolder;
 import org.springframework.roo.addon.plural.PluralMetadata;
 import org.springframework.roo.classpath.PhysicalTypeCategory;
 import org.springframework.roo.classpath.PhysicalTypeIdentifier;

diff --git a/...work/roo/addon/jsf/RooJsfManagedBean.java → ...on/jsf/managedbean/RooJsfManagedBean.java b/...work/roo/addon/jsf/RooJsfManagedBean.java → ...on/jsf/managedbean/RooJsfManagedBean.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.managedbean;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...amework/roo/addon/jsf/JsfFieldHolder.java → ...k/roo/addon/jsf/model/JsfFieldHolder.java b/...amework/roo/addon/jsf/JsfFieldHolder.java → ...k/roo/addon/jsf/model/JsfFieldHolder.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.model;
 
 import static org.springframework.roo.model.RooJavaType.ROO_UPLOADED_FILE;
 

diff --git a/...gframework/roo/addon/jsf/JsfJavaType.java → ...work/roo/addon/jsf/model/JsfJavaType.java b/...gframework/roo/addon/jsf/JsfJavaType.java → ...work/roo/addon/jsf/model/JsfJavaType.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.model;
 
 import org.springframework.roo.model.JavaType;
 

diff --git a/...mework/roo/addon/jsf/RooUploadedFile.java → .../roo/addon/jsf/model/RooUploadedFile.java b/...mework/roo/addon/jsf/RooUploadedFile.java → .../roo/addon/jsf/model/RooUploadedFile.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.model;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/.../springframework/roo/addon/jsf/Theme.java → ...gframework/roo/addon/jsf/model/Theme.java b/.../springframework/roo/addon/jsf/Theme.java → ...gframework/roo/addon/jsf/model/Theme.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.model;
 
 /**
  * Enum to represent PrimeFaces themes. PrimeFaces is integrated with the <a href="http://jqueryui.com/themeroller/">ThemeRoller</a> CSS framework.

diff --git a/...oo/addon/jsf/UploadedFileContentType.java → ...on/jsf/model/UploadedFileContentType.java b/...oo/addon/jsf/UploadedFileContentType.java → ...on/jsf/model/UploadedFileContentType.java
@@ -1,4 +1,4 @@
-package org.springframework.roo.addon.jsf;
+package org.springframework.roo.addon.jsf.model;
 
 
 /**