From 8b36a84dbdfe05ee8288d4b76ad0082e8fd16062 Mon Sep 17 00:00:00 2001
From: Paul Holmes-Higgin <paulhh@alfresco.com>
Date: Fri, 16 Nov 2007 12:53:13 +0000
Subject: [PATCH] Remove duplicate context file and set allow to all address
 patterns by default.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7390 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../extension/custom-email-server.sample.zip  | Bin 1077 -> 1092 bytes
 .../custom-email-service-context.xml.sample   |  26 ------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 config/alfresco/extension/custom-email-service-context.xml.sample

diff --git a/config/alfresco/extension/custom-email-server.sample.zip b/config/alfresco/extension/custom-email-server.sample.zip
index 806fee01af09498e15a4f815d307e953f24a57b8..150cc00f039349579a15d545c2091d03756e3121 100644
GIT binary patch
delta 526
zcmV+p0`dK|2*e1mmH`oVUT`<xss<X(0RRB@0{{RXld%I9lf3~9e^X71)Ibou56pik
z*o!U_LGU6BC^*U<ysQcy_EOWS$+X+)3jML;{Ci&|8J!I4NkY=pN56XSb?0Wix}gtY
zpCmh_ZO=Z?S4mIa32|&MGLqISbX)&6@-E2hk3QQ<<sjtaPAmFl?9UTIL-Y-`IU=Vu
zw6qhdS+JgHNa`eKf61i4NC4t!_y`t*>4h|1L#<EZ3f+IXBX+j&C1pjk&$JKR5mp~t
z83dnLNcWdOGo$rtWZ2An8yTgvo06(v^vJh@aO57sl(?1yz`WxELoyu^jj$P0z>M2A
zfr-tIS_lNSiyry_wwzSsW7K2(4)6^}ji+8~9{pTsHB$yjf5pR<Gub>=uDLF1gQl{1
z^Y%L3Dx$dI`G6azJx1c0&YckV3@rmE2y7|%Y{t#Uc)$I;{Xqkl0z<OpIRrhTZ&IHd
zL%AD$PO!(`c%ml`RqQM*KS7#_wt3z-;h)WuY%qOAU(dxIaBV&*dVX;~1bJsgqUQGD
z{aMC?>3DUOPtw$lnv9{*(1@)|184Tl%zo3{{)ZL2pziTmE1nfONs~O?*K)o_JxbgO
z9eoJ)Yb5z84&x2(A1)lU81RJ&ooW~4PxAT_OicgEUax)wlZFFX4R&5|H{YrT8qEO!
Q0QQsY149Ot0{{R30GWvR`v3p{

delta 511
zcmV<b0RaBQ2(<{XmH`nXVPZEtY95fj0RRBx0{{RXlfVNOlf3~9f0MzA8!-%q?}5C7
zU@vVcE);qx47AX+?4g%!3q9;bv6YFt9&4~Xo968+%{XN<Y)@s#7|HUl|C1*-+szGp
zOou|^8FmB41mCDUMo)k_JjqbmZnWC!cNzDI-h7H;E7T)F%zK`+p5}U46db^J-D?qe
zo>G84!6c;X8OFk%e?&-tRimg7X4BW;sxiDE*E<NYkgss}^%l_E!IvPc#Zlmpum@dZ
z4m6U!as@uDgv`-)Ll(Q{*U^j;x>_dE*5=pjm5hUeG2o;cxkitb00mAO&9Y)$3SbCD
zomlV871SX2IVzuuU3Z%DL*`Tdq2e88&gX$Andf=MYC{>Rf7D0<7qc?&ti4|Cja+K?
z_T4%iSfkuwyI|*e(3biv_YN8ls4OEE1q_g)*x=eV-tE5Ze!_^gQpsX@Oo>kv8ofAE
zxt-@+2+)4{43C&5vb(VSB56ak!|h<xZ^I)onPJkp0jobcfX}Qozi}87y|+yO_v-$`
z1>@d0UawMIK>9U(bL*Ph?mxiyiT%T~;Ljp0ASBDzSuY>Wpj+4zoMKA$M=11*ytX&F
ze=r}pn(!0kp1Du-H@SwMonArz0h5&jSq&p$VmCZ$9+18P0088Z`vXG;h64Zq002Ab
B_v`=w

diff --git a/config/alfresco/extension/custom-email-service-context.xml.sample b/config/alfresco/extension/custom-email-service-context.xml.sample
deleted file mode 100644
index 38c293c68f..0000000000
--- a/config/alfresco/extension/custom-email-service-context.xml.sample
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<!--
-	An example of how to override the emailServerConfiguration.
-	For example you can change port or domain or others property.
-	So here we substituted port to 2525 and added blocked senders from *.tut.by.
-	Also we turn on email server (set enabled property to true).	
--->
-<beans>
-	
-    <bean id="emailServerConfigurationProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="ignoreUnresolvablePlaceholders">
-            <value>true</value>
-        </property>
-        <property name="locations">
-            <list>
-                <value>classpath:alfresco/email-server.properties</value>
-
-                <!-- Override -->
-                <value>classpath:alfresco/extension/custom-email-server.properties</value>
-            </list>
-        </property>
-    </bean>
-
-</beans>