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

- Added SDK samples for web client customisation

Browse Source 
- AWC-687 & AWC-631
- Fixed issue showing custom folder types in advanced search

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2006-05-22 13:35:16 +00:00
parent 7ef5ae9ad7
commit d024e64d9d
5 changed files with 246 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
project-build.xml
View File

@@ -7,14 +7,8 @@
<!-- we want to build a WAR file in this project --> <!-- we want to build a WAR file in this project -->
<target name="package" depends="package-war" /> <target name="package" depends="package-war" />
<!-- copy the template web.xml and replace the "@facesconfig@" token with list of faces config files -->
<target name="generate-web-xml" depends="init">
<copy file="${dir.src.webinf}/${file.name.war.template}" tofile="${dir.src.webinf}/web.xml" overwrite="yes" />
<replace file="${dir.src.webinf}/web.xml" token="@facesconfig@" value="${files.faces.config}" />
</target>
<!-- override the common assemble-war target --> <!-- override the common assemble-war target -->
<target name="assemble-war" depends="common.assemble-war, generate-web-xml"> <target name="assemble-war" depends="common.assemble-war">
<fail unless="server" message="You must supply a value for the 'server' property to indicate which WAR to build" /> <fail unless="server" message="You must supply a value for the 'server' property to indicate which WAR to build" />
<condition property="isTomcat"> <condition property="isTomcat">
@@ -90,8 +84,4 @@
</delete> </delete>
</target> </target>
<target name="clean" depends="common.clean" description="Cleans all the normal files plus web.xml">
<delete file="${dir.src.webinf}/web.xml" />
</target>
</project> </project>

2
project.properties
View File

@@ -1,4 +1,2 @@
webinf.delete.tomcat=jboss*.xml,portlet*.xml,alfresco-object.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 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-app.xml,/WEB-INF/faces-config-beans.xml,/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml

8
source/java/org/alfresco/web/config/AdvancedSearchConfigElement.java
View File

@@ -104,6 +104,14 @@ public class AdvancedSearchConfigElement extends ConfigElementAdapter
} }
} }
if (newElement.getFolderTypes() != null)
{
for (String type : newElement.getFolderTypes())
{
combinedElement.addFolderType(type);
}
}
if (newElement.getCustomProperties() != null) if (newElement.getCustomProperties() != null)
{ {
for (CustomProperty property : newElement.getCustomProperties()) for (CustomProperty property : newElement.getCustomProperties())

11
source/web/WEB-INF/faces-config-custom.xml Normal file
View File

@@ -0,0 +1,11 @@
<?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>
<!-- *************************************************************** -->
<!-- Empty JSF config file to prevent errors being thrown during JSF -->
<!-- initialisation. Overwrite this file with your custom version. -->
<!-- *************************************************************** -->
</faces-config>

2
source/web/WEB-INF/web_TEMPLATE.xml → source/web/WEB-INF/web.xml
View File

@@ -16,7 +16,7 @@
<context-param> <context-param>
<param-name>javax.faces.CONFIG_FILES</param-name> <param-name>javax.faces.CONFIG_FILES</param-name>
<param-value>@facesconfig@</param-value> <param-value>/WEB-INF/faces-config-app.xml,/WEB-INF/faces-config-beans.xml,/WEB-INF/faces-config-navigation.xml,/WEB-INF/faces-config-common.xml,/WEB-INF/faces-config-repo.xml,WEB-INF/faces-config-custom.xml</param-value>
</context-param> </context-param>
<context-param> <context-param>