Author: sohil.shah(a)jboss.com Date: 2008-12-31 16:06:30 -0500 (Wed, 31 Dec 2008) New Revision: 12418 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties Log: JBPORTAL-2157 - User not notified when uploading nonexisting / wrong type archive in CMS Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-12-31 21:05:25 UTC (rev 12417) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-12-31 21:06:30 UTC (rev 12418) @@ -46,7 +46,7 @@ <componentref name="jboss-portal/modules/test" version="1.0.3"/> <componentref name="jboss-portal/modules/portlet" version="2.0.4"/> <componentref name="jboss-portal/modules/identity" version="1.0.5"/> - <componentref name="jboss-portal/modules/cms" version="1.2.1"/> + <componentref name="jboss-portal/modules/cms" version="1.2.2"/> <componentref name="antlr" version="2.7.6-brew"/> <componentref name="apache-ant" version="1.6.5"/> <componentref name="jackrabbit" version="1.4"/> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-12-31 21:05:25 UTC (rev 12417) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-12-31 21:06:30 UTC (rev 12418) @@ -1079,12 +1079,26 @@ if (!item.isFormField()) { byte[] archiveBytes = item.get(); - + Command storearchiveCMD = CMSService.getCommandFactory().createAsyncStoreArchiveCommand(sPath, archiveBytes, sLanguage); - CMSService.execute(storearchiveCMD); List messages = new ArrayList(); - messages.add(this.resources.getObject("CMS_MSG_UPLOADARCHIVE_ASYNC")); + + try + { + CMSService.execute(storearchiveCMD); + messages.add(this.resources.getObject("CMS_MSG_UPLOADARCHIVE_ASYNC")); + } + catch(CMSException cme) + { + String messageKey = cme.getMessageKey(); + if(messageKey != null && messageKey.trim().length() > 0) + { + messages.add(this.resources.getObject(messageKey)); + } + } + + aReq.getPortletSession().setAttribute("messages", messages); aRes.setRenderParameter("path", FileUtil.cleanDoubleSlashes(sPath)); Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-12-31 21:05:25 UTC (rev 12417) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-12-31 21:06:30 UTC (rev 12418) @@ -149,4 +149,6 @@ CMS_DATE_PATTERN=MM/dd/yy HH:mm +INVALID_ARCHIVE_MESSAGE=The archive being uploaded is not a valid archive file +