inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
13424: ETHREEOH-1242: Sample LDAP authentication config breaks site invites in Share
   13427: Fixes for ETHREEOH-1157: Propagate exceptions using ReportedException
   13428: Fix ETHREEOH-1493: Upgrade from 2.1-A to 3.1 uses incorrect patch id and fixes_to_schema
   13429: Specific fix for ETHREEOH-1157: duplicate/triplicate users not properly prohibited
   13436: Merged V2.2 to V3.1
      13435: Merged V2.1 to V2.2  
         12307: Merged DEV/V2.1SP7 to 2.1 
            11927: ETWOONE-396 
            12112: ETWOONE-396
   13437: Fixed ETHREEOH-1498: Mismatched closing XML tag in ehcache-custom.xml.sample.cluster
   13439: Fix for ETHREEOH-1157: JSF Dialogs Absorbing Exceptions
   13456: Fixed ETHREEOH-1472: Changes to systemBootstrap cause bootstrapping ACP's not to work
   13469: Upgrade patch to update internal version2Store counter (follow-on fix for ETHREEOH-1540)
   13491: Chaining example for DOC-84
   13492: Fixed paths in zip file
   13494: Fixed GenericBootstrapPatch when overriding bootstrap views
   13495: Added @version javadoc
   13496: Minor logging updates
   13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
   13500: Temporary fix for Sharepoint issue raised last week
   13502: ETHREEOH-1575: It's impossible to create Change Request task
   13511: Fix for ETHREEOH-1549: Impossible to create HTML web content
   13529: Fix for ETHREEOH-1595
   13531: Fix for ETHREEOH-1607: Error on chaining example xml - malformed comment
   13537: Build fix ... exclude the system user from auto creation
   13538: Build Fix - further contraints to aviod auto-creation of guest
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.1:r12307
      Merged /alfresco/BRANCHES/V2.2:r13435
      Merged /alfresco/BRANCHES/V3.1:r
                   13424,13427-13429,13436-13437,13439,13442-13450,13452,13454-13456,
                   13469-13473,13475-13476,13479-13480,13491-13500,13502,13511,13529-13538


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-13 01:52:39 +00:00
parent ba836f778c
commit a966e847f0
33 changed files with 77 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/web/bean/BaseDetailsBean.java
View File

@@ -54,6 +54,7 @@ import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.workflow.WorkflowUtil;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.Utils.URLMode;
import org.alfresco.web.ui.common.component.UIActionLink;
@@ -496,6 +497,7 @@ public abstract class BaseDetailsBean extends BaseDialogBean
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR_UPDATE_SIMPLEWORKFLOW), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
return outcome;
@@ -563,6 +565,7 @@ public abstract class BaseDetailsBean extends BaseDialogBean
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR_WORKFLOW_APPROVE), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
}
@@ -629,6 +632,7 @@ public abstract class BaseDetailsBean extends BaseDialogBean
// rollback the transaction
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR_WORKFLOW_REJECT), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
}
@@ -720,6 +724,7 @@ public abstract class BaseDetailsBean extends BaseDialogBean
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
fc, Repository.ERROR_GENERIC), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
}

2
source/java/org/alfresco/web/bean/LinkPropertiesDialog.java
View File

@@ -43,6 +43,7 @@ import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.Utils.URLMode;
@@ -220,6 +221,7 @@ public class LinkPropertiesDialog extends BaseDialogBean
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
context, Repository.ERROR_GENERIC), e.getMessage()), e);
outcome = null;
ReportedException.throwIfNecessary(e);
}
return outcome;

2
source/java/org/alfresco/web/bean/admin/ImportDialog.java
View File

@@ -50,6 +50,7 @@ import org.alfresco.web.app.Application;
import org.alfresco.web.bean.FileUploadBean;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -139,6 +140,7 @@ public class ImportDialog extends BaseDialogBean
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR), e.toString()), e);
outcome = null;
ReportedException.throwIfNecessary(e);
}
}
else

2
source/java/org/alfresco/web/bean/categories/CreateCategoryDialog.java
View File

@@ -40,6 +40,7 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class CreateCategoryDialog extends BaseDialogBean
@@ -177,6 +178,7 @@ public class CreateCategoryDialog extends BaseDialogBean
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
outcome = null;
ReportedException.throwIfNecessary(err);
}
return outcome;

2
source/java/org/alfresco/web/bean/categories/DeleteCategoryDialog.java
View File

@@ -47,6 +47,7 @@ import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.component.IBreadcrumbHandler;
import org.alfresco.web.ui.common.component.data.UIRichList;
@@ -406,6 +407,7 @@ public class DeleteCategoryDialog extends BaseDialogBean
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
outcome = null;
ReportedException.throwIfNecessary(err);
}
}

2
source/java/org/alfresco/web/bean/categories/EditCategoryDialog.java
View File

@@ -47,6 +47,7 @@ import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.component.IBreadcrumbHandler;
import org.alfresco.web.ui.common.component.data.UIRichList;
@@ -284,6 +285,7 @@ public class EditCategoryDialog extends BaseDialogBean
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), err.getMessage()), err);
outcome = null;
ReportedException.throwIfNecessary(err);
}
return outcome;

2
source/java/org/alfresco/web/bean/coci/CCCheckoutFileDialog.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.Application;
import org.alfresco.web.app.servlet.DownloadContentServlet;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -156,6 +157,7 @@ public class CCCheckoutFileDialog extends CheckinCheckoutDialog
catch (Throwable err)
{
Utils.addErrorMessage(Application.getMessage(context, MSG_ERROR_CHECKOUT) + err.getMessage(), err);
ReportedException.throwIfNecessary(err);
}
}
else

2
source/java/org/alfresco/web/bean/coci/CCUndoCheckoutFileDialog.java
View File

@@ -29,6 +29,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.model.ContentModel;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -107,6 +108,7 @@ public class CCUndoCheckoutFileDialog extends CheckinCheckoutDialog
catch (Throwable err)
{
Utils.addErrorMessage(Application.getMessage(FacesContext.getCurrentInstance(), MSG_ERROR_CANCELCHECKOUT) + err.getMessage(), err);
ReportedException.throwIfNecessary(err);
}
}
else

2
source/java/org/alfresco/web/bean/coci/CancelEditingDialog.java
View File

@@ -29,6 +29,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.model.ContentModel;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -104,6 +105,7 @@ public class CancelEditingDialog extends CheckinCheckoutDialog
catch (Throwable err)
{
Utils.addErrorMessage(Application.getMessage(FacesContext.getCurrentInstance(), MSG_ERROR_CANCELCHECKOUT) + err.getMessage(), err);
ReportedException.throwIfNecessary(err);
}
}
else

5
source/java/org/alfresco/web/bean/coci/CheckinCheckoutDialog.java
View File

@@ -57,6 +57,7 @@ import org.alfresco.web.bean.NavigationBean;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.component.UIActionLink;
import org.apache.commons.logging.Log;
@@ -414,6 +415,7 @@ public class CheckinCheckoutDialog extends BaseDialogBean
Utils.addErrorMessage(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR_UPDATE) + err.getMessage());
outcome = null;
ReportedException.throwIfNecessary(err);
}
}
else
@@ -446,6 +448,7 @@ public class CheckinCheckoutDialog extends BaseDialogBean
{
Utils.addErrorMessage(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR_CANCELCHECKOUT) + err.getMessage(), err);
ReportedException.throwIfNecessary(err);
}
}
else
@@ -538,6 +541,7 @@ public class CheckinCheckoutDialog extends BaseDialogBean
{
Utils.addErrorMessage(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR_CHECKIN) + err.getMessage(), err);
ReportedException.throwIfNecessary(err);
}
}
else
@@ -591,6 +595,7 @@ public class CheckinCheckoutDialog extends BaseDialogBean
{
Utils.addErrorMessage(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR_UPDATE) + err.getMessage(), err);
ReportedException.throwIfNecessary(err);
}
}
else

5
source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
View File

@@ -66,6 +66,7 @@ import org.alfresco.web.bean.ml.SingleEditionBean;
import org.alfresco.web.bean.repository.MapNode;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.Utils.URLMode;
import org.alfresco.web.ui.common.component.UIActionLink;
@@ -525,6 +526,7 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR_ASPECT_CLASSIFY), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
}
@@ -562,6 +564,7 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR_ASPECT_VERSIONING), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
}
@@ -596,6 +599,7 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
fc, Repository.ERROR_GENERIC), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
}
@@ -645,6 +649,7 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements Navigatio
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
FacesContext.getCurrentInstance(), MSG_ERROR_ASPECT_INLINEEDITABLE), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
// force recreation of the details view - this means the properties sheet component will reinit

2
source/java/org/alfresco/web/bean/content/EditSimpleWorkflowDialog.java
View File

@@ -38,6 +38,7 @@ import org.alfresco.web.app.Application;
import org.alfresco.web.bean.actions.handlers.SimpleWorkflowHandler;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class EditSimpleWorkflowDialog extends BaseDialogBean
@@ -137,6 +138,7 @@ public class EditSimpleWorkflowDialog extends BaseDialogBean
catch (Throwable e)
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), MSG_ERROR_UPDATE_SIMPLEWORKFLOW), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
return outcome;

2
source/java/org/alfresco/web/bean/rules/DeleteRuleDialog.java
View File

@@ -36,6 +36,7 @@ import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -129,6 +130,7 @@ public class DeleteRuleDialog extends BaseDialogBean
catch (Throwable err)
{
Utils.addErrorMessage(Application.getMessage(FacesContext.getCurrentInstance(), MSG_ERROR_DELETE_RULE) + err.getMessage(), err);
ReportedException.throwIfNecessary(err);
}
}
else

2
source/java/org/alfresco/web/bean/search/EditSearchDialog.java
View File

@@ -39,6 +39,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class EditSearchDialog extends AdvancedSearchDialog
@@ -110,6 +111,7 @@ public class EditSearchDialog extends AdvancedSearchDialog
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(newContext, MSG_ERROR_SAVE_SEARCH), e.getMessage()), e);
outcome = null;
this.isFinished = false;
ReportedException.throwIfNecessary(e);
}
}

2
source/java/org/alfresco/web/bean/search/SaveSearchDialog.java
View File

@@ -43,6 +43,7 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class SaveSearchDialog extends AdvancedSearchDialog
@@ -119,6 +120,7 @@ public class SaveSearchDialog extends AdvancedSearchDialog
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(newContext, MSG_ERROR_SAVE_SEARCH), e.getMessage()), e);
outcome = null;
this.isFinished = false;
ReportedException.throwIfNecessary(e);
}
}

2
source/java/org/alfresco/web/bean/spaces/ApplyDocTemplateDialog.java
View File

@@ -35,6 +35,7 @@ import org.alfresco.web.bean.TemplateSupportBean;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class ApplyDocTemplateDialog extends BaseDialogBean
@@ -73,6 +74,7 @@ public class ApplyDocTemplateDialog extends BaseDialogBean
catch (Exception e)
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
}
return DIALOG_CLOSE;

2
source/java/org/alfresco/web/bean/spaces/ApplyRssTemplateDialog.java
View File

@@ -36,6 +36,7 @@ import org.alfresco.web.bean.TemplateSupportBean;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class ApplyRssTemplateDialog extends BaseDialogBean
@@ -104,6 +105,7 @@ public class ApplyRssTemplateDialog extends BaseDialogBean
catch (Exception e)
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
}
}

2
source/java/org/alfresco/web/bean/spaces/ApplySpaceTemplateDialog.java
View File

@@ -36,6 +36,7 @@ import org.alfresco.web.bean.TemplateSupportBean;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class ApplySpaceTemplateDialog extends BaseDialogBean
@@ -90,6 +91,7 @@ public class ApplySpaceTemplateDialog extends BaseDialogBean
catch (Exception e)
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), Repository.ERROR_GENERIC), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
}
}

2
source/java/org/alfresco/web/bean/spaces/EditSimpleWorkflowDialog.java
View File

@@ -41,6 +41,7 @@ import org.alfresco.web.bean.actions.handlers.SimpleWorkflowHandler;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class EditSimpleWorkflowDialog extends BaseDialogBean
@@ -143,6 +144,7 @@ public class EditSimpleWorkflowDialog extends BaseDialogBean
catch (Throwable e)
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), MSG_ERROR_UPDATE_SIMPLEWORKFLOW), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
return outcome;

2
source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteAllItemsDialog.java
View File

@@ -30,6 +30,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class TrashcanDeleteAllItemsDialog extends TrashcanDialog
@@ -53,6 +54,7 @@ public class TrashcanDeleteAllItemsDialog extends TrashcanDialog
catch (Throwable err)
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(context, Repository.ERROR_GENERIC), err.getMessage()), err);
ReportedException.throwIfNecessary(err);
}
finally
{

2
source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteItemDialog.java
View File

@@ -32,6 +32,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class TrashcanDeleteItemDialog extends TrashcanDialog
@@ -61,6 +62,7 @@ public class TrashcanDeleteItemDialog extends TrashcanDialog
catch (Throwable err)
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(newContext, Repository.ERROR_GENERIC), err.getMessage()), err);
ReportedException.throwIfNecessary(err);
}
}
return newOutcome;

2
source/java/org/alfresco/web/bean/trashcan/TrashcanDeleteListedItemsDialog.java
View File

@@ -34,6 +34,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class TrashcanDeleteListedItemsDialog extends TrashcanDialog
@@ -62,6 +63,7 @@ public class TrashcanDeleteListedItemsDialog extends TrashcanDialog
catch (Throwable err)
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(context, Repository.ERROR_GENERIC), err.getMessage()), err);
ReportedException.throwIfNecessary(err);
}
finally
{

2
source/java/org/alfresco/web/bean/trashcan/TrashcanRecoverItemDialog.java
View File

@@ -32,6 +32,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.repo.node.archive.RestoreNodeReport;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.ui.common.ReportedException;
public class TrashcanRecoverItemDialog extends TrashcanDialog
{
@@ -117,6 +118,7 @@ public class TrashcanRecoverItemDialog extends TrashcanDialog
String msg = MessageFormat.format(Application.getMessage(fc, MSG_RECOVERED_ITEM_FAILURE), item.getName(), reason);
FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_ERROR, msg, msg);
fc.addMessage(null, facesMsg);
ReportedException.throwIfNecessary(err);
}
}

2
source/java/org/alfresco/web/bean/users/ChangeMyPasswordDialog.java
View File

@@ -28,6 +28,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.model.ContentModel;
import org.alfresco.web.app.Application;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class ChangeMyPasswordDialog extends UsersDialog
@@ -78,6 +79,7 @@ public class ChangeMyPasswordDialog extends UsersDialog
outcome = null;
Utils.addErrorMessage(Application.getMessage(FacesContext.getCurrentInstance(),
MSG_ERROR_INCORRECT_OLD_PASSWORD));
ReportedException.throwIfNecessary(e);
}
}
else

2
source/java/org/alfresco/web/bean/users/ChangePasswordDialog.java
View File

@@ -31,6 +31,7 @@ import javax.faces.context.FacesContext;
import org.alfresco.model.ContentModel;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
public class ChangePasswordDialog extends UsersDialog
@@ -79,6 +80,7 @@ public class ChangePasswordDialog extends UsersDialog
{
outcome = null;
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(newContext, Repository.ERROR_GENERIC), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
}
else

9
source/java/org/alfresco/web/bean/users/CreateUserWizard.java
View File

@@ -59,6 +59,7 @@ import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.spaces.CreateSpaceWizard;
import org.alfresco.web.bean.wizard.BaseWizardBean;
import org.alfresco.web.config.ClientConfigElement;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -786,7 +787,7 @@ public class CreateUserWizard extends BaseWizardBean
}
@Override
protected String finishImpl(FacesContext context, String outcome) throws Exception
protected String finishImpl(FacesContext context, String outcome) throws Throwable
{
// TODO: implement create new Person object from specified details
try
@@ -840,7 +841,7 @@ public class CreateUserWizard extends BaseWizardBean
props.put(ContentModel.PROP_PRESENCEUSERNAME, this.presenceUsername);
// create the node to represent the Person
NodeRef newPerson = getPersonService().createPerson(props);
getPersonService().createPerson(props);
// ensure the user can access their own Person object
// getPermissionService().setPermission(newPerson, this.userName, getPermissionService().getAllPermission(), true);
@@ -871,11 +872,13 @@ public class CreateUserWizard extends BaseWizardBean
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), ERROR), e.getMessage()), e);
outcome = null;
this.isFinished = false;
ReportedException.throwIfNecessary(e);
}
if (outcome == null)
{
this.isFinished = false;
this.isFinished = false;
}
return outcome;

3
source/java/org/alfresco/web/bean/users/DeleteUserDialog.java
View File

@@ -49,6 +49,7 @@ import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.MapNode;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.component.UIActionLink;
import org.apache.commons.logging.Log;
@@ -106,6 +107,7 @@ public class DeleteUserDialog extends BaseDialogBean
catch (AuthenticationException authErr)
{
Utils.addErrorMessage(Application.getMessage(context, ERROR_USER_DELETE));
ReportedException.throwIfNecessary(authErr);
}
}
@@ -119,6 +121,7 @@ public class DeleteUserDialog extends BaseDialogBean
{
// rollback the transaction
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(context, ERROR_DELETE), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
return outcome;

2
source/java/org/alfresco/web/bean/users/EditUserDetailsDialog.java
View File

@@ -45,6 +45,7 @@ import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
/**
@@ -129,6 +130,7 @@ public class EditUserDetailsDialog extends BaseDialogBean
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(context, Repository.ERROR_GENERIC), err.getMessage()), err);
outcome = null;
ReportedException.throwIfNecessary(err);
}
return outcome;
}

2
source/java/org/alfresco/web/bean/users/EditUserWizard.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -222,6 +223,7 @@ public class EditUserWizard extends CreateUserWizard
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(), ERROR), e.getMessage()), e);
outcome = null;
ReportedException.throwIfNecessary(e);
}
if (outcome == null) {

3
source/java/org/alfresco/web/bean/users/UsersDialog.java
View File

@@ -56,6 +56,7 @@ import org.alfresco.web.bean.repository.MapNode;
import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.NodePropertyResolver;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.component.UIActionLink;
import org.alfresco.web.ui.common.component.UIListItem;
@@ -238,6 +239,7 @@ public class UsersDialog extends BaseDialogBean implements IContextListener, Cha
catch (AuthenticationException authErr)
{
Utils.addErrorMessage(Application.getMessage(context, ERROR_USER_DELETE));
ReportedException.throwIfNecessary(authErr);
}
}
@@ -252,6 +254,7 @@ public class UsersDialog extends BaseDialogBean implements IContextListener, Cha
// rollback the transaction
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(context,
ERROR_DELETE), e.getMessage()), e);
ReportedException.throwIfNecessary(e);
}
return DIALOG_CLOSE;

1
source/java/org/alfresco/web/bean/wcm/AVMEditBean.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.forms.FormInstanceData;
import org.alfresco.web.forms.FormNotFoundException;
import org.alfresco.web.forms.FormsService;
import org.alfresco.web.ui.common.ReportedException;
import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

16
source/java/org/alfresco/web/ui/common/Utils.java
View File

@@ -44,7 +44,6 @@ import javax.faces.el.EvaluationException;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.transaction.UserTransaction;
import org.alfresco.config.ConfigElement;
import org.alfresco.error.AlfrescoRuntimeException;
@@ -57,7 +56,6 @@ import org.alfresco.jlan.server.filesys.FilesystemsConfigSection;
import org.alfresco.model.ApplicationModel;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.webdav.WebDAVServlet;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.model.FileFolderService;
@@ -821,20 +819,6 @@ public final class Utils extends StringUtils
*/
public static void addErrorMessage(String msg, Throwable err)
{
UserTransaction txn = RetryingTransactionHelper.getActiveUserTransaction();
if (txn != null)
{
// We're in a transaction and need to ensure that we ONLY rollback
try
{
txn.setRollbackOnly();
}
catch (Throwable e)
{
// Ignore
}
}
FacesContext context = FacesContext.getCurrentInstance( );
FacesMessage facesMsg = new FacesMessage(FacesMessage.SEVERITY_ERROR, msg, msg);
context.addMessage(null, facesMsg);