Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-11-08 05:17:40 +00:00
parent 2c20af6d2b
commit b2f9df29d1
140 changed files with 20060 additions and 16456 deletions

View File

@@ -4,8 +4,8 @@ bpm_businessprocessmodel.title=Business Process Model
bpm_businessprocessmodel.description=Base definitions of all Business Processes
# Default transition
bpm_businessprocessmodel.transition.title=Done
bpm_businessprocessmodel.transition.description=Done
bpm_businessprocessmodel.transition.title=Task Done
bpm_businessprocessmodel.transition.description=Task Done
# Base Task
bpm_businessprocessmodel.type.bpm_task.title=Task

View File

@@ -0,0 +1,3 @@
# copy service externalised display strings
copy_service.copy_of_label=Copy of {0}

View File

@@ -27,8 +27,8 @@ patch.savedSearchesPermission.description=Sets required permissions on 'Saved Se
patch.savedSearchesPermission.result.applied=Granted CONTRIBUTOR role to EVERYONE on ''Saved Searches'' folder: {0}.
patch.savedSearchesPermission.err.not_found='Saved Searches' folder could not be found.
patch.updatePermissionData.description=Update permission entries from 'folder' to 'cmobject'.
patch.updatePermissionData.upgrade=Please follow an upgrade path via server version 1.2.1
patch.updatePermissionData.description=Update permissions from 'folder' to 'cmobject' [JIRA: AR-344].
patch.updatePermissionData.result=Changed {0} 'folder' access control entries to 'cmobject'.
patch.authoritiesFolder.description=Ensures the existence of the user authorities folder [JIRA: AR-497].
@@ -39,7 +39,7 @@ patch.fixNodeSerializableValues.description=Ensure that property values are not
patch.fixNodeSerializableValues.result=Fixed {0} node property serialized values
patch.updateGuestPermission.description=Rename guest permission from 'Guest' to 'Consumer'
patch.updateGuestPermission.upgrade=Please follow an upgrade path via server version 1.2.1
patch.updateGuestPermission.result=Changed {0} 'Guest' access control entries to 'Consumer'.
patch.categoryRootPermission.description=Sets required permissions on 'Category Root' folder.
patch.categoryRootPermission.result=Granted CONSUMER role to GUEST on ''Category Root'' folder: {0}.
@@ -52,7 +52,7 @@ patch.spacesRootPermission.description=Change Spaces store root permission from
patch.spacesRootPermission.result=Updated Spaces store root permission from 'Consumer' to 'Read'
patch.contentPermission.description=Update permission entries from 'cm:content' to 'sys:base'.
patch.contentPermission.upgrade=Please follow an upgrade path via server version 1.2.1
patch.contentPermission.result=Changed {0} 'cm:content' access control entries to 'sys:base'.
patch.forumsIcons.description=Updates forums icon references
patch.forumsIcons.result=Updated {0} icon references
@@ -96,6 +96,6 @@ patch.schemaUpgradeScript.description=Ensures that the database upgrade script h
patch.schemaUpgradeScript.err.not_executed=The schema upgrade script, ''{0}'', has not been run against this database.
patch.uniqueChildName.description=Checks and renames duplicate children.
patch.uniqueChildName.copyOf=({0})
patch.uniqueChildName.copyOf=({0}-{1})
patch.uniqueChildName.result=Checked {0} associations and fixed {1} duplicates. See file {2} for details.
patch.uniqueChildName.err.unable_to_fix=Auto-fixing of duplicate names failed. See file {0} for details.

View File

@@ -1,6 +1,8 @@
# Schema update messages
schema.update.msg.executing_script=Executing database script: {0}
schema.update.msg.optional_statement_failed=Optional statement execution failed:\n SQL: {0}\n Error: {1}\n File: {2}\n Line: {3}
schema.update.err.statement_failed=Statement execution failed:\n SQL: {0}\n Error: {1}\n File: {2}\n Line: {3}
schema.update.err.update_failed=Schema auto-update failed
schema.update.err.validation_failed=Schema validation failed
schema.update.err.update_script_not_run=The following schema upgrade script needs to be executed manually: {0}

View File

@@ -0,0 +1 @@
workflow_console.help=alfresco/messages/workflow-interpreter-help.txt

View File

@@ -0,0 +1,174 @@
##
## Meta commands
##
ok> help
List this help.
ok> r
Repeat last command.
ok> user [<userName>]
Switch to specified <userName>. If <userName> is omitted, the currently
selected user is shown.
ok> use
Show current workflow context.
##
## Workflow Definition Commands
##
ok> deploy <definitionClassPath>
Deploy workflow definition to Alfresco server.
<definitionClassPath> class path to workflow definition.
ok> redeploy
Redeploy the last workflow definition.
ok> show definitions
List all deployed workflow definitions.
ok> use definition [<workflowDefId>]
Switch to use the workflow definition identified by <workflowDefId>. If
<workflowDefId> is ommited, the currently selected workflow definition
is shown.
##
## Variable Commands
##
ok> var
Show all defined variables.
ok> var <varName>[*]=<varValue>
Define or update a variable.
<varName> variable name
[*] if specified, define a collection
<varValue> variable value (comma-seperate to specify a list of values)
e.g.
set bpm:assignee*=admin,fred
set wf:notifyMe=true
ok> var <varName>[*] person <varValue>
Define or update a (cm:person) node ref variable.
<varName> variable name
[*] if specified, define a collection
<varValue> variable value (comma-seperate to specify a list of values)
e.g.
set bpm:assignee* person admin,fred
ok> var <varName>=
Delete an existing variable.
<varName> variable name
##
## Workflow Commands
##
ok> start [<varName[=varValue>]]*
Start a new workflow using the currently selected workflow definition. Start
Task parameters are provided as name/value pairs or references to pre-defined
variables.
e.g.
start bpm:assignee=david wf:predefined
ok> show workflows
Display the list of active workflows for the currently selected workflow
definition.
ok> use workflow <workflowId>
Use the specified <workflowId>.
ok> show paths [<workflowId>]
Display the workflow paths for the specified <workflowId>. If <workflowId>
is omitted, the paths for the currently started workflow are shown.
ok> show transitions [<workflowId>]
Display all available transitions for the specified <workflowId>. If
<workflowId> is omitted, the transitions for the currently started workflow
are shown.
ok> signal <pathId> [<transitionName>]
Signal transition on specified <pathId>. If <transitionName> is omitted, the
default transition is taken.
ok> desc workflow <workflowId>
Describe the specified <workflowId>.
ok> end workflow <workflowId>
End (cancel) the specified <workflowId>.
##
## Task Commands
##
ok> show my tasks
List tasks assigned to the currently selected user.
ok> show my completed
List tasks completed by the currently selected user.
ok> show tasks [<pathId>]
List tasks associated with the specified workflow <pathId>. If <pathId> is
omitted, the tasks associated with the currently selected workflow path are
shown.
ok> desc task <taskId>
Describe the task identified by <taskId>.
ok> update task <taskid> [<varName[=varValue>]]*
Update the state of the specified <taskId>. Task properties are provided as
name/value pairs or references to pre-defined variables.
<varName> variable name
[*] if specified, define a collection
<varValue> variable value (comma-seperate to specify a list of values)
e.g.
update task jbpm$122 bpm:assignee=fred wf:notifyMe=false
ok> end task <taskId> [<transitionName>]
End the task identified by <taskId>. If <transitionName> is omitted, the
default transition is taken.
##
## end
##