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 
12999: Fixed read-only bootstrap of SiteAVMBootstrap and removed incorrect use of 'assert'
   13000: Added log4j to Eclipse classpath (unexported)
   13001: Merged V2.1-A to V3.1
      9127: Performance improvement to folder copy
      9151: *RECORD-ONLY* Fix index back up failing with missing files
   13002: Merged V2.1-A to V3.1
      9174: Further fixes for ACT-2588 (Lucene backup read-write locks)
      9279: Fix ADB-84. PHP module is not restricted by the upper version
      10191: Fix for ADB-77: Need to have as the sender's email address the email address of the user triggering the rule
   13006: Merged V2.1-A to V3.1
      10893: Fixes for ADB-78 & ADB-98
             - Fixed service getter/setter pattern as well
      10903: Fix for ADB-115 ACT-4355
   13010: Made AVMLockingBootstrap resilient to read-only mode
   13011: Better message for InvalidStoreRefException
   13013: Merged V2.1-A to V3.1
      9189: Composite Conditions Support Part 1 of 2 (repo)
      9190: Composite Conditions Support Part 1a of 2 ( missed file from repo)
   13015: Port of Adobe CIFS/FTP configuration changes
   13017: Convert avoids folders given by '--svn-status' option
   13018: Merge V2.1A to V3.1
      7746: (record-only) Added ability to specify a custom CIFS authenticator class
      8533: (record-only) Added the <disableNativeCode/> configuration tag, disable use of JNI code on Windows
      8700: (record-only) Update to prevent any native calls via configuration code
      8705: (record-only) Filer out the '0.0.0.0' bind address
      8864: (record-only) Added the getBean() method for custom authenticators to get access to beans
      9054: (record-only) Added the 'AIX' platform type for use in the platforms="..." attribute
      8863: (record-only) Fix passthru socket connection timeout, added 'protocolOrder' and 'offlineCheckInterval' config values
      12144: (record-only) CIFS virtual circuit fixes
   13020: Merged V2.1-A to V3.1 (Composite Actions)
      9191: Composite Conditions Support Part 2 of 2 (client)
      9243: Composite Conditions Support Part 1 of 2 (client)
      9245: Composite Conditions Support Part 2 of 2 (repo)
   13021: Merged V3.0 to V3.1
      13008: Merged V2.2 to V3.0
         12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
   13024: Ported CIFS configuration changes from Adobe V2.1A, missed checkin.
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903
      Merged /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-11 03:22:35 +00:00
parent e98e71fb6f
commit 6519945977
18 changed files with 2244 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
source/java/org/alfresco/web/bean/rules/handlers/CompositeConditionHandler.java Normal file
View File

@@ -0,0 +1,131 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.web.bean.rules.handlers;
import java.io.Serializable;
import java.text.MessageFormat;
import java.util.List;
import java.util.Map;
import javax.faces.context.FacesContext;
import org.alfresco.repo.action.ActionModel;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.wizard.IWizardBean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* @author Jean Barmash
* This class has no equivalent evaluator, since it
*
*/
public class CompositeConditionHandler extends BaseConditionHandler
{
public static final String NAME = "composite-condition";
public static final String PROP_COMPOSITE_CONDITION = "composite-condition";
private static final Log logger = LogFactory.getLog(CompositeConditionHandler.class);
public static final String PROP_CONDITION_OR = "orconditions";
/* (non-Javadoc)
* @see org.alfresco.web.bean.actions.IHandler#generateSummary(javax.faces.context.FacesContext, org.alfresco.web.bean.wizard.IWizardBean, java.util.Map)
*/
public String generateSummary(FacesContext context, IWizardBean wizard,
Map<String, Serializable> props)
{
List<Object> conditionPropertiesList = (List<Object>) props.get(PROP_COMPOSITE_CONDITION);
if (conditionPropertiesList == null )
{
logger.error("Error - composite condition has no sub-conditions");
if (logger.isDebugEnabled())
{
for (String str : props.keySet())
{
logger.debug("\t key - "+ str + " value " + props.get(str));
}
}
return Application.getMessage(context, "condition_composite_error");
}
Boolean not = (Boolean) props.get(PROP_CONDITION_NOT);
Boolean orconditions = (Boolean) props.get(PROP_CONDITION_OR);
String msgId = not.booleanValue() ? "condition_composite_summary_not" : "condition_composite_summary";
return MessageFormat.format(Application.getMessage(context, msgId),
new Object[] {conditionPropertiesList.size(), orconditions.booleanValue()?"ORed":"ANDed"});
}
/* (non-Javadoc)
* @see org.alfresco.web.bean.actions.IHandler#getJSPPath()
*/
public String getJSPPath()
{
return getJSPPath(CompositeConditionHandler.NAME);
}
/* (non-Javadoc)
* @see org.alfresco.web.bean.actions.IHandler#prepareForEdit(java.util.Map, java.util.Map)
*/
public void prepareForEdit(Map<String, Serializable> uiConditionProps,
Map<String, Serializable> repoProps)
{
if (logger.isDebugEnabled())
logger.debug("Preparing Composite Condition for Edit");
Boolean orconditions = (Boolean) repoProps.get(PROP_CONDITION_OR);
if (orconditions == null)
{
if (logger.isWarnEnabled())
logger.warn("orconditions is NULL, it should not be. Defaulting to false");
orconditions = Boolean.FALSE;
}
uiConditionProps.put(PROP_CONDITION_OR, orconditions);
}
public void prepareForSave(Map<String, Serializable> uiConditionProps,
Map<String, Serializable> repoProps)
{
if (logger.isDebugEnabled())
logger.debug("Saving Composite Condition");
// put the selected category in the condition params
Boolean orconditions = (Boolean)uiConditionProps.get(PROP_CONDITION_OR);
if (orconditions == null)
{
if (logger.isWarnEnabled())
logger.warn("orconditions is NULL, it should not be. Defaulting to false");
orconditions = Boolean.FALSE;
}
repoProps.put(PROP_CONDITION_OR, orconditions);
}
}

15
source/java/org/alfresco/web/bean/rules/handlers/PropertyValueHandler.java
View File

@@ -18,7 +18,7 @@
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
@@ -52,6 +52,12 @@ public class PropertyValueHandler extends BaseConditionHandler
public void prepareForSave(Map<String, Serializable> conditionProps,
Map<String, Serializable> repoProps)
{
prepareForSaveWithCorrectType(conditionProps, repoProps);
}
//Responsible for serializing the value of the property, which could have different types
protected void prepareForSaveWithCorrectType(Map<String, Serializable> conditionProps, Map<String, Serializable> repoProps)
{
String text = (String)conditionProps.get(PROP_CONTAINS_TEXT);
repoProps.put(ComparePropertyValueEvaluator.PARAM_VALUE, text);
@@ -59,11 +65,18 @@ public class PropertyValueHandler extends BaseConditionHandler
public void prepareForEdit(Map<String, Serializable> conditionProps,
Map<String, Serializable> repoProps)
{
prepareForEditWithCorrectType(conditionProps, repoProps);
}
protected void prepareForEditWithCorrectType(Map<String, Serializable> conditionProps,
Map<String, Serializable> repoProps)
{
String propValue = (String)repoProps.get(ComparePropertyValueEvaluator.PARAM_VALUE);
conditionProps.put(PROP_CONTAINS_TEXT, propValue);
}
public String generateSummary(FacesContext context, IWizardBean wizard,
Map<String, Serializable> conditionProps)
{

93
source/java/org/alfresco/web/bean/rules/handlers/property/DatePropertyValueConditionHandler.java Normal file
View File

@@ -0,0 +1,93 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.web.bean.rules.handlers.property;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
import org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation;
/**
* Condition handler for the "compare-date-property" condition.
*
* @author Jean Barmash
*/
public class DatePropertyValueConditionHandler extends TextPropertyValueConditionHandler
{
public static final String NAME = "compare-date-property";
@Override
protected String getConditionName()
{
return DatePropertyValueConditionHandler.NAME;
}
//Responsible for serializing the value of the property, which could have different types
protected void prepareForSaveWithCorrectType(Map<String, Serializable> conditionProps, Map<String, Serializable> repoProps)
{
Date date = (Date) conditionProps.get(PROP_CONTAINS_TEXT);
repoProps.put(ComparePropertyValueEvaluator.PARAM_VALUE, date);
}
protected void prepareForEditWithCorrectType(Map<String, Serializable> conditionProps,
Map<String, Serializable> repoProps)
{
Date dateValue = (Date) repoProps.get(ComparePropertyValueEvaluator.PARAM_VALUE);
conditionProps.put(PROP_CONTAINS_TEXT, dateValue);
}
@Override
protected String getSummaryStringTemplate(Boolean not)
{
String msgId = not.booleanValue() ? "condition_compare_date_property_value_not"
: "condition_compare_date_property_value";
return msgId;
}
@Override
protected String displayOperation(String operation)
{
ComparePropertyValueOperation op = ComparePropertyValueOperation.valueOf(operation);
switch (op)
{
case EQUALS:
return "property_date_condition_equals";
case GREATER_THAN:
return "property_date_condition_greaterthan";
case GREATER_THAN_EQUAL:
return "property_date_condition_greaterthanequals";
case LESS_THAN:
return "property_date_condition_lessthan";
case LESS_THAN_EQUAL:
return "property_date_condition_lessthanequals";
default: return "property_condition_invalid";
}
}
}

92
source/java/org/alfresco/web/bean/rules/handlers/property/IntegerPropertyValueConditionHandler.java Normal file
View File

@@ -0,0 +1,92 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.web.bean.rules.handlers.property;
import java.io.Serializable;
import java.util.Map;
import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
import org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation;
/**
* Condition handler for the "compare-integer-property" condition.
*
* @author Jean Barmash
*/
public class IntegerPropertyValueConditionHandler extends TextPropertyValueConditionHandler
{
public static final String NAME = "compare-integer-property";
@Override
protected String getConditionName()
{
return IntegerPropertyValueConditionHandler.NAME;
}
//Responsible for serializing the value of the property, which could have different types
protected void prepareForSaveWithCorrectType(Map<String, Serializable> conditionProps, Map<String, Serializable> repoProps)
{
Long number = Long.parseLong((String)conditionProps.get(PROP_CONTAINS_TEXT));
repoProps.put(ComparePropertyValueEvaluator.PARAM_VALUE, number );
}
protected void prepareForEditWithCorrectType(Map<String, Serializable> conditionProps,
Map<String, Serializable> repoProps)
{
Long propValue = (Long)repoProps.get(ComparePropertyValueEvaluator.PARAM_VALUE);
conditionProps.put(PROP_CONTAINS_TEXT, propValue.toString());
}
@Override
protected String getSummaryStringTemplate(Boolean not)
{
String msgId = not.booleanValue() ? "condition_compare_integer_property_value_not"
: "condition_compare_integer_property_value";
return msgId;
}
@Override
protected String displayOperation(String operation)
{
ComparePropertyValueOperation op = ComparePropertyValueOperation.valueOf(operation);
switch (op)
{
case EQUALS:
return "property_condition_equals";
case GREATER_THAN:
return "property_condition_greaterthan";
case GREATER_THAN_EQUAL:
return "property_condition_greaterthanequals";
case LESS_THAN:
return "property_condition_lessthan";
case LESS_THAN_EQUAL:
return "property_condition_lessthanequals";
default: return "property_condition_invalid";
}
}
}

140
source/java/org/alfresco/web/bean/rules/handlers/property/TextPropertyValueConditionHandler.java Normal file
View File

@@ -0,0 +1,140 @@
/*
* Copyright (C) 2005-2008 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.web.bean.rules.handlers.property;
import java.io.Serializable;
import java.text.MessageFormat;
import java.util.Map;
import javax.faces.context.FacesContext;
import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
import org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.bean.rules.handlers.PropertyValueHandler;
import org.alfresco.web.bean.wizard.IWizardBean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Condition handler for the "compare-text-property" condition.
*
* @author Jean Barmash
*/
public class TextPropertyValueConditionHandler extends PropertyValueHandler
{
private static final Log logger = LogFactory.getLog(TextPropertyValueConditionHandler.class);
public static final String NAME = "compare-text-property";
public static final String UI_PARAM_OPERATION = "operation";
public static final String UI_PARAM_QNAME = "qname";
public String getJSPPath()
{
return getJSPPath(getConditionName());
}
protected String getConditionName()
{
return TextPropertyValueConditionHandler.NAME;
}
public void prepareForSave(Map<String, Serializable> conditionParams, Map<String, Serializable> repoProps)
{
if (logger.isDebugEnabled())
logger.debug("Preparing to Save Text Condition Parameters");
super.prepareForSave(conditionParams, repoProps);
String propertyString = (String) conditionParams.get(UI_PARAM_QNAME);
FacesContext fc = FacesContext.getCurrentInstance();
ServiceRegistry serviceRegistry = Repository.getServiceRegistry(fc);
QName qname = null;
if ((propertyString.indexOf(':')) == -1) // TODO: there might be a better way to resolve namespaces
qname = QName.createQName(propertyString);
else
qname = QName.createQName(propertyString, serviceRegistry.getNamespaceService());
if (logger.isDebugEnabled())
logger.warn("Storing Property QName " + qname);
repoProps.put(ComparePropertyValueEvaluator.PARAM_PROPERTY, qname);
String operation = (String) conditionParams.get(UI_PARAM_OPERATION);
repoProps.put(ComparePropertyValueEvaluator.PARAM_OPERATION, operation);
}
public void prepareForEdit(Map<String, Serializable> conditionProps, Map<String, Serializable> repoProps)
{
if (logger.isDebugEnabled())
logger.debug("Retrieving Text Condition Parameters for editing");
super.prepareForEdit(conditionProps, repoProps);
conditionProps.put(UI_PARAM_QNAME, ((QName) repoProps.get(ComparePropertyValueEvaluator.PARAM_PROPERTY))
.toPrefixString());
conditionProps.put(UI_PARAM_OPERATION, repoProps.get(ComparePropertyValueEvaluator.PARAM_OPERATION).toString());
}
public String generateSummary(FacesContext context, IWizardBean wizard, Map<String, Serializable> conditionProps)
{
Boolean not = (Boolean) conditionProps.get(PROP_CONDITION_NOT);
String msgId = getSummaryStringTemplate(not);
String text = conditionProps.get(PROP_CONTAINS_TEXT).toString();
String operation = (String) conditionProps.get(UI_PARAM_OPERATION);
String qname = (String) conditionProps.get(UI_PARAM_QNAME);
return MessageFormat.format(Application.getMessage(context, msgId), new Object[]
{ qname, Application.getMessage(context, displayOperation(operation)), text });
}
protected String displayOperation(String operation)
{
ComparePropertyValueOperation op = ComparePropertyValueOperation.valueOf(operation);
switch (op)
{
case EQUALS:
return "property_date_condition_equals";
case CONTAINS:
return "property_condition_contains";
case BEGINS:
return "property_condition_beginswith";
case ENDS:
return "property_condition_endswith";
default: return "property_condition_invalid";
}
}
protected String getSummaryStringTemplate(Boolean not)
{
String msgId = not.booleanValue() ? "condition_compare_text_property_value_not"
: "condition_compare_text_property_value";
return msgId;
}
}