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

Merged V3.1 to HEAD

Browse Source 
13484: ETHREEOH-1547: Do not set requiresNew flag and propagate exceptions in BaseDialogBean
   13383: ETHREEOH-1220: Update LDAP-authentication-context to include allowGetEnabled entry to support Share
   13381: ETHREEOH-1181: NTLM authentication periodically fails over CIFS - "Read-Write transaction started within read-only transaction"
   13376: ETHREEOH-279: Friendly error message when cm:filename regular expression constraint is violated
   13364: ETHREEOH-814: Correct character encoding issues in LDAP synchronization
   13353: ETHREEOH-1444: Ability to run Alfresco from unexploded .war file with embedded license
   13328: ETHREEOH-1400: Prevent TLD warnings on Weblogic startup
   13183: Follow up to 13177: Fixes for Weblogic compatibility
   13177: Fixes for Weblogic compatibility
   13109: Build/test fix (to avoid unintentional import via application-context.xml)
   13100: Checkpoint for new DM index check (enterprise-only)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-03-10 14:27:09 +00:00
parent cad725fd39
commit ba48c270d0
6 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java
View File

@@ -141,6 +141,7 @@ public abstract class BaseDialogBean implements IDialogBean, Serializable
Utils.addErrorMessage(formatErrorMessage(e), e); Utils.addErrorMessage(formatErrorMessage(e), e);
outcome = getErrorOutcome(e); outcome = getErrorOutcome(e);
ReportedException.throwIfNecessary(e);
} }
} }

2
source/web/WEB-INF/alfresco.tld
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd"> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
<!-- Alfresco common JSF UI components tag library --> <!-- Alfresco common JSF UI components tag library -->
<taglib> <taglib>

2
source/web/WEB-INF/repo.tld
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd"> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
<taglib> <taglib>

2
source/web/WEB-INF/wcm.tld
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd"> <!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
<taglib> <taglib>

16
source/web/WEB-INF/web-application-context.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<!-- Top-level imports of XML configuration -->
<beans>
<import resource="classpath:alfresco/application-context.xml" />
<import resource="classpath:alfresco/webscript-framework-application-context.xml" />
<import resource="classpath:alfresco/web-client-application-context.xml" />
<import resource="classpath:alfresco/web-scripts-application-context.xml" />
<import resource="classpath*:alfresco/enterprise-web-scripts-application-context.xml" />
<import resource="classpath:alfresco/web-services-application-context.xml" />
<!--
To give final control over the tuning of the custom environment, the custom-web-context.xml file is processed
last (note: custom-web-context.xml isn't part of the source tree itself).
-->
<import resource="classpath*:alfresco/extension/custom-web-context.xml" />
</beans>

23
source/web/WEB-INF/web.xml
View File

@@ -67,22 +67,13 @@
<context-param> <context-param>
<param-name>contextConfigLocation</param-name> <param-name>contextConfigLocation</param-name>
<param-value> <param-value>/WEB-INF/web-application-context.xml</param-value>
classpath:alfresco/application-context.xml <description>Spring config file location</description>
classpath:alfresco/webscript-framework-application-context.xml </context-param>
classpath:alfresco/web-client-application-context.xml <context-param>
classpath:alfresco/web-scripts-application-context.xml <param-name>log4jExposeWebAppRoot</param-name>
classpath:alfresco/web-services-application-context.xml <param-value>false</param-value>
<description>Do not try to resolve web app root as file</description>
<!--
To give final control over the tuning of the custom environment,
the custom-web-context.xml file is processed last (note:
custom-web-context.xml isn't part of the source tree itself).
-->
classpath*:alfresco/extension/custom-web-context.xml
</param-value>
<description>Spring config file locations</description>
</context-param> </context-param>
<!-- These were previously init params for the WebDAV servlet, <!-- These were previously init params for the WebDAV servlet,