diff --git a/config/alfresco/web-client-application-context.xml b/config/alfresco/web-client-application-context.xml index 568fb33106..ba65077eb4 100644 --- a/config/alfresco/web-client-application-context.xml +++ b/config/alfresco/web-client-application-context.xml @@ -3,26 +3,28 @@ - + - + classpath:alfresco/web-client-config.xml + classpath:alfresco/web-client-config-properties.xml classpath:alfresco/web-client-config-edit-properties.xml - classpath:alfresco/web-client-config-icons.xml + classpath:alfresco/web-client-config-navigation.xml + classpath:alfresco/extension/web-client-config-custom.xml - - + + - + - + diff --git a/config/alfresco/web-client-config-edit-properties.xml b/config/alfresco/web-client-config-edit-properties.xml index 86e4810caf..67edce3fc3 100644 --- a/config/alfresco/web-client-config-edit-properties.xml +++ b/config/alfresco/web-client-config-edit-properties.xml @@ -1,15 +1,4 @@ - - - - - - - - - - - - + @@ -72,15 +61,5 @@ - - - - - - - - - - diff --git a/config/alfresco/web-client-config-icons.xml b/config/alfresco/web-client-config-icons.xml deleted file mode 100644 index 88e4f13ae5..0000000000 --- a/config/alfresco/web-client-config-icons.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/alfresco/web-client-config-navigation.xml b/config/alfresco/web-client-config-navigation.xml new file mode 100644 index 0000000000..0222671006 --- /dev/null +++ b/config/alfresco/web-client-config-navigation.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/alfresco/web-client-config-properties.xml b/config/alfresco/web-client-config-properties.xml new file mode 100644 index 0000000000..9d500c5a3d --- /dev/null +++ b/config/alfresco/web-client-config-properties.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/alfresco/web-client-config-zoo.xml b/config/alfresco/web-client-config-zoo.xml deleted file mode 100644 index 0b55b77eec..0000000000 --- a/config/alfresco/web-client-config-zoo.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml index 86c9dabe4d..c5722e045b 100644 --- a/config/alfresco/web-client-config.xml +++ b/config/alfresco/web-client-config.xml @@ -123,169 +123,19 @@ alfresco@alfresco.org - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -301,8 +151,6 @@ - - @@ -320,17 +168,49 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + diff --git a/project.properties b/project.properties index 5a5cf914a5..836652924c 100644 --- a/project.properties +++ b/project.properties @@ -1,4 +1,4 @@ -webinf.delete.tomcat=jboss*.xml,portlet*.xml,alfresco-pages.xml +webinf.delete.tomcat=jboss*.xml,portlet*.xml,alfresco-object.xml webinf.lib.delete.jboss=log4j-1.2.8.jar,portlet-api-lib.jar,myfaces-api.jar,myfaces-impl.jar -files.faces.config=/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml,/WEB-INF/faces-config-zoo.xml +files.faces.config=/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml diff --git a/source/java/jsftest/DummyBean.java b/source/java/jsftest/DummyBean.java deleted file mode 100644 index 27f983121c..0000000000 --- a/source/java/jsftest/DummyBean.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package jsftest; - -import java.util.Properties; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Object that can be used as a backing bean for components in the zoo - * - * @author gavinc - */ -public class DummyBean -{ - private static Log logger = LogFactory.getLog(DummyBean.class); - - private String name; - private Properties properties; - - public DummyBean() - { - this.properties = new Properties(); - this.properties.put("one", "This is 1"); - this.properties.put("two", "This is 2"); - this.properties.put("three", "This is 3"); - this.properties.put("four", "This is 4"); - } - - public Properties getProperties() - { - return this.properties; - } - - /** - * @return Returns the name. - */ - public String getName() - { - return name; - } - - /** - * @param name The name to set. - */ - public void setName(String name) - { - this.name = name; - } - - /** - * @see java.lang.Object#toString() - */ - public String toString() - { - StringBuilder builder = new StringBuilder(super.toString()); - builder.append(" (name=").append(this.name); - builder.append(" properties=").append(this.properties).append(")"); - return builder.toString(); - } - - /** - * Method to call on form submit buttons - */ - public void submit() - { - if (logger.isDebugEnabled()) - logger.debug("Submit called on DummyBean, state = " + toString()); - } -} diff --git a/source/java/jsftest/TestList.java b/source/java/jsftest/TestList.java deleted file mode 100644 index f7fba1669b..0000000000 --- a/source/java/jsftest/TestList.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package jsftest; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.List; -import java.util.Map; - -import javax.faces.event.ActionEvent; - -import org.alfresco.web.ui.common.component.UIActionLink; -import org.alfresco.web.ui.common.component.UIBreadcrumb; -import org.apache.log4j.Logger; - -/** - * @author kevinr - */ -public class TestList -{ - /** - * Constructor - */ - public TestList() - { - // Create test data rows - - Calendar date = new GregorianCalendar(1999, 1, 5); - rows.add(new TestRow("monkey", 5, true, 0.1f, date.getTime())); - date = new GregorianCalendar(2000, 12, 5); - rows.add(new TestRow("biscuit", 15, true, 0.2f, date.getTime())); - date = new GregorianCalendar(1999, 11, 15); - rows.add(new TestRow("HORSEY", 23, false, 0.333f, date.getTime())); - date = new GregorianCalendar(2003, 11, 11); - rows.add(new TestRow("thing go here", 5123, true, 0.999f, date.getTime())); - date = new GregorianCalendar(1999, 2, 3); - rows.add(new TestRow("I like docs", -5, false, 0.333f, date.getTime())); - date = new GregorianCalendar(2005, 1, 1); - rows.add(new TestRow("Document", 1235, false, 12.0f, date.getTime())); - date = new GregorianCalendar(1998, 8, 8); - rows.add(new TestRow("1234567890", 52, false, 5.0f, date.getTime())); - date = new GregorianCalendar(1997, 9, 30); - rows.add(new TestRow("space", 77, true, 17.5f, date.getTime())); - date = new GregorianCalendar(2001, 7, 15); - rows.add(new TestRow("House", 12, true, 0.4f, date.getTime())); - date = new GregorianCalendar(2002, 5, 28); - rows.add(new TestRow("Baboon", 14, true, -0.888f, date.getTime())); - date = new GregorianCalendar(2003, 11, 11); - rows.add(new TestRow("Woof", 0, true, 0.0f, date.getTime())); - } - - public List getRows() - { - return this.rows; - } - - public void clickBreadcrumb(ActionEvent event) - { - if (event.getComponent() instanceof UIBreadcrumb) - { - s_logger.debug("clickBreadcrumb action listener called, path now: " + ((UIBreadcrumb)event.getComponent()).getValue()); - } - } - - public void clickActionLink(ActionEvent event) - { - s_logger.debug("clickActionLink"); - } - - public void clickNameLink(ActionEvent event) - { - UIActionLink link = (UIActionLink)event.getComponent(); - Map params = link.getParameterMap(); - String value = params.get("name"); - if (value != null) - { - s_logger.debug("clicked item in list: " + value); - } - } - - - private final static Logger s_logger = Logger.getLogger(TestList.class); - - private List rows = new ArrayList();; -} diff --git a/source/java/jsftest/TestRow.java b/source/java/jsftest/TestRow.java deleted file mode 100644 index 612a977913..0000000000 --- a/source/java/jsftest/TestRow.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package jsftest; - -import java.util.Date; - -/** - * @author kevinr - */ -public class TestRow -{ - /** - * Test a row bean with various data types - */ - public TestRow(String name, int count, boolean valid, float relevance, Date created) - { - this.name = name; - this.count = count; - this.valid = valid; - this.relevance = relevance; - this.created = created; - } - - public String getName() - { - return name; - } - - public int getCount() - { - return count; - } - - public boolean getValid() - { - return valid; - } - - public float getRelevance() - { - return relevance; - } - - public Date getCreated() - { - return created; - } - - public void setCreated(Date date) - { - this.created = date; - } - - public TestRow getObject() - { - return this; - } - - - private String name; - private int count; - private boolean valid; - private float relevance; - private Date created; -} diff --git a/source/java/jsftest/User.java b/source/java/jsftest/User.java deleted file mode 100644 index 9f0daa8c49..0000000000 --- a/source/java/jsftest/User.java +++ /dev/null @@ -1,222 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package jsftest; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import javax.faces.model.SelectItem; - - -/** - * Class representing a single User bean instance. - * - * @author kevinr - */ -public class User implements Cloneable -{ - public User() - { - setRoles(new ArrayList(4)); - } - - public User(String username, String password, String name, String[] roles, Date joined) - { - setUsername(username); - setPassword(password); - setName(name); - setDateJoined(joined); - List rolesList = new ArrayList(roles.length); - for (int i=0; i(u.getRoles())); - } - - /** - * @see java.lang.Object#clone() - */ - protected Object clone() throws CloneNotSupportedException - { - // invoke copy constructor - return new User(this); - } - - /** - * Get the username - * - * @return the username - */ - public String getUsername() - { - return m_username; - } - - /** - * Set the username - * - * @param username the username - */ - public void setUsername(String username) - { - m_username = username; - } - - /** - * Get the name - * - * @return the name - */ - public String getName() - { - return m_name; - } - - /** - * Set the name - * - * @param name the name - */ - public void setName(String name) - { - m_name = name; - } - - /** - * Get the roles - * - * @return the roles - */ - public List getRoles() - { - return m_roles; - } - - /** - * Set the roles - * - * @param roles the roles - */ - public void setRoles(List roles) - { - m_roles = roles; - } - - /** - * Get the password - * - * @return the password - */ - public String getPassword() - { - return m_password; - } - - /** - * Set the password - * - * @param password the password - */ - public void setPassword(String password) - { - m_password = password; - } - - /** - * Get the All Roles List - * - * @return the allRolesList - */ - public List getAllRolesList() - { - return m_allRolesList; - } - - /** - * Set the allRolesList - * - * @param allRolesList the allRolesList - */ - public void setAllRolesList(List allRolesList) - { - m_allRolesList = allRolesList; - } - - /** - * Get the dateJoined - * - * @return the dateJoined - */ - public Date getDateJoined() - { - return m_dateJoined; - } - - /** - * Set the dateJoined - * - * @param dateJoined the dateJoined - */ - public void setDateJoined(Date dateJoined) - { - m_dateJoined = dateJoined; - } - - - /** the allRolesList enum list */ - private static List m_allRolesList = new ArrayList(8); - static - { - m_allRolesList.add(new SelectItem("admin", "Administrator")); - m_allRolesList.add(new SelectItem("superuser", "Super User")); - m_allRolesList.add(new SelectItem("dev", "Developer")); - m_allRolesList.add(new SelectItem("qa", "QA")); - m_allRolesList.add(new SelectItem("standard", "Basic User")); - } - - - /** the password */ - private String m_password; - - /** the username */ - private String m_username; - - /** the name */ - private String m_name; - - /** the roles */ - private List m_roles; - - /** the date joined */ - private Date m_dateJoined; -} \ No newline at end of file diff --git a/source/java/jsftest/UserListBean.java b/source/java/jsftest/UserListBean.java deleted file mode 100644 index d3921e3ff3..0000000000 --- a/source/java/jsftest/UserListBean.java +++ /dev/null @@ -1,302 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package jsftest; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.Iterator; -import java.util.List; - -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.component.UIParameter; -import javax.faces.component.html.HtmlOutputText; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; -import javax.faces.event.ValueChangeEvent; -import javax.faces.model.DataModel; -import javax.faces.model.ListDataModel; -import javax.faces.validator.ValidatorException; - -import org.apache.log4j.Logger; - -/** - * JSF Managed Bean. Provides the backing for the userlist.jsp view. The view uses - * the datatable control to bind to the List of User bean objects. Implements the - * action events called by the view when the user clicks the Edit link or Add button. - * - * @author kevinr - */ -public class UserListBean -{ - // =========================================================================== - // Construction - - public UserListBean() - { - Calendar date = new GregorianCalendar(2002, 5, 10); - m_users.add(new User("admin", "admin", "Administrator", new String[] {"admin","superuser"}, date.getTime())); - date = new GregorianCalendar(2001, 7, 10); - m_users.add(new User("kevinr", "kevinr", "Kevin Roast", new String[] {"admin","superuser","dev"}, date.getTime())); - date = new GregorianCalendar(2003, 8, 15); - m_users.add(new User("gavinc", "gavinc", "Gavin Cornwell", new String[] {"superuser","dev"}, date.getTime())); - date = new GregorianCalendar(2003, 1, 1); - m_users.add(new User("stever", "stever", "Steve Rigby", new String[] {"superuser","qa"}, date.getTime())); - } - - - // =========================================================================== - // Bean methods - - public List getUsers() - { - return m_users; - } - - public void setUsers(List users) - { - m_users = users; - } - - /** - * Get the users list as a wrapped DataModel object - * - * @return DataModel for use by the data-table components - */ - public DataModel getUsersModel() - { - if (m_usersModel == null) - { - m_usersModel = new ListDataModel(); - m_usersModel.setWrappedData(m_users); - } - - return m_usersModel; - } - - public User getUser() - { - return m_currentUser; - } - - public void setUser(User user) - { - m_currentUser = user; - } - - /** - * Get the isNewUser - * - * @return the isNewUser - */ - public boolean getIsNewUser() - { - return m_isNewUser; - } - - /** - * Set the isNewUser - * - * @param isNewUser the isNewUser - */ - public void setIsNewUser(boolean isNewUser) - { - m_isNewUser = isNewUser; - } - - /** - * Get the rolesOutputText - * - * @return the rolesOutputText - */ - public HtmlOutputText getRolesOutputText() - { - return m_rolesOutputText; - } - - /** - * Set the rolesOutputText - * - * @param rolesOutputText the rolesOutputText component - */ - public void setRolesOutputText(HtmlOutputText rolesOutputText) - { - m_rolesOutputText = rolesOutputText; - } - - - - // =========================================================================== - // Action event methods - - /** - * Edit user action event listener - * - * Specified directly on the appropriate tag such as commandLink or commandButton - * e.g. actionListener="#{UserListBean.editUser}" - * - * This listener cannot directly affect the navigation of the page - the command - * tag has an "action" attribute of which the default handler will use the outcome - * from the faces-config.xml by default or call a specifid controller method - * returning the String outcome as usual. - */ - public void editUser(ActionEvent event) - { - s_logger.debug("*****USERLIST: " + ((UIParameter)event.getComponent().findComponent("userId")).getValue().toString()); - - // Get the username from the "param" tag component we added as a nested tag - // to the command tag that fired this event. - // So we can have a key to work out which item was clicked in the data table - String usernameId = ((UIParameter)event.getComponent().findComponent("userId")).getValue().toString(); - - // It is also possible to get the relevent row from the DataModel we created - // wrapping our users list. But this is a weak solution as models which then - // potentially sort or page data may not provide the correct row index. - // e.g. - // m_usersModel.getWrappedData().get(m_usersModel.getRowIndex()); - - for (Iterator i=m_users.iterator(); i.hasNext(); /**/) - { - User user = (User)i.next(); - if (user.getUsername().equals(usernameId)) - { - // set the user as current so we know which one to edit etc. - try - { - setUser((User)user.clone()); - setIsNewUser(false); - } - catch (CloneNotSupportedException e) - { - // will not happen - clone is supported for our own types - } - } - } - } - - /** - * OK button action handler - * - * @return outcome view name - */ - public void editUserOK(ActionEvent event) - { - s_logger.debug("*****USERLIST: persisting user: " + getUser().getUsername()); - for (int i=0; i 12) - { - String err = "Username must be between 5 and 12 characters in length."; - throw new ValidatorException(new FacesMessage(err)); - } - else if (username.indexOf(' ') != -1 || username.indexOf('\t') != -1) - { - String err = "Username cannot contain space or whitespace characters."; - throw new ValidatorException(new FacesMessage(err)); - } - } - - - // =========================================================================== - // Private data - - private List m_users = new ArrayList(); - private DataModel m_usersModel = null; - private User m_currentUser = null; - private boolean m_isNewUser = false; - - /** the HTMLOutputText component */ - private HtmlOutputText m_rolesOutputText = null; - - protected final static Logger s_logger = Logger.getLogger(UserListBean.class); -} \ No newline at end of file diff --git a/source/java/jsftest/ZooService.java b/source/java/jsftest/ZooService.java deleted file mode 100644 index e50d6f3780..0000000000 --- a/source/java/jsftest/ZooService.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package jsftest; - -/** - * Managed bean that provides action handlers to navigate around the component zoo - * - * @author gavinc - */ -public class ZooService -{ - public String showPropertyZoo() - { - return "showPropertyZoo"; - } - - public String showPropertyZoo2() - { - return "showPropertyZoo2"; - } -} diff --git a/source/java/jsftest/repository/DataDictionary.java b/source/java/jsftest/repository/DataDictionary.java deleted file mode 100644 index 4a01f57095..0000000000 --- a/source/java/jsftest/repository/DataDictionary.java +++ /dev/null @@ -1,256 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package jsftest.repository; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -/** - * Class to represent a basic data dictionary service - * - * @author gavinc - */ -public class DataDictionary -{ - private Map types; - - public DataDictionary() - { - this.types = new HashMap(); - - // setup the dictionary - Property name = new Property("name", "string", "Name", false); - Property desc = new Property("description", "string", "Description" , false); - Property created = new Property("created", "datetime", "Created Date", true); - Property modified = new Property("modified", "datetime", "Modified Date", false); - Property keywords = new Property("keywords", "string[]", "Keywords", false); - - MetaData base = new MetaData("base"); - base.addProperty(name); - base.addProperty(desc); - base.addProperty(created); - base.addProperty(modified); - base.addProperty(keywords); - - Property sopid = new Property("sopId", "string", "SOP ID", true); - Property effective = new Property("effective", "datetime", "Effective Date", false); - Property approved = new Property("approved", "boolean", "Approved", false); - Property latestVersion = new Property("latestversion", "string", "Latest Version", true); - - MetaData sop = new MetaData("SOP"); - sop.setProperties(base.getProperties()); - sop.addProperty(sopid); - sop.addProperty(effective); - sop.addProperty(approved); - // add an aspect and the associated property - sop.addAspect("versionable"); - sop.addProperty(latestVersion); - - this.types.put(base.getTypeName(), base); - this.types.put(sop.getTypeName(), sop); - } - - public MetaData getMetaData(String type) - { - return (MetaData)this.types.get(type); - } - - /** - * @return Returns the types. - */ - public Map getTypes() - { - return this.types; - } - - - // ********************* - // *** Inner classes *** - // ********************* - - /** - * Represents the meta data of an object - * @author gavinc - */ - public class MetaData - { - private Map propertiesMap; - private List properties; - private String typeName; - private List aspects; - - public MetaData(String typeName) - { - this.properties = new ArrayList(); - this.propertiesMap = new HashMap(); - this.aspects = new ArrayList(); - this.typeName = typeName; - } - - /** - * Adds a property to the meta data object - * - * @author gavinc - */ - public void addProperty(Property property) - { - this.properties.add(property); - this.propertiesMap.put(property.getName(), property); - } - - /** - * @return Returns the properties. - */ - public List getProperties() - { - return this.properties; - } - - /** - * @param properties The properties to set. - */ - public void setProperties(List properties) - { - this.properties.clear(); - this.propertiesMap.clear(); - - Iterator iter = properties.iterator(); - while (iter.hasNext()) - { - Property prop = (Property)iter.next(); - this.properties.add(prop); - this.propertiesMap.put(prop.getName(), prop); - } - } - - public Map getPropertiesMap() - { - return this.propertiesMap; - } - - public List getAspects() - { - return this.aspects; - } - - public void addAspect(String aspect) - { - this.aspects.add(aspect); - } - - /** - * @return Returns the typeName. - */ - public String getTypeName() - { - return this.typeName; - } - } - - /** - * Represents a property on an object - * @author gavinc - */ - public class Property - { - private String name; - private String type; - private String displayName; - private boolean readOnly; - - /** - * @param name - * @param type - * @param readOnly - */ - public Property(String name, String type, String displayName, boolean readOnly) - { - this.name = name; - this.type = type; - this.displayName = displayName; - this.readOnly = readOnly; - } - - /** - * @return Returns the name. - */ - public String getName() - { - return this.name; - } - - /** - * @param name The name to set. - */ - public void setName(String name) - { - this.name = name; - } - - /** - * @return Returns the type. - */ - public String getType() - { - return this.type; - } - - /** - * @param type The type to set. - */ - public void setType(String type) - { - this.type = type; - } - - /** - * @return Returns the displayName. - */ - public String getDisplayName() - { - return this.displayName; - } - - /** - * @param displayName The displayName to set. - */ - public void setDisplayName(String displayName) - { - this.displayName = displayName; - } - - /** - * @return Returns the readOnly. - */ - public boolean isReadOnly() - { - return this.readOnly; - } - - /** - * @param readOnly The readOnly to set. - */ - public void setReadOnly(boolean readOnly) - { - this.readOnly = readOnly; - } - } - -} \ No newline at end of file diff --git a/source/java/jsftest/repository/NodeRef.java b/source/java/jsftest/repository/NodeRef.java deleted file mode 100644 index 388ee4258b..0000000000 --- a/source/java/jsftest/repository/NodeRef.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package jsftest.repository; - -import java.io.Serializable; - -/** - * Mock NodeRef object that comes from the Mock NodeService API. - * - * @author gavinc - */ -public class NodeRef implements Serializable -{ - private static final long serialVersionUID = 3833183614468175153L; - - private String id; - - public NodeRef(String id) - { - this.id = id; - } - - /** - * @return Returns the id. - */ - public String getId() - { - return id; - } -} diff --git a/source/java/jsftest/repository/NodeService.java b/source/java/jsftest/repository/NodeService.java deleted file mode 100644 index b558580336..0000000000 --- a/source/java/jsftest/repository/NodeService.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package jsftest.repository; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * Mock NodeService API - * - * @author gavinc - */ -public class NodeService -{ - private static Log logger = LogFactory.getLog(NodeService.class); - - public static NodeRef getNodeRef(String path) - { - return new NodeRef(path); - } - - public static String getType(NodeRef nodeRef) - { - String id = nodeRef.getId(); - String type = null; - - if (id.equalsIgnoreCase("/gav.doc") || - id.equalsIgnoreCase("/kev.txt")) - { - type = "base"; - } - else if (id.equalsIgnoreCase("/sop.txt")) - { - type = "SOP"; - } - - return type; - } - - public static Map getProperties(NodeRef nodeRef) - { - String id = nodeRef.getId(); - Map properties = null; - - if (id.equalsIgnoreCase("/gav.doc")) - { - properties = createProperties("Gav", "Gavs Object", - new String[] {"gav", "gadget", "gibbon"}, null); - } - else if (id.equalsIgnoreCase("/kev.txt")) - { - properties = createProperties("Kev", "Kevs Object", - new String[] {"kev", "monkey"}, null); - } - else if (id.equalsIgnoreCase("/sop.txt")) - { - properties = createProperties("SOP", "A manufacturing SOP", - new String[] {"sop", "manufacturing"}, "sop1"); - } - - return properties; - } - - private static Map createProperties(String name, String desc, - String[] keywords, String sop) - { - HashMap props = new HashMap(); - - Date date = new Date(); - props.put("name", name); - props.put("description", desc); - props.put("keywords", keywords); - props.put("created", date); - props.put("modified", date); - - if (sop != null) - { - props.put("sopId", sop); - props.put("effective", date); - props.put("approved", new Boolean(true)); - props.put("latestversion", "1.6"); - } - - return props; - } -} diff --git a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java index f49cad9122..8a70b08890 100644 --- a/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java +++ b/source/java/org/alfresco/web/app/AlfrescoNavigationHandler.java @@ -181,9 +181,7 @@ public class AlfrescoNavigationHandler extends NavigationHandler "' in dispatch context"); // see if there is any navigation config for the node type - ConfigService configSvc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - context).getBean(Application.BEAN_CONFIG_SERVICE); - + ConfigService configSvc = Application.getConfigService(context); Config nodeConfig = configSvc.getConfig(node); NavigationConfigElement navigationCfg = (NavigationConfigElement)nodeConfig. getConfigElement(NavigationElementReader.ELEMENT_NAVIGATION); diff --git a/source/java/org/alfresco/web/app/Application.java b/source/java/org/alfresco/web/app/Application.java index 8c1f57bb0f..0ff3c4d211 100644 --- a/source/java/org/alfresco/web/app/Application.java +++ b/source/java/org/alfresco/web/app/Application.java @@ -55,7 +55,7 @@ public class Application { private static final String LOCALE = "locale"; - public static final String BEAN_CONFIG_SERVICE = "configService"; + public static final String BEAN_CONFIG_SERVICE = "webClientConfigService"; public static final String BEAN_DATA_DICTIONARY = "dataDictionary"; public static final String BEAN_IMPORTER_BOOTSTRAP = "importerBootstrap"; @@ -65,7 +65,6 @@ public class Application private static StoreRef repoStoreRef; private static String rootPath; private static String companyRootId; - private static String companyRootDescription; private static String glossaryFolderName; private static String spaceTemplatesFolderName; private static String contentTemplatesFolderName; diff --git a/source/java/org/alfresco/web/bean/AdminBean.java b/source/java/org/alfresco/web/bean/AdminBean.java deleted file mode 100644 index 0be3526671..0000000000 --- a/source/java/org/alfresco/web/bean/AdminBean.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2005 Alfresco, Inc. - * - * Licensed under the Mozilla Public License version 1.1 - * with a permitted attribution clause. You may obtain a - * copy of the License at - * - * http://www.alfresco.org/legal/license.txt - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific - * language governing permissions and limitations under the - * License. - */ -package org.alfresco.web.bean; - -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; - -import org.alfresco.config.xml.XMLConfigService; -import org.alfresco.web.app.Application; -import org.springframework.web.jsf.FacesContextUtils; - -/** - * Bean used for administration purposes - * - * @author gavinc - */ -public class AdminBean -{ - /** - * Resets the config service - * - * @param event Event that caused the request for the reset - */ - public void resetConfigService(ActionEvent event) - { - // get the config service - XMLConfigService configSvc = (XMLConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); - - // reset it - configSvc.reset(); - } -} diff --git a/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java b/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java index 0b9a6571a9..e80e94d680 100644 --- a/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java +++ b/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java @@ -35,7 +35,6 @@ import org.alfresco.config.ConfigService; import org.alfresco.model.ContentModel; import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.dictionary.DictionaryService; -import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.model.FileExistsException; import org.alfresco.service.cmr.model.FileFolderService; import org.alfresco.service.cmr.repository.AssociationRef; @@ -53,7 +52,6 @@ import org.alfresco.web.config.PropertySheetConfigElement; import org.alfresco.web.data.IDataContainer; import org.alfresco.web.data.QuickSort; import org.alfresco.web.ui.common.Utils; -import org.springframework.web.jsf.FacesContextUtils; /** * Backing bean for the edit document properties dialog @@ -180,8 +178,6 @@ public class DocumentPropertiesBean // make sure the property is represented correctly Serializable propValue = (Serializable)props.get(propName); - PropertyDefinition propDef = this.dictionaryService.getProperty(qname); - properties.put(qname, propValue); } @@ -315,8 +311,7 @@ public class DocumentPropertiesBean { // we need to use the config service to see whether there are any // editable properties configured for this document. - ConfigService configSvc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); + ConfigService configSvc = Application.getConfigService(FacesContext.getCurrentInstance()); Config configProps = configSvc.getConfig(this.editableNode, new ConfigLookupContext("edit-properties")); PropertySheetConfigElement propsToDisplay = (PropertySheetConfigElement)configProps. getConfigElement("property-sheet"); diff --git a/source/java/org/alfresco/web/bean/LoginBean.java b/source/java/org/alfresco/web/bean/LoginBean.java index 2dc4bbba5c..856a358065 100644 --- a/source/java/org/alfresco/web/bean/LoginBean.java +++ b/source/java/org/alfresco/web/bean/LoginBean.java @@ -30,7 +30,6 @@ import javax.faces.validator.ValidatorException; import javax.portlet.PortletRequest; import javax.servlet.http.HttpServletRequest; -import org.alfresco.config.ConfigService; import org.alfresco.model.ContentModel; import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.service.cmr.repository.InvalidNodeRefException; @@ -99,14 +98,6 @@ public class LoginBean this.navigator = navigator; } - /** - * @param configService The ConfigService to set. - */ - public void setConfigService(ConfigService configService) - { - this.configService = configService; - } - /** * @param val Username from login dialog */ @@ -161,8 +152,8 @@ public class LoginBean */ public SelectItem[] getLanguages() { - ClientConfigElement config = (ClientConfigElement) this.configService.getGlobalConfig() - .getConfigElement(ClientConfigElement.CONFIG_ELEMENT_ID); + ClientConfigElement config = Application.getClientConfig( + FacesContext.getCurrentInstance()); List languages = config.getLanguages(); SelectItem[] items = new SelectItem[languages.size()]; @@ -420,7 +411,4 @@ public class LoginBean /** The NavigationBean bean reference */ private NavigationBean navigator; - - /** ConfigService bean reference */ - private ConfigService configService; } diff --git a/source/java/org/alfresco/web/bean/RecentSpacesBean.java b/source/java/org/alfresco/web/bean/RecentSpacesBean.java index 8b0542e76d..becf767904 100644 --- a/source/java/org/alfresco/web/bean/RecentSpacesBean.java +++ b/source/java/org/alfresco/web/bean/RecentSpacesBean.java @@ -23,7 +23,6 @@ import java.util.List; import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; -import org.alfresco.config.ConfigService; import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.web.app.Application; @@ -54,9 +53,6 @@ public class RecentSpacesBean implements IContextListener /** The BrowseBean reference */ private BrowseBean browseBean; - /** ConfigService bean reference */ - private ConfigService configService; - /** Maximum number of recent spaces to show */ private Integer maxRecentSpaces = null; @@ -95,14 +91,6 @@ public class RecentSpacesBean implements IContextListener this.browseBean = browseBean; } - /** - * @param configService The ConfigService to set. - */ - public void setConfigService(ConfigService configService) - { - this.configService = configService; - } - /** * @return the List of recent spaces */ @@ -194,8 +182,7 @@ public class RecentSpacesBean implements IContextListener { if (maxRecentSpaces == null) { - ClientConfigElement config = (ClientConfigElement)this.configService.getGlobalConfig().getConfigElement( - ClientConfigElement.CONFIG_ELEMENT_ID); + ClientConfigElement config = Application.getClientConfig(FacesContext.getCurrentInstance()); maxRecentSpaces = Integer.valueOf(config.getRecentSpacesItems()); } diff --git a/source/java/org/alfresco/web/bean/wizard/AddContentWizard.java b/source/java/org/alfresco/web/bean/wizard/AddContentWizard.java index e9f179432e..7ed89fd53a 100644 --- a/source/java/org/alfresco/web/bean/wizard/AddContentWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/AddContentWizard.java @@ -33,8 +33,6 @@ import org.alfresco.service.namespace.QName; import org.alfresco.web.app.Application; import org.alfresco.web.bean.FileUploadBean; import org.alfresco.web.bean.repository.Repository; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Handler class used by the Add Content Wizard @@ -43,8 +41,6 @@ import org.apache.commons.logging.LogFactory; */ public class AddContentWizard extends BaseContentWizard { - private static Log logger = LogFactory.getLog(AddContentWizard.class); - // TODO: retrieve these from the config service private static final String WIZARD_TITLE_ID = "add_content_title"; private static final String WIZARD_DESC_ID = "add_content_desc"; diff --git a/source/java/org/alfresco/web/bean/wizard/BaseActionWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseActionWizard.java index 4a87c98508..16ce49a939 100644 --- a/source/java/org/alfresco/web/bean/wizard/BaseActionWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/BaseActionWizard.java @@ -41,7 +41,6 @@ import org.alfresco.repo.action.executer.MoveActionExecuter; import org.alfresco.repo.action.executer.SimpleWorkflowActionExecuter; import org.alfresco.repo.action.executer.SpecialiseTypeActionExecuter; import org.alfresco.repo.action.executer.TransformActionExecuter; -import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.action.ActionDefinition; import org.alfresco.service.cmr.action.ActionService; import org.alfresco.service.cmr.dictionary.AspectDefinition; @@ -58,7 +57,6 @@ import org.alfresco.web.data.IDataContainer; import org.alfresco.web.data.QuickSort; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.web.jsf.FacesContextUtils; /** * Base handler class containing common code used by the New Space Wizard and New Action Wizard @@ -559,8 +557,7 @@ public abstract class BaseActionWizard extends AbstractWizardBean { if (this.encodings == null) { - ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); Config wizardCfg = svc.getConfig("Action Wizards"); if (wizardCfg != null) { @@ -617,8 +614,7 @@ public abstract class BaseActionWizard extends AbstractWizardBean { if (this.transformers == null) { - ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); Config wizardCfg = svc.getConfig("Action Wizards"); if (wizardCfg != null) { @@ -682,8 +678,7 @@ public abstract class BaseActionWizard extends AbstractWizardBean { if (this.imageTransformers == null) { - ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); Config wizardCfg = svc.getConfig("Action Wizards"); if (wizardCfg != null) { @@ -747,8 +742,7 @@ public abstract class BaseActionWizard extends AbstractWizardBean { if (this.aspects == null) { - ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); Config wizardCfg = svc.getConfig("Action Wizards"); if (wizardCfg != null) { @@ -825,8 +819,7 @@ public abstract class BaseActionWizard extends AbstractWizardBean Application.getMessage(context, "content"))); // add any configured content sub-types to the list - ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); Config wizardCfg = svc.getConfig("Custom Content Types"); if (wizardCfg != null) { diff --git a/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java index cca568a1c7..7d42c2845a 100644 --- a/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/BaseContentWizard.java @@ -51,7 +51,6 @@ import org.alfresco.web.data.QuickSort; import org.alfresco.web.ui.common.Utils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.web.jsf.FacesContextUtils; /** * Base Handler class used by the Content Wizards @@ -499,8 +498,7 @@ public abstract class BaseContentWizard extends AbstractWizardBean Application.getMessage(context, "content"))); // add any configured content sub-types to the list - ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); Config wizardCfg = svc.getConfig("Custom Content Types"); if (wizardCfg != null) { diff --git a/source/java/org/alfresco/web/bean/wizard/CreateContentWizard.java b/source/java/org/alfresco/web/bean/wizard/CreateContentWizard.java index c767cb1b20..c415d20d3d 100644 --- a/source/java/org/alfresco/web/bean/wizard/CreateContentWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/CreateContentWizard.java @@ -23,8 +23,6 @@ import javax.faces.event.ValueChangeEvent; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Repository; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Handler class used by the Create In-line Content Wizard @@ -36,8 +34,6 @@ public class CreateContentWizard extends BaseContentWizard protected static final String CONTENT_TEXT = "txt"; protected static final String CONTENT_HTML = "html"; - private static Log logger = LogFactory.getLog(CreateContentWizard.class); - // TODO: retrieve these from the config service private static final String WIZARD_TITLE_ID = "create_content_title"; private static final String WIZARD_DESC_ID = "create_content_desc"; diff --git a/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java b/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java index 126c548a0f..c4bc15bae8 100644 --- a/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java @@ -63,7 +63,6 @@ import org.alfresco.web.data.QuickSort; import org.alfresco.web.ui.common.Utils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.web.jsf.FacesContextUtils; /** * Handler class used by the New Space Wizard @@ -948,8 +947,7 @@ public class NewRuleWizard extends BaseActionWizard { if (this.modelTypes == null) { - ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); + ConfigService svc = Application.getConfigService(FacesContext.getCurrentInstance()); Config wizardCfg = svc.getConfig("Action Wizards"); if (wizardCfg != null) { diff --git a/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java b/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java index 6c96c51939..e5114a3aba 100644 --- a/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/NewSpaceWizard.java @@ -31,7 +31,6 @@ import javax.transaction.UserTransaction; import org.alfresco.config.Config; import org.alfresco.config.ConfigElement; -import org.alfresco.config.ConfigService; import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.TypeDefinition; @@ -52,7 +51,6 @@ import org.alfresco.web.ui.common.component.UIListItem; import org.alfresco.web.ui.common.component.description.UIDescription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.web.jsf.FacesContextUtils; /** * Handler class used by the New Space Wizard @@ -78,12 +76,12 @@ public class NewSpaceWizard extends AbstractWizardBean private static final String ERROR = "error_space"; private static final String DEFAULT_SPACE_TYPE_ICON = "/images/icons/space.gif"; + private static final String ICONS_LOOKUP_KEY = " icons"; // new space wizard specific properties protected SearchService searchService; protected NamespaceService namespaceService; protected DictionaryService dictionaryService; - protected ConfigService configService; protected String spaceType; protected String icon; @@ -559,9 +557,8 @@ public class NewSpaceWizard extends AbstractWizardBean this.folderTypeDescriptions.add(defaultDesc); // add any configured content sub-types to the list - ConfigService svc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); - Config wizardCfg = svc.getConfig("Custom Folder Types"); + Config wizardCfg = Application.getConfigService(FacesContext.getCurrentInstance()). + getConfig("Custom Folder Types"); if (wizardCfg != null) { ConfigElement typesCfg = wizardCfg.getConfigElement("folder-types"); @@ -689,7 +686,8 @@ public class NewSpaceWizard extends AbstractWizardBean QName type = QName.createQName(this.spaceType); String typePrefixForm = type.toPrefixString(this.namespaceService); - Config config = this.configService.getConfig(typePrefixForm); + Config config = Application.getConfigService(FacesContext.getCurrentInstance()). + getConfig(typePrefixForm + ICONS_LOOKUP_KEY); if (config != null) { ConfigElement iconsCfg = config.getConfigElement("icons"); @@ -774,16 +772,6 @@ public class NewSpaceWizard extends AbstractWizardBean { this.dictionaryService = dictionaryService; } - - /** - * Sets the config service - * - * @param configService The ConfigService - */ - public void setConfigService(ConfigService configService) - { - this.configService = configService; - } /** * @return Returns the copyPolicy. diff --git a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java index 3cdaafc0cb..9089f7074f 100644 --- a/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/NewUserWizard.java @@ -30,13 +30,11 @@ import javax.faces.event.ActionEvent; import javax.faces.validator.ValidatorException; import javax.transaction.UserTransaction; -import org.alfresco.config.ConfigService; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.InvalidNodeRefException; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.OwnableService; import org.alfresco.service.cmr.security.PermissionService; @@ -44,7 +42,6 @@ import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.QName; import org.alfresco.web.app.Application; -import org.alfresco.web.app.ContextListener; import org.alfresco.web.app.context.UIContextService; import org.alfresco.web.bean.repository.Node; import org.alfresco.web.bean.repository.Repository; @@ -97,9 +94,6 @@ public class NewUserWizard extends AbstractWizardBean /** OwnableService bean reference */ private OwnableService ownableService; - - /** ConfigService bean reference */ - private ConfigService configService; /** action context */ private Node person = null; @@ -150,14 +144,6 @@ public class NewUserWizard extends AbstractWizardBean { this.ownableService = ownableService; } - - /** - * @param configService The ConfigService to set. - */ - public void setConfigService(ConfigService configService) - { - this.configService = configService; - } /** * Initialises the wizard @@ -968,9 +954,7 @@ public class NewUserWizard extends AbstractWizardBean */ private String getDefaultPermission() { - ClientConfigElement config = (ClientConfigElement)this.configService.getGlobalConfig().getConfigElement( - ClientConfigElement.CONFIG_ELEMENT_ID); - + ClientConfigElement config = Application.getClientConfig(FacesContext.getCurrentInstance()); return config.getHomeSpacePermission(); } diff --git a/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java b/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java index f7024a32d0..5d29d3428f 100644 --- a/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java +++ b/source/java/org/alfresco/web/ui/common/component/data/UIRichList.java @@ -32,10 +32,8 @@ import org.alfresco.web.bean.repository.Repository; import org.alfresco.web.config.ClientConfigElement; import org.alfresco.web.data.IDataContainer; import org.alfresco.web.ui.common.renderer.data.IRichListRenderer; -import org.alfresco.web.ui.common.renderer.data.RichListRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.web.jsf.FacesContextUtils; /** * @author Kevin Roast @@ -51,13 +49,9 @@ public class UIRichList extends UIComponentBase implements IDataContainer public UIRichList() { setRendererType("org.alfresco.faces.RichListRenderer"); - - - IRichListRenderer test = new RichListRenderer.IconViewRenderer(); // get the list of views from the client configuration - ConfigService configSvc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - FacesContext.getCurrentInstance()).getBean(Application.BEAN_CONFIG_SERVICE); + ConfigService configSvc = Application.getConfigService(FacesContext.getCurrentInstance()); ClientConfigElement clientConfig = (ClientConfigElement)configSvc.getGlobalConfig(). getConfigElement(ClientConfigElement.CONFIG_ELEMENT_ID); List views = clientConfig.getViews(); diff --git a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java index 8349eb8494..d8612e5630 100644 --- a/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java +++ b/source/java/org/alfresco/web/ui/repo/component/property/UIPropertySheet.java @@ -29,7 +29,6 @@ import javax.faces.el.ValueBinding; import org.alfresco.config.Config; import org.alfresco.config.ConfigLookupContext; import org.alfresco.config.ConfigService; -import org.alfresco.service.cmr.repository.AssociationRef; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.web.app.Application; import org.alfresco.web.bean.repository.Node; @@ -40,7 +39,6 @@ import org.alfresco.web.config.PropertySheetConfigElement.ItemConfig; import org.alfresco.web.config.PropertySheetConfigElement.PropertyConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.web.jsf.FacesContextUtils; /** * Component that represents the properties of a Node @@ -84,7 +82,6 @@ public class UIPropertySheet extends UIPanel implements NamingContainer */ public void encodeBegin(FacesContext context) throws IOException { - String var = null; int howManyKids = getChildren().size(); Boolean externalConfig = (Boolean)getAttributes().get("externalConfig"); @@ -106,8 +103,7 @@ public class UIPropertySheet extends UIPanel implements NamingContainer logger.debug("Configuring property sheet using ConfigService"); // get the properties to display - ConfigService configSvc = (ConfigService)FacesContextUtils.getRequiredWebApplicationContext( - context).getBean(Application.BEAN_CONFIG_SERVICE); + ConfigService configSvc = Application.getConfigService(FacesContext.getCurrentInstance()); Config configProps = null; if (getConfigArea() == null) { diff --git a/source/web/WEB-INF/faces-config-zoo.xml b/source/web/WEB-INF/faces-config-zoo.xml deleted file mode 100644 index f7508506ca..0000000000 --- a/source/web/WEB-INF/faces-config-zoo.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - The bean that backs up the jsf-test webapp User List screen - - UserListBean - jsftest.UserListBean - session - - - - - Bean for component testing - - TestList - jsftest.TestList - session - - - - - The bean that acts as the Data Dictionary Service - - MockDDService - jsftest.repository.DataDictionary - session - - - - - A bean that components in the zoo can use - - DummyBean - jsftest.DummyBean - request - - - - - - /jsp/zoo/zoo.jsp - - showUserlist - /jsp/test/userlist.jsp - - - showRichListZoo - /jsp/zoo/components.jsp - - - showPropertyZoo - /jsp/zoo/properties.jsp - - - showAutoPropertyZoo - /jsp/zoo/properties-auto.jsp - - - showImagePickerZoo - /jsp/zoo/image-picker.jsp - - - showDynaDescZoo - /jsp/zoo/dynamic-description.jsp - - - showWebClient - /jsp/browse/browse.jsp - - - - - - /jsp/* - - showZoo - /jsp/zoo/zoo.jsp - - - - - - /jsp/test/userlist.jsp - - edituser - /jsp/test/edituser.jsp - - - adduser - /jsp/test/adduser.jsp - - - - - /jsp/test/adduser.jsp - - success - /jsp/test/userlist.jsp - - - cancel - /jsp/test/userlist.jsp - - - - - /jsp/test/edituser.jsp - - success - /jsp/test/userlist.jsp - - - cancel - /jsp/test/userlist.jsp - - - - diff --git a/source/web/WEB-INF/faces-config.xml b/source/web/WEB-INF/faces-config.xml index 5b16891c45..504bc3663e 100644 --- a/source/web/WEB-INF/faces-config.xml +++ b/source/web/WEB-INF/faces-config.xml @@ -41,10 +41,6 @@ browseBean #{BrowseBean} - - configService - #{configService} - @@ -141,10 +137,6 @@ browseBean #{BrowseBean} - - configService - #{configService} - @@ -258,10 +250,6 @@ dictionaryService #{DictionaryService} - - configService - #{configService} - namespaceService #{NamespaceService} @@ -295,10 +283,6 @@ browseBean #{BrowseBean} - - configService - #{configService} - namespaceService #{NamespaceService} @@ -336,10 +320,6 @@ searchService #{SearchService} - - configService - #{configService} - namespaceService #{NamespaceService} @@ -570,10 +550,6 @@ ownableService #{OwnableService} - - configService - #{configService} - @@ -890,13 +866,6 @@ - - Backing bean used for administration purposes - AdminBean - org.alfresco.web.bean.AdminBean - application - - Backing bean used for the Export dialog ExportDialog @@ -1036,10 +1005,6 @@ searchService #{SearchService} - - configService - #{configService} - namespaceService #{NamespaceService} @@ -1077,10 +1042,6 @@ searchService #{SearchService} - - configService - #{configService} - namespaceService #{NamespaceService} @@ -1118,10 +1079,6 @@ searchService #{SearchService} - - configService - #{configService} - namespaceService #{NamespaceService} @@ -1159,10 +1116,6 @@ searchService #{SearchService} - - configService - #{configService} - namespaceService #{NamespaceService} @@ -1204,10 +1157,6 @@ contentService #{ContentService} - - configService - #{configService} - namespaceService #{NamespaceService} @@ -1245,10 +1194,6 @@ searchService #{SearchService} - - configService - #{configService} - namespaceService #{NamespaceService} @@ -1401,10 +1346,6 @@ contentService #{ContentService} - - configService - #{configService} - namespaceService #{NamespaceService} diff --git a/source/web/jsp/zoo/components.jsp b/source/web/jsp/zoo/components.jsp deleted file mode 100644 index fe8aab019c..0000000000 --- a/source/web/jsp/zoo/components.jsp +++ /dev/null @@ -1,411 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> - -<%@ page buffer="64kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> - - - - - <%-- load a bundle of properties I18N strings here --%> - - - - -

Components Test Page

- - <%-- ModeList tests --%> - ModeList component:
- Basic ModeList
- - - - - -
- Modelist with styles applied, icons, title label and the initial value set:
- - - - - - -
- ModeList rendered horizontally with first item selected:
- - - - - - -

- - <%-- Menu tests --%> - Menus:
- Simple menu:
- - - - - - -

- Menu with image, styles and actions with icons:
- - - - - - -

- - <%-- Breadcrumb tests --%> - Breadcrumbs:
- Default style with modified separator and actionListener handler:
- -
- Path style with default separator:
- -
- Root should be missing from this breadcrumb:
- - - - -

- - <%-- ActionLink tests --%> - ActionLinks:
- -
- -
- Action link with image and text, using vertical alignment property to centre text.
- -
- Action link with no text, just an image with title/alt text instead:
- - -

- - <%-- Progressive panel tests --%> - Progressive Panels:
- -

- HTML text inside the Progressive Panel -

- - - -
- - -

- nothing exciting here - not at all -

- -
- - - -

- - <%-- RichList component test --%> - <%-- The RichList component is different to the data-grid in that it is - designed to render it's own child components. This means it is capable - of rendering the columns in any order and in any kind of layout. Allowing - the impl of details, icons and list views within a single component. --%> - <%-- NOTE: Suggest config of each view independantly in the config XML e.g. - to allow the icon/details views to use different page sizes or styles. - Otherwise you have to pick values "compatible" with all view modes! --%> - RichList:
- RichList component test shown in Details view mode, including sortable columns of various data types and paging.
- - - - - - - <%-- this could be a clickable action image etc. --%> - - - - <%-- example of a clickable action image as an icon --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%-- example of a DateTime converter --%> - <%-- can be used to convert both input and output text --%> - - - - - - - - - - - - <%-- components other than columns added to a RichList will generally - be rendered as part of the list footer --%> - - - -

- - - NOTE: currently all JSF components within a Progressive Panel MUST be given an explicit ID! - -
- - Same list shown in a different view mode (Icons). This mode renderer displays the large icon and renderers in a multi-column format. It also chooses not to display the sort header links. - - - - - - - <%-- example of a clickable action image as an icon --%> - - - - - - - - <%-- example of a clickable action link item --%> - - - - - - <%-- TODO: need some way to allow columns for specific views - - - - --%> - - - - - - - - - - - - - - - <%-- example of a DateTime converter --%> - <%-- can be used to convert both input and output text --%> - - - - - - - - - - - - <%-- components other than columns added to a RichList will generally - be rendered as part of the list footer --%> - - - - - -

- - - -
- - Same list shown in a different view mode (List). This mode displays the small icon and uses single column rendering.
- - - - - - - <%-- this could be a clickable action image etc. --%> - - - - <%-- this could be a clickable action image etc. --%> - - - - - - - - - - - - - - - - - - - - - <%-- example of a DateTime converter --%> - <%-- can be used to convert both input and output text --%> - - - - - - - - - - - - <%-- components other than columns added to a RichList will generally - be rendered as part of the list footer --%> - - - - - -

- - - - - -

- - <%-- component evaluators --%> - Evaluators:
- 1a. Boolean Evaluator - you should see the next line of text:
- - - -

- 1b. Boolean Evaluator - you should not see the next line of text:
- - - -

- 2a. Value Set Evaluator - you should see the next line of text:
- - - -

- 2b. Value Set Evaluator - you should not see the next line of text:
- - - -

- 3a. String Equals Evaluator - you should see the next line of text:
- - - -

- 3b. String Equals Evaluator - you should not see the next line of text:
- - - -

- Test evaluators around menu actions:
- - - - - - - -

- - <%-- Date Picker Component --%> - <%-- Example of a tag utilising an Input Component with a custom renderer. - The renderer handles encoding and decoding of date values to UI elements --%> - Date Picker:
- Basic date picker:
- -
- Date Picker with CSS style applied:
- - -

- - - - - - - \ No newline at end of file diff --git a/source/web/jsp/zoo/dynamic-description.jsp b/source/web/jsp/zoo/dynamic-description.jsp deleted file mode 100644 index 2c2ac2b96e..0000000000 --- a/source/web/jsp/zoo/dynamic-description.jsp +++ /dev/null @@ -1,69 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> - - - - - -

Dynamic Description

- - - - - - - - - - -

- - - - -

- - - - - - -

- - - - - - -

- - - - - - - \ No newline at end of file diff --git a/source/web/jsp/zoo/image-picker.jsp b/source/web/jsp/zoo/image-picker.jsp deleted file mode 100644 index 40248b236d..0000000000 --- a/source/web/jsp/zoo/image-picker.jsp +++ /dev/null @@ -1,62 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> - - - - - -

Image Picker

- - - - - - - - -
- - -

- - - - - -
- - - -

- - - - - - - - - \ No newline at end of file diff --git a/source/web/jsp/zoo/properties-auto.jsp b/source/web/jsp/zoo/properties-auto.jsp deleted file mode 100644 index a6ae27124e..0000000000 --- a/source/web/jsp/zoo/properties-auto.jsp +++ /dev/null @@ -1,62 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> - - - - - -

Auto configured property sheet

- - - - - - -
-
- - - - -
- -

Config driven property sheet (WEB-INF/web-client-config.xml)

- - - - - - -
-
- - -

- - - - - - - - \ No newline at end of file diff --git a/source/web/jsp/zoo/properties.jsp b/source/web/jsp/zoo/properties.jsp deleted file mode 100644 index dfd00b03a1..0000000000 --- a/source/web/jsp/zoo/properties.jsp +++ /dev/null @@ -1,80 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> - - - - - -

Property sheet with standard JSF components

- - - - - - - - - - - - - - - - - - - -
-
- - - - -
- -

Property sheet with custom property components

- - - - - - - - - - - -
-
- - -

- - - - - - - - \ No newline at end of file diff --git a/source/web/jsp/zoo/zoo.jsp b/source/web/jsp/zoo/zoo.jsp deleted file mode 100644 index 29d769b7df..0000000000 --- a/source/web/jsp/zoo/zoo.jsp +++ /dev/null @@ -1,56 +0,0 @@ -<%-- - Copyright (C) 2005 Alfresco, Inc. - - Licensed under the Mozilla Public License version 1.1 - with a permitted attribution clause. You may obtain a - copy of the License at - - http://www.alfresco.org/legal/license.txt - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - either express or implied. See the License for the specific - language governing permissions and limitations under the - License. ---%> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %> -<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %> - -<%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %> -<%@ page isELIgnored="false" %> - - - - - -

The Zoo

- - - - -

- <%-- - -

- -

- --%> - -

- -

- - -

-

- - - - - - - \ No newline at end of file