. WCM HEAD merge fixes

- fix ups
 - removal of obsolete JBPM files

. Addition of AVM JavaScript integation files
 - ability to retrieve AVM node references by Path or from the root node of a store by lookup
 - getting and setting of AVM node properties and aspects
 - walking of child nodes
 - moving and renaming of AVM nodes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4311 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-11-08 11:10:10 +00:00
parent 64c6e1809a
commit 01fe4b13ce
5 changed files with 9 additions and 987 deletions

View File

@@ -89,7 +89,7 @@ public class Node implements Serializable
/** /**
* @return All the properties known about this node. * @return All the properties known about this node.
*/ */
public final Map<String, Object> getProperties() public Map<String, Object> getProperties()
{ {
if (this.propsRetrieved == false) if (this.propsRetrieved == false)
{ {

View File

@@ -27,7 +27,7 @@ import org.alfresco.web.bean.dialog.BaseDialogBean;
import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Node;
import org.alfresco.web.bean.repository.TransientNode; import org.alfresco.web.bean.repository.TransientNode;
import org.alfresco.web.bean.wcm.CreateWebsiteWizard.WorkflowWrapper; import org.alfresco.web.bean.wcm.CreateWebsiteWizard.WorkflowWrapper;
import org.alfresco.web.bean.workflow.WorkflowBean; import org.alfresco.web.bean.workflow.WorkflowUtil;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -86,11 +86,10 @@ public class FormWorkflowDialog extends BaseDialogBean
@Override @Override
protected String finishImpl(FacesContext context, String outcome) throws Exception protected String finishImpl(FacesContext context, String outcome) throws Exception
{ {
// TODO: marshall params using WorkflowBean.prepareTaskParams() // push serialized params back into workflow object
// store params back into workflow object
if (this.workflowNode != null) if (this.workflowNode != null)
{ {
getActionWorkflow().setParams( WorkflowBean.prepareTaskParams(this.workflowNode) ); getActionWorkflow().setParams( WorkflowUtil.prepareTaskParams(this.workflowNode) );
getActionWorkflow().setType(this.workflowNode.getType()); getActionWorkflow().setType(this.workflowNode.getType());
} }
return outcome; return outcome;

View File

@@ -40,15 +40,10 @@ public class ClientConfigElement extends ConfigElementAdapter
private String helpUrl = null; private String helpUrl = null;
private String editLinkType = "http"; private String editLinkType = "http";
private String homeSpacePermission = null; private String homeSpacePermission = null;
<<<<<<< .working
private boolean ajaxEnabled = false; private boolean ajaxEnabled = false;
private String initialLocation = "myalfresco"; private String initialLocation = "myalfresco";
private String wcmDomain = null; private String wcmDomain = null;
private String wcmPort = null; private String wcmPort = null;
=======
private boolean ajaxEnabled = false;
private String initialLocation = "myalfresco";
>>>>>>> .merge-right.r4305
/** /**
* Default Constructor * Default Constructor
@@ -143,34 +138,22 @@ public class ClientConfigElement extends ConfigElementAdapter
combinedElement.setSearchMaxResults(newElement.getSearchMaxResults()); combinedElement.setSearchMaxResults(newElement.getSearchMaxResults());
} }
<<<<<<< .working
if (newElement.isShelfVisible() != combinedElement.isShelfVisible())
=======
if (newElement.getSelectorsSearchMaxResults() != combinedElement.getSelectorsSearchMaxResults()) if (newElement.getSelectorsSearchMaxResults() != combinedElement.getSelectorsSearchMaxResults())
>>>>>>> .merge-right.r4305
{ {
<<<<<<< .working
combinedElement.setShelfVisible(newElement.isShelfVisible());
=======
combinedElement.setSelectorsSearchMaxResults(newElement.getSelectorsSearchMaxResults()); combinedElement.setSelectorsSearchMaxResults(newElement.getSelectorsSearchMaxResults());
>>>>>>> .merge-right.r4305
} }
<<<<<<< .working if (newElement.isShelfVisible() != combinedElement.isShelfVisible())
{
combinedElement.setShelfVisible(newElement.isShelfVisible());
}
if (newElement.getFromEmailAddress() != null && if (newElement.getFromEmailAddress() != null &&
(newElement.getFromEmailAddress().equals(combinedElement.getFromEmailAddress()) == false)) (newElement.getFromEmailAddress().equals(combinedElement.getFromEmailAddress()) == false))
=======
if (newElement.isShelfVisible() != combinedElement.isShelfVisible())
>>>>>>> .merge-right.r4305
{ {
<<<<<<< .working
combinedElement.setFromEmailAddress(newElement.getFromEmailAddress()); combinedElement.setFromEmailAddress(newElement.getFromEmailAddress());
=======
combinedElement.setShelfVisible(newElement.isShelfVisible());
>>>>>>> .merge-right.r4305
} }
<<<<<<< .working
if (newElement.isAjaxEnabled() != combinedElement.isAjaxEnabled()) if (newElement.isAjaxEnabled() != combinedElement.isAjaxEnabled())
{ {
combinedElement.setAjaxEnabled(newElement.isAjaxEnabled()); combinedElement.setAjaxEnabled(newElement.isAjaxEnabled());
@@ -201,26 +184,6 @@ public class ClientConfigElement extends ConfigElementAdapter
} }
return combinedElement; return combinedElement;
=======
if (newElement.getFromEmailAddress() != null &&
(newElement.getFromEmailAddress().equals(combinedElement.getFromEmailAddress()) == false))
{
combinedElement.setFromEmailAddress(newElement.getFromEmailAddress());
}
if (newElement.isAjaxEnabled() != combinedElement.isAjaxEnabled())
{
combinedElement.setAjaxEnabled(newElement.isAjaxEnabled());
}
if (newElement.getInitialLocation() != null &&
newElement.getInitialLocation().equals(combinedElement.getInitialLocation()) == false)
{
combinedElement.setInitialLocation(newElement.getInitialLocation());
}
return combinedElement;
>>>>>>> .merge-right.r4305
} }
/** /**
@@ -427,7 +390,6 @@ public class ClientConfigElement extends ConfigElementAdapter
{ {
this.homeSpacePermission = homeSpacePermission; this.homeSpacePermission = homeSpacePermission;
} }
<<<<<<< .working
/** /**
* @return Returns whether AJAX support is enabled in the client * @return Returns whether AJAX support is enabled in the client
@@ -494,40 +456,4 @@ public class ClientConfigElement extends ConfigElementAdapter
{ {
this.wcmPort = wcmPort; this.wcmPort = wcmPort;
} }
=======
/**
* @return Returns whether AJAX support is enabled in the client
*/
public boolean isAjaxEnabled()
{
return this.ajaxEnabled;
}
/**
* Sets whether AJAX support is enabled in the client
*
* @param ajaxEnabled
*/
/*package*/ void setAjaxEnabled(boolean ajaxEnabled)
{
this.ajaxEnabled = ajaxEnabled;
}
/**
* @return Returns the default initial location for the user.
*/
public String getInitialLocation()
{
return this.initialLocation;
}
/**
* @param initialLocation The initial location to set.
*/
/*package*/ void setInitialLocation(String initialLocation)
{
this.initialLocation = initialLocation;
}
>>>>>>> .merge-right.r4305
} }

View File

@@ -941,19 +941,6 @@ public abstract class BaseAssociationEditor extends UIInput
logger.debug("Added lastname as sort column to query for people"); logger.debug("Added lastname as sort column to query for people");
} }
SearchParameters searchParams = new SearchParameters();
searchParams.addStore(Repository.getStoreRef());
searchParams.setLanguage(SearchService.LANGUAGE_LUCENE);
searchParams.setQuery(query.toString());
if (type.equals(ContentModel.TYPE_PERSON.toString()))
{
searchParams.addSort("@" + ContentModel.PROP_LASTNAME, true);
if (logger.isDebugEnabled())
logger.debug("Added lastname as sort column to query for people");
}
ResultSet results = null; ResultSet results = null;
try try
{ {

View File

@@ -1,4 +1,3 @@
<<<<<<< .working
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" <!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
@@ -944,892 +943,3 @@
</navigation-rule> </navigation-rule>
</faces-config> </faces-config>
=======
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<faces-config>
<!-- ==================== NAVIGATION ==================== -->
<!-- navigation rules describe the navigation cases between views using the -->
<!-- outcomes from action methods or the outcome from a default action impl -->
<navigation-rule>
<description>
The decision rule used by the NavigationHandler to
determine which view must be displayed after the
current view, login.jsp is processed.
</description>
<from-view-id>/jsp/login.jsp</from-view-id>
<navigation-case>
<description>
Indicates to the NavigationHandler that the browse.jsp
view must be displayed if the Action referenced by a
UICommand component on the login.jsp view returns
the outcome "success".
</description>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/browse/browse.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- rule to get back to the Browse page from anywhere (e.g. breadcrumb click, finish on dialog) -->
<navigation-rule>
<from-view-id>/jsp/*</from-view-id>
<navigation-case>
<from-outcome>browse</from-outcome>
<to-view-id>/jsp/browse/browse.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>myalfresco</from-outcome>
<to-view-id>/jsp/dashboards/container.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>about</from-outcome>
<to-view-id>/jsp/dialog/about.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- rules to the Details pages from anywhere (e.g. shelf components etc.) -->
<navigation-rule>
<from-view-id>/jsp/*</from-view-id>
<navigation-case>
<from-outcome>showDocDetails</from-outcome>
<to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>showSpaceDetails</from-outcome>
<to-view-id>/jsp/dialog/space-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>dashboard</from-outcome>
<to-view-id>/jsp/browse/dashboard.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>addContent</from-outcome>
<to-view-id>/jsp/content/add-content-dialog.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- rule to get to the Advanced Search page from anywhere -->
<navigation-rule>
<from-view-id>/jsp/*</from-view-id>
<navigation-case>
<from-outcome>advSearch</from-outcome>
<to-view-id>/jsp/dialog/advanced-search.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- rule to get back to the login page from anywhere -->
<navigation-rule>
<from-view-id>/jsp/*</from-view-id>
<navigation-case>
<from-outcome>logout</from-outcome>
<to-view-id>/jsp/login.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>relogin</from-outcome>
<to-view-id>/jsp/relogin.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- rule to get back to the Admin/User Console from anywhere -->
<navigation-rule>
<from-view-id>/jsp/*</from-view-id>
<navigation-case>
<from-outcome>adminConsole</from-outcome>
<to-view-id>/jsp/admin/admin-console.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>userConsole</from-outcome>
<to-view-id>/jsp/users/user-console.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Common document actions available from anywhere -->
<navigation-rule>
<from-view-id>/jsp/*</from-view-id>
<navigation-case>
<from-outcome>checkoutFile</from-outcome>
<to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>checkinFile</from-outcome>
<to-view-id>/jsp/dialog/checkin-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>undoCheckoutFile</from-outcome>
<to-view-id>/jsp/dialog/undocheckout-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>updateFile</from-outcome>
<to-view-id>/jsp/dialog/update-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editFile</from-outcome>
<to-view-id>/jsp/dialog/edit-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editHtmlInline</from-outcome>
<to-view-id>/jsp/dialog/edit-html-inline.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editTextInline</from-outcome>
<to-view-id>/jsp/dialog/edit-text-inline.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Browse screen action outcomes -->
<navigation-rule>
<from-view-id>/jsp/browse/browse.jsp</from-view-id>
<!-- showDocDetails and showSpaceDetails moved to /jsp/* above -->
<!-- edit, update, checkout actions moved to /jsp/* above -->
<navigation-case>
<from-outcome>manageInvitedUsers</from-outcome>
<to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>manageContentUsers</from-outcome>
<to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>manageRules</from-outcome>
<to-view-id>/jsp/dialog/rules.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>previewContent</from-outcome>
<to-view-id>/jsp/dialog/preview-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>previewSpace</from-outcome>
<to-view-id>/jsp/dialog/preview-space.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>startDiscussion</from-outcome>
<to-view-id>/jsp/forums/create-topic.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>showForum</from-outcome>
<to-view-id>/jsp/forums/forum.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>showTopic</from-outcome>
<to-view-id>/jsp/forums/topic.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>saveNewSearch</from-outcome>
<to-view-id>/jsp/dialog/save-search.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>saveEditSearch</from-outcome>
<to-view-id>/jsp/dialog/edit-search.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>manageDeletedItems</from-outcome>
<to-view-id>/jsp/trashcan/trash-list.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/content/add-content-dialog.jsp</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/browse/browse.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Admin Console rules -->
<navigation-rule>
<from-view-id>/jsp/admin/admin-console.jsp</from-view-id>
<navigation-case>
<from-outcome>manageCategories</from-outcome>
<to-view-id>/jsp/categories/categories.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>manageUsers</from-outcome>
<to-view-id>/jsp/users/users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>manageGroups</from-outcome>
<to-view-id>/jsp/groups/groups.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>showSystemInfo</from-outcome>
<to-view-id>/jsp/dialog/system-info.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>showNodeBrowser</from-outcome>
<to-view-id>/jsp/admin/store-browser.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>import</from-outcome>
<to-view-id>/jsp/dialog/import.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>export</from-outcome>
<to-view-id>/jsp/dialog/export.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/edit-file.jsp</from-view-id>
<navigation-case>
<from-outcome>checkoutFile</from-outcome>
<to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/edit-text-inline.jsp</from-view-id>
<navigation-case>
<from-outcome>checkoutFile</from-outcome>
<to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/edit-html-inline.jsp</from-view-id>
<navigation-case>
<from-outcome>checkoutFile</from-outcome>
<to-view-id>/jsp/dialog/checkout-file.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/checkout-file.jsp</from-view-id>
<navigation-case>
<from-outcome>checkoutFileLink</from-outcome>
<to-view-id>/jsp/dialog/checkout-file-link.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/space-details.jsp</from-view-id>
<navigation-case>
<from-outcome>manageInvitedUsers</from-outcome>
<to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>manageRules</from-outcome>
<to-view-id>/jsp/dialog/rules.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>import</from-outcome>
<to-view-id>/jsp/dialog/import.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>export</from-outcome>
<to-view-id>/jsp/dialog/export.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>applyTemplate</from-outcome>
<to-view-id>/jsp/dialog/apply-space-template.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>applyRSSTemplate</from-outcome>
<to-view-id>/jsp/dialog/apply-rss-template.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>previewSpace</from-outcome>
<to-view-id>/jsp/dialog/preview-space.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>showForum</from-outcome>
<to-view-id>/jsp/forums/forum.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editCategories</from-outcome>
<to-view-id>/jsp/dialog/edit-space-category.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editSimpleWorkflow</from-outcome>
<to-view-id>/jsp/dialog/edit-space-simple-workflow.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/apply-rss-template.jsp</from-view-id>
<navigation-case>
<from-outcome>manageInvitedUsers</from-outcome>
<to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/document-details.jsp</from-view-id>
<navigation-case>
<from-outcome>editSimpleWorkflow</from-outcome>
<to-view-id>/jsp/dialog/edit-simple-workflow.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editCategories</from-outcome>
<to-view-id>/jsp/dialog/edit-category.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>previewContent</from-outcome>
<to-view-id>/jsp/dialog/preview-file.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>showForum</from-outcome>
<to-view-id>/jsp/forums/forum.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>manageContentUsers</from-outcome>
<to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>applyTemplate</from-outcome>
<to-view-id>/jsp/dialog/apply-doc-template.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/edit-simple-workflow.jsp</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/edit-space-simple-workflow.jsp</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/dialog/space-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/dialog/space-details.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/edit-category.jsp</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/dialog/document-details.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/edit-space-category.jsp</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/dialog/space-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/dialog/space-details.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/rules.jsp</from-view-id>
<navigation-case>
<from-outcome>deleteRule</from-outcome>
<to-view-id>/jsp/dialog/delete-rule.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/delete-rule.jsp</from-view-id>
<navigation-case>
<from-outcome>manageRules</from-outcome>
<to-view-id>/jsp/dialog/rules.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/dialog/rules.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>browse</from-outcome>
<to-view-id>/jsp/dialog/rules.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- File Link object details page navigation -->
<navigation-rule>
<from-view-id>/jsp/dialog/filelink-details.jsp</from-view-id>
<navigation-case>
<from-outcome>editLinkProperties</from-outcome>
<to-view-id>/jsp/dialog/edit-link-properties.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>manageContentUsers</from-outcome>
<to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Space Link object details page navigation -->
<navigation-rule>
<from-view-id>/jsp/dialog/spacelink-details.jsp</from-view-id>
<navigation-case>
<from-outcome>editLinkProperties</from-outcome>
<to-view-id>/jsp/dialog/edit-link-properties.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>manageContentUsers</from-outcome>
<to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Edit Link object properties page navigation -->
<navigation-rule>
<from-view-id>/jsp/dialog/edit-link-properties.jsp</from-view-id>
<navigation-case>
<from-outcome>cancelEdit</from-outcome>
<to-view-id>/jsp/dialog/filelink-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finishEdit</from-outcome>
<to-view-id>/jsp/dialog/filelink-details.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Manage Invited Users navigation -->
<navigation-rule>
<from-view-id>/jsp/roles/manage-invited-users.jsp</from-view-id>
<navigation-case>
<from-outcome>inviteUsers</from-outcome>
<to-view-id>/jsp/wizard/invite-users/invite.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editRoles</from-outcome>
<to-view-id>/jsp/roles/edit-user-roles.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>removeUser</from-outcome>
<to-view-id>/jsp/roles/remove-invited-user.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/roles/edit-user-roles.jsp</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/roles/remove-invited-user.jsp</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/roles/manage-content-users.jsp</from-view-id>
<navigation-case>
<from-outcome>inviteUsers</from-outcome>
<to-view-id>/jsp/wizard/invite-content-users/invite.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editRoles</from-outcome>
<to-view-id>/jsp/roles/edit-content-user-roles.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>removeUser</from-outcome>
<to-view-id>/jsp/roles/remove-content-user.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/roles/edit-content-user-roles.jsp</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/roles/remove-content-user.jsp</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- navigation rules for the Invite Users wizard -->
<navigation-rule>
<from-view-id>/jsp/wizard/invite-users/*</from-view-id>
<navigation-case>
<from-outcome>invite</from-outcome>
<to-view-id>/jsp/wizard/invite-users/invite.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>notify</from-outcome>
<to-view-id>/jsp/wizard/invite-users/notify.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- navigation rules for the Invite Content Users wizard -->
<navigation-rule>
<from-view-id>/jsp/wizard/invite-content-users/*</from-view-id>
<navigation-case>
<from-outcome>invite</from-outcome>
<to-view-id>/jsp/wizard/invite-content-users/invite.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>notify</from-outcome>
<to-view-id>/jsp/wizard/invite-content-users/notify.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/roles/manage-content-users.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- System User Management navigation -->
<navigation-rule>
<from-view-id>/jsp/users/*</from-view-id>
<navigation-case>
<from-outcome>manageUsers</from-outcome>
<to-view-id>/jsp/users/users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/users/users.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/users/users.jsp</from-view-id>
<navigation-case>
<from-outcome>createUser</from-outcome>
<to-view-id>/jsp/wizard/new-user/person-properties.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editUser</from-outcome>
<to-view-id>/jsp/wizard/new-user/person-properties.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>deleteUser</from-outcome>
<to-view-id>/jsp/users/delete-user.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>changePassword</from-outcome>
<to-view-id>/jsp/users/change-password.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- User Details and preferences action outcomes -->
<navigation-rule>
<from-view-id>/jsp/users/user-console.jsp</from-view-id>
<navigation-case>
<from-outcome>changePassword</from-outcome>
<to-view-id>/jsp/users/change-my-password.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editUserDetails</from-outcome>
<to-view-id>/jsp/users/edit-user-details.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- navigation rules for the New User wizard -->
<navigation-rule>
<from-view-id>/jsp/wizard/new-user/*</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/users/users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/users/users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>person-properties</from-outcome>
<to-view-id>/jsp/wizard/new-user/person-properties.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>user-properties</from-outcome>
<to-view-id>/jsp/wizard/new-user/user-properties.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>summary</from-outcome>
<to-view-id>/jsp/wizard/new-user/summary.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- navigation rules for the Group Management pages -->
<navigation-rule>
<from-view-id>/jsp/groups/*</from-view-id>
<navigation-case>
<from-outcome>newGroup</from-outcome>
<to-view-id>/jsp/groups/new-group.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>deleteGroup</from-outcome>
<to-view-id>/jsp/groups/delete-group.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>addUser</from-outcome>
<to-view-id>/jsp/groups/add-user.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>deleteUser</from-outcome>
<to-view-id>/jsp/groups/delete-user.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/groups/groups.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/groups/groups.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Categories screen action outcomes -->
<navigation-rule>
<from-view-id>/jsp/categories/*</from-view-id>
<navigation-case>
<from-outcome>addCategory</from-outcome>
<to-view-id>/jsp/categories/new-category.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editCategory</from-outcome>
<to-view-id>/jsp/categories/edit-category.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>deleteCategory</from-outcome>
<to-view-id>/jsp/categories/delete-category.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/categories/categories.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/categories/categories.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- navigation rule to cancel and finish from any wizard -->
<navigation-rule>
<from-view-id>/jsp/wizard/*</from-view-id>
<navigation-case>
<from-outcome>cancel</from-outcome>
<to-view-id>/jsp/browse/browse.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>finish</from-outcome>
<to-view-id>/jsp/browse/browse.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Navigation for Admin Node Browser -->
<navigation-rule>
<from-view-id>/jsp/admin/*</from-view-id>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.selectStores}</from-action>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/admin/store-browser.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>nodeBrowser</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/admin/store-browser.jsp</from-view-id>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.selectStore}</from-action>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/admin/node-browser.jsp</from-view-id>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.selectChild}</from-action>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.selectPrimaryPath}</from-action>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.selectPrimaryParent}</from-action>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.selectParent}</from-action>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.selectToNode}</from-action>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.selectNodeProperty}</from-action>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.submitSearch}</from-action>
<from-outcome>error</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.submitSearch}</from-action>
<from-outcome>node</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.submitSearch}</from-action>
<from-outcome>search</from-outcome>
<to-view-id>/jsp/admin/search-results.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/admin/search-results.jsp</from-view-id>
<navigation-case>
<from-action>#{AdminNodeBrowseBean.selectResultNode}</from-action>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/admin/node-browser.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Workflow Admin -->
<navigation-rule>
<from-view-id>/jsp/workflow/workflow-console.jsp</from-view-id>
<navigation-case>
<from-action>#{WorkflowConsoleBean.submitCommand}</from-action>
<from-outcome>success</from-outcome>
<to-view-id>/jsp/workflow/workflow-console.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Forums screen action outcomes -->
<navigation-rule>
<from-view-id>/jsp/forums/*</from-view-id>
<!-- NOTE: we can't have a case for browse in here otherwise you can -->
<!-- never navigate back to the main browse screen -->
<navigation-case>
<from-outcome>showForumsDetails</from-outcome>
<to-view-id>/jsp/forums/forums-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>showForumDetails</from-outcome>
<to-view-id>/jsp/forums/forum-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>showTopicDetails</from-outcome>
<to-view-id>/jsp/forums/topic-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>manageInvitedUsers</from-outcome>
<to-view-id>/jsp/roles/manage-invited-users.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>import</from-outcome>
<to-view-id>/jsp/dialog/import.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>export</from-outcome>
<to-view-id>/jsp/dialog/export.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<!-- Manage Deleted Items screen action outcomes -->
<navigation-rule>
<from-view-id>/jsp/trashcan/*</from-view-id>
<navigation-case>
<from-outcome>deleteItem</from-outcome>
<to-view-id>/jsp/trashcan/delete-item.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>recoverItem</from-outcome>
<to-view-id>/jsp/trashcan/recover-item.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>recoverAllItems</from-outcome>
<to-view-id>/jsp/trashcan/recover-all.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>deleteAllItems</from-outcome>
<to-view-id>/jsp/trashcan/delete-all.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>recoverListedItems</from-outcome>
<to-view-id>/jsp/trashcan/recover-listed.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>deleteListedItems</from-outcome>
<to-view-id>/jsp/trashcan/delete-listed.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>itemDetails</from-outcome>
<to-view-id>/jsp/trashcan/item-details.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>recoveryReport</from-outcome>
<to-view-id>/jsp/trashcan/recovery-report.jsp</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<from-view-id>/jsp/dialog/container.jsp</from-view-id>
<!-- Overridden dialog:close navigation rules for forums -->
<navigation-case>
<from-outcome>forumsDeleted</from-outcome>
<to-view-id>/jsp/forums/forums.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>forumDeleted</from-outcome>
<to-view-id>/jsp/forums/forums.jsp</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>topicDeleted</from-outcome>
<to-view-id>/jsp/forums/forum.jsp</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
>>>>>>> .merge-right.r4305